@plusscommunities/pluss-maintenance-aws 2.1.44 → 2.1.46

package/feature.config.js

@@ -1,272 +1,289 @@
 const { values } = require("./values.config");
 
 exports.permissions = [
-  values.permissionMaintenanceTracking,
-  values.permissionMaintenanceAssignment,
-  values.permissionMaintenanceTypes,
+	values.permissionMaintenanceTracking,
+	values.permissionMaintenanceAssignment,
+	values.permissionMaintenanceTypes,
 ];
 
 exports.entity = {
-  key: values.entityKey,
-  permission: values.permissionMaintenanceTracking,
-  table: values.tableNameMaintenance,
-  id: "id",
-  webPath: values.routeEntityPath,
-  appPath: values.screenMaintenanceDetail,
+	key: values.entityKey,
+	permission: values.permissionMaintenanceTracking,
+	table: values.tableNameMaintenance,
+	id: "id",
+	webPath: values.routeEntityPath,
+	appPath: values.screenMaintenanceDetail,
 };
 
 exports.serverless = {
-  name: values.serviceKey,
-  useVpc: true, // Enable VPC routing for static outbound IP (requires vpcConfig in config/index.js)
-  apis: [
-    {
-      name: "getJobType",
-      file: "getJobType",
-      function: "getJobType",
-      memorySize: 256,
-      timeout: 30,
-      path: "getjobtype",
-      method: "post",
-    },
-    {
-      name: "getJobTypes",
-      file: "getJobTypes",
-      function: "getJobTypes",
-      memorySize: 256,
-      timeout: 30,
-      path: "getjobtypes",
-      method: "post",
-    },
-    {
-      name: "createJobType",
-      file: "createJobType",
-      function: "createJobType",
-      memorySize: 256,
-      timeout: 30,
-      path: "createJobType",
-      method: "post",
-    },
-    {
-      name: "editJobType",
-      file: "editJobType",
-      function: "editJobType",
-      memorySize: 256,
-      timeout: 30,
-      path: "editJobType",
-      method: "post",
-    },
-    {
-      name: "deleteJobType",
-      file: "deleteJobType",
-      function: "deleteJobType",
-      memorySize: 256,
-      timeout: 30,
-      path: "deleteJobType",
-      method: "post",
-    },
-    {
-      name: "getJob",
-      file: "getJob",
-      function: "getJob",
-      memorySize: 256,
-      timeout: 30,
-      path: "getJob",
-      method: "post",
-    },
-    {
-      name: "getJobs",
-      file: "getJobs",
-      function: "getJobs",
-      memorySize: 256,
-      timeout: 30,
-      path: "getJobs",
-      method: "post",
-    },
-    {
-      name: "createJob",
-      file: "createJob",
-      function: "createJob",
-      memorySize: 256,
-      timeout: 30,
-      path: "sendMaintenance",
-      method: "post",
-    },
-    {
-      name: "editJob",
-      file: "editJob",
-      function: "editJob",
-      memorySize: 256,
-      timeout: 30,
-      path: "editJob",
-      method: "post",
-    },
-    {
-      name: "deleteJob",
-      file: "deleteJob",
-      function: "deleteJob",
-      memorySize: 256,
-      timeout: 30,
-      path: "requests/remove",
-      method: "post",
-    },
-    {
-      name: "editJobStatus",
-      file: "editJobStatus",
-      function: "editJobStatus",
-      memorySize: 256,
-      timeout: 30,
-      path: "editJobStatus",
-      method: "post",
-    },
-    {
-      name: "editNote",
-      file: "editNote",
-      function: "editNote",
-      memorySize: 256,
-      timeout: 30,
-      path: "requests/note",
-      method: "post",
-    },
-    {
-      name: "getData",
-      file: "getData",
-      function: "getData",
-      memorySize: 256,
-      timeout: 30,
-      path: "get/{action}",
-      method: "get",
-    },
-    {
-      name: "updateData",
-      file: "updateData",
-      function: "updateData",
-      memorySize: 256,
-      timeout: 30,
-      path: "update/{action}",
-      method: "post",
-    },
-  ],
-  triggers: [
-    {
-      name: "jobChanged",
-      file: "jobChanged",
-      function: "jobChanged",
-      memorySize: 2048,
-      timeout: 300,
-      table: values.tableKeyMaintenance,
-    },
-    {
-      name: "jobTypesChanged",
-      file: "jobTypesChanged",
-      function: "jobTypesChanged",
-      memorySize: 512,
-      timeout: 60,
-      table: values.tableKeyJobTypes,
-    },
-  ],
-  schedules: [
-    {
-      name: "watchJobs",
-      file: "watchJobs",
-      function: "watchJobs",
-      memorySize: "2048",
-      timeout: "300",
-      rate: "1/5 * * * ? *",
-    },
-    {
-      name: "scheduleJobImport",
-      file: "scheduleJobImport",
-      function: "scheduleJobImport",
-      memorySize: "2048",
-      timeout: "300",
-      rate: "2/3 * * * ? *",
-    },
-  ],
-  tables: [
-    {
-      key: values.tableKeyJobTypes,
-      name: values.tableNameJobTypes,
-      attributes: [
-        { name: "id", type: "S" },
-        { name: "site", type: "S" },
-        { name: "typeName", type: "S" },
-      ],
-      id: "id",
-      indexes: [
-        {
-          name: "JobTypeSiteIndex",
-          keys: [
-            { name: "site", type: "HASH" },
-            { name: "typeName", type: "RANGE" },
-          ],
-        },
-      ],
-    },
-    {
-      key: values.tableKeyMaintenance,
-      name: values.tableNameMaintenance,
-      attributes: [
-        { name: "id", type: "S" },
-        { name: "site", type: "S" },
-        { name: "jobId", type: "S" },
-        { name: "jobNo", type: "N" },
-        { name: "userID", type: "S" },
-        { name: "AssigneeId", type: "S" },
-      ],
-      id: "id",
-      indexes: [
-        {
-          name: "MaintenanceSiteIndex",
-          keys: [{ name: "site", type: "HASH" }],
-        },
-        {
-          name: "MaintenanceSiteJobIdIndex",
-          keys: [
-            { name: "site", type: "HASH" },
-            { name: "jobId", type: "RANGE" },
-          ],
-        },
-        {
-          name: "MaintenanceSiteJobNoIndex",
-          keys: [
-            { name: "site", type: "HASH" },
-            { name: "jobNo", type: "RANGE" },
-          ],
-        },
-        {
-          name: "MaintenanceSiteUserIdIndex",
-          keys: [
-            { name: "site", type: "HASH" },
-            { name: "userID", type: "RANGE" },
-          ],
-        },
-        {
-          name: "MaintenanceSiteAssigneeIndex",
-          keys: [
-            { name: "site", type: "HASH" },
-            { name: "AssigneeId", type: "RANGE" },
-          ],
-        },
-      ],
-    },
-    {
-      key: values.tableKeySupportTickets,
-      name: values.tableNameSupportTickets,
-      attributes: [
-        { name: "Id", type: "S" },
-        { name: "Site", type: "S" },
-        { name: "Status", type: "S" },
-      ],
-      id: "Id",
-      indexes: [
-        {
-          name: "TicketsSiteStatusIndex",
-          keys: [
-            { name: "Site", type: "HASH" },
-            { name: "Status", type: "RANGE" },
-          ],
-        },
-      ],
-    },
-  ],
+	name: values.serviceKey,
+	useVpc: true, // Enable VPC routing for static outbound IP (requires vpcConfig in config/index.js)
+	usePostgres: true, // Wires the Aurora app secret for property resolution (requires useVpc)
+	apis: [
+		{
+			name: "getJobType",
+			file: "getJobType",
+			function: "getJobType",
+			memorySize: 256,
+			timeout: 30,
+			path: "getjobtype",
+			method: "post",
+		},
+		{
+			name: "getJobTypes",
+			file: "getJobTypes",
+			function: "getJobTypes",
+			memorySize: 256,
+			timeout: 30,
+			path: "getjobtypes",
+			method: "post",
+		},
+		{
+			name: "createJobType",
+			file: "createJobType",
+			function: "createJobType",
+			memorySize: 256,
+			timeout: 30,
+			path: "createJobType",
+			method: "post",
+		},
+		{
+			name: "editJobType",
+			file: "editJobType",
+			function: "editJobType",
+			memorySize: 256,
+			timeout: 30,
+			path: "editJobType",
+			method: "post",
+		},
+		{
+			name: "deleteJobType",
+			file: "deleteJobType",
+			function: "deleteJobType",
+			memorySize: 256,
+			timeout: 30,
+			path: "deleteJobType",
+			method: "post",
+		},
+		{
+			name: "getJob",
+			file: "getJob",
+			function: "getJob",
+			memorySize: 256,
+			timeout: 30,
+			path: "getJob",
+			method: "post",
+		},
+		{
+			name: "getJobs",
+			file: "getJobs",
+			function: "getJobs",
+			memorySize: 256,
+			timeout: 30,
+			path: "getJobs",
+			method: "post",
+		},
+		{
+			name: "createJob",
+			file: "createJob",
+			function: "createJob",
+			memorySize: 256,
+			timeout: 30,
+			path: "sendMaintenance",
+			method: "post",
+		},
+		{
+			name: "editJob",
+			file: "editJob",
+			function: "editJob",
+			memorySize: 256,
+			timeout: 30,
+			path: "editJob",
+			method: "post",
+		},
+		{
+			name: "deleteJob",
+			file: "deleteJob",
+			function: "deleteJob",
+			memorySize: 256,
+			timeout: 30,
+			path: "requests/remove",
+			method: "post",
+		},
+		{
+			name: "editJobStatus",
+			file: "editJobStatus",
+			function: "editJobStatus",
+			memorySize: 256,
+			timeout: 30,
+			path: "editJobStatus",
+			method: "post",
+		},
+		{
+			name: "editNote",
+			file: "editNote",
+			function: "editNote",
+			memorySize: 256,
+			timeout: 30,
+			path: "requests/note",
+			method: "post",
+		},
+		{
+			name: "getData",
+			file: "getData",
+			function: "getData",
+			memorySize: 256,
+			timeout: 30,
+			path: "get/{action}",
+			method: "get",
+		},
+		{
+			name: "updateData",
+			file: "updateData",
+			function: "updateData",
+			memorySize: 256,
+			timeout: 30,
+			path: "update/{action}",
+			method: "post",
+		},
+	],
+	triggers: [
+		{
+			name: "jobChanged",
+			file: "jobChanged",
+			function: "jobChanged",
+			memorySize: 2048,
+			timeout: 300,
+			table: values.tableKeyMaintenance,
+		},
+		{
+			name: "jobTypesChanged",
+			file: "jobTypesChanged",
+			function: "jobTypesChanged",
+			memorySize: 512,
+			timeout: 60,
+			table: values.tableKeyJobTypes,
+		},
+	],
+	schedules: [
+		{
+			name: "watchJobs",
+			file: "watchJobs",
+			function: "watchJobs",
+			memorySize: "2048",
+			timeout: "300",
+			rate: "1/5 * * * ? *",
+		},
+		{
+			name: "scheduleJobImport",
+			file: "scheduleJobImport",
+			function: "scheduleJobImport",
+			memorySize: "2048",
+			timeout: "300",
+			rate: "2/3 * * * ? *",
+		},
+	],
+	tables: [
+		{
+			key: values.tableKeyJobTypes,
+			name: values.tableNameJobTypes,
+			attributes: [
+				{ name: "id", type: "S" },
+				{ name: "site", type: "S" },
+				{ name: "typeName", type: "S" },
+			],
+			id: "id",
+			indexes: [
+				{
+					name: "JobTypeSiteIndex",
+					keys: [
+						{ name: "site", type: "HASH" },
+						{ name: "typeName", type: "RANGE" },
+					],
+				},
+			],
+		},
+		{
+			key: values.tableKeyMaintenance,
+			name: values.tableNameMaintenance,
+			attributes: [
+				{ name: "id", type: "S" },
+				{ name: "site", type: "S" },
+				{ name: "jobId", type: "S" },
+				{ name: "jobNo", type: "N" },
+				{ name: "userID", type: "S" },
+				{ name: "AssigneeId", type: "S" },
+				{ name: "status", type: "S" },
+				// Set only on property-linked requests (sparse index key).
+				{ name: "propertyId", type: "S" },
+			],
+			id: "id",
+			indexes: [
+				{
+					name: "MaintenanceSiteIndex",
+					keys: [{ name: "site", type: "HASH" }],
+				},
+				// Declared to match the table deployed from newer published releases —
+				// omitting them would make CloudFormation delete live indexes.
+				{
+					name: "MaintenanceSiteAssigneeIndex",
+					keys: [
+						{ name: "site", type: "HASH" },
+						{ name: "AssigneeId", type: "RANGE" },
+					],
+				},
+				{
+					name: "MaintenanceSiteStatusIndex",
+					keys: [
+						{ name: "site", type: "HASH" },
+						{ name: "status", type: "RANGE" },
+					],
+				},
+				{
+					name: "MaintenanceSiteJobIdIndex",
+					keys: [
+						{ name: "site", type: "HASH" },
+						{ name: "jobId", type: "RANGE" },
+					],
+				},
+				{
+					name: "MaintenanceSiteJobNoIndex",
+					keys: [
+						{ name: "site", type: "HASH" },
+						{ name: "jobNo", type: "RANGE" },
+					],
+				},
+				{
+					name: "MaintenanceSiteUserIdIndex",
+					keys: [
+						{ name: "site", type: "HASH" },
+						{ name: "userID", type: "RANGE" },
+					],
+				},
+				{
+					name: "MaintenancePropertyIdIndex",
+					keys: [{ name: "propertyId", type: "HASH" }],
+				},
+			],
+		},
+		{
+			key: values.tableKeySupportTickets,
+			name: values.tableNameSupportTickets,
+			attributes: [
+				{ name: "Id", type: "S" },
+				{ name: "Site", type: "S" },
+				{ name: "Status", type: "S" },
+			],
+			id: "Id",
+			indexes: [
+				{
+					name: "TicketsSiteStatusIndex",
+					keys: [
+						{ name: "Site", type: "HASH" },
+						{ name: "Status", type: "RANGE" },
+					],
+				},
+			],
+		},
+	],
 };

package/getData.js

@@ -5,52 +5,59 @@ const generateJsonResponse = require("@plusscommunities/pluss-core-aws/helper/ge
 const getAssignees = require("./requests/getAssignees");
 const getRequests = require("./requests/getRequests");
 const getRequest = require("./requests/getRequest");
+const getPropertyRequests = require("./requests/getPropertyRequests");
 const getExternalSync = require("./requests/getExternalSync");
 
 module.exports.getData = async (event, context, callback) => {
-  init(config);
-  const action = event.pathParameters.action;
-  const logId = log(action, "Input", event.queryStringParameters);
+	init(config);
+	const action = event.pathParameters.action;
+	const logId = log(action, "Input", event.queryStringParameters);
 
-  let response;
+	let response;
 
-  try {
-    switch (action) {
-      case "requests":
-        response = await getRequests(event);
-        if (response.status === 200) {
-          log(action, "ResponseLength", response.data.Items.length, logId);
-        }
-        break;
+	try {
+		switch (action) {
+			case "requests":
+				response = await getRequests(event);
+				if (response.status === 200) {
+					log(action, "ResponseLength", response.data.Items.length, logId);
+				}
+				break;
 
-      case "request":
-        response = await getRequest(event);
-        if (response.status === 200) {
-          log(action, "ResponseLength", response.data, logId);
-        }
-        break;
-      case "assignees":
-        response = await getAssignees(event);
-        if (response.status === 200) {
-          log(action, "ResponseLength", response.data.Users.length, logId);
-        }
-        break;
-      case "externalsync":
-        response = await getExternalSync(event);
-        if (response.status === 200) {
-          log(action, "ExternalSystem", response.data.externalSystem, logId);
-        }
-        break;
-      default:
-        break;
-    }
-  } catch (err) {
-    log(action, "InternalError", err.toString(), logId);
-    if (!response) {
-      response = { status: 500, data: { error: "Internal Error" } };
-    }
-  }
-  log(action, "ResponseStatus", response.status, logId);
+			case "request":
+				response = await getRequest(event);
+				if (response.status === 200) {
+					log(action, "ResponseLength", response.data, logId);
+				}
+				break;
+			case "propertyrequests":
+				response = await getPropertyRequests(event);
+				if (response.status === 200) {
+					log(action, "ResponseLength", response.data.requests.length, logId);
+				}
+				break;
+			case "assignees":
+				response = await getAssignees(event);
+				if (response.status === 200) {
+					log(action, "ResponseLength", response.data.Users.length, logId);
+				}
+				break;
+			case "externalsync":
+				response = await getExternalSync(event);
+				if (response.status === 200) {
+					log(action, "ExternalSystem", response.data.externalSystem, logId);
+				}
+				break;
+			default:
+				break;
+		}
+	} catch (err) {
+		log(action, "InternalError", err.toString(), logId);
+		if (!response) {
+			response = { status: 500, data: { error: "Internal Error" } };
+		}
+	}
+	log(action, "ResponseStatus", response.status, logId);
 
-  return callback(null, generateJsonResponse(response.status, response.data));
+	return callback(null, generateJsonResponse(response.status, response.data));
 };