Merge pull request #257 from Bostads-AB-Mimer/feature/mim-374-hantera-skyddade-personuppgifter

MIM-374: getWorkOrderData gets leases on contactCode instead of pnr

Author: johanneskarlsson

src/adapters/leasing-adapter/index.ts

@@ -60,6 +60,23 @@ const getLeasesForPnr = async (
   return leasesResponse.data.content
 }
 
+const getLeasesForContactCode = async (
+  contactCode: string,
+  includeTerminatedLeases: boolean,
+  includeContacts: boolean
+): Promise<Lease[]> => {
+  const queryParams = new URLSearchParams({
+    includeTerminatedLeases: includeTerminatedLeases.toString(),
+    includeContacts: includeContacts.toString(),
+  })
+
+  const leasesResponse = await axios.get(
+    `${tenantsLeasesServiceUrl}/leases/for/contactCode/${contactCode}?${queryParams.toString()}`
+  )
+
+  return leasesResponse.data.content
+}
+
 const getLeasesForPropertyId = async (
   propertyId: string,
   includeTerminatedLeases: string | string[] | undefined,
@@ -591,6 +608,7 @@ export {
   getInternalCreditInformation,
   getLease,
   getLeasesForPnr,
+  getLeasesForContactCode,
   getLeasesForPropertyId,
   getDetailedApplicantsByListingId,
   getTenantByContactCode,

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

@@ -163,29 +163,24 @@ export const routes = (router: KoaRouter) => {
           ctx.params.identifier
         )
         if (contact) {
-          const leases = await leasingAdapter.getLeasesForPnr(
-            contact.nationalRegistrationNumber,
+          const leases = await leasingAdapter.getLeasesForContactCode(
+            contact.contactCode,
             false,
-            true
+            false
           )
           if (leases) {
             await getRentalPropertyInfoWithLeases(leases)
           }
         }
       },
       contactCode: async () => {
-        const contactResult = await leasingAdapter.getContactByContactCode(
-          ctx.params.identifier
+        const leases = await leasingAdapter.getLeasesForContactCode(
+          ctx.params.identifier,
+          false,
+          true
         )
-        if (contactResult.ok) {
-          const leases = await leasingAdapter.getLeasesForPnr(
-            contactResult.data.nationalRegistrationNumber,
-            false,
-            true
-          )
-          if (leases) {
-            await getRentalPropertyInfoWithLeases(leases)
-          }
+        if (leases) {
+          await getRentalPropertyInfoWithLeases(leases)
         }
       },
     }

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

@@ -113,9 +113,9 @@ describe('work-order-service index', () => {
       const getContactByPhoneNumberSpy = jest
         .spyOn(tenantLeaseAdapter, 'getContactByPhoneNumber')
         .mockResolvedValue(contactMock)
-      const getLeaseSpy = jest
-        .spyOn(tenantLeaseAdapter, 'getLease')
-        .mockResolvedValue(leaseMock)
+      const getLeasesForContactCodeSpy = jest
+        .spyOn(tenantLeaseAdapter, 'getLeasesForContactCode')
+        .mockResolvedValue([leaseMock])
 
       const getRentalPropertyInfoSpy = jest
         .spyOn(propertyManagementAdapter, 'getRentalPropertyInfo')
@@ -127,18 +127,19 @@ describe('work-order-service index', () => {
 
       expect(res.status).toBe(200)
       expect(getContactByPhoneNumberSpy).toHaveBeenCalledWith('1234567890')
-      expect(getLeaseSpy).toHaveBeenCalledWith('123', 'true')
+      expect(getLeasesForContactCodeSpy).toHaveBeenCalledWith(
+        'P158770',
+        false,
+        false
+      )
       expect(getRentalPropertyInfoSpy).toHaveBeenCalledWith('123-456-789')
       expect(res.body.content).toBeDefined()
     })
 
     it('should handle contactCode case', async () => {
-      const getContactByContactCodeSpy = jest
-        .spyOn(tenantLeaseAdapter, 'getContactByContactCode')
-        .mockResolvedValue({ ok: true, data: contactMock })
-      const getLeaseSpy = jest
-        .spyOn(tenantLeaseAdapter, 'getLease')
-        .mockResolvedValue(leaseMock)
+      const getLeasesForContactCodeSpy = jest
+        .spyOn(tenantLeaseAdapter, 'getLeasesForContactCode')
+        .mockResolvedValue([leaseMock])
 
       const getRentalPropertyInfoSpy = jest
         .spyOn(propertyManagementAdapter, 'getRentalPropertyInfo')
@@ -149,8 +150,11 @@ describe('work-order-service index', () => {
       )
 
       expect(res.status).toBe(200)
-      expect(getContactByContactCodeSpy).toHaveBeenCalledWith('P965339')
-      expect(getLeaseSpy).toHaveBeenCalledWith('123', 'true')
+      expect(getLeasesForContactCodeSpy).toHaveBeenCalledWith(
+        'P965339',
+        false,
+        true
+      )
       expect(getRentalPropertyInfoSpy).toHaveBeenCalledWith('123-456-789')
       expect(res.body.content).toBeDefined()
     })