Feature/AVTAL-84: visa avtal som inte signerats ännu pa mimer.nu

apps/internal-portal/frontend/src/pages/ParkingSpace/components/Applicants.tsx

@@ -219,6 +219,7 @@ const leaseStatusFormatMap: Record<LeaseStatus, string> = {
   [LeaseStatus.AboutToEnd]: 'Uppsagt',
   [LeaseStatus.Ended]: 'Upphört',
   [LeaseStatus.PreliminaryTerminated]: 'Preliminärt uppsagt',
+  [LeaseStatus.PendingSignature]: 'Väntar på signering',
 }
 
 const formatLeaseStatus = (v: LeaseStatus) => leaseStatusFormatMap[v]

apps/internal-portal/frontend/src/pages/ParkingSpace/components/OfferRound.tsx

@@ -207,6 +207,7 @@ const leaseStatusFormatMap: Record<LeaseStatus, string> = {
   [LeaseStatus.AboutToEnd]: 'Uppsagt',
   [LeaseStatus.Ended]: 'Upphört',
   [LeaseStatus.PreliminaryTerminated]: 'Preliminärt uppsagt',
+  [LeaseStatus.PendingSignature]: 'Väntar på signering',
 }
 
 const formatLeaseStatus = (v: LeaseStatus) => leaseStatusFormatMap[v]

libs/types/src/enums.ts

@@ -4,6 +4,7 @@ enum LeaseStatus {
   AboutToEnd = 2, // Uppsagt, kommer att upphöra
   Ended = 3, // Upphört
   PreliminaryTerminated = 4, // Preliminärt uppsagt
+  PendingSignature = 5, // Väntar på signering
 }
 
 enum ParkingSpaceType {

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

@@ -9,53 +9,76 @@ export type GetLeasesFilters = {
     | 'about-to-end'
     | 'ended'
     | 'preliminary-terminated'
+    | 'pending-signature'
   )[]
 }
 
-export function filterByStatus(
+export const filterByStatus = (
   leases: TenfastLease[],
   statuses: GetLeasesFilters['status']
-) {
+) => {
   const now = new Date()
+  const seenIds = new Set<string>()
 
   return statuses.reduce<TenfastLease[]>(
     (acc, status) =>
       acc.concat(
-        leases.filter((l) =>
-          match(status)
+        leases.filter((l) => {
+          // Skip if we've already included this lease (by externalId/leaseId)
+          if (seenIds.has(l.externalId)) return false
+
+          const matches = match(status)
             .with('current', () => isCurrentLease(l, now))
             .with('upcoming', () => isUpcomingLease(l, now))
             .with('about-to-end', () => isAboutToEndLease(l, now))
             .with('ended', () => isEndedLease(l, now))
             .with('preliminary-terminated', () => isPreliminaryTerminated(l))
+            .with('pending-signature', () => isPendingSignature(l))
             .exhaustive()
-        )
+
+          if (matches) {
+            seenIds.add(l.externalId)
+            return true
+          }
+          return false
+        })
       ),
     []
   )
 }
 
-function isCurrentLease(l: TenfastLease, now: Date) {
-  return (
-    l.startDate < now &&
-    (!l.endDate || l.endDate > now) &&
-    !isPreliminaryTerminated(l) &&
-    !l.cancellation.cancelled
-  )
+const isCurrentLease = (l: TenfastLease, now: Date) => {
+  return l.startDate < now && !l.endDate && l.stage === 'signed'
 }
 
-function isUpcomingLease(l: TenfastLease, now: Date) {
-  return l.startDate >= now
+const isUpcomingLease = (l: TenfastLease, now: Date) => {
+  return l.startDate >= now && l.stage === 'signed'
 }
 
-function isAboutToEndLease(l: TenfastLease, now: Date) {
-  return l.endDate && l.endDate >= now && !!l.cancellation.cancelled
+const isAboutToEndLease = (l: TenfastLease, now: Date) => {
+  return l.endDate !== null && l.endDate >= now
 }
 
-function isEndedLease(l: TenfastLease, now: Date) {
-  return l.endDate && l.endDate < now
+const isEndedLease = (l: TenfastLease, now: Date) => {
+  return (
+    (l.stage === 'cancelled' || l.stage === 'archived') &&
+    l.endDate !== null &&
+    l.endDate < now
+  )
 }
 
 export const isPreliminaryTerminated = (lease: TenfastLease): boolean => {
-  return !!lease.simplesignTermination?.sentAt && !lease.cancellation.cancelled
+  return (
+    lease.stage === 'requestedCancellation' ||
+    lease.stage === 'preliminaryCancellation'
+  )
+}
+
+// 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'
+  )
 }

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

@@ -173,6 +173,7 @@ export const TenfastLeaseSchema = z.object({
   betalasForskott: z.boolean(),
   vatEnabled: z.boolean(),
   method: z.string(),
+  signed: z.boolean(),
   file: z
     .object({
       key: z.string(),
@@ -233,6 +234,7 @@ export const TenfastLeaseSchema = z.object({
   updatedAt: z.coerce.date(),
   startInvoicingFrom: optionalDateField,
   signedAt: optionalDateField, // When the lease was finalized as in tenant signed it or manually marked by mimer if offline sign.
+  stage: z.string(),
   tags: z.array(z.unknown()),
 })
 

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

@@ -652,6 +652,7 @@ const defaultFilters: GetLeasesFilters = {
     'about-to-end',
     'ended',
     'preliminary-terminated',
+    'pending-signature',
   ],
 }
 

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

@@ -13,6 +13,8 @@
   [LeaseStatus.Upcoming]: 'upcoming',
   [LeaseStatus.AboutToEnd]: 'abouttoend',
   [LeaseStatus.Ended]: 'ended',
+  [LeaseStatus.PreliminaryTerminated]: 'preliminaryterminated',
+  [LeaseStatus.PendingSignature]: 'pendingsignature',
 }
 
 /** Maps normalized status keys to SQL WHERE conditions */
@@ -430,7 +432,7 @@
  * Batch fetch contacts for a list of lease keys
  * Returns a Map from leaseKey to array of ContactInfo
  */
 const getContactsForLeases = async (
   leaseKeys: string[]
 ): Promise<Map<string, leasing.v1.ContactInfo[]>> => {
   if (leaseKeys.length === 0) {

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

@@ -5,25 +5,52 @@ import {
   TenfastInvoiceRow,
   TenfastRentalObject,
 } from '../adapters/tenfast/schemas'
-import { isPreliminaryTerminated } from '../adapters/tenfast/filters'
+import {
+  isPreliminaryTerminated,
+  isPendingSignature,
+} from '../adapters/tenfast/filters'
 
-const calculateLeaseStatus = (
-  startDate: Date,
-  endDate: Date | null,
-  isPreliminaryTerminated: boolean
-): LeaseStatus => {
-  // TODO: Verify this logic
+const calculateLeaseStatus = (lease: TenfastLease): LeaseStatus => {
   const today = new Date()
-  if (endDate && endDate < today) return LeaseStatus.Ended
-  if (startDate >= today) return LeaseStatus.Upcoming
-  if (isPreliminaryTerminated) return LeaseStatus.PreliminaryTerminated
-  if (endDate && endDate >= today) return LeaseStatus.AboutToEnd
+  const { startDate, endDate, stage } = lease
+
+  // Check pending signature first (unsigned leases)
+  if (isPendingSignature(lease)) return LeaseStatus.PendingSignature
+
+  // Check preliminary termination
+  if (isPreliminaryTerminated(lease)) return LeaseStatus.PreliminaryTerminated
+
+  // Check ended leases (must be cancelled/archived with past end date)
+  if (
+    (stage === 'cancelled' || stage === 'archived') &&
+    endDate &&
+    endDate < today
+  ) {
+    return LeaseStatus.Ended
+  }
+
+  // Check about to end - any lease with a future end date
+  if (endDate && endDate >= today) {
+    return LeaseStatus.AboutToEnd
+  }
+
+  // Check upcoming (signed with future start date)
+  if (startDate >= today && stage === 'signed') {
+    return LeaseStatus.Upcoming
+  }
+
+  // Current lease (signed, started, no end date)
+  if (stage === 'signed' && startDate < today && !endDate) {
+    return LeaseStatus.Current
+  }
+
+  // Default fallback
   return LeaseStatus.Current
 }
 
-function mapToOnecoreRentalObject(
+const mapToOnecoreRentalObject = (
   rentalObject: TenfastRentalObject
-): RentalObject | undefined {
+): RentalObject | undefined => {
   // Only map if we have populated fields (not just a reference)
   if (!rentalObject.postadress) {
     return undefined
@@ -69,17 +96,13 @@ function mapToOnecoreRentalObject(
 // lastDebitDate: Date | undefined // Sista betaldatum
 // approvalDate: Date | undefined // När godkände mimer kontraktet?
 
-export function mapToOnecoreLease(lease: TenfastLease): Lease {
+export const mapToOnecoreLease = (lease: TenfastLease): Lease => {
   return {
     leaseId: lease.externalId,
     leaseNumber: lease.externalId.split('/')[1],
     leaseStartDate: lease.startDate,
     leaseEndDate: lease.endDate ?? undefined,
-    status: calculateLeaseStatus(
-      lease.startDate,
-      lease.endDate,
-      isPreliminaryTerminated(lease)
-    ),
+    status: calculateLeaseStatus(lease),
     noticeGivenBy: lease.cancellation.cancelledByType ?? undefined,
     noticeDate: lease.cancellation.handledAt ?? undefined,
     noticeTimeTenant: lease.uppsagningstid,
@@ -100,7 +123,7 @@ export function mapToOnecoreLease(lease: TenfastLease): Lease {
   }
 }
 
-export function mapToOnecoreRentRow(row: TenfastInvoiceRow): LeaseRentRow {
+export const mapToOnecoreRentRow = (row: TenfastInvoiceRow): LeaseRentRow => {
   return {
     id: row._id,
     amount: row.amount,

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

@@ -8,56 +8,38 @@ describe(filterByStatus, () => {
     const currentLease = factory.tenfastLease.build({
       startDate: sub(new Date(), { days: 1 }),
       endDate: null,
-      cancellation: {
-        cancelled: false,
-        doneAutomatically: false,
-        receivedCancellationAt: null,
-        notifiedAt: null,
-        handledAt: null,
-        handledBy: null,
-        preferredMoveOutDate: null,
-      },
-      simplesignTermination: undefined,
+      stage: 'signed',
+      signed: true,
     })
     const upcomingLease = factory.tenfastLease.build({
       startDate: add(new Date(), { days: 1 }),
       endDate: null,
+      stage: 'signed',
+      signed: true,
     })
     const aboutToEndLease = factory.tenfastLease.build({
       startDate: sub(new Date(), { days: 1 }),
       endDate: add(new Date(), { days: 1 }),
-      cancellation: {
-        cancelled: true,
-        doneAutomatically: false,
-        receivedCancellationAt: null,
-        notifiedAt: null,
-        handledAt: new Date(),
-        handledBy: 'admin-user-id',
-        preferredMoveOutDate: null,
-      },
-      simplesignTermination: undefined,
+      stage: 'cancelled',
+      signed: true,
     })
     const preliminaryTerminatedLease = factory.tenfastLease.build({
       startDate: sub(new Date(), { days: 1 }),
       endDate: add(new Date(), { days: 30 }),
-      cancellation: {
-        cancelled: false,
-        doneAutomatically: false,
-        receivedCancellationAt: null,
-        notifiedAt: null,
-        handledAt: null,
-        handledBy: null,
-        preferredMoveOutDate: null,
-      },
-      simplesignTermination: {
-        signatures: [],
-        sentAt: new Date(),
-        signedAt: null,
-      },
+      stage: 'requestedCancellation',
+      signed: true,
     })
     const endedLease = factory.tenfastLease.build({
       startDate: sub(new Date(), { days: 1 }),
       endDate: sub(new Date(), { days: 1 }),
+      stage: 'cancelled',
+      signed: true,
+    })
+    const pendingSignatureLease = factory.tenfastLease.build({
+      startDate: sub(new Date(), { days: 1 }),
+      endDate: null,
+      stage: 'signingInProgress',
+      signed: false,
     })
 
     const leases = [
@@ -66,6 +48,7 @@ describe(filterByStatus, () => {
       aboutToEndLease,
       preliminaryTerminatedLease,
       endedLease,
+      pendingSignatureLease,
     ]
 
     expect(filterByStatus(leases, ['current'])).toEqual([currentLease])
@@ -75,5 +58,8 @@ describe(filterByStatus, () => {
       preliminaryTerminatedLease,
     ])
     expect(filterByStatus(leases, ['ended'])).toEqual([endedLease])
+    expect(filterByStatus(leases, ['pending-signature'])).toEqual([
+      pendingSignatureLease,
+    ])
   })
 })

services/leasing/src/services/lease-service/tests/factories/tenfast-lease.ts

@@ -21,6 +21,8 @@ export const TenfastLeaseFactory = Factory.define<TenfastLease>(
     betalasForskott: false,
     vatEnabled: false,
     method: 'digital',
+    signed: true,
+    stage: 'signed',
     file: {
       key: `file-key-${sequence}`,
       location: 'https://files.example.com/file.pdf',
@@ -36,6 +38,7 @@ export const TenfastLeaseFactory = Factory.define<TenfastLease>(
       handledAt: null,
       handledBy: null,
       preferredMoveOutDate: null,
+      cancelledByType: null,
     },
     deposit: {
       ekoNotifications: [],