From 38542c65adebe4bd340aca9f81981473d4ff1352 Mon Sep 17 00:00:00 2001 From: "CITE\\amentis" Date: Fri, 27 Sep 2024 13:21:51 +0300 Subject: [PATCH] add status changed notifications --- .../notification/NotificationProperties.java | 18 ++++++++++++++++++ .../description/DescriptionServiceImpl.java | 12 +++++++----- .../opencdmp/service/plan/PlanServiceImpl.java | 11 +++++++---- .../resources/config/notification-devel.yml | 2 ++ frontend/src/assets/i18n/baq.json | 2 ++ frontend/src/assets/i18n/de.json | 2 ++ frontend/src/assets/i18n/en.json | 2 ++ frontend/src/assets/i18n/es.json | 2 ++ frontend/src/assets/i18n/gr.json | 2 ++ frontend/src/assets/i18n/hr.json | 2 ++ frontend/src/assets/i18n/pl.json | 2 ++ frontend/src/assets/i18n/pt.json | 2 ++ frontend/src/assets/i18n/sk.json | 2 ++ frontend/src/assets/i18n/sr.json | 2 ++ frontend/src/assets/i18n/tr.json | 2 ++ .../core/enum/notification-type.enum.ts | 2 ++ .../core/formatting/enum-utils.service.ts | 2 ++ 17 files changed, 60 insertions(+), 9 deletions(-) diff --git a/backend/core/src/main/java/org/opencdmp/commons/notification/NotificationProperties.java b/backend/core/src/main/java/org/opencdmp/commons/notification/NotificationProperties.java index 8df77a337..c5e549c9a 100644 --- a/backend/core/src/main/java/org/opencdmp/commons/notification/NotificationProperties.java +++ b/backend/core/src/main/java/org/opencdmp/commons/notification/NotificationProperties.java @@ -11,11 +11,13 @@ public class NotificationProperties { private UUID planInvitationExistingUserType; private UUID planModifiedType; private UUID planFinalisedType; + private UUID planStatusChangedType; private UUID planAnnotationCreatedType; private UUID planAnnotationStatusChangedType; private UUID descriptionCreatedType; private UUID descriptionModifiedType; private UUID descriptionFinalisedType; + private UUID descriptionStatusChangedType; private UUID descriptionAnnotationCreatedType; private UUID descriptionAnnotationStatusChangedType; private UUID mergeAccountConfirmationType; @@ -61,6 +63,14 @@ public class NotificationProperties { this.planFinalisedType = planFinalisedType; } + public UUID getPlanStatusChangedType() { + return planStatusChangedType; + } + + public void setPlanStatusChangedType(UUID planStatusChangedType) { + this.planStatusChangedType = planStatusChangedType; + } + public UUID getPlanAnnotationCreatedType() { return planAnnotationCreatedType; } @@ -101,6 +111,14 @@ public class NotificationProperties { this.descriptionFinalisedType = descriptionFinalisedType; } + public UUID getDescriptionStatusChangedType() { + return descriptionStatusChangedType; + } + + public void setDescriptionStatusChangedType(UUID descriptionStatusChangedType) { + this.descriptionStatusChangedType = descriptionStatusChangedType; + } + public UUID getMergeAccountConfirmationType() { return this.mergeAccountConfirmationType; } diff --git a/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java index 0db62cb27..787f26340 100644 --- a/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java @@ -392,7 +392,7 @@ public class DescriptionServiceImpl implements DescriptionService { private void sendNotification(DescriptionEntity description, Boolean isUpdate) throws InvalidApplicationException { DescriptionStatusEntity descriptionStatusEntity = this.entityManager.find(DescriptionStatusEntity.class, description.getStatusId(), true); if (descriptionStatusEntity == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{description, DescriptionStatus.class.getSimpleName()}, LocaleContextHolder.getLocale())); - if (descriptionStatusEntity.getInternalStatus() == null || descriptionStatusEntity.getInternalStatus().equals(DescriptionStatus.Canceled)) return; + if (descriptionStatusEntity.getInternalStatus() != null && descriptionStatusEntity.getInternalStatus().equals(DescriptionStatus.Canceled)) return; List existingUsers = this.queryFactory.query(PlanUserQuery.class).disableTracking() .planIds(description.getPlanId()) @@ -406,7 +406,7 @@ public class DescriptionServiceImpl implements DescriptionService { if (!planUser.getUserId().equals(this.userScope.getUserIdSafe())){ UserEntity user = this.queryFactory.query(UserQuery.class).disableTracking().ids(planUser.getUserId()).first(); if (user == null || user.getIsActive().equals(IsActive.Inactive)) throw new MyValidationException(this.errors.getPlanInactiveUser().getCode(), this.errors.getPlanInactiveUser().getMessage()); - this.createDescriptionNotificationEvent(description, descriptionStatusEntity.getInternalStatus(), user, isUpdate); + this.createDescriptionNotificationEvent(description, descriptionStatusEntity, user, isUpdate); } } } @@ -455,17 +455,19 @@ public class DescriptionServiceImpl implements DescriptionService { return cleanData; } - private void createDescriptionNotificationEvent(DescriptionEntity description, DescriptionStatus internalStatus, UserEntity user, Boolean isUpdate) throws InvalidApplicationException { + private void createDescriptionNotificationEvent(DescriptionEntity description, DescriptionStatusEntity descriptionStatus, UserEntity user, Boolean isUpdate) throws InvalidApplicationException { NotifyIntegrationEvent event = new NotifyIntegrationEvent(); event.setUserId(user.getId()); - this.applyNotificationType(internalStatus, event, isUpdate); + if (descriptionStatus.getInternalStatus() == null) event.setNotificationType(this.notificationProperties.getDescriptionStatusChangedType()); + else this.applyNotificationType(descriptionStatus.getInternalStatus(), event, isUpdate); NotificationFieldData data = new NotificationFieldData(); List fieldInfoList = new ArrayList<>(); fieldInfoList.add(new FieldInfo("{recipient}", DataType.String, user.getName())); fieldInfoList.add(new FieldInfo("{reasonName}", DataType.String, this.queryFactory.query(UserQuery.class).disableTracking().ids(this.userScope.getUserId()).first().getName())); fieldInfoList.add(new FieldInfo("{name}", DataType.String, description.getLabel())); fieldInfoList.add(new FieldInfo("{id}", DataType.String, description.getId().toString())); + if (descriptionStatus.getInternalStatus() == null) fieldInfoList.add(new FieldInfo("{statusName}", DataType.String, descriptionStatus.getName())); if(this.tenantScope.getTenantCode() != null && !this.tenantScope.getTenantCode().equals(this.tenantScope.getDefaultTenantCode())){ fieldInfoList.add(new FieldInfo("{tenant-url-path}", DataType.String, String.format("/t/%s", this.tenantScope.getTenantCode()))); } @@ -525,7 +527,7 @@ public class DescriptionServiceImpl implements DescriptionService { this.eventBroker.emit(new DescriptionTouchedEvent(data.getId())); this.annotationEntityTouchedIntegrationEventHandler.handleDescription(data.getId()); - if (newStatusEntity.getInternalStatus() != null && newStatusEntity.getInternalStatus().equals(DescriptionStatus.Finalized)) this.sendNotification(data, true); + this.sendNotification(data, true); } return this.builderFactory.builder(DescriptionBuilder.class).authorize(AuthorizationFlags.AllExceptPublic).build(BaseFieldSet.build(fields, Description._id), data); } diff --git a/backend/core/src/main/java/org/opencdmp/service/plan/PlanServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/plan/PlanServiceImpl.java index d6d6d93b6..df033b439 100644 --- a/backend/core/src/main/java/org/opencdmp/service/plan/PlanServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/plan/PlanServiceImpl.java @@ -316,7 +316,6 @@ public class PlanServiceImpl implements PlanService { private void sendNotification(PlanEntity plan) throws InvalidApplicationException { PlanStatusEntity planStatusEntity = this.entityManager.find(PlanStatusEntity.class, plan.getStatusId(), true); if (planStatusEntity == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{plan.getStatusId(), PlanStatusEntity.class.getSimpleName()}, LocaleContextHolder.getLocale())); - if (planStatusEntity.getInternalStatus() == null) return; List existingUsers = this.queryFactory.query(PlanUserQuery.class).disableTracking() .planIds(plan.getId()) @@ -331,22 +330,25 @@ public class PlanServiceImpl implements PlanService { if (!planUser.getUserId().equals(this.userScope.getUserIdSafe())){ UserEntity user = this.queryFactory.query(UserQuery.class).disableTracking().ids(planUser.getUserId()).first(); if (user == null || user.getIsActive().equals(IsActive.Inactive)) throw new MyValidationException(this.errors.getPlanInactiveUser().getCode(), this.errors.getPlanInactiveUser().getMessage()); - this.createPlanNotificationEvent(plan, planStatusEntity.getInternalStatus(), user); + this.createPlanNotificationEvent(plan, planStatusEntity, user); } } } - private void createPlanNotificationEvent(PlanEntity plan, PlanStatus internalStatus, UserEntity user) throws InvalidApplicationException { + private void createPlanNotificationEvent(PlanEntity plan, PlanStatusEntity planStatus, UserEntity user) throws InvalidApplicationException { NotifyIntegrationEvent event = new NotifyIntegrationEvent(); event.setUserId(user.getId()); - this.applyNotificationType(internalStatus, event); + if (planStatus.getInternalStatus() == null) event.setNotificationType(this.notificationProperties.getPlanStatusChangedType()); + else this.applyNotificationType(planStatus.getInternalStatus(), event); + NotificationFieldData data = new NotificationFieldData(); List fieldInfoList = new ArrayList<>(); fieldInfoList.add(new FieldInfo("{recipient}", DataType.String, user.getName())); fieldInfoList.add(new FieldInfo("{reasonName}", DataType.String, this.queryFactory.query(UserQuery.class).disableTracking().ids(this.userScope.getUserId()).first().getName())); fieldInfoList.add(new FieldInfo("{name}", DataType.String, plan.getLabel())); fieldInfoList.add(new FieldInfo("{id}", DataType.String, plan.getId().toString())); + if (planStatus.getInternalStatus() == null) fieldInfoList.add(new FieldInfo("{statusName}", DataType.String, planStatus.getName())); if(this.tenantScope.getTenantCode() != null && !this.tenantScope.getTenantCode().equals(this.tenantScope.getDefaultTenantCode())){ fieldInfoList.add(new FieldInfo("{tenant-url-path}", DataType.String, String.format("/t/%s", this.tenantScope.getTenantCode()))); } @@ -1626,6 +1628,7 @@ public class PlanServiceImpl implements PlanService { this.entityManager.merge(plan); this.entityManager.flush(); + this.sendNotification(plan); } } diff --git a/backend/web/src/main/resources/config/notification-devel.yml b/backend/web/src/main/resources/config/notification-devel.yml index de6b3e48e..217cc1a1c 100644 --- a/backend/web/src/main/resources/config/notification-devel.yml +++ b/backend/web/src/main/resources/config/notification-devel.yml @@ -3,11 +3,13 @@ notification: planInvitationExistingUserType: 4904dea2-5079-46d3-83be-3a19c9ab45dc planModifiedType: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB planFinalisedType: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E + planStatusChangedType: 25bbc307-4fa8-4381-b2d7-a3395f57d575 planAnnotationCreatedType: 1cca80f5-2ea9-41ae-a204-9b4332216c24 planAnnotationStatusChangedType: 0c8a5c62-e48f-4eca-99ee-a7f262477061 descriptionCreatedType: 8965b1d5-99a6-4acf-9016-c0d0ce341364 descriptionModifiedType: 4FDBFA80-7A71-4A69-B854-67CBB70648F1 descriptionFinalisedType: 33790bad-94d4-488a-8ee2-7f6295ca18ea + descriptionStatusChangedType: 8389aca8-43bd-4aac-958d-24daf6ed47b4 descriptionAnnotationCreatedType: db1e99d2-a240-4e75-9bb2-ef25b234c1f0 descriptionAnnotationStatusChangedType: 3189e3a6-91e6-40c6-8ff8-275a68445aec mergeAccountConfirmationType: BFE68845-CB05-4C5A-A03D-29161A7C9660 diff --git a/frontend/src/assets/i18n/baq.json b/frontend/src/assets/i18n/baq.json index 1fd3f1d49..107e614c1 100644 --- a/frontend/src/assets/i18n/baq.json +++ b/frontend/src/assets/i18n/baq.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/de.json b/frontend/src/assets/i18n/de.json index 45951b2cd..3b45a97ec 100644 --- a/frontend/src/assets/i18n/de.json +++ b/frontend/src/assets/i18n/de.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json index 88e4e97bc..dae6ac9bf 100644 --- a/frontend/src/assets/i18n/en.json +++ b/frontend/src/assets/i18n/en.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/es.json b/frontend/src/assets/i18n/es.json index d5d802397..5c10fe2f7 100644 --- a/frontend/src/assets/i18n/es.json +++ b/frontend/src/assets/i18n/es.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/gr.json b/frontend/src/assets/i18n/gr.json index 0230f5e41..b0027d2ae 100644 --- a/frontend/src/assets/i18n/gr.json +++ b/frontend/src/assets/i18n/gr.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/hr.json b/frontend/src/assets/i18n/hr.json index 604c6d803..fed2a28c1 100644 --- a/frontend/src/assets/i18n/hr.json +++ b/frontend/src/assets/i18n/hr.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/pl.json b/frontend/src/assets/i18n/pl.json index 75e50c1ae..2aa69ba67 100644 --- a/frontend/src/assets/i18n/pl.json +++ b/frontend/src/assets/i18n/pl.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/pt.json b/frontend/src/assets/i18n/pt.json index ed0001af9..3bc8dfc0c 100644 --- a/frontend/src/assets/i18n/pt.json +++ b/frontend/src/assets/i18n/pt.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/sk.json b/frontend/src/assets/i18n/sk.json index 613badf88..cb68acb3f 100644 --- a/frontend/src/assets/i18n/sk.json +++ b/frontend/src/assets/i18n/sk.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/sr.json b/frontend/src/assets/i18n/sr.json index d80882731..793d958cb 100644 --- a/frontend/src/assets/i18n/sr.json +++ b/frontend/src/assets/i18n/sr.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/assets/i18n/tr.json b/frontend/src/assets/i18n/tr.json index a3eef9fa8..9477255a1 100644 --- a/frontend/src/assets/i18n/tr.json +++ b/frontend/src/assets/i18n/tr.json @@ -2259,11 +2259,13 @@ "PLAN-INVITATION-EXISTING-USER": "Plan Invitation Existing User", "PLAN-MODIFIED": "Plan Modified", "PLAN-FINALISED": "Plan Finalised", + "PLAN-STATUS-CHANGED": "Plan Status Changed", "PLAN-ANNOTATION-CREATED": "Plan Annotation Created", "PLAN-ANNOTATION-STATUS-CHANGED": "Plan Annotation Status Changed", "DESCRIPTION-CREATED": "Description Created", "DESCRIPTION-MODIFIED": "Description Modified", "DESCRIPTION-FINALISED": "Description Finalised", + "DESCRIPTION-STATUS-CHANGED": "Description Status Changed", "DESCRIPTION-ANNOTATION-CREATED": "Description Annotation Created", "DESCRIPTION-ANNOTATION-STATUS-CHANGED": "Description Annotation Status Changed", "MERGE-ACCOUNT-CONFIRMATION": "Merge Account Confirmation", diff --git a/frontend/src/notification-service/core/enum/notification-type.enum.ts b/frontend/src/notification-service/core/enum/notification-type.enum.ts index 64123d82d..7b4489ae1 100644 --- a/frontend/src/notification-service/core/enum/notification-type.enum.ts +++ b/frontend/src/notification-service/core/enum/notification-type.enum.ts @@ -4,12 +4,14 @@ export enum NotificationType { descriptionCreatedType = '8965b1d5-99a6-4acf-9016-c0d0ce341364', planModifiedType = '4542262a-22f8-4baa-9db6-1c8e70ac1dbb', planFinalisedType = '90db0b46-42de-bd89-aebf-6f27efeb256e', + planStatusChangedType = "25bbc307-4fa8-4381-b2d7-a3395f57d575", planAnnotationCreatedType = '1cca80f5-2ea9-41ae-a204-9b4332216c24', planAnnotationStatusChangedType = '0c8a5c62-e48f-4eca-99ee-a7f262477061', descriptionAnnotationCreatedType = 'db1e99d2-a240-4e75-9bb2-ef25b234c1f0', descriptionAnnotationStatusChangedType = '3189e3a6-91e6-40c6-8ff8-275a68445aec', descriptionModifiedType = '4fdbfa80-7a71-4a69-b854-67cbb70648f1', descriptionFinalisedType = '33790bad-94d4-488a-8ee2-7f6295ca18ea', + descriptionStatusChangedType = "8389aca8-43bd-4aac-958d-24daf6ed47b4", mergeAccountConfirmationType = 'bfe68845-cb05-4c5a-a03d-29161a7c9660', removeCredentialConfirmationType = 'c9bc3f16-057e-4bba-8a5f-36bd835e5604', planDepositType = '55736f7a-83ab-4190-af43-9d031a6f9612', diff --git a/frontend/src/notification-service/core/formatting/enum-utils.service.ts b/frontend/src/notification-service/core/formatting/enum-utils.service.ts index 5d822fb51..cf5d91e6d 100644 --- a/frontend/src/notification-service/core/formatting/enum-utils.service.ts +++ b/frontend/src/notification-service/core/formatting/enum-utils.service.ts @@ -32,11 +32,13 @@ export class NotificationServiceEnumUtils extends BaseEnumUtilsService { case NotificationType.planInvitationExistingUserType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-INVITATION-EXISTING-USER'); case NotificationType.planModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-MODIFIED'); case NotificationType.planFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-FINALISED'); + case NotificationType.planStatusChangedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-STATUS-CHANGED'); case NotificationType.planAnnotationCreatedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-ANNOTATION-CREATED'); case NotificationType.planAnnotationStatusChangedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.PLAN-ANNOTATION-STATUS-CHANGED'); case NotificationType.descriptionCreatedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-CREATED'); case NotificationType.descriptionModifiedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-MODIFIED'); case NotificationType.descriptionFinalisedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-FINALISED'); + case NotificationType.descriptionStatusChangedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-STATUS-CHANGED'); case NotificationType.descriptionAnnotationCreatedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-ANNOTATION-CREATED'); case NotificationType.descriptionAnnotationStatusChangedType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.DESCRIPTION-ANNOTATION-STATUS-CHANGED'); case NotificationType.mergeAccountConfirmationType: return this.language.instant('TYPES.NOTIFICATION-TEMPLATE-NOTIFICATION-TYPE.MERGE-ACCOUNT-CONFIRMATION');