MIM-178: Do not count terminated leases as active

.github/workflows/lint-and-test.yml

@@ -14,8 +14,8 @@ jobs:
           SA_PASSWORD: Passw0rd!
           ACCEPT_EULA: Y
         ports:
-          - "1433:1433"
-    runs-on: ubuntu-latest
+          - '1433:1433'
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

src/services/lease-service/adapters/xpand/tenant-lease-adapter.ts

@@ -18,7 +18,7 @@
   terminationDate: Lease['terminationDate']
 }
 
 function trimRow(obj: any): any {
   return Object.fromEntries(
     Object.entries(obj).map(([key, value]) => [
       key,
@@ -40,7 +40,7 @@
 }
 
 const getParkingSpaceWaitingList = (
   rows: Array<any>
 ): WaitingList | undefined => {
   const parkingSpaceQueueTime =
     rows
@@ -57,7 +57,7 @@
 }
 
 const transformFromDbContact = (
   rows: Array<any>,
   phoneNumbers: any,
   leases: any
 ): Contact => {
@@ -531,15 +531,13 @@
 }
 
 const isLeaseActive = (lease: Lease | PartialLease): boolean => {
+  const { leaseStartDate, lastDebitDate, terminationDate } = lease
   const currentDate = new Date()
-  const leaseStartDate = new Date(lease.leaseStartDate)
-  const lastDebitDate = lease.lastDebitDate
-    ? new Date(lease.lastDebitDate)
-    : null
 
   return (
     leaseStartDate < currentDate &&
-    (!lastDebitDate || currentDate < lastDebitDate)
+    (!lastDebitDate || currentDate < lastDebitDate) &&
+    (!terminationDate || currentDate < terminationDate)
   )
 }
 

src/services/lease-service/tests/index.test.ts

@@ -318,5 +318,12 @@ describe('lease-service', () => {
 
       expect(tenantLeaseAdapter.isLeaseActive(lease)).toBe(false)
     })
+
+    it('should return false if terminationDate is in the past', () => {
+      const lease = leaseMock[0]
+      lease.terminationDate = new Date(Date.now() - 1000 * 60 * 60 * 24)
+
+      expect(tenantLeaseAdapter.isLeaseActive(lease)).toBe(false)
+    })
   })
 })