fix: add missing lease statuses to core schema, improve test coverage, and clean up filters

Author: lalmqvist

core/src/services/lease-service/schemas/lease.ts

@@ -15,7 +15,7 @@ export const Lease = z.object({
   leaseNumber: z.string(),
   leaseStartDate: z.coerce.date(),
   leaseEndDate: z.coerce.date().optional(),
-  status: z.enum(['Current', 'Upcoming', 'AboutToEnd', 'Ended']),
+  status: z.enum(['Current', 'Upcoming', 'AboutToEnd', 'Ended', 'PreliminaryTerminated', 'PendingSignature']),
   tenantContactIds: z.array(z.string()).optional(),
   rentalPropertyId: z.string(),
   rentalProperty: z
@@ -139,7 +139,13 @@ export function mapLease(lease: OnecoreTypesLease): z.infer<typeof Lease> {
           ? 'Upcoming'
           : lease.status === 2
             ? 'AboutToEnd'
-            : 'Ended',
+            : lease.status === 3
+              ? 'Ended'
+              : lease.status === 4
+                ? 'PreliminaryTerminated'
+                : lease.status === 5
+                  ? 'PendingSignature'
+                  : 'Ended',
     tenantContactIds: lease.tenantContactIds,
     rentalPropertyId: lease.rentalPropertyId,
     type: lease.type,

services/leasing/src/services/lease-service/adapters/tenfast/filters.ts

@@ -79,11 +79,6 @@ export const isPreliminaryTerminated = (lease: TenfastLease): boolean => {
   )
 }
 
-// TODO: Verify that acceptedByHyresgast and start actually means pending signature.
 export const isPendingSignature = (lease: TenfastLease): boolean => {
-  return (
-    lease.stage === 'signingInProgress' ||
-    lease.stage === 'acceptedByHyresgast' ||
-    lease.stage === 'start'
-  )
+  return lease.stage === 'signingInProgress'
 }

services/leasing/src/services/lease-service/adapters/xpand/lease-search-adapter.ts

@@ -13,8 +13,6 @@ const STATUS_ENUM_MAP: Record<string, string> = {
   [LeaseStatus.Upcoming]: 'upcoming',
   [LeaseStatus.AboutToEnd]: 'abouttoend',
   [LeaseStatus.Ended]: 'ended',
-  [LeaseStatus.PreliminaryTerminated]: 'preliminaryterminated',
-  [LeaseStatus.PendingSignature]: 'pendingsignature',
 }
 
 /** Maps normalized status keys to SQL WHERE conditions */

services/leasing/src/services/lease-service/helpers/tenfast.ts

@@ -14,7 +14,7 @@ const calculateLeaseStatus = (lease: TenfastLease): LeaseStatus => {
   const today = new Date()
   const { startDate, endDate, stage } = lease
 
-  // Check pending signature first (unsigned leases)
+  // Check pending signature first
   if (isPendingSignature(lease)) return LeaseStatus.PendingSignature
 
   // Check preliminary termination

services/leasing/src/services/lease-service/tests/adapters/tenfast/filters.test.ts

@@ -57,6 +57,19 @@ describe(filterByStatus, () => {
     expect(filterByStatus(leases, ['preliminary-terminated'])).toEqual([
       preliminaryTerminatedLease,
     ])
+
+    // preliminaryCancellation stage should also be classified as preliminary-terminated
+    const preliminaryCancellationLease = factory.tenfastLease.build({
+      startDate: sub(new Date(), { days: 1 }),
+      endDate: add(new Date(), { days: 30 }),
+      stage: 'preliminaryCancellation',
+      signed: true,
+    })
+    expect(
+      filterByStatus([preliminaryCancellationLease], [
+        'preliminary-terminated',
+      ])
+    ).toEqual([preliminaryCancellationLease])
     expect(filterByStatus(leases, ['ended'])).toEqual([endedLease])
     expect(filterByStatus(leases, ['pending-signature'])).toEqual([
       pendingSignatureLease,

services/leasing/src/services/lease-service/tests/helpers/tenfast.test.ts

@@ -0,0 +1,138 @@
+import { add, sub } from 'date-fns'
+import { LeaseStatus } from '@onecore/types'
+
+import { mapToOnecoreLease } from '../../helpers/tenfast'
+import * as factory from '../factories'
+
+describe('calculateLeaseStatus (via mapToOnecoreLease)', () => {
+  it('returns PendingSignature for signingInProgress stage', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'signingInProgress',
+      signed: false,
+      startDate: sub(new Date(), { days: 1 }),
+      endDate: null,
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.PendingSignature)
+  })
+
+  it('returns PreliminaryTerminated for requestedCancellation stage', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'requestedCancellation',
+      signed: true,
+      startDate: sub(new Date(), { days: 30 }),
+      endDate: add(new Date(), { days: 30 }),
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(
+      LeaseStatus.PreliminaryTerminated
+    )
+  })
+
+  it('returns PreliminaryTerminated for preliminaryCancellation stage', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'preliminaryCancellation',
+      signed: true,
+      startDate: sub(new Date(), { days: 30 }),
+      endDate: add(new Date(), { days: 30 }),
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(
+      LeaseStatus.PreliminaryTerminated
+    )
+  })
+
+  it('returns Ended for cancelled lease with past end date', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'cancelled',
+      signed: true,
+      startDate: sub(new Date(), { days: 60 }),
+      endDate: sub(new Date(), { days: 1 }),
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.Ended)
+  })
+
+  it('returns Ended for archived lease with past end date', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'archived',
+      signed: true,
+      startDate: sub(new Date(), { days: 60 }),
+      endDate: sub(new Date(), { days: 1 }),
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.Ended)
+  })
+
+  it('returns AboutToEnd for lease with future end date', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'cancelled',
+      signed: true,
+      startDate: sub(new Date(), { days: 30 }),
+      endDate: add(new Date(), { days: 30 }),
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.AboutToEnd)
+  })
+
+  it('returns Upcoming for signed lease with future start date', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'signed',
+      signed: true,
+      startDate: add(new Date(), { days: 1 }),
+      endDate: null,
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.Upcoming)
+  })
+
+  it('returns Current for signed lease with past start date and no end date', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'signed',
+      signed: true,
+      startDate: sub(new Date(), { days: 30 }),
+      endDate: null,
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.Current)
+  })
+
+  it('returns Current as fallback for unexpected stage', () => {
+    const lease = factory.tenfastLease.build({
+      stage: 'unknownStage',
+      signed: false,
+      startDate: sub(new Date(), { days: 30 }),
+      endDate: null,
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.Current)
+  })
+
+  it('prioritizes PendingSignature over other statuses', () => {
+    // A signingInProgress lease with a future end date could match AboutToEnd,
+    // but PendingSignature should take priority
+    const lease = factory.tenfastLease.build({
+      stage: 'signingInProgress',
+      signed: false,
+      startDate: sub(new Date(), { days: 1 }),
+      endDate: add(new Date(), { days: 30 }),
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(LeaseStatus.PendingSignature)
+  })
+
+  it('prioritizes PreliminaryTerminated over AboutToEnd', () => {
+    // A requestedCancellation lease with a future end date could match AboutToEnd,
+    // but PreliminaryTerminated should take priority
+    const lease = factory.tenfastLease.build({
+      stage: 'requestedCancellation',
+      signed: true,
+      startDate: sub(new Date(), { days: 1 }),
+      endDate: add(new Date(), { days: 30 }),
+    })
+
+    expect(mapToOnecoreLease(lease).status).toBe(
+      LeaseStatus.PreliminaryTerminated
+    )
+  })
+})