Epic/uth 227 publicera alla bilplatser fran onecore (#196)

* add endpoint to get vacant parkingspaces
* show vacant parkinspaces on a new page
* create endpoint and method to create multiple listings.
* create endpoint in core
* add endpoint and logic to portal backend
* refactor UI and publish vacant parkingspaces
* handle potential empty PublishedTo-date for NON_SCORED listings
* handle re-render errors
* handle publishing of large batches
* rename kötyp to Uthyrningsmetod
* filter out offered as well as ready for offer listings from vacant parking spaces
* disable creation of application for non scored listings
* Don't render applicants or offers tabs on details page for NON_SCORED rental rules
* refactor parking-spaces endpoints in core and leasing service to take body param list of rentalobjectIds and return rentalobjects.
* parallelize vacant-parkingspace request
* remove all xpand-sync code in internal-portal be and fe and core
* remove xpand-internal-parkingspaces-sync from lease-service
* Feat/uth 236 get all parking space listings from one core (#35)
* Feat: UTH-236 Get All Parking Space Listings From OneCore
Added missing functionality to filter result based on a ContactCode. Scored/internal Listings where the user doesn't have a housing contract is filtered out.
* Feat:UTH-237 Get Published Lisings by RentalObjectCode (#42)
To be able to show the parking space detail page on mimer.nu we need to be able to retrieve published listings by RentalObjectCode.
* filter on RentalObjectCode has been added to GET /listings in both core and lesing
* Feat:UTH-247-Rental-Object-Search
* UTH-238: Unpublish listing (#38)

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Linda Almqvist <linda.almqvist@prototyp.se>
Co-authored-by: Sven Johansson <sven.johansson@iteam.se>
Co-authored-by: Andreas Lundqvist <31646645+momentiris@users.noreply.github.com>
Co-authored-by: Linda Almqvist <34321514+lalmqvist@users.noreply.github.com>
Co-authored-by: lindblomdavid <65215239+lindblomdavid@users.noreply.github.com>

Author: 6 people

.env.template

@@ -7,3 +7,9 @@
 SQLSERVER_IMAGE=mcr.microsoft.com/mssql/server:2022-latest
 SQLSERVER_PLATFORM=linux/amd64
 SQLSERVER_USER=root
+
+# Alternative for M* Macs, in case azure-sql-edge does not work
+#SQLSERVER_IMAGE=mcr.microsoft.com/mssql/server:2022-CU16-ubuntu-20.04
+
+#DOCKER_SQL_PLATFORM=linux/amd64
+#DOCKER_SQL_USER=root

.github/workflows/build-and-push.yaml

@@ -55,8 +55,8 @@ jobs:
     env:
       # Prefer workflow_run context if present, otherwise fall back defaults
       HEAD_BRANCH: ${{ github.event.workflow_run.head_branch || (github.ref_type == 'branch' && github.ref_name) }}
-      HEAD_TAG:    ${{ github.event.workflow_run.head_branch == null && github.ref_type == 'tag' && github.ref_name || '' }}
-      HEAD_SHA:    ${{ github.event.workflow_run.head_sha || github.sha }}
+      HEAD_TAG: ${{ github.event.workflow_run.head_branch == null && github.ref_type == 'tag' && github.ref_name || '' }}
+      HEAD_SHA: ${{ github.event.workflow_run.head_sha || github.sha }}
     outputs:
       matrix: ${{ steps.read-matrix.outputs.matrix }}
       build_type: ${{ steps.build-type.outputs.build_type }}
@@ -145,7 +145,7 @@ jobs:
         run: |
           BRANCH_TAG="${{ steps.build-type.outputs.build_tag_base }}"
 
-          LATEST=$(crane ls "ghcr.io/bostads-ab-mimer/onecore/onecore-core" \
+          LATEST=$(crane ls $IMAGE \
             | grep "^${BRANCH_TAG}\." \
             | sed "s/^${BRANCH_TAG}\.//" \
             | sort -n \
@@ -214,7 +214,7 @@ jobs:
       - name: Render build_args
         id: render-build-args
         env:
-          BUILD_TYPE:  ${{ needs.prepare.outputs.build_type }}
+          BUILD_TYPE: ${{ needs.prepare.outputs.build_type }}
           RELEASE_BUILD_ARGS: ${{ (matrix.build_args.release && toJSON(matrix.build_args.release)) }}
           TEST_BUILD_ARGS: ${{ (matrix.build_args.test && toJSON(matrix.build_args.test)) }}
         run: |
@@ -286,4 +286,3 @@ jobs:
           git add $(git ls-files -m '*package*.json')
           git commit -m "chore: bump version to ${new_version} [skip ci]"
           git push --follow-tags
-

apps/internal-portal/backend/jest.config.js

@@ -1,5 +1,5 @@
 /** @type {import('jest').Config} */
-export default {
+module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   moduleNameMapper: {

apps/internal-portal/backend/src/api.ts

@@ -5,13 +5,16 @@ import { routes as contactsRoutes } from './services/leasing-service/contacts'
 import { routes as offersRoutes } from './services/leasing-service/offers'
 import { routes as listingsRoutes } from './services/leasing-service/listings'
 import { routes as invoicesRoutes } from './services/invoices/invoices'
+import { routes as rentalObjectsRoutes } from './services/leasing-service/rental-objects'
 
 const router = new KoaRouter()
 
 commentsRoutes(router)
 contactsRoutes(router)
 offersRoutes(router)
 listingsRoutes(router)
+rentalObjectsRoutes(router)
+
 propertyInfoRoutes(router)
 invoicesRoutes(router)
 

apps/internal-portal/backend/src/services/auth-service/adapters/msal.ts

@@ -1,4 +1,3 @@
-import config from '../../../common/config'
 import msal from '@azure/msal-node'
 import axios from 'axios'
 import {
@@ -8,10 +7,10 @@ import {
   KoaContext,
 } from './types'
 
-const redirectUri = config.auth.msal.redirectUri || config.msal.redirectUri
-const postLogoutRedirectUri =
-  config.auth.msal.postLogoutRedirectUri || config.msal.postLogoutRedirectUri
+import config from '../../../common/config'
 
+const redirectUri = config.msal.redirectUri
+const postLogoutRedirectUri = config.msal.postLogoutRedirectUri
 const cryptoProvider = new msal.CryptoProvider()
 
 const defaultOptions: AuthOptions = {

apps/internal-portal/backend/src/services/leasing-service/adapters/core-adapter.ts

@@ -4,7 +4,6 @@ import {
   CreateNoteOfInterestErrorCodes,
   DetailedApplicant,
   GetActiveOfferByListingIdErrorCodes,
-  InternalParkingSpaceSyncSuccessResponse,
   Listing,
   ListingStatus,
   Offer,
@@ -16,6 +15,7 @@ import {
   Comment,
   CommentThread,
   CommentThreadId,
+  RentalObject,
   Invoice,
   Lease,
 } from '@onecore/types'
@@ -40,12 +40,20 @@ const getListingsWithApplicants = async (
       url: url,
     })
 
+    const listings = listingsResponse.data?.content
+
+    listings.sort((a, b) => {
+      const dateA = new Date(a.publishedFrom).getTime()
+      const dateB = new Date(b.publishedFrom).getTime()
+      return dateB - dateA
+    })
+
     if (querystring !== 'type=offered') {
-      return { ok: true, data: listingsResponse.data.content }
+      return { ok: true, data: listings }
     }
 
     const withOffers = await Promise.all(
-      listingsResponse.data.content.map(async (listing) => {
+      listings.map(async (listing) => {
         const offer = await getActiveOfferByListingId(listing.id)
         if (!offer.ok) {
           throw new Error('Failed to get offer')
@@ -292,19 +300,42 @@ const createOffer = async (params: {
   }
 }
 
-const syncInternalParkingSpacesFromXpand = async (): Promise<
-  AdapterResult<InternalParkingSpaceSyncSuccessResponse, 'unknown'>
-> => {
+const createListings = async (
+  listingData: Omit<Listing, 'id' | 'rentalObject'>
+): Promise<AdapterResult<Listing, 'conflict' | 'unknown'>> => {
   try {
-    const response = await getFromCore<{
-      content: InternalParkingSpaceSyncSuccessResponse
-    }>({
+    const response = await getFromCore<{ content: Listing }>({
       method: 'post',
-      url: `${coreBaseUrl}/listings/sync-internal-from-xpand`,
+      url: `${coreBaseUrl}/listings`,
+      data: listingData,
     })
 
     return { ok: true, data: response.data.content }
-  } catch {
+  } catch (err) {
+    const axiosError = err as AxiosError
+    if (axiosError.response?.status === HttpStatusCode.Conflict) {
+      return { ok: false, err: 'conflict', statusCode: 409 }
+    }
+    return { ok: false, err: 'unknown', statusCode: 500 }
+  }
+}
+
+const createMultipleListings = async (
+  listingsData: Array<Omit<Listing, 'id' | 'rentalObject'>>
+): Promise<AdapterResult<Array<Listing>, 'partial-failure' | 'unknown'>> => {
+  try {
+    const response = await getFromCore<{ content: Array<Listing> }>({
+      method: 'post',
+      url: `${coreBaseUrl}/listings/batch`,
+      data: { listings: listingsData },
+    })
+
+    return { ok: true, data: response.data.content }
+  } catch (err) {
+    const axiosError = err as AxiosError
+    if (axiosError.response?.status === 207) {
+      return { ok: false, err: 'partial-failure', statusCode: 207 }
+    }
     return { ok: false, err: 'unknown', statusCode: 500 }
   }
 }
@@ -313,9 +344,7 @@ const deleteListing = async (
   listingId: number
 ): Promise<AdapterResult<null, 'conflict' | 'unknown'>> => {
   try {
-    await getFromCore<{
-      content: InternalParkingSpaceSyncSuccessResponse
-    }>({
+    await getFromCore({
       method: 'delete',
       url: `${coreBaseUrl}/listings/${listingId}`,
     })
@@ -348,6 +377,22 @@ const closeListing = async (
   }
 }
 
+const expireListing = async (
+  listingId: number
+): Promise<AdapterResult<null, 'unknown'>> => {
+  try {
+    await getFromCore({
+      method: 'put',
+      url: `${coreBaseUrl}/listings/${listingId}/status`,
+      data: { status: ListingStatus.Expired },
+    })
+
+    return { ok: true, data: null }
+  } catch {
+    return { ok: false, err: 'unknown', statusCode: 500 }
+  }
+}
+
 const acceptOffer = async (
   offerId: string
 ): Promise<AdapterResult<Array<Listing>, ReplyToOfferErrorCodes>> => {
@@ -565,6 +610,23 @@ const removeComment = async (
   }
 }
 
+const getVacantParkingSpaces = async (): Promise<
+  AdapterResult<RentalObject[], unknown>
+> => {
+  try {
+    const response = await getFromCore<{ content: RentalObject[] }>({
+      method: 'get',
+      url: `${coreBaseUrl}/vacant-parkingspaces`,
+    })
+    return { ok: true, data: response.data.content }
+  } catch (e) {
+    if (e instanceof AxiosError && e.response?.status === 401) {
+      return { ok: false, err: 'unauthorized', statusCode: 401 }
+    }
+    return { ok: false, err: 'unknown', statusCode: 500 }
+  }
+}
+
 async function getInvoicesByContactCode(
   contactCode: string
 ): Promise<AdapterResult<Invoice[], 'not-found' | 'unknown'>> {
@@ -603,6 +665,59 @@ async function getLeasesByContactCode(contactCode: string) {
   return { ok: true, data: response.data.content }
 }
 
+const createLeaseForNonScoredParkingSpace = async (params: {
+  parkingSpaceId: string
+  contactCode: string
+}): Promise<
+  AdapterResult<
+    unknown,
+    | 'internal-credit-check-failed'
+    | 'external-credit-check-failed'
+    | 'invalid-address'
+    | 'already-has-lease'
+    | 'unknown'
+  >
+> => {
+  try {
+    const response = await getFromCore<any>({
+      method: 'post',
+      url: `${coreBaseUrl}/parking-spaces/${params.parkingSpaceId}/leases`,
+      data: { contactCode: params.contactCode },
+    })
+
+    return { ok: true, data: response.data.content }
+  } catch (err) {
+    if (err instanceof AxiosError && err.response?.data) {
+      const statusCode = err.response.status
+      // Check error at root level first, then nested in content
+      const errorCode =
+        err.response.data?.error || err.response.data?.content?.errorCode
+
+      // Handle both 400 BadRequest and 404 NotFound for validation errors
+      if (statusCode === HttpStatusCode.BadRequest || statusCode === 404) {
+        // Map error codes from core service
+        if (errorCode === 'internal-credit-check-failed') {
+          return { ok: false, err: 'internal-credit-check-failed', statusCode }
+        }
+        if (errorCode === 'external-credit-check-failed') {
+          return { ok: false, err: 'external-credit-check-failed', statusCode }
+        }
+        if (
+          errorCode === 'invalid-address' ||
+          errorCode === 'applicant-missing-address'
+        ) {
+          return { ok: false, err: 'invalid-address', statusCode }
+        }
+        if (errorCode === 'already-has-lease') {
+          return { ok: false, err: 'already-has-lease', statusCode }
+        }
+      }
+    }
+
+    return { ok: false, err: 'unknown', statusCode: 500 }
+  }
+}
+
 export {
   addComment,
   removeComment,
@@ -614,18 +729,22 @@ export {
   getTenantByContactCode,
   getContactByContactCode,
   getContactByNationalRegistrationNumber,
+  createListings,
+  createMultipleListings,
   createNoteOfInterestForInternalParkingSpace,
   validatePropertyRentalRules,
   validateResidentialAreaRentalRules,
-  syncInternalParkingSpacesFromXpand,
   createOffer,
   deleteListing,
   closeListing,
+  expireListing,
   acceptOffer,
   denyOffer,
   getActiveOfferByListingId,
   getApplicationProfileByContactCode,
   createOrUpdateApplicationProfile,
+  getVacantParkingSpaces,
   getInvoicesByContactCode,
   getLeasesByContactCode,
+  createLeaseForNonScoredParkingSpace,
 }