From ef0876d058949788d50d1c5195136a4d7814145e Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Fri, 29 Sep 2023 14:19:38 +0200 Subject: [PATCH 1/2] add redirecturl link --- src/common/notifications/NotificationBuilder.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/notifications/NotificationBuilder.ts b/src/common/notifications/NotificationBuilder.ts index 732d1c73..4fd3937c 100644 --- a/src/common/notifications/NotificationBuilder.ts +++ b/src/common/notifications/NotificationBuilder.ts @@ -5,6 +5,7 @@ import { Service } from "typedi"; import NotificationsService from "@Services/common/NotificationsService/NotificationsService"; import UsersService from "@Services/super-admin/UsersService/UsersService"; import OfficeFoldersService from "@Services/super-admin/OfficeFoldersService/OfficeFoldersService"; +import { BackendVariables } from "@Common/config/variables/Variables"; @Service() export default class NotificationBuilder { @@ -13,6 +14,7 @@ export default class NotificationBuilder { private documentsService: DocumentsService, private usersService: UsersService, private foldersService: OfficeFoldersService, + private backendVariables: BackendVariables ) {} public async sendDocumentDepositedNotification(documentEntity: Documents) { @@ -32,7 +34,7 @@ export default class NotificationBuilder { " " + document.depositor?.contact?.last_name + " vous a envoyé un document à valider", - redirection_url: "", + redirection_url: `${this.backendVariables.APP_HOST}/office/folders/${document.folder?.uid}/documents/${document.uid}`, created_at: new Date(), updated_at: new Date(), user: document.folder!.stakeholders || [], @@ -55,7 +57,7 @@ export default class NotificationBuilder { " - " + document.folder?.name + " a été certifié. Vous pouvez désormais télécharger le certificat de dépôt pour le mettre dans la GED de votre logiciel de rédaction d'acte.", - redirection_url: "", + redirection_url: `${this.backendVariables.APP_HOST}/office/folders/${document.folder?.uid}/documents/${document.uid}`, created_at: new Date(), updated_at: new Date(), user: document.folder!.stakeholders || [], @@ -80,7 +82,7 @@ export default class NotificationBuilder { this.notificationsService.create({ message: message, - redirection_url: "", + redirection_url: `${this.backendVariables.APP_HOST}/users/${vote.appointment.targeted_user.uid}`, created_at: new Date(), updated_at: new Date(), user: superAdminList || [], @@ -131,7 +133,7 @@ export default class NotificationBuilder { " avant le " + formattedDate + " (date limite d'expiration des documents).", - redirection_url: "", + redirection_url: `${this.backendVariables.APP_HOST}/office/folders/${folder.uid}`, created_at: new Date(), updated_at: new Date(), user: folder.stakeholders || [], From 199cf051a8361587ccc68fa312974207ba8412bf Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Fri, 29 Sep 2023 15:26:36 +0200 Subject: [PATCH 2/2] add redirect url to notifications --- src/common/notifications/NotificationBuilder.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/notifications/NotificationBuilder.ts b/src/common/notifications/NotificationBuilder.ts index 4fd3937c..0e8b9eb3 100644 --- a/src/common/notifications/NotificationBuilder.ts +++ b/src/common/notifications/NotificationBuilder.ts @@ -34,7 +34,7 @@ export default class NotificationBuilder { " " + document.depositor?.contact?.last_name + " vous a envoyé un document à valider", - redirection_url: `${this.backendVariables.APP_HOST}/office/folders/${document.folder?.uid}/documents/${document.uid}`, + redirection_url: `${this.backendVariables.APP_HOST}/folders/${document.folder?.uid}/documents/${document.uid}`, created_at: new Date(), updated_at: new Date(), user: document.folder!.stakeholders || [], @@ -57,7 +57,7 @@ export default class NotificationBuilder { " - " + document.folder?.name + " a été certifié. Vous pouvez désormais télécharger le certificat de dépôt pour le mettre dans la GED de votre logiciel de rédaction d'acte.", - redirection_url: `${this.backendVariables.APP_HOST}/office/folders/${document.folder?.uid}/documents/${document.uid}`, + redirection_url: `${this.backendVariables.APP_HOST}/folders/${document.folder?.uid}/documents/${document.uid}`, created_at: new Date(), updated_at: new Date(), user: document.folder!.stakeholders || [], @@ -133,7 +133,7 @@ export default class NotificationBuilder { " avant le " + formattedDate + " (date limite d'expiration des documents).", - redirection_url: `${this.backendVariables.APP_HOST}/office/folders/${folder.uid}`, + redirection_url: `${this.backendVariables.APP_HOST}/folders/${folder.uid}`, created_at: new Date(), updated_at: new Date(), user: folder.stakeholders || [],