@plusscommunities/pluss-maintenance-aws 2.1.13 → 2.1.14-beta.0

package/integration/archibus/ArchibusStrategy.js

@@ -9,6 +9,7 @@ const updateRef = require("@plusscommunities/pluss-core-aws/db/common/updateRef"
 const indexQuery = require("@plusscommunities/pluss-core-aws/db/common/indexQuery");
 const publishNotifications = require("@plusscommunities/pluss-core-aws/db/notifications/publishNotifications");
 const getRef = require("@plusscommunities/pluss-core-aws/db/common/getRef");
+const getString = require("@plusscommunities/pluss-core-aws/db/strings/getString");
 const { values } = require("../../values.config");
 
 class ArchibusStrategy extends IntegrationStrategy {
@@ -23,6 +24,7 @@ class ArchibusStrategy extends IntegrationStrategy {
 
     this.statusMap = config.StatusMap;
     this.siteMap = config.SiteMap ?? {};
+    this.buildingCodes = [];
   }
 
   /**
@@ -61,10 +63,48 @@ class ArchibusStrategy extends IntegrationStrategy {
    */
   createRequest = async (request, mockResponse = null) => {
     const logId = log("Archibus:CreateRequest", "Start", request);
-    const siteId = this.siteMap[request.site];
+
+    let siteId = this.siteMap[request.site];
+    let buildingCode = null;
+    if (request.room) {
+      if (this.buildingCodes.length === 0) {
+        this.buildingCodes = await getString(
+          getRowId(request.site, `${values.serviceKey}buildingcodes`),
+          "plussSpace"
+        );
+      }
+      const building = this.buildingCodes.find((b) => {
+        const address = request.room.toLowerCase();
+        const search = b.SearchString.toLowerCase();
+        const name = b.BuildingName.toLowerCase();
+        return address.includes(search) || address.includes(name);
+      });
+
+      if (building?.SiteCode) siteId = building.SiteCode.toString();
+      buildingCode = building?.BuildingCode;
+    }
     if (!siteId) return false;
 
     try {
+      const data = {
+        prob_type: "1.ON-SITE|1. MAINTENANCE",
+        requestor: "PLUSS",
+        description: `${request.title}${
+          _.isEmpty(request.description) ? "" : `\n\n${request.description}`
+        }${_.isEmpty(request.room) ? "" : `\n\nLocation: ${request.room}`}${
+          _.isEmpty(request.userName) ? "" : `\n\nName: ${request.userName}`
+        }${_.isEmpty(request.phone) ? "" : `\n\nPhone: ${request.phone}`}${
+          _.isEmpty(request.type) ? "" : `\n\nJob Type: ${request.type}`
+        }${
+          _.isEmpty(request.images)
+            ? ""
+            : `\n\nImages: ${request.images.join("\n")}`
+        }`,
+        site_id: siteId,
+      };
+      if (buildingCode) data.bl_id = buildingCode;
+      log("Archibus:CreateRequest", "Request", data, logId);
+
       const response =
         mockResponse ??
         (await axios({
@@ -76,29 +116,9 @@ class ArchibusStrategy extends IntegrationStrategy {
             "Content-Type": "application/json",
             Host: this.host,
           },
-          data: {
-            prob_type: "1.ON-SITE|1. MAINTENANCE",
-            requestor: "PLUSS",
-            description: `${request.title}${
-              _.isEmpty(request.description) ? "" : `\n\n${request.description}`
-            }${_.isEmpty(request.room) ? "" : `\n\nLocation: ${request.room}`}${
-              _.isEmpty(request.userName) ? "" : `\n\nName: ${request.userName}`
-            }${_.isEmpty(request.phone) ? "" : `\n\nPhone: ${request.phone}`}${
-              _.isEmpty(request.type) ? "" : `\n\nJob Type: ${request.type}`
-            }${
-              _.isEmpty(request.images)
-                ? ""
-                : `\n\nImages: ${request.images.join("\n")}`
-            }`,
-            site_id: siteId,
-          },
+          data,
         }));
-      log(
-        "Archibus:CreateRequest",
-        "Response",
-        { data: response.data, siteId },
-        logId
-      );
+      log("Archibus:CreateRequest", "Response", response.data, logId);
 
       // Save the ID to external entities for future reference
       await updateRef("externalentities", {

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws",
-  "version": "2.1.13",
+  "version": "2.1.14-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1744,7 +1744,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "available-typed-arrays": {
       "version": "1.0.7",
@@ -2579,7 +2579,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "detect-newline": {
       "version": "3.1.0",
@@ -3077,7 +3077,7 @@
     "events": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
     },
     "execa": {
       "version": "5.1.1",
@@ -6657,7 +6657,7 @@
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
     },
     "querystringify": {
       "version": "2.2.0",
@@ -6808,7 +6808,7 @@
     "sax": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-      "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
+      "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
     },
     "scmp": {
       "version": "2.1.0",
@@ -7308,7 +7308,7 @@
     "url": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-      "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
       "requires": {
         "punycode": "1.3.2",
         "querystring": "0.2.0"

package/package.json

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