@plusscommunities/pluss-maintenance-aws-forms 2.1.23 → 2.1.24

package/integration/archibus/ArchibusStrategy.js

@@ -128,6 +128,7 @@ class ArchibusStrategy extends IntegrationStrategy {
         InternalId: request.id,
         ExternalId: response.data.wrId,
         TrackedData: {},
+        SystemType: "Archibus",
       });
 
       // Save the Archibus ID as the job number and add history entry
@@ -145,6 +146,7 @@ class ArchibusStrategy extends IntegrationStrategy {
           displayName: "Archibus Integration",
           id: "system",
         },
+        systemType: "Archibus",
       });
 
       await editRef(values.tableNameMaintenance, "id", request.id, {
@@ -181,6 +183,7 @@ class ArchibusStrategy extends IntegrationStrategy {
             displayName: "Archibus Integration",
             id: "system",
           },
+          systemType: "Archibus",
         });
 
         await editRef(values.tableNameMaintenance, "id", request.id, {

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.23",
+  "version": "2.1.24",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-forms",
-  "version": "2.1.23",
+  "version": "2.1.24",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",

package/requests/getExternalSync.js

@@ -100,51 +100,27 @@ module.exports = async (event, params) => {
 
     log("getExternalSync", "Authorised", true, logId);
 
-    // Query externalentities table for this request
-    // Check both SeeStuff and Archibus entity types
-    const entityTypes = [
-      `${values.serviceKey}_SeeStuff`,
-      `${values.serviceKey}_Archibus`,
-    ];
-
-    log("getExternalSync", "CheckingEntityTypes", entityTypes, logId);
-
     let externalSync = null;
+    const query = await indexQuery("externalentities", {
+      IndexName: "OnlyInternalIdIndex",
+      KeyConditionExpression: "InternalId = :internalId",
+      ExpressionAttributeValues: {
+        ":internalId": request.id,
+      },
+    });
+
+    log("getExternalSync", "Results", query.Items.length, logId);
+
+    if (query.Items && query.Items.length > 0) {
+      const item = query.Items[0];
+      externalSync = {
+        systemType: item.SystemType,
+        externalId: item.ExternalId,
+        syncedAt: item.LastUpdated,
+        trackedData: item.TrackedData || {},
+      };
 
-    // Check each external system type
-    for (const entityType of entityTypes) {
-      const query = await indexQuery("externalentities", {
-        IndexName: "InternalIdIndex",
-        KeyConditionExpression:
-          "EntityType = :entityType AND InternalId = :internalId",
-        ExpressionAttributeValues: {
-          ":entityType": entityType,
-          ":internalId": request.id,
-        },
-      });
-
-      log(
-        "getExternalSync",
-        `${entityType}_Results`,
-        query.Items.length,
-        logId
-      );
-
-      if (query.Items && query.Items.length > 0) {
-        const item = query.Items[0];
-        // Extract system name from entity type (e.g., "maintenance_SeeStuff" -> "SeeStuff")
-        const systemName = entityType.split("_")[1];
-
-        externalSync = {
-          externalSystem: systemName,
-          externalId: item.ExternalId,
-          syncedAt: item.LastUpdated,
-          trackedData: item.TrackedData || {},
-        };
-
-        log("getExternalSync", "FoundSync", externalSync, logId);
-        break; // Stop after finding first match
-      }
+      log("getExternalSync", "FoundSync", externalSync, logId);
     }
 
     // If no external sync found, return 404

package/requests/setExternalJobId.js

@@ -67,6 +67,7 @@ module.exports = async (event, data) => {
       LastUpdated: moment().valueOf(),
       TrackedData: data.trackedData || {},
       Site: job.site, // Store for site-specific queries
+      SystemType: data.systemType,
     });
 
     log(action, "ExternalEntityCreated", externalEntity, logId);
@@ -78,6 +79,7 @@ module.exports = async (event, data) => {
       EntryType: "ExternalIDSet",
       externalId: data.externalId,
       user,
+      systemType: data.systemType,
     });
 
     // 8. Update job with history and optionally update job number for system parity