From 07db1fbe4636f6d0ccff7c4075a030757aa169b3 Mon Sep 17 00:00:00 2001
From: Johannes <erikjohanneskarlsson@gmail.com>
Date: Mon, 31 Mar 2025 11:09:06 +0200
Subject: [PATCH] exclude terminatedLeases in get workOrderData

---
 src/adapters/leasing-adapter/index.ts               | 12 ++++++------
 src/services/work-order-service/index.ts            |  4 ++--
 src/services/work-order-service/tests/index.test.ts |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/adapters/leasing-adapter/index.ts b/src/adapters/leasing-adapter/index.ts
index 4dc68471..833a7994 100644
--- a/src/adapters/leasing-adapter/index.ts
+++ b/src/adapters/leasing-adapter/index.ts
@@ -79,15 +79,15 @@ const getLeasesForContactCode = async (
 
 const getLeasesForPropertyId = async (
   propertyId: string,
-  includeTerminatedLeases: string | string[] | undefined,
-  includeContacts: string | string[] | undefined
+  includeTerminatedLeases: boolean,
+  includeContacts: boolean
 ): Promise<Lease[]> => {
-  const query = querystring.stringify({
-    includeTerminatedLeases,
-    includeContacts,
+  const queryParams = new URLSearchParams({
+    includeTerminatedLeases: includeTerminatedLeases.toString(),
+    includeContacts: includeContacts.toString(),
   })
   const leasesResponse = await axios(
-    `${tenantsLeasesServiceUrl}/leases/for/propertyId/${propertyId}?${query}`
+    `${tenantsLeasesServiceUrl}/leases/for/propertyId/${propertyId}?${queryParams.toString()}`
   )
   return leasesResponse.data.content
 }
diff --git a/src/services/work-order-service/index.ts b/src/services/work-order-service/index.ts
index 45a2a4aa..67af537d 100644
--- a/src/services/work-order-service/index.ts
+++ b/src/services/work-order-service/index.ts
@@ -121,8 +121,8 @@ export const routes = (router: KoaRouter) => {
       rentalObjectId: async () => {
         const leases = await leasingAdapter.getLeasesForPropertyId(
           ctx.params.identifier,
-          ctx.query['includeTerminatedLeases'],
-          'true'
+          false,
+          true
         )
         if (leases && leases.length > 0) {
           await getRentalPropertyInfoWithLeases(leases)
diff --git a/src/services/work-order-service/tests/index.test.ts b/src/services/work-order-service/tests/index.test.ts
index 5a33abf2..86570ddd 100644
--- a/src/services/work-order-service/tests/index.test.ts
+++ b/src/services/work-order-service/tests/index.test.ts
@@ -84,8 +84,8 @@ describe('work-order-service index', () => {
       expect(getRentalPropertyInfoSpy).toHaveBeenCalledWith('123-456-789')
       expect(getLeasesForPropertyIdSpy).toHaveBeenCalledWith(
         '123-456-789',
-        undefined,
-        'true'
+        false,
+        true
       )
       expect(res.body.content).toBeDefined()
     })