fix/Undefined VacantFrom Gets Todays Date (#39)

* Using the same helper function to handle undefined vacantFrom in createOffer as well as replyToOffer

Author: mittistormen

core/src/common/helpers.ts

@@ -0,0 +1,15 @@
+import { Listing } from '@onecore/types'
+import * as utils from '../utils'
+
+export const calculateVacantFrom = (listing: Listing): Date => {
+  const todaysDate = utils.date.getUTCDateWithoutTime(new Date())
+  const vacantDate = listing.rentalObject.vacantFrom
+    ? utils.date.getUTCDateWithoutTime(
+        new Date(listing.rentalObject.vacantFrom)
+      )
+    : null
+  const fromDate =
+    vacantDate && vacantDate > todaysDate ? vacantDate : todaysDate
+
+  return fromDate
+}

core/src/processes/parkingspaces/internal/create-offer.ts

@@ -15,12 +15,12 @@ import {
   ProcessError,
 } from '../../../common/types'
 import * as leasingAdapter from '../../../adapters/leasing-adapter'
-import * as propertyMgmtAdapter from '../../../adapters/property-management-adapter'
 import * as utils from '../../../utils'
 import * as communicationAdapter from '../../../adapters/communication-adapter'
 import { makeProcessError } from '../utils'
 import { sendNotificationToRole } from '../../../adapters/communication-adapter'
 import config from '../../../common/config'
+import { calculateVacantFrom } from '../../../common/helpers'
 
 type CreateOfferError =
   | CreateOfferErrorCodes.NoListing
@@ -215,7 +215,7 @@ export const createOfferForInternalParkingSpace = async (
         firstName: eligibleApplicant.name
           ? extractApplicantFirstName(eligibleApplicant.name)
           : '',
-        availableFrom: new Date(listing.rentalObject.vacantFrom).toISOString(),
+        availableFrom: calculateVacantFrom(listing).toISOString(),
         deadlineDate: new Date(offer.data.expiresAt).toISOString(),
         rent: String(listing.rentalObject.monthlyRent),
         type: listing.rentalObject.objectTypeCaption ?? '',

core/src/processes/parkingspaces/internal/reply-to-offer.ts

@@ -16,7 +16,7 @@ import * as communicationAdapter from '../../../adapters/communication-adapter'
 import { makeProcessError } from '../utils'
 import { AdapterResult } from '../../../adapters/types'
 import { createOfferForInternalParkingSpace } from './create-offer'
-import * as utils from '../../../utils'
+import { calculateVacantFrom } from '../../../common/helpers'
 
 type ReplyToOfferError =
   | ReplyToOfferErrorCodes.NoOffer
@@ -110,21 +110,10 @@ export const acceptOffer = async (
     let leaseId: string
 
     try {
-      const todaysDate = utils.date.getUTCDateWithoutTime(new Date())
-      const vacantDate = listing.rentalObject.vacantFrom
-        ? utils.date.getUTCDateWithoutTime(
-            new Date(listing.rentalObject.vacantFrom)
-          )
-        : null
-      const fromDate =
-        vacantDate && vacantDate > todaysDate
-          ? vacantDate.toISOString()
-          : todaysDate.toISOString()
-
       const createLeaseResult = await leasingAdapter.createLease(
         listing.rentalObjectCode,
         offer.offeredApplicant.contactCode,
-        fromDate,
+        calculateVacantFrom(listing).toISOString(),
         '001'
       )
 

core/src/processes/parkingspaces/internal/tests/create-offer.test.ts

@@ -498,4 +498,55 @@ describe('createOfferForInternalParkingSpace', () => {
     expect(expiresAt.getUTCHours()).toBe(23)
     expect(expiresAt.getUTCMinutes()).toBe(59)
   })
+
+  it('creates offer on a listing with an undefined vacantFrom date', async () => {
+    const listing = factory.listing.build({ status: ListingStatus.Expired })
+    jest
+      .spyOn(leasingAdapter, 'getListingByListingId')
+      .mockResolvedValue(listing)
+
+    jest.spyOn(leasingAdapter, 'getParkingSpaceByCode').mockResolvedValue({
+      ok: true,
+      data: factory.vacantParkingSpace
+        .params({
+          rentalObjectCode: listing.rentalObjectCode,
+          vacantFrom: undefined,
+        })
+        .build(),
+    })
+    jest
+      .spyOn(leasingAdapter, 'getDetailedApplicantsByListingId')
+      .mockResolvedValueOnce({
+        ok: true,
+        data: factory.detailedApplicant.buildList(1),
+      })
+    jest
+      .spyOn(leasingAdapter, 'getContactByContactCode')
+      .mockResolvedValueOnce({ ok: true, data: factory.contact.build() })
+    jest
+      .spyOn(leasingAdapter, 'updateApplicantStatus')
+      .mockResolvedValueOnce(null)
+
+    jest
+      .spyOn(communicationAdapter, 'sendParkingSpaceOfferEmail')
+      .mockResolvedValueOnce(null)
+
+    jest
+      .spyOn(leasingAdapter, 'createOffer')
+      .mockResolvedValueOnce({ ok: true, data: factory.offer.build() })
+
+    const updateOfferSentAtSpy = jest
+      .spyOn(leasingAdapter, 'updateOfferSentAt')
+      .mockResolvedValue({ ok: true, data: null })
+
+    const result = await createOfferForInternalParkingSpace(123)
+
+    expect(result).toEqual({
+      processStatus: ProcessStatus.successful,
+      data: null,
+      httpStatus: 200,
+    })
+
+    expect(updateOfferSentAtSpy).toHaveBeenCalledTimes(1)
+  })
 })