Merge pull request #5953 from bcgov/fix/5948

feat(5948): revisit sync-changes API for public and private clouds

Author: Kolezhanchik

app/app/api/v1/private-cloud/requests/sync-changes/route.ts

@@ -3,7 +3,8 @@ import createApiHandler from '@/core/api-handler';
 import prisma from '@/core/prisma';
 import { OkResponse } from '@/core/responses';
 import { comparePrivateProductData } from '@/helpers/product-change';
-import { RequestType } from '@/prisma/client';
+import { PrivateCloudRequest, RequestType } from '@/prisma/client';
+import { enrichMembersWithEmail } from '@/services/db';
 
 const apiHandler = createApiHandler({
   roles: [GlobalRole.Admin],
@@ -30,12 +31,22 @@ export const POST = apiHandler(async () => {
     },
   });
 
-  const results = await Promise.all(
-    requests.map((req) => {
-      const { changes, ...otherChangeMeta } = comparePrivateProductData(req.originalData, req.decisionData);
-      return prisma.privateCloudRequest.update({ where: { id: req.id }, data: { changes: otherChangeMeta } });
-    }),
-  );
+  const results: PrivateCloudRequest[] = [];
+
+  for (const req of requests) {
+    const [enrichedOriginal, enrichedDecision] = await Promise.all([
+      enrichMembersWithEmail(req.originalData),
+      enrichMembersWithEmail(req.decisionData),
+    ]);
+    const { changes, ...otherChangeMeta } = comparePrivateProductData(enrichedOriginal, enrichedDecision);
+
+    const updated = await prisma.privateCloudRequest.update({
+      where: { id: req.id },
+      data: { changes: otherChangeMeta },
+    });
+
+    results.push(updated);
+  }
 
   await prisma.privateCloudRequest.updateMany({
     where: { type: { not: RequestType.EDIT } },

app/app/api/v1/public-cloud/requests/sync-changes/route.ts

@@ -3,7 +3,8 @@ import createApiHandler from '@/core/api-handler';
 import prisma from '@/core/prisma';
 import { OkResponse } from '@/core/responses';
 import { comparePublicProductData } from '@/helpers/product-change';
-import { RequestType } from '@/prisma/client';
+import { PublicCloudRequest, RequestType } from '@/prisma/client';
+import { enrichMembersWithEmail } from '@/services/db';
 
 const apiHandler = createApiHandler({
   roles: [GlobalRole.Admin],
@@ -18,29 +19,39 @@ export const POST = apiHandler(async () => {
           projectOwner: true,
           primaryTechnicalLead: true,
           secondaryTechnicalLead: true,
+          expenseAuthority: true,
         },
       },
       decisionData: {
         include: {
           projectOwner: true,
           primaryTechnicalLead: true,
           secondaryTechnicalLead: true,
+          expenseAuthority: true,
         },
       },
     },
   });
 
-  const results = await Promise.all(
-    requests.map((req) => {
-      const { changes, ...otherChangeMeta } = comparePublicProductData(req.originalData, req.decisionData);
-      return prisma.publicCloudRequest.update({ where: { id: req.id }, data: { changes: otherChangeMeta } });
-    }),
-  );
+  const results: PublicCloudRequest[] = [];
 
-  await prisma.publicCloudRequest.updateMany({
-    where: { type: { not: RequestType.EDIT } },
-    data: { changes: null },
-  });
+  for (const req of requests) {
+    const [enrichedOriginal, enrichedDecision] = await Promise.all([
+      enrichMembersWithEmail(req.originalData),
+      enrichMembersWithEmail(req.decisionData),
+    ]);
+    const { changes, ...otherChangeMeta } = comparePublicProductData(enrichedOriginal, enrichedDecision);
+
+    const updated = await prisma.publicCloudRequest.update({
+      where: { id: req.id },
+      data: { changes: otherChangeMeta },
+    });
+
+    results.push(updated);
+  }
 
-  return OkResponse(results.map((ret) => ret.id));
+  if (!results.length) {
+    return OkResponse({ message: 'No updates were made.' });
+  }
+  return OkResponse(results.map((res) => res.id));
 });

app/helpers/product-change.ts

@@ -107,6 +107,8 @@ const publicDataFields = [
   'name',
   'description',
   'ministry',
+  'providerSelectionReasons',
+  'providerSelectionReasonsNote',
   'accountCoding',
   'budget',
   'projectOwner.email',
@@ -123,7 +125,9 @@ function preparePublicCloudProductCloudData(data: any) {
       roles: (member.roles || []).join(', '),
     }));
   }
-
+  if (data.providerSelectionReasons) {
+    data.providerSelectionReasons = data.providerSelectionReasons.join(', ');
+  }
   return data;
 }
 
@@ -147,6 +151,8 @@ export function comparePublicProductData(data1: any, data2: any) {
       case 'name':
       case 'description':
       case 'ministry':
+      case 'providerSelectionReasons':
+      case 'providerSelectionReasonsNote':
         profileChanged = true;
         break;
 

app/services/db/user.ts

@@ -6,7 +6,7 @@ import _uniq from 'lodash-es/uniq';
 import { logger } from '@/core/logging';
 import prisma from '@/core/prisma';
 import { parsePaginationParams } from '@/helpers/pagination';
-import { Prisma } from '@/prisma/client';
+import { Prisma, PrivateCloudRequestData, PublicCloudRequestData } from '@/prisma/client';
 import { listUsersByRoles, findUserByEmail, getKcAdminClient } from '@/services/keycloak/app-realm';
 import { getUserByEmail, getUserPhoto } from '@/services/msgraph';
 import { AppUser } from '@/types/user';
@@ -284,3 +284,24 @@ export async function getUsersEmailsByIds(ids: (string | null | undefined)[]) {
 
   return filteredIds.map((id) => userMap.get(id) ?? null);
 }
+
+export async function enrichMembersWithEmail(data: PublicCloudRequestData | PrivateCloudRequestData | null) {
+  if (!data?.members?.length) return data;
+
+  const userIds = Array.from(new Set(data.members.map((m) => m.userId).filter((id): id is string => !!id)));
+
+  const users = await getUsersEmailsByIds(userIds);
+  const userMap = new Map(users.map((u) => [u?.id, u]));
+
+  data.members = data.members.map((member: any) => {
+    if (member.email) return member;
+
+    const user = userMap.get(member.userId);
+    return {
+      ...member,
+      email: user?.email ?? '',
+    };
+  });
+
+  return data;
+}