Merge branch 'beta' into next

Author: AntoineRelief

CHANGELOG/CHANGELOG_beta.md

@@ -1,3 +1,10 @@
+# [2.13.0-beta.1](https://github.com/ReliefApplications/ems-backend/compare/v2.12.2...v2.13.0-beta.1) (2025-02-27)
+
+
+### Features
+
+* improve back-end caching for common services requests ([173877b](https://github.com/ReliefApplications/ems-backend/commit/173877b6f880194f1da554e4711bbbcb647181bd))
+
 # [2.12.0-beta.14](https://github.com/ReliefApplications/ems-backend/compare/v2.12.0-beta.13...v2.12.0-beta.14) (2025-02-14)
 
 

src/schema/mutation/deleteEmailDistributionList.mutation.ts

@@ -0,0 +1,63 @@
+import { GraphQLError, GraphQLNonNull, GraphQLID } from 'graphql';
+import { logger } from '@services/logger.service';
+import { graphQLAuthCheck } from '@schema/shared';
+import { Context } from '@server/apollo/context';
+import { EmailDistributionList, EmailNotification } from '@models';
+import { EmailDistributionListType } from '@schema/types/emailDistribution.type';
+import extendAbilityForApplications from '@security/extendAbilityForApplication';
+import { AppAbility } from '@security/defineUserAbility';
+
+/**
+ * Mutation to delete an existing distribution list.
+ */
+export default {
+  type: EmailDistributionListType,
+  args: {
+    id: { type: new GraphQLNonNull(GraphQLID) },
+  },
+  async resolve(_, { id }, context: Context) {
+    graphQLAuthCheck(context);
+
+    try {
+      const distributionList = await EmailDistributionList.findOne({
+        _id: id,
+        isDeleted: 0,
+      });
+
+      if (!distributionList) {
+        throw new GraphQLError(context.i18next.t('common.errors.dataNotFound'));
+      }
+
+      const user = context.user;
+      const ability: AppAbility = extendAbilityForApplications(
+        user,
+        distributionList.applicationId.toString()
+      );
+
+      if (ability.cannot('update', 'EmailNotification')) {
+        throw new GraphQLError(
+          context.i18next.t('common.errors.permissionNotGranted')
+        );
+      }
+
+      // Unset the reference in any EmailNotifications using this distribution list
+      await EmailNotification.updateMany(
+        { emailDistributionList: distributionList._id },
+        { $unset: { emailDistributionList: 1 } }
+      );
+
+      // Delete DL
+      await distributionList.deleteOne();
+
+      return distributionList;
+    } catch (err) {
+      logger.error(err.message, { stack: err.stack });
+      if (err instanceof GraphQLError) {
+        throw new GraphQLError(err.message);
+      }
+      throw new GraphQLError(
+        context.i18next.t('common.errors.internalServerError')
+      );
+    }
+  },
+};

src/schema/mutation/deleteEmailNotification.mutation.ts

@@ -15,6 +15,7 @@ import { Types } from 'mongoose';
 import { Context } from '@server/apollo/context';
 import extendAbilityForApplications from '@security/extendAbilityForApplication';
 import { CustomTemplate } from '@models/customTemplate.model';
+import { deleteFile } from '@utils/notification/util';
 
 /** Arguments for the deleteEmailNotification mutation */
 type DeleteEmailNotificationArgs = {
@@ -60,6 +61,7 @@ export default {
           _id: args.id,
           applicationId: args.applicationId,
         });
+        await deleteFile(emailNotification.attachments, context);
       } else {
         // Handle cases where the user has limited permissions
         const accessibleEmailNotification = await EmailNotification.findOne({
@@ -73,6 +75,7 @@ export default {
             _id: args.id,
             applicationId: args.applicationId,
           });
+          await deleteFile(emailNotification.attachments, context);
         }
       }
 

src/schema/mutation/index.ts

@@ -96,6 +96,7 @@ import editEmailDistributionList from './editEmailDistributionList.mutation';
 import addCustomTemplate from './addCustomTemplate.mutation';
 import editCustomTemplate from './editCustomTemplate.mutation';
 import deleteEmailNotification from './deleteEmailNotification.mutation';
+import deleteEmailDistributionList from './deleteEmailDistributionList.mutation';
 
 /** GraphQL mutation definition */
 const Mutation = new GraphQLObjectType({
@@ -198,6 +199,7 @@ const Mutation = new GraphQLObjectType({
     deleteDashboardTemplates,
     editCustomTemplate,
     deleteEmailNotification,
+    deleteEmailDistributionList,
   },
 });
 

src/utils/notification/util.ts

@@ -1,3 +1,9 @@
+import { EmailNotificationAttachment } from '@models/emailNotification.model';
+import { Context } from '@server/apollo/context';
+import { logger } from '@services/logger.service';
+import axios from 'axios';
+import config from 'config';
+
 /**
  * Returns headers required for Azure Function
  *
@@ -13,3 +19,46 @@ export const azureFunctionHeaders = (req: any) => {
     }),
   };
 };
+
+/**
+ * Deletes files from document management
+ *
+ * @param attachments - attachment details, including file info and whether to send as an attachment.
+ * @param context - context from GraphQL resolver, used to get accesstoken
+ * @returns promise that resolves when the files have been deleted.
+ */
+export async function deleteFile(
+  attachments: EmailNotificationAttachment,
+  context: Context
+) {
+  if (
+    !attachments.files ||
+    attachments.files.length === 0 ||
+    !context.accesstoken
+  ) {
+    return;
+  }
+
+  const attachmentRequests = attachments.files.map(async (file) => {
+    const { driveId, itemId, fileName } = file;
+
+    try {
+      if (attachments.sendAsAttachment) {
+        await axios.delete(
+          `${config.get(
+            'commonServices.url'
+          )}/documents/drives/${driveId}/items/${itemId}`,
+          {
+            headers: {
+              Authorization: `Bearer ${context.accesstoken}`,
+            },
+          }
+        );
+      }
+    } catch (error) {
+      logger.error(`Failed to delete file: ${fileName}`, error.message);
+    }
+  });
+
+  await Promise.all(attachmentRequests);
+}