@plusscommunities/pluss-maintenance-aws-a 2.1.13 → 2.1.15

package/getJobTypes.js

@@ -39,20 +39,35 @@ module.exports.getJobTypes = (event, context, callback) => {
       };
 
       indexQuery(values.tableNameJobTypes, query)
-        .then((typeRes) => {
-          if (!_.isEmpty(typeRes.Items) || !values.allowGeneralType) {
+        .then(async (typeRes) => {
+          if (!_.isEmpty(typeRes.Items)) {
             return callback(null, generateJsonResponse(200, typeRes.Items));
           }
 
-          const jobType = {
-            id: createGuid().substring(0, 8),
-            typeName: "General",
-            site: data.site,
-          };
+          const defaultJobTypes = [];
+          if (values.allowGeneralType) {
+            const generalType = {
+              id: createGuid().substring(0, 8),
+              typeName: "General",
+              site: data.site,
+            };
 
-          updateRef(values.tableNameJobTypes, jobType).then(() => {
-            return callback(null, generateJsonResponse(200, [jobType]));
-          });
+            await updateRef(values.tableNameJobTypes, generalType);
+            defaultJobTypes.push(generalType);
+          }
+          if (values.defaultJobTypes?.length) {
+            for await (const jobType of values.defaultJobTypes) {
+              const defaultType = {
+                ...jobType,
+                id: createGuid().substring(0, 8),
+                site: data.site,
+              };
+              await updateRef(values.tableNameJobTypes, defaultType);
+              defaultJobTypes.push(defaultType);
+            }
+          }
+
+          return callback(null, generateJsonResponse(200, defaultJobTypes));
         })
         .catch((error) => {
           return callback(

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-a",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1468,9 +1468,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.20.tgz",
-      "integrity": "sha512-EB/Z8rUPSlghJeR3f/DdGvvGl1bF8GhcCENADsfhmwxeHFEKay8pwKnfkmFVHFLvcl9AbT1kF5mKuIA3z6RiGA==",
+      "version": "2.0.21",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.21.tgz",
+      "integrity": "sha512-eVkJTkTau5FiK1HSwPCnq40cxttezORA5sBTWohKL+0VcXsEQxJpJ8gzVTaPvo4tn/n+67n23nJaGR663fAdgQ==",
       "requires": {
         "@aws/dynamodb-auto-marshaller": "^0.7.1",
         "amazon-cognito-identity-js": "^2.0.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-aws-a",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.20",
+    "@plusscommunities/pluss-core-aws": "2.0.21",
     "amazon-cognito-identity-js": "^2.0.19",
     "aws-sdk": "^2.1591.0",
     "axios": "^1.6.8",

package/sendJobEmail.js

@@ -90,6 +90,15 @@ module.exports = function (job, updated) {
                       `<img style="max-height: 400px" src="${image}" />`
                   )}`
                 : "";
+            case "document":
+              return field.answer && Array.isArray(field.answer)
+                ? `<br>${field.answer
+                    .map(
+                      (doc) =>
+                        `<a href="${doc.url}" target="_blank">${doc.name}</a><br>`
+                    )
+                    .join("")}`
+                : "";
             default:
               return field.answer;
           }

package/values.config.default.js

@@ -24,6 +24,7 @@ const values = {
   activityEditMaintenanceNote: "EditMaintenanceNote",
   textJobEmailTitle: "Service Request",
   allowGeneralType: true,
+  defaultJobTypes: [],
   triggerMaintenanceStatusChanged: "MaintenanceStatusChanged",
 };
 exports.values = values;

package/values.config.enquiry.js

@@ -0,0 +1,223 @@
+const values = {
+  entityKey: "maintenancerequestEnquiry",
+  serviceKey: "maintenanceEnquiry",
+  updateKey: "jobsEnquiry",
+  tableKeyJobTypes: "jobtypesEnquiry",
+  tableKeyMaintenance: "maintenanceEnquiry",
+  tableKeySupportTickets: "supportticketsEnquiry",
+  tableNameJobTypes: "jobTypesEnquiry",
+  tableNameMaintenance: "maintenanceEnquiry",
+  tableNameSupportTickets: "supportticketsEnquiry",
+  permissionMaintenanceTracking: "maintenanceTrackingEnquiry",
+  permissionMaintenanceAssignment: "maintenanceAssignmentEnquiry",
+  permissionMaintenanceTypes: "maintenanceTypesEnquiry",
+  routeEntityPath: "/requestsHubEnquiry/jobDetails/:id",
+  screenMaintenanceDetail: "requestDetailEnquiry",
+  notificationMaintenanceJobAssigned: "MaintenanceJobAssignedEnquiry",
+  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassignedEnquiry",
+  activityAddMaintenanceJob: "AddMaintenanceJobEnquiry",
+  activityDeleteMaintenanceJob: "DeleteMaintenanceJobEnquiry",
+  activityEditMaintenanceJob: "EditMaintenanceJobEnquiry",
+  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChangedEnquiry",
+  activityAddMaintenanceNote: "AddMaintenanceNoteEnquiry",
+  activityDeleteMaintenanceNote: "DeleteMaintenanceNoteEnquiry",
+  activityEditMaintenanceNote: "EditMaintenanceNoteEnquiry",
+  textJobEmailTitle: "Enquiry Submission",
+  allowGeneralType: false,
+  defaultJobTypes: [
+    {
+      customFields: [
+        {
+          isTitle: false,
+          label: "Subject of your enquiry",
+          mandatory: true,
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Details of your enquiry",
+          mandatory: true,
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Do you need a response by a specific date?",
+          mandatory: false,
+          type: "date",
+        },
+      ],
+      description:
+        "Use this form to submit any general questions to our community team. We'll get back to you as soon as possible",
+      email: "enquiry@pluss.com",
+      hasCustomFields: true,
+      level: 1,
+      typeName: "General Enquiry",
+    },
+    {
+      customFields: [
+        {
+          isTitle: false,
+          label:
+            "Are you or someone you know interested in buying a property? ",
+          mandatory: true,
+          type: "multichoice",
+          values: ["Myself", "Family member", "Friend", "Other"],
+        },
+        {
+          isTitle: false,
+          label:
+            "If this enquiry is not for yourself then please record the other person's name, email and phone number so that we can get in touch with them.",
+          mandatory: false,
+          placeHolder:
+            "First name, last name, email address, mobile phone number.",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "What would you like to know more about?",
+          mandatory: true,
+          type: "checkbox",
+          values: [
+            "Availability",
+            "Pricing",
+            "Services",
+            "Eligibility",
+            "Something else",
+            "Arranging a tour of the property",
+          ],
+        },
+        {
+          isTitle: false,
+          label: "Message details",
+          mandatory: true,
+          placeHolder:
+            "Record any details or message you would like to pass on regarding this sales enquiry",
+          type: "text",
+        },
+      ],
+      description: "Enquire about living in our community",
+      email: "sales@pluss.com",
+      hasCustomFields: true,
+      level: 1,
+      typeName: "Sales Enquiry",
+    },
+    {
+      customFields: [
+        {
+          isTitle: false,
+          label: "How would you like to help?",
+          mandatory: true,
+          type: "checkbox",
+          values: [
+            "Social Activities",
+            "Transport",
+            "Tech Support",
+            "Gardening",
+            "Companionship",
+            "Other",
+          ],
+        },
+        {
+          isTitle: false,
+          label: "If other please describe here",
+          mandatory: false,
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Availability",
+          mandatory: false,
+          type: "checkbox",
+          values: [
+            "Weekdays",
+            "Weekends",
+            "Specific days",
+            "Flexible",
+            "I'm not sure yet but would like to discuss further",
+          ],
+        },
+        {
+          isTitle: false,
+          label: "Relevant experience",
+          mandatory: false,
+          placeHolder:
+            "Please provide a brief description of any relevant experience ",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "How soon can you start?",
+          mandatory: true,
+          type: "multichoice",
+          values: [
+            "This week",
+            "Next week",
+            "Next month",
+            "Not sure yet",
+            "Other",
+          ],
+        },
+        {
+          isTitle: false,
+          label:
+            "Thanks for submitting your enquiry to volunteer in our community. Someone will be in touch with you soon.",
+          mandatory: false,
+          type: "staticText",
+        },
+      ],
+      description:
+        "If you're interested in volunteering your time, skills or companionship, we'd love to hear from you.",
+      email: "volunteer@pluss.com",
+      hasCustomFields: true,
+      level: 1,
+      typeName: "Volunteer Enquiry",
+    },
+    {
+      customFields: [
+        {
+          isTitle: false,
+          label: "Topic",
+          mandatory: true,
+          placeHolder:
+            "What is the topic of your enquiry for the resident committee?",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Details",
+          mandatory: true,
+          placeHolder: "Add the details of your enquiry here",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Would you like a response",
+          mandatory: true,
+          type: "yn",
+        },
+        {
+          isTitle: false,
+          label: "If yes, how should we contact you?",
+          mandatory: true,
+          type: "multichoice",
+          values: [
+            "Send a message through the app",
+            "Email",
+            "Phone",
+            "In person",
+            "Through the committee meeting report",
+            "Other",
+          ],
+        },
+      ],
+      description:
+        "This form lets you raise a question, share a suggestion, or request something for discussion with your resident committee or leadership team.",
+      email: "council@pluss.com",
+      hasCustomFields: true,
+      level: 1,
+      typeName: "Resident Council / Committee Enquiry",
+    },
+  ],
+  triggerMaintenanceStatusChanged: "MaintenanceStatusChangedEnquiry",
+};
+exports.values = values;

package/values.config.feedback.js

@@ -0,0 +1,195 @@
+const values = {
+  entityKey: "maintenancerequestFeedback",
+  serviceKey: "maintenanceFeedback",
+  updateKey: "jobsFeedback",
+  tableKeyJobTypes: "jobtypesFeedback",
+  tableKeyMaintenance: "maintenanceFeedback",
+  tableKeySupportTickets: "supportticketsFeedback",
+  tableNameJobTypes: "jobTypesFeedback",
+  tableNameMaintenance: "maintenanceFeedback",
+  tableNameSupportTickets: "supportticketsFeedback",
+  permissionMaintenanceTracking: "maintenanceTrackingFeedback",
+  permissionMaintenanceAssignment: "maintenanceAssignmentFeedback",
+  permissionMaintenanceTypes: "maintenanceTypesFeedback",
+  routeEntityPath: "/requestsHubFeedback/jobDetails/:id",
+  screenMaintenanceDetail: "requestDetailFeedback",
+  notificationMaintenanceJobAssigned: "MaintenanceJobAssignedFeedback",
+  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassignedFeedback",
+  activityAddMaintenanceJob: "AddMaintenanceJobFeedback",
+  activityDeleteMaintenanceJob: "DeleteMaintenanceJobFeedback",
+  activityEditMaintenanceJob: "EditMaintenanceJobFeedback",
+  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChangedFeedback",
+  activityAddMaintenanceNote: "AddMaintenanceNoteFeedback",
+  activityDeleteMaintenanceNote: "DeleteMaintenanceNoteFeedback",
+  activityEditMaintenanceNote: "EditMaintenanceNoteFeedback",
+  textJobEmailTitle: "Feedback Submission",
+  allowGeneralType: false,
+  defaultJobTypes: [
+    {
+      customFields: [
+        {
+          isTitle: false,
+          label: "What is the feedback about?",
+          mandatory: true,
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Feedback details",
+          mandatory: true,
+          placeHolder:
+            "Record specific details related to your feedback. Include dates, names, other relevant information in the order they happened",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Desired outcome",
+          mandatory: false,
+          placeHolder:
+            "Describe the outcome you would like to see achieved as a result of the feedback you have provided.",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Thanks for taking the time to share your feedback with us.",
+          mandatory: false,
+          type: "staticText",
+        },
+      ],
+      description:
+        "Use this form to provide general feedback that is not a specific complaint or compliment",
+      email: "feedback@plusscommunities.com",
+      hasCustomFields: true,
+      level: 1,
+      typeName: "General Feedback",
+    },
+    {
+      customFields: [
+        {
+          isTitle: false,
+          label: "What is the complaint about?",
+          mandatory: true,
+          type: "checkbox",
+          values: [
+            "An employee",
+            "Another community member",
+            "A specific incident",
+            "Service delivery",
+            "A facility",
+            "An Activity",
+            "Other",
+          ],
+        },
+        {
+          isTitle: false,
+          label: "Complaint details",
+          mandatory: true,
+          placeHolder:
+            "Please provide the details of your complaint in this section. Include dates, names, other relevant information in the order they happened",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Action required",
+          mandatory: true,
+          placeHolder:
+            "Please describe what action, if any, you would like the organisation to take in relation to this matter",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label: "Have you raised this complaint previously",
+          mandatory: true,
+          type: "yn",
+        },
+        {
+          isTitle: false,
+          label:
+            "If yes, please provide details of who you complained to, when and how (phone, email, form)",
+          mandatory: false,
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label:
+            "If you have any supporting documentation (e.g. emails, letters, receipts) for your complaint, please attach the files below. If you do not have the documentation right now, you can email us.",
+          mandatory: false,
+          type: "document",
+        },
+        {
+          isTitle: false,
+          label:
+            "Declaration .  I declare that the information supplied by me is, to the best of my knowledge, true and correct. ",
+          mandatory: true,
+          type: "yn",
+        },
+        {
+          isTitle: false,
+          label:
+            "I agree that the information provided (except for demographic data) may, if necessary, be revealed to the organisation in correspondence or investigations concerning this complaint or referred to another authority for their appropriate action should the matter fall outside this department's jurisdiction",
+          mandatory: true,
+          type: "yn",
+        },
+        {
+          isTitle: false,
+          label:
+            "If your complaint is resolved after lodgement of this form, please advise us at as soon as possible.",
+          mandatory: false,
+          type: "staticText",
+        },
+      ],
+      description: "Use this form to provide a complaint to the organisation",
+      email: "example@plusscommunities.com",
+      hasCustomFields: true,
+      level: 1,
+      typeName: "Complaint",
+    },
+    {
+      customFields: [
+        {
+          isTitle: false,
+          label: "What is this compliment about?",
+          mandatory: true,
+          type: "multichoice",
+          values: [
+            "An employee",
+            "A facility",
+            "Another community member",
+            "A facility",
+            "A service",
+            "An activity",
+            "Other",
+          ],
+        },
+        {
+          isTitle: false,
+          label: "Compliment details",
+          mandatory: true,
+          placeHolder: "Please explain your compliment in detail",
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label:
+            "Please describe what action, if any, you would like us to take in relation to this compliment",
+          mandatory: false,
+          type: "text",
+        },
+        {
+          isTitle: false,
+          label:
+            "Thanks for taking the time to record your compliment. It is always appreciated.",
+          mandatory: false,
+          type: "staticText",
+        },
+      ],
+      description: "Use this form to record a compliment",
+      email: "example@pluss.com",
+      hasCustomFields: true,
+      level: 1,
+      typeName: "Compliment",
+    },
+  ],
+  triggerMaintenanceStatusChanged: "MaintenanceStatusChangedFeedback",
+};
+exports.values = values;

package/values.config.food.js

@@ -0,0 +1,30 @@
+const values = {
+  entityKey: "maintenancerequestFood",
+  serviceKey: "maintenanceFood",
+  updateKey: "jobsFood",
+  tableKeyJobTypes: "jobtypesFood",
+  tableKeyMaintenance: "maintenanceFood",
+  tableKeySupportTickets: "supportticketsFood",
+  tableNameJobTypes: "jobTypesFood",
+  tableNameMaintenance: "maintenanceFood",
+  tableNameSupportTickets: "supportticketsFood",
+  permissionMaintenanceTracking: "maintenanceTrackingFood",
+  permissionMaintenanceAssignment: "maintenanceAssignmentFood",
+  permissionMaintenanceTypes: "maintenanceTypesFood",
+  routeEntityPath: "/requestsHubFood/jobDetails/:id",
+  screenMaintenanceDetail: "requestDetailFood",
+  notificationMaintenanceJobAssigned: "MaintenanceJobAssignedFood",
+  notificationMaintenanceJobUnassigned: "MaintenanceJobUnassignedFood",
+  activityAddMaintenanceJob: "AddMaintenanceJobFood",
+  activityDeleteMaintenanceJob: "DeleteMaintenanceJobFood",
+  activityEditMaintenanceJob: "EditMaintenanceJobFood",
+  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChangedFood",
+  activityAddMaintenanceNote: "AddMaintenanceNoteFood",
+  activityDeleteMaintenanceNote: "DeleteMaintenanceNoteFood",
+  activityEditMaintenanceNote: "EditMaintenanceNoteFood",
+  textJobEmailTitle: "Food Ordering",
+  allowGeneralType: false,
+  defaultJobTypes: [],
+  triggerMaintenanceStatusChanged: "MaintenanceStatusChangedFood",
+};
+exports.values = values;

package/values.config.forms.js

@@ -24,6 +24,7 @@ const values = {
   activityEditMaintenanceNote: "EditMaintenanceNoteForms",
   textJobEmailTitle: "Form Submission",
   allowGeneralType: false,
+  defaultJobTypes: [],
   triggerMaintenanceStatusChanged: "MaintenanceStatusChangedForms",
 };
 exports.values = values;