Merge branch 'next' into beta

Author: AntoineRelief

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.12.2](https://github.com/ReliefApplications/ems-backend/compare/v2.12.1...v2.12.2) (2025-02-20)
+
+
+### Bug Fixes
+
+* allow files to be attached to emails ([#1191](https://github.com/ReliefApplications/ems-backend/issues/1191)) ([49d91cc](https://github.com/ReliefApplications/ems-backend/commit/49d91cc39db11a2c04a0278f5f515bc49c250c3f)), closes [AB#107812](https://github.com/AB/issues/107812)
+
 ## [2.12.1](https://github.com/ReliefApplications/ems-backend/compare/v2.12.0...v2.12.1) (2025-02-15)
 
 

CHANGELOG/CHANGELOG_next.md

@@ -1,3 +1,10 @@
+## [2.12.2-rc.1](https://github.com/ReliefApplications/ems-backend/compare/v2.12.1...v2.12.2-rc.1) (2025-02-19)
+
+
+### Bug Fixes
+
+* allow files to be attached to emails ([#1191](https://github.com/ReliefApplications/ems-backend/issues/1191)) ([49d91cc](https://github.com/ReliefApplications/ems-backend/commit/49d91cc39db11a2c04a0278f5f515bc49c250c3f)), closes [AB#107812](https://github.com/AB/issues/107812)
+
 # [2.12.0-rc.3](https://github.com/ReliefApplications/ems-backend/compare/v2.12.0-rc.2...v2.12.0-rc.3) (2025-02-14)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ems-backend",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "description": "",
   "main": "index.js",
   "scripts": {

package.json

@@ -44,6 +44,30 @@ export interface Dataset {
   };
 }
 
+/** Interface File */
+export interface EmailNotificationFile {
+  occurrence?: {
+    id: string;
+    name?: string;
+  };
+  driveId: string;
+  itemId: string;
+  fileName: string;
+  clamAV?: string;
+  fileFormat?: string;
+  versionName?: string;
+  fileSize: string;
+  documentType?: any[];
+  documentCategory?: any[];
+  createdDate?: string;
+  modifiedDate?: string;
+}
+
+/** Model for email File attachement response */
+export interface EmailNotificationAttachment {
+  sendAsAttachment: boolean;
+  files?: EmailNotificationFile[];
+}
 /** custom notification documents interface declaration */
 export interface EmailNotification extends Document {
   kind: 'EmailNotification';
@@ -67,6 +91,7 @@ export interface EmailNotification extends Document {
   modifiedAt?: Date;
   isDraft?: boolean;
   draftStepper?: number;
+  attachments?: EmailNotificationAttachment;
 }
 
 /** Mongoose email notification schema declaration */
@@ -164,6 +189,28 @@ export const emailNotificationSchema = new Schema<EmailNotification>(
     draftStepper: {
       type: Number,
     },
+    attachments: {
+      sendAsAttachment: { type: Boolean, default: false },
+      files: [
+        {
+          occurrence: {
+            id: { type: String },
+            name: { type: String },
+          },
+          driveId: { type: String, required: true },
+          itemId: { type: String, required: true },
+          fileName: { type: String, required: true },
+          clamAV: { type: String },
+          fileFormat: { type: String },
+          versionName: { type: String },
+          fileSize: { type: String, required: true },
+          documentType: [{ type: mongoose.Schema.Types.Mixed }],
+          documentCategory: [{ type: mongoose.Schema.Types.Mixed }],
+          createdDate: { type: String },
+          modifiedDate: { type: String },
+        },
+      ],
+    },
   },
   {
     timestamps: { createdAt: 'createdAt', updatedAt: 'modifiedAt' },

src/models/emailNotification.model.ts

@@ -1,3 +1,4 @@
+import { EmailNotificationAttachment } from '@models';
 import {
   GraphQLInputObjectType,
   GraphQLString,
@@ -28,6 +29,7 @@ export type EmailNotificationArgs = {
   isDeleted: number;
   isDraft: boolean;
   draftStepper: number;
+  attachments: EmailNotificationAttachment;
 };
 
 /**
@@ -65,6 +67,47 @@ export const DatasetInputType = new GraphQLInputObjectType({
   }),
 });
 
+/**
+ * Input type for email notification file details.
+ */
+export const EmailNotificationFileInputType = new GraphQLInputObjectType({
+  name: 'EmailNotificationFileInputType',
+  fields: () => ({
+    occurrence: {
+      type: new GraphQLInputObjectType({
+        name: 'OccurrenceInputType',
+        fields: {
+          id: { type: new GraphQLNonNull(GraphQLString) },
+          name: { type: GraphQLString },
+        },
+      }),
+    },
+    _id: { type: GraphQLID },
+    driveId: { type: new GraphQLNonNull(GraphQLString) },
+    itemId: { type: new GraphQLNonNull(GraphQLString) },
+    fileName: { type: new GraphQLNonNull(GraphQLString) },
+    clamAV: { type: GraphQLString },
+    fileFormat: { type: GraphQLString },
+    versionName: { type: GraphQLString },
+    fileSize: { type: new GraphQLNonNull(GraphQLString) },
+    documentType: { type: new GraphQLList(GraphQLJSON) },
+    documentCategory: { type: new GraphQLList(GraphQLJSON) },
+    createdDate: { type: GraphQLString },
+    modifiedDate: { type: GraphQLString },
+  }),
+});
+
+/**
+ * Input type for email notification attachment details.
+ */
+export const EmailNotificationAttachmentInputType = new GraphQLInputObjectType({
+  name: 'EmailNotificationAttachmentInputType',
+  fields: () => ({
+    sendAsAttachment: { type: GraphQLBoolean },
+    files: { type: new GraphQLList(EmailNotificationFileInputType) },
+  }),
+});
+
 /** GraphQL custom notification query input type definition */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const EmailNotificationInputType = new GraphQLInputObjectType({
@@ -88,5 +131,6 @@ export const EmailNotificationInputType = new GraphQLInputObjectType({
     isDeleted: { type: GraphQLInt },
     isDraft: { type: GraphQLBoolean },
     draftStepper: { type: GraphQLInt },
+    attachments: { type: EmailNotificationAttachmentInputType },
   }),
 });

src/schema/inputs/emailNotification.input.ts

@@ -87,6 +87,7 @@ export default {
         lastExecutionStatus: args.notification.lastExecutionStatus,
         isDraft: args.notification.isDraft,
         draftStepper: args.notification.draftStepper,
+        attachments: args.notification.attachments,
       };
 
       // Check permission to edit an email notification

src/schema/mutation/addEmailNotification.mutation.ts

@@ -115,6 +115,7 @@ export default {
           isDeleted: args.notification.isDeleted,
           isDraft: args.notification.isDraft,
           draftStepper: args.notification.draftStepper,
+          attachments: args.notification.attachments,
         };
 
         // Check permission to edit an email notification

src/schema/mutation/editEmailNotification.mutation.ts

@@ -85,6 +85,7 @@ export const EmailNotificationType = new GraphQLObjectType({
     isDeleted: { type: GraphQLInt },
     isDraft: { type: GraphQLBoolean },
     draftStepper: { type: GraphQLInt },
+    attachments: { type: GraphQLJSON },
   }),
 });