Feat:UTH-117 Get Republished Listings by Rental Object Code (#210)

* Feat:UTH-117 Get Republished Listings by Rental Object Code * Create Note Of Interest-process for Parking spaces is now getting listing by new route that only returns active listings. This fixes a bug where it wasn't possible to get listings by rental object code that had been republished and imported again Co-authored-by: Andreas Lundqvist <[email protected]>
Bostads-AB-Mimer · Nov 6, 2024 · 283e04f · 283e04f
1 parent bda60f7
commit 283e04f
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 31 deletions.
diff --git a/src/adapters/leasing-adapter/index.ts b/src/adapters/leasing-adapter/index.ts
@@ -542,7 +542,7 @@ export {
   createNewListing,
   deleteListing,
   getListingByListingId,
-  getListingByRentalObjectCode,
+  getActiveListingByRentalObjectCode,
   getListingsWithApplicants,
   syncInternalParkingSpacesFromXpand,
   updateListingStatus,

diff --git a/src/adapters/leasing-adapter/listings.ts b/src/adapters/leasing-adapter/listings.ts
@@ -13,12 +13,12 @@ import config from '../../common/config'
 
 const tenantsLeasesServiceUrl = config.tenantsLeasesService.url
 
-const getListingByRentalObjectCode = async (
+const getActiveListingByRentalObjectCode = async (
   rentalObjectCode: string
 ): Promise<AdapterResult<Listing | undefined, 'not-found' | 'unknown'>> => {
   try {
     const res = await axios.get(
-      `${tenantsLeasesServiceUrl}/listings/by-code/${rentalObjectCode}`
+      `${tenantsLeasesServiceUrl}/listings/active/by-code/${rentalObjectCode}`
     )
 
     if (res.status == HttpStatusCode.NotFound) {
@@ -27,7 +27,10 @@ const getListingByRentalObjectCode = async (
 
     return { ok: true, data: res.data.content }
   } catch (error) {
-    logger.error(error, 'Error fetching listing by rental object code:', error)
+    logger.error(
+      error,
+      'Error fetching active listing by rental object code:'
+    )
     return { ok: false, err: 'unknown' }
   }
 }
@@ -207,7 +210,7 @@ const getExpiredListingsWithNoOffers = async (): Promise<
 }
 
 export {
-  getListingByRentalObjectCode,
+  getActiveListingByRentalObjectCode,
   getListingsWithApplicants,
   createNewListing,
   applyForListing,

diff --git a/src/adapters/tests/leasing-adapter/listings.test.ts b/src/adapters/tests/leasing-adapter/listings.test.ts
@@ -89,3 +89,49 @@ describe(leasingAdapter.updateListingStatus, () => {
     expect(result).toEqual({ ok: true, data: null })
   })
 })
+
+describe(leasingAdapter.getActiveListingByRentalObjectCode, () => {
+  it('returns err if leasing responds with 404', async () => {
+    nock(config.tenantsLeasesService.url)
+      .get('/listings/active/by-code/123')
+      .reply(404)
+
+    const result =
+      await leasingAdapter.getActiveListingByRentalObjectCode('123')
+
+    expect(result).toEqual({ ok: false, err: 'not-found' })
+  })
+
+  it('returns err if leasing responds with 500', async () => {
+    nock(config.tenantsLeasesService.url)
+      .get('/listings/active/by-code/123')
+      .reply(500)
+
+    const result =
+      await leasingAdapter.getActiveListingByRentalObjectCode('123')
+
+    expect(result).toEqual({ ok: false, err: 'unknown' })
+  })
+
+  it('returns an active listing', async () => {
+    nock(config.tenantsLeasesService.url)
+      .get('/listings/active/by-code/123')
+      .reply(200, {
+        content: factory.listing.build({
+          rentalObjectCode: '123',
+          status: ListingStatus.Active,
+        }),
+      })
+
+    const result =
+      await leasingAdapter.getActiveListingByRentalObjectCode('123')
+
+    expect(result).toMatchObject({
+      ok: true,
+      data: expect.objectContaining({
+        rentalObjectCode: '123',
+        status: ListingStatus.Active,
+      }),
+    })
+  })
+})
diff --git a/src/adapters/tests/leasing-adapter/offers.test.ts b/src/adapters/tests/leasing-adapter/offers.test.ts
@@ -48,19 +48,10 @@ describe(leasingAdapter.getOfferByOfferId, () => {
   })
 
   it('should return 404 on not found', async () => {
-    nock(config.tenantsLeasesService.url)
-      .get('/offers/123')
-      .reply(404, {
-        content: {
-          ok: false,
-          err: 'not-found',
-        },
-      })
+    nock(config.tenantsLeasesService.url).get('/offers/123').reply(404)
 
     const res = await leasingAdapter.getOfferByOfferId(123)
-
-    expect(res.ok).toBe(false)
-    if (!res.ok) expect(res.err).toBe('not-found')
+    expect(res).toEqual({ ok: false, err: 'not-found' })
   })
 })
 
@@ -77,6 +68,35 @@ describe(leasingAdapter.getOffersForContact, () => {
     assert(result.ok)
     expect(result.data).toEqual([expect.objectContaining({ id: offer.id })])
   })
+
+  it('should return 404 on not found', async () => {
+    nock(config.tenantsLeasesService.url)
+      .get('/contacts/P174965/offers')
+      .reply(404)
+
+    const res = await leasingAdapter.getOffersForContact('P174965')
+    expect(res).toEqual({ ok: false, err: 'not-found' })
+  })
+
+  it('should return an empty array if no offers are found', async () => {
+    nock(config.tenantsLeasesService.url)
+      .get('/contacts/P174965/offers')
+      .reply(200, {
+        content: [],
+      })
+
+    const res = await leasingAdapter.getOffersForContact('P174965')
+    expect(res).toEqual({ ok: true, data: [] })
+  })
+
+  it('should handle server errors gracefully', async () => {
+    nock(config.tenantsLeasesService.url)
+      .get('/contacts/P174965/offers')
+      .reply(500)
+
+    const res = await leasingAdapter.getOffersForContact('P174965')
+    expect(res).toEqual({ ok: false, err: 'unknown' })
+  })
 })
 
 describe(leasingAdapter.updateOfferSentAt, () => {

diff --git a/src/processes/parkingspaces/internal/create-note-of-interest.ts b/src/processes/parkingspaces/internal/create-note-of-interest.ts
@@ -15,7 +15,7 @@ import {
   getContact,
   getLeasesForPnr,
   addApplicantToWaitingList,
-  getListingByRentalObjectCode,
+  getActiveListingByRentalObjectCode,
   createNewListing,
   applyForListing,
   getInternalCreditInformation,
@@ -190,7 +190,7 @@ export const createNoteOfInterestForInternalParkingSpace = async (
     //todo: refactor get and create listing to new func ->
     //todo: should return the listing regardless of if it exists previously or is being created
     let listingAdapterResult =
-      await getListingByRentalObjectCode(parkingSpaceId)
+      await getActiveListingByRentalObjectCode(parkingSpaceId)
     if (listingAdapterResult?.ok) {
       log.push(
         `Annons med id ${listingAdapterResult.data?.id} existerar sedan tidigare i onecore-leasing`

diff --git a/src/processes/parkingspaces/internal/tests/create-note-of-interest.test.ts b/src/processes/parkingspaces/internal/tests/create-note-of-interest.test.ts
@@ -73,8 +73,8 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
     .spyOn(leasingAdapter, 'getApplicantByContactCodeAndListingId')
     .mockResolvedValue({ content: mockedApplicant })
 
-  const getListingByRentalObjectCodeSpy = jest
-    .spyOn(leasingAdapter, 'getListingByRentalObjectCode')
+  const getActiveListingByRentalObjectCodeSpy = jest
+    .spyOn(leasingAdapter, 'getActiveListingByRentalObjectCode')
     .mockResolvedValue({
       ok: true,
       data: sharedListing,
@@ -101,10 +101,12 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
     .spyOn(communicationAdapter, 'sendNotificationToRole')
     .mockResolvedValue({})
 
-  jest.spyOn(leasingAdapter, 'getListingByRentalObjectCode').mockResolvedValue({
-    ok: true,
-    data: sharedListing,
-  })
+  jest
+    .spyOn(leasingAdapter, 'getActiveListingByRentalObjectCode')
+    .mockResolvedValue({
+      ok: true,
+      data: sharedListing,
+    })
   jest.spyOn(leasingAdapter, 'createNewListing').mockResolvedValue({
     ok: true,
     data: sharedListing,
@@ -313,7 +315,7 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
       'Additional'
     )
 
-    expect(getListingByRentalObjectCodeSpy).toHaveBeenCalledWith('foo')
+    expect(getActiveListingByRentalObjectCodeSpy).toHaveBeenCalledWith('foo')
   })
 
   it("creates new listing if it hasn't been added already", async () => {
@@ -322,7 +324,7 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
     getLeasesForPnrSpy.mockResolvedValue(mockedLeases)
     getInternalCreditInformationSpy.mockResolvedValue(true)
     applyForListingSpy.mockResolvedValue({ status: 201 } as any)
-    getListingByRentalObjectCodeSpy.mockResolvedValue({
+    getActiveListingByRentalObjectCodeSpy.mockResolvedValue({
       ok: false,
       err: 'not-found',
     })
@@ -364,7 +366,7 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
       ok: true,
       data: sharedListing,
     })
-    getListingByRentalObjectCodeSpy.mockResolvedValue({
+    getActiveListingByRentalObjectCodeSpy.mockResolvedValue({
       ok: true,
       data: sharedListing,
     })
@@ -409,7 +411,7 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
       ok: true,
       data: sharedListing,
     })
-    getListingByRentalObjectCodeSpy.mockResolvedValue({
+    getActiveListingByRentalObjectCodeSpy.mockResolvedValue({
       ok: false,
       err: 'not-found',
     })
@@ -441,7 +443,7 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
       ok: false,
       err: 'conflict',
     } as any)
-    getListingByRentalObjectCodeSpy.mockResolvedValue({
+    getActiveListingByRentalObjectCodeSpy.mockResolvedValue({
       ok: true,
       data: factory.listing.build({ status: ListingStatus.Active }),
     })
@@ -470,7 +472,7 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
     applyForListingSpy.mockResolvedValue({
       status: HttpStatusCode.Ok,
     } as any)
-    getListingByRentalObjectCodeSpy.mockResolvedValue({
+    getActiveListingByRentalObjectCodeSpy.mockResolvedValue({
       ok: true,
       data: sharedListing,
     })
@@ -505,7 +507,7 @@ describe('createNoteOfInterestForInternalParkingSpace', () => {
       ok: false,
       err: 'conflict',
     })
-    getListingByRentalObjectCodeSpy.mockResolvedValue({
+    getActiveListingByRentalObjectCodeSpy.mockResolvedValue({
       ok: true,
       data: sharedListing,
     })