1351 Preview

CHANGELOG.md

@@ -33,7 +33,7 @@ All notable changes to this project will be documented in this file. The format
 ### Frontend
 
 - Added:
-
+  - Adds filtering capability to listings list and implements on public site ([#1351](https://github.com/bloom-housing/bloom/pull/1359))
   - Listings Management pieces added to Parnter's app, including add and detail pages
     - add accessible at `/listings/add`
     - detail page accessible at `/listings/[id]`
@@ -53,11 +53,8 @@ All notable changes to this project will be documented in this file. The format
   - Fix repetition of select text on preferences ([#1270](https://github.com/bloom-housing/bloom/pull/1270)) (Emily Jablonski)
   - Fix aplication submission and broken test ([#1270](https://github.com/bloom-housing/bloom/pull/1282)) (Dominik Barcikowski)
   - Fix broken application search in Partners ([#1301](https://github.com/bloom-housing/bloom/pull/1301)) (Dominik Barcikowski)
-    <<<<<<< HEAD
-    =======
   - Fix multiple unit rows in summaries, sorting issues ([#1306](https://github.com/bloom-housing/bloom/pull/1306)) (Emily Jablonski)
   - Fix partners application submission ([#1340](https://github.com/bloom-housing/bloom/pull/1340)) (Dominik Barcikowski)
-    > > > > > > > upstream/master
 
 - Changed:
 

backend/core/package.json

@@ -40,7 +40,7 @@
     "@nestjs/jwt": "^7.1.0",
     "@nestjs/passport": "^7.1.0",
     "@nestjs/platform-express": "^7.4.4",
-    "@nestjs/swagger": "4.6.1",
+    "@nestjs/swagger": "4.7.3",
     "@nestjs/throttler": "^1.1.2",
     "@nestjs/typeorm": "^7.1.0",
     "@types/cache-manager": "^3.4.0",

backend/core/src/listings/dto/listing.dto.ts

@@ -22,6 +22,7 @@ import { AddressCreateDto, AddressDto, AddressUpdateDto } from "../../shared/dto
 import { ValidationsGroupsEnum } from "../../shared/types/validations-groups-enum"
 import { UserBasicDto } from "../../user/dto/user.dto"
 import { ListingStatus } from "../types/listing-status-enum"
+import { BaseFilter } from "../../shared/dto/filter.dto"
 import { UnitCreateDto, UnitDto, UnitUpdateDto } from "../../units/dto/unit.dto"
 import { transformUnits } from "../../shared/units-transformations"
 import { UnitsSummarized } from "../../units/types/units-summarized"
@@ -544,3 +545,22 @@ export class ListingUpdateDto extends OmitType(ListingDto, [
   @IsNumber({}, { groups: [ValidationsGroupsEnum.default] })
   yearBuilt: number | null
 }
+
+// add other listing filter params here
+export class ListingFilterParams extends BaseFilter {
+  @Expose()
+  @ApiProperty({
+    type: String,
+    example: "Coliseum",
+    required: false,
+  })
+  name?: string
+
+  @Expose()
+  @ApiProperty({
+    enum: Object.keys(ListingStatus),
+    example: "active",
+    required: false,
+  })
+  status?: ListingStatus
+}

backend/core/src/listings/listings.controller.ts

@@ -8,14 +8,28 @@ import {
   Post,
   Put,
   Query,
+  Req,
   UseGuards,
   UseInterceptors,
   UsePipes,
   ValidationPipe,
 } from "@nestjs/common"
+import { Request } from "express"
 import { ListingsService } from "./listings.service"
-import { ApiBearerAuth, ApiOperation, ApiTags } from "@nestjs/swagger"
-import { ListingCreateDto, ListingDto, ListingUpdateDto } from "./dto/listing.dto"
+import {
+  ApiBearerAuth,
+  ApiExtraModels,
+  ApiOperation,
+  ApiQuery,
+  ApiTags,
+  getSchemaPath,
+} from "@nestjs/swagger"
+import {
+  ListingCreateDto,
+  ListingDto,
+  ListingUpdateDto,
+  ListingFilterParams,
+} from "./dto/listing.dto"
 import { ResourceType } from "../auth/decorators/resource-type.decorator"
 import { OptionalAuthGuard } from "../auth/guards/optional-auth.guard"
 import { AuthzGuard } from "../auth/guards/authz.guard"
@@ -39,9 +53,30 @@ export class ListingsController {
     required: false,
     type: String,
   })
+  @ApiExtraModels(ListingFilterParams)
+  @ApiQuery({
+    name: "filter",
+    required: false,
+    type: [String],
+    schema: {
+      type: "array",
+      example: [
+        { $comparison: "=", status: "active" },
+        { $comparison: "<>", name: "Coliseum" },
+      ],
+      items: {
+        $ref: getSchemaPath(ListingFilterParams),
+      },
+    },
+  })
   @UseInterceptors(CacheInterceptor)
-  public async getAll(@Query("jsonpath") jsonpath?: string): Promise<ListingDto[]> {
-    return mapTo(ListingDto, await this.listingsService.list(jsonpath))
+  public async getAll(
+    @Req() request: Request,
+    @Query("jsonpath") jsonpath?: string,
+    @Query("filter") filter?: ListingFilterParams[]
+    // TODO: Add options param here for paging and sorting
+  ): Promise<ListingDto[]> {
+    return mapTo(ListingDto, await this.listingsService.list(jsonpath, filter))
   }
 
   @Post()

backend/core/src/listings/listings.service.ts

@@ -2,9 +2,10 @@ import { Injectable, NotFoundException } from "@nestjs/common"
 import jp from "jsonpath"
 
 import { Listing } from "./entities/listing.entity"
-import { ListingCreateDto, ListingUpdateDto } from "./dto/listing.dto"
+import { ListingCreateDto, ListingUpdateDto, ListingFilterParams } from "./dto/listing.dto"
 import { InjectRepository } from "@nestjs/typeorm"
 import { Repository } from "typeorm"
+import { addFilter } from "../shared/filter"
 import { plainToClass } from "class-transformer"
 import { PropertyCreateDto, PropertyUpdateDto } from "../property/dto/property.dto"
 import { Property } from "../property/entities/property.entity"
@@ -26,14 +27,20 @@ export class ListingsService {
       .leftJoinAndSelect("units.amiChart", "amiChart")
   }
 
-  public async list(jsonpath?: string): Promise<Listing[]> {
-    let listings = await this.getQueryBuilder()
-      .orderBy({
-        "listings.id": "DESC",
-        "units.max_occupancy": "ASC",
-        "preferences.ordinal": "ASC",
-      })
-      .getMany()
+  public async list(jsonpath?: string, filter?: ListingFilterParams[]): Promise<Listing[]> {
+    const qb = this.getQueryBuilder()
+    console.log("***** filter ****** ", filter)
+    if (filter) {
+      addFilter<ListingFilterParams>(filter, "listings", qb)
+    }
+
+    qb.orderBy({
+      "listings.id": "DESC",
+      "units.max_occupancy": "ASC",
+      "preferences.ordinal": "ASC",
+    })
+
+    let listings = await qb.getMany()
 
     if (jsonpath) {
       listings = jp.query(listings, jsonpath)

backend/core/src/shared/default-validation-pipe-options.ts

@@ -8,5 +8,5 @@ export const defaultValidationPipeOptions: ValidationPipeOptions = {
     enableImplicitConversion: false,
   },
   groups: [ValidationsGroupsEnum.default],
-  forbidUnknownValues: true,
+  forbidUnknownValues: false,
 }

backend/core/src/shared/dto/filter.dto.ts

@@ -0,0 +1,18 @@
+import { ApiProperty } from "@nestjs/swagger"
+import { Expose } from "class-transformer"
+
+// Add other comparisons as needed (>, <, etc)
+export enum Compare {
+  "=" = "=",
+  "<>" = "<>",
+}
+
+export class BaseFilter {
+  @Expose()
+  @ApiProperty({
+    enum: Object.keys(Compare),
+    example: "=",
+    default: Compare["="],
+  })
+  $comparison: Compare
+}

backend/core/src/shared/filter/index.ts

@@ -0,0 +1,49 @@
+import { WhereExpression } from "typeorm"
+
+/**
+ *
+ * @param filter
+ * @param schema
+ * @param qb
+ */
+/**
+ * This is super simple right now, but we can expand to include complex filter with ands, ors, more than one schema, etc
+ */
+export function addFilter<Filter>(filter: Filter[], schema: string, qb: WhereExpression): void {
+  const operator = "andWhere"
+  /**
+   * By specifying that the filter is an array, it keeps the keys in order, so we can iterate like below
+   */
+  let comparisons: unknown[],
+    comparisonCount = 0
+
+  // eslint-disable-next-line @typescript-eslint/no-for-in-array
+  for (const key in filter) {
+    const value = filter[key]
+    if (key === "$comparison") {
+      if (Array.isArray(value)) {
+        comparisons = value
+      } else {
+        comparisons = [value]
+      }
+    } else {
+      if (value !== undefined) {
+        let values
+        // handle multiple values for the same key
+        if (Array.isArray(value)) {
+          values = value
+        } else {
+          values = [value]
+        }
+
+        values.forEach((val: unknown) => {
+          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+          qb[operator](`${schema}.${key} ${comparisons[comparisonCount]} :${key}`, {
+            [key]: val,
+          })
+          comparisonCount++
+        })
+      }
+    }
+  }
+}

backend/core/types/src/backend-swagger.ts

@@ -273,14 +273,16 @@ export class ListingsService {
     params: {
       /**  */
       jsonpath?: string;
+      /**  */
+      filter?: ListingFilterParams[];
     } = {} as any,
     options: IRequestOptions = {}
   ): Promise<Listing[]> {
     return new Promise((resolve, reject) => {
       let url = basePath + '/listings';
 
       const configs: IRequestConfig = getConfigs('get', 'application/json', url, options);
-      configs.params = { jsonpath: params['jsonpath'] };
+      configs.params = { jsonpath: params['jsonpath'], filter: params['filter'] };
       let data = null;
 
       configs.data = data;
@@ -1522,6 +1524,17 @@ export interface Login {
   password: string;
 }
 
+export interface ListingFilterParams {
+  /**  */
+  comparison: string;
+
+  /**  */
+  name?: string;
+
+  /**  */
+  status?: EnumListingFilterParamsStatus;
+}
+
 export interface MinMaxCurrency {
   /**  */
   min: string;
@@ -3927,7 +3940,11 @@ export enum Language {
   'vi' = 'vi',
   'zh' = 'zh'
 }
-
+export enum EnumListingFilterParamsStatus {
+  'active' = 'active',
+  'pending' = 'pending',
+  'closed' = 'closed'
+}
 export enum ListingStatus {
   'active' = 'active',
   'pending' = 'pending',
@@ -3952,7 +3969,7 @@ export enum InputType {
   'address' = 'address',
   'hhMemberSelect' = 'hhMemberSelect'
 }
-export type CombinedAmiChartTypes = (AmiChart & any) | null;
+export type CombinedAmiChartTypes = AmiChart;
 export enum ApplicationMethodType {
   'Internal' = 'Internal',
   'FileDownload' = 'FileDownload',
@@ -3967,10 +3984,10 @@ export enum ListingEventType {
   'publicLottery' = 'publicLottery',
   'lotteryResults' = 'lotteryResults'
 }
-export type CombinedApplicationAddressTypes = (AddressUpdate & any) | null;
-export type CombinedApplicationPickUpAddressTypes = (AddressUpdate & any) | null;
-export type CombinedLeasingAgentAddressTypes = (AddressUpdate & any) | null;
-export type CombinedWhatToExpectTypes = (WhatToExpect & any) | null;
+export type CombinedApplicationAddressTypes = AddressUpdate;
+export type CombinedApplicationPickUpAddressTypes = AddressUpdate;
+export type CombinedLeasingAgentAddressTypes = AddressUpdate;
+export type CombinedWhatToExpectTypes = WhatToExpect;
 export enum IncomePeriod {
   'perMonth' = 'perMonth',
   'perYear' = 'perYear'

package.json

@@ -25,6 +25,7 @@
     "build:app:partners": "cd sites/partners && yarn build",
     "dev:backend": "cd backend/core && yarn dev",
     "dev:all": "concurrently --names \" BACKEND_CORE,APP_PUBLIC,APP_PARTNERS\" --prefix \"{name}\" \"yarn dev:backend\" \"yarn dev:app:public\" \"yarn dev:app:partners\"",
+    "dev:frontend": "concurrently --names \" APP_PUBLIC,APP_PARTNERS\" --prefix \"{name}\" \"yarn dev:app:public\" \"yarn dev:app:partners\"",
     "dev:partners": "concurrently \"yarn dev:backend\" \"yarn dev:app:partners\"",
     "dev:public": "concurrently \"yarn dev:backend\" \"yarn dev:app:public\"",
     "test:shared:ui": "cd ui-components && yarn && yarn test",

sites/partners/.env.template

@@ -2,4 +2,5 @@
 BACKEND_API_BASE=http://localhost:3100
 LISTINGS_QUERY=/listings
 NEXTJS_PORT=3001
-SHOW_DUPLICATES=FALSE
+SHOW_DUPLICATES=FALSE
+PUBLIC_BASE_URL=http://localhost:3000

sites/partners/next.config.js

@@ -41,6 +41,7 @@ module.exports = withCSS(
             listingServiceUrl: BACKEND_API_BASE + LISTINGS_QUERY,
             idleTimeout: process.env.IDLE_TIMEOUT,
             showDuplicates: process.env.SHOW_DUPLICATES === "TRUE",
+            publicBaseUrl: process.env.PUBLIC_BASE_URL,
           },
           i18n: {
             locales: process.env.LANGUAGES ? process.env.LANGUAGES.split(",") : ["en"],

sites/partners/src/listings/Aside.tsx

@@ -23,7 +23,7 @@ type AsideType = "add" | "edit" | "details"
 const Aside = ({ type, setStatusAndSubmit }: AsideProps) => {
   const listing = useContext(ListingContext)
 
-  const lisitngId = listing?.id
+  const listingId = listing?.id
 
   const recordUpdated = useMemo(() => {
     if (!listing) return null
@@ -47,7 +47,7 @@ const Aside = ({ type, setStatusAndSubmit }: AsideProps) => {
     if (type === "details") {
       elements.push(
         <GridCell key="btn-submitNew">
-          <LocalizedLink href={`/listings/${lisitngId}/edit`}>
+          <LocalizedLink href={`/listings/${listingId}/edit`}>
             <Button styleType={AppearanceStyleType.secondary} fullWidth onClick={() => false}>
               {t("t.edit")}
             </Button>
@@ -79,17 +79,21 @@ const Aside = ({ type, setStatusAndSubmit }: AsideProps) => {
       )
     }
 
-    elements.push(
-      <GridCell key="btn-preview">
-        <Button styleType={AppearanceStyleType.secondary} fullWidth onClick={() => false}>
-          {t("listings.actions.preview")}
-        </Button>
-      </GridCell>,
-      cancel
-    )
+    if (type === "details") {
+      elements.push(
+        <GridCell key="btn-preview">
+          <a target="_blank" href={`${process.env.publicBaseUrl}/preview/listings/${listingId}`}>
+            <Button styleType={AppearanceStyleType.secondary} fullWidth onClick={() => false}>
+              {t("listings.actions.preview")}
+            </Button>
+          </a>
+        </GridCell>,
+        cancel
+      )
+    }
 
     return elements
-  }, [lisitngId, setStatusAndSubmit, type])
+  }, [listingId, setStatusAndSubmit, type])
 
   return (
     <>

sites/public/pages/index.tsx

@@ -81,7 +81,10 @@ export default function Home(props: IndexProps) {
 export async function getStaticProps() {
   let listings = []
   try {
-    const response = await axios.get(process.env.listingServiceUrl)
+    // const response = await axios.get(process.env.listingServiceUrl)
+    const response = await axios.get(
+      process.env.listingServiceUrl + "?filter[$comparison]=<>&filter[status]=pending"
+    )
     listings = response.data
   } catch (error) {
     console.error(error)