feat: creating views for public and partner lists (#1271)

* feat: creating views for public and partner lists

* fix: re-adding the features per sean

* fix: fixes accessibilityFeaturesExist

* fix: updates per sean

* feat: update default listing view

Co-authored-by: Sean Albert <[email protected]>

backend/core/src/listings/views/config.ts

@@ -63,13 +63,15 @@ views.partnerList = {
   select: [
     "listings.id",
     "listings.name",
-    "listings.applicationDueDate",
+    "property.id",
+    ...getBaseAddressSelect(["buildingAddress"]),
     "listings.status",
-    "listings.waitlistMaxSize",
-    "listings.waitlistCurrentSize",
-    "property.unitsAvailable",
+    "listings.isVerified",
+  ],
+  leftJoins: [
+    { join: "listings.property", alias: "property" },
+    { join: "property.buildingAddress", alias: "buildingAddress" },
   ],
-  leftJoins: [{ join: "listings.property", alias: "property" }],
 }
 
 views.detail = {
@@ -209,4 +211,46 @@ views.full = {
   ],
 }
 
+views.publicListings = {
+  select: [
+    "listings.id",
+    "listings.name",
+    "listings.marketingType",
+    "listings.marketingDate",
+    "listings.marketingSeason",
+    "listings.isVerified",
+    "property.id",
+    ...getBaseAddressSelect(["buildingAddress"]),
+    "listingImages.ordinal",
+    "listingImagesImage.id",
+    "listingImagesImage.fileId",
+    "listingImagesImage.label",
+    "listingPrograms.ordinal",
+    "listingsProgramsProgram.id",
+    "listingsProgramsProgram.title",
+    "features.id",
+    "features.elevator",
+    "features.wheelchairRamp",
+    "features.serviceAnimalsAllowed",
+    "features.accessibleParking",
+    "features.parkingOnSite",
+    "features.inUnitWasherDryer",
+    "features.barrierFreeEntrance",
+    "features.rollInShower",
+    "features.grabBars",
+    "features.heatingInUnit",
+    "features.acInUnit",
+    "features.laundryInBuilding",
+  ],
+  leftJoins: [
+    { join: "listings.property", alias: "property" },
+    { join: "property.buildingAddress", alias: "buildingAddress" },
+    { join: "listings.images", alias: "listingImages" },
+    { join: "listingImages.image", alias: "listingImagesImage" },
+    { join: "listings.listingPrograms", alias: "listingPrograms" },
+    { join: "listingPrograms.program", alias: "listingsProgramsProgram" },
+    { join: "listings.features", alias: "features" },
+  ],
+}
+
 export { views }

backend/core/src/listings/views/types.ts

@@ -5,6 +5,7 @@ export enum ListingViewEnum {
   detail = "detail",
   full = "full",
   partnerList = "partnerList",
+  publicListings = "publicListings",
 }
 
 export type Views = {

backend/core/src/listings/views/view.ts

@@ -10,6 +10,10 @@ export function getView(qb: SelectQueryBuilder<Listing>, view?: string) {
       return new BaseListingView(qb)
     case views.detail:
       return new DetailView(qb)
+    case views.publicListings:
+      return new PublicListingsView(qb)
+    case views.partnerList:
+      return new PartnerListView(qb)
     case views.full:
     default:
       return new FullView(qb)
@@ -51,6 +55,19 @@ export class DetailView extends BaseListingView {
   }
 }
 
+export class PublicListingsView extends BaseListingView {
+  constructor(qb: SelectQueryBuilder<Listing>) {
+    super(qb)
+    this.view = views.publicListings
+  }
+}
+export class PartnerListView extends BaseListingView {
+  constructor(qb: SelectQueryBuilder<Listing>) {
+    super(qb)
+    this.view = views.partnerList
+  }
+}
+
 export class FullView extends BaseListingView {
   constructor(qb: SelectQueryBuilder<Listing>) {
     super(qb)

sites/partners/lib/hooks.ts

@@ -29,6 +29,7 @@ type UseUserListProps = PaginationProps
 
 type UseListingsDataProps = PaginationProps & {
   listingIds?: string[]
+  view?: string
 }
 
 export function useSingleListingData(listingId: string) {
@@ -50,11 +51,12 @@ export function useListingsData({
   listingIds,
   orderBy,
   orderDir,
+  view = "base",
 }: UseListingsDataProps) {
   const params = {
     page,
     limit,
-    view: "base",
+    view,
     orderBy,
     orderDir: OrderDirEnum.ASC,
   }

sites/partners/pages/index.tsx

@@ -181,6 +181,7 @@ export default function ListingsList() {
       : undefined,
     orderBy: sortOptions.orderBy,
     orderDir: sortOptions.orderDir,
+    view: "partnerList",
   })
 
   const gridOptions: GridOptions = {

sites/public/lib/helpers.tsx

@@ -24,7 +24,7 @@ import {
   ImageTag,
   Tooltip,
 } from "@bloom-housing/ui-components"
-import { imageUrlFromListing, listingFeatures } from "@bloom-housing/shared-helpers"
+import { imageUrlFromListing } from "@bloom-housing/shared-helpers"
 
 export const emailRegex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
 
@@ -55,13 +55,7 @@ const getListingCardSubtitle = (address: Address) => {
 
 export const accessibilityFeaturesExist = (features: ListingFeatures) => {
   if (!features) return false
-  let featuresExist = false
-  Object.keys(listingFeatures).map((feature) => {
-    if (features[feature]) {
-      featuresExist = true
-    }
-  })
-  return featuresExist
+  return Object.keys(features).some((feature) => features[feature])
 }
 
 export const getImageTagLabelFromListing = (listing: Listing) => {

sites/public/lib/hooks.ts

@@ -50,7 +50,7 @@ export const useFormConductor = (stepName: string) => {
   return context
 }
 
-const listingsFetcher = function () {
+const listingsFetcher = function (view: string) {
   return async (
     url: string,
     page: number,
@@ -60,11 +60,11 @@ const listingsFetcher = function () {
   ) => {
     const res = await axios.get(url, {
       params: {
-        view: "base",
-        page: page,
-        limit: limit,
+        view,
+        page,
+        limit,
         filter: encodeToBackendFilterArray(filters),
-        orderBy: orderBy,
+        orderBy,
       },
       paramsSerializer: (params) => {
         return qs.stringify(params)
@@ -77,13 +77,14 @@ const listingsFetcher = function () {
 // TODO: move this so it can be shared with the partner site.
 export function useListingsData(
   pageIndex: number,
-  limit = 10,
+  limit = 8,
   filters: ListingFilterState,
-  orderBy: OrderByFieldsEnum
+  orderBy: OrderByFieldsEnum,
+  view = "publicListings"
 ) {
   const { data, error } = useSWR(
     [`${process.env.listingServiceUrl}`, pageIndex, limit, filters, orderBy],
-    listingsFetcher()
+    listingsFetcher(view)
   )
 
   return {
@@ -140,9 +141,9 @@ export async function fetchBaseListingData() {
   try {
     const response = await axios.get(process.env.listingServiceUrl, {
       params: {
-        view: "base",
-        limit: "8",
-        page: "1",
+        view: "publicListings",
+        limit: 8,
+        page: 1,
         orderBy: OrderByFieldsEnum.comingSoon,
         filter: [
           {

sites/public/pages/account/favorites.tsx

@@ -42,7 +42,8 @@ const FavoritedListingsPage = () => {
     currentPage,
     itemsPerPage,
     filterState,
-    OrderByFieldsEnum.mostRecentlyUpdated
+    OrderByFieldsEnum.comingSoon,
+    "publicListings"
   )
 
   const content = useMemo(() => {

sites/public/pages/listings/filtered.tsx

@@ -59,7 +59,8 @@ const FilteredListingsPage = () => {
     currentPage,
     itemsPerPage,
     filterState,
-    OrderByFieldsEnum.comingSoon
+    OrderByFieldsEnum.comingSoon,
+    "publicListings"
   )
 
   let numberOfFilters = 0