MIM-380: Handle more work orders (#254)

* Update onecore-types dependency

* Add HearingImpaired to CreateWorkOrderDetailsFactory

* Handle more work orders

* Fix test name

---------

Co-authored-by: Henrik Persson <henrik.persson@iteam.com>

Author: henrikhenrikpersson

package-lock.json

@@ -69,7 +69,7 @@
     "koa2-swagger-ui": "^5.10.0",
     "lodash": "^4.17.21",
     "odoo-await": "^3.4.1",
-    "onecore-types": "^2.6.1",
+    "onecore-types": "^3.4.0",
     "onecore-utilities": "^1.1.0",
     "pino": "^9.1.0",
     "pino-elasticsearch": "^8.0.0",

package.json

@@ -394,17 +394,17 @@ export const routes = (router: KoaRouter) => {
         Images,
       } = ctx.request.body
 
-      // Filter out workOrders that are not related to laundry rooms
-      const laundryRoomWorkOrderRequests = Rows.filter(
-        (workOrder: any) => workOrder.LocationCode === 'TV'
+      // Filter out workOrders that are not handled by onecore
+      const onecoreWorkOrderRequests = Rows.filter((workOrder: any) =>
+        ['TV', 'BWC', 'KÖ'].includes(workOrder.LocationCode)
       )
 
       const reason = !ContactCode
         ? 'ContactCode is missing'
         : !RentalObjectCode
           ? 'RentalObjectCode is missing'
-          : laundryRoomWorkOrderRequests.length === 0
-            ? 'No work orders on laundry rooms found in request'
+          : onecoreWorkOrderRequests.length === 0
+            ? 'No supported work orders found in request'
             : null
 
       if (reason) {
@@ -428,20 +428,6 @@ export const routes = (router: KoaRouter) => {
         return
       }
 
-      // Check if rental property has laundry room access
-      const propertyHasLaundryRoomAccess =
-        rentalPropertyInfo.maintenanceUnits?.find(
-          (unit) => unit.type.toUpperCase() === 'TVÄTTSTUGA'
-        )
-      if (!propertyHasLaundryRoomAccess) {
-        ctx.status = 404
-        ctx.body = {
-          reason: 'No laundry room found for rental property',
-          ...metadata,
-        }
-        return
-      }
-
       // Get tenant with leases by contact code
       const tenant = await leasingAdapter.getTenantByContactCode(ContactCode)
       if (!tenant.ok) {
@@ -466,34 +452,39 @@ export const routes = (router: KoaRouter) => {
         return
       }
 
-      for (let workOrderRequest of laundryRoomWorkOrderRequests) {
-        workOrderRequest = {
-          rentalPropertyInfo: rentalPropertyInfo,
-          tenant: tenant.data,
-          lease: lease,
-          details: {
-            ContactCode,
-            RentalObjectCode,
-            AccessOptions,
-            HearingImpaired,
-            Pet,
-            Images,
-            Rows: [workOrderRequest],
-          },
-        }
-        workOrderAdapter.createWorkOrder(workOrderRequest)
-      }
+      const results = await Promise.all(
+        onecoreWorkOrderRequests.map((workOrderRequest: any) =>
+          workOrderAdapter.createWorkOrder({
+            rentalPropertyInfo: rentalPropertyInfo,
+            tenant: tenant.data,
+            lease: lease,
+            details: {
+              ContactCode,
+              RentalObjectCode,
+              AccessOptions,
+              HearingImpaired,
+              Pet,
+              Images,
+              Rows: [workOrderRequest],
+            },
+          })
+        )
+      )
 
       ctx.status = 200
       ctx.body = {
-        message: `Work order created`,
+        message: `Work orders created`,
+        // TODO better handling/response when there is an error with creating one or more work orders in the batch
+        errors: results
+          .filter((result) => !result.ok)
+          .map((result) => result.err),
         ...metadata,
       }
     } catch (error) {
-      logger.error(error, 'Error creating new work order')
+      logger.error(error, 'Error creating new work orders')
       ctx.status = 500
       ctx.body = {
-        error: 'Failed to create a new work order',
+        error: 'Failed to create new work orders',
         ...metadata,
       }
     }

src/services/work-order-service/index.ts

@@ -252,16 +252,14 @@ describe('work-order-service index', () => {
       expect(res.body.reason).toBe('RentalObjectCode is missing')
     })
 
-    it('should return 400 if no work orders on laundry rooms found in request', async () => {
+    it('should return 400 if no supported work orders found in request', async () => {
       createWorkOrderDetailsMock.Rows = []
       const res = await request(app.callback())
         .post('/api/workOrders')
         .send(createWorkOrderDetailsMock)
 
       expect(res.status).toBe(400)
-      expect(res.body.reason).toBe(
-        'No work orders on laundry rooms found in request'
-      )
+      expect(res.body.reason).toBe('No supported work orders found in request')
     })
 
     it('should return 404 if rental property not found', async () => {

src/services/work-order-service/tests/index.test.ts

@@ -52,6 +52,7 @@ export const CreateWorkOrderDetailsFactory =
       CallBetween: '08:00 - 17:00',
     },
     Pet: false,
+    HearingImpaired: false,
     Rows: [
       {
         LocationCode: 'TV',