2022-08-25 release

README.md

@@ -103,20 +103,6 @@ On every merge to master (roughly bi-weekly), a release of the backend/core and
 
 Once staging has been QAed, we manually update `production`.
 
-### Committing, Versioning, and Releasing
-
-We are using [lerna](https://lerna.js.org/) as a monorepo management tool. It automatically versions, releases, and generates a changelog across our packages. In conjunction with lerna we are also using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/), a specification for commit messages that helps lerna understand what level of change each commit is in order to automate our processes.
-
-On commit, two steps automatically run: (1) linting and (2) a verification of the conventional commit standard. We recommend not running `git commit` and instead globally installing commitizen (`npm install -g commitizen`) and committing with `git cz` which will run a commit message CLI. The CLI asks a series of questions and builds the commit message for you in the conventional commit format. You can also `git commit` with a message if you are 100% confident you have indicated the right level of change (it will still lint the message format).
-
-In addition to commits needing to be formatted as conventional commits, if you are making version changes across multiple packages, your commits must also be separated by package in order to not improperly version a package.
-
-On every merge to dev, a pre-release of the ui-components package is automatically published to npm, and our Netlify dev environment is updated.
-
-On every merge to master (bi-weekly), a release of the backend/core and ui-components packages are automatically published to npm, and our Netlify staging environment is updated.
-
-Once staging has been QAed, we manually update production.
-
 ### Pull Requests
 
 Pull requests are opened to the dev branch, not to master. When opening a pull request please fill out the entire pull request template which includes tagging the issue your PR is related to, a description of your PR, indicating the type of change, including details for the reviewer about how to test your PR, and a testing checklist. Additionally, officially link the issue to the PR using GitHub's linking UI.

backend/core/scripts/import-listings-basic.ts

@@ -107,7 +107,7 @@ function destructureYearBuilt(yearBuilt: string): number {
   }
 
   if (yearBuilt.includes("/")) {
-    const [year1, year2] = yearBuilt.split("/")
+    const [_year1, year2] = yearBuilt.split("/")
     return Number.parseInt(year2)
   }
 

backend/core/scripts/import-listings-from-csv.ts

@@ -111,7 +111,7 @@ async function main() {
     }
 
     // Add data about unitsSummaries
-    const unitsSummaries: UnitsSummaryImport[] = []
+    // const unitsSummaries: UnitsSummaryImport[] = []
     // TODO: Update with new unit groups model
     // if (listingFields["Number 0BR"]) {
     //   unitsSummaries.push({

backend/core/scripts/import-realpages-availability-report.ts

@@ -115,13 +115,13 @@ async function main(): Promise<void> {
     }
   }
 
-  const listingsService = new client.ListingsService()
-  const listing = await listingsService.retrieve({ id: args.listingId })
+  // const listingsService = new client.ListingsService()
+  // const listing = await listingsService.retrieve({ id: args.listingId })
   // TODO: Update with new unit groups model
   // const listingUnitTypeNameSummaryMap = listing.unitsSummary.reduce((a, s) => {
   //   return { ...a, [s.unitType.name]: s }
   // }, {})
-  const listingUnitTypeNameSummaryMap = {}
+  // const listingUnitTypeNameSummaryMap = {}
 
   // Make sure that the listing has all specified mapped unit type names.
   /* const listingUnitTypeNames = new Set(Object.keys(listingUnitTypeNameSummaryMap))

backend/core/src/ami-charts/entities/ami-chart.entity.ts

@@ -6,10 +6,7 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from "typeorm"
-import { Expose, Type } from "class-transformer"
-import { IsDate, IsDefined, IsString, IsUUID, ValidateNested } from "class-validator"
 import { AmiChartItem } from "./ami-chart-item.entity"
-import { ValidationsGroupsEnum } from "../../shared/types/validations-groups-enum"
 import { Jurisdiction } from "../../jurisdictions/entities/jurisdiction.entity"
 
 @Entity()

backend/core/src/auth/dto/user-filter-type-to-field-map.ts

@@ -1,6 +1,6 @@
 import { UserFilterKeys } from "../types/user-filter-keys"
 
 export const userFilterTypeToFieldMap: Record<keyof typeof UserFilterKeys, string> = {
-  isPartner: "user_roles.isPartner",
-  isPortalUser: "user_roles",
+  isPartner: "userRoles.isPartner",
+  isPortalUser: "userRoles",
 }

backend/core/src/auth/services/user.service.ts

@@ -7,7 +7,7 @@ import {
   UnauthorizedException,
 } from "@nestjs/common"
 import { InjectRepository } from "@nestjs/typeorm"
-import { DeepPartial, FindConditions, Repository } from "typeorm"
+import { Brackets, DeepPartial, FindConditions, Repository } from "typeorm"
 import { paginate, Pagination, PaginationTypeEnum } from "nestjs-typeorm-paginate"
 import { decode, encode } from "jwt-simple"
 import dayjs from "dayjs"
@@ -108,11 +108,11 @@ export class UserService {
       PaginationType: PaginationTypeEnum.TAKE_AND_SKIP,
     }
     // https://www.npmjs.com/package/nestjs-typeorm-paginate
-    const distinctIDQB = this._getQb(false)
+    const distinctIDQB = this.userRepository.getQb()
     distinctIDQB.select("user.id")
     distinctIDQB.groupBy("user.id")
     distinctIDQB.orderBy("user.id")
-    const qb = this._getQb()
+    const qb = this.userRepository.getQb()
 
     if (params.filter) {
       addFilters<Array<UserFilterParams>, typeof userFilterTypeToFieldMap>(
@@ -126,12 +126,30 @@ export class UserService {
         qb
       )
     }
+
+    if (params.search) {
+      distinctIDQB.andWhere(
+        new Brackets((subQb) => {
+          subQb.where("user.firstName ILIKE :search", { search: `%${params.search}%` })
+          subQb.orWhere("user.lastName ILIKE :search", { search: `%${params.search}%` })
+          subQb.orWhere("user.email ILIKE :search", { search: `%${params.search}%` })
+          subQb.orWhere("leasingAgentInListings.name ILIKE :search", {
+            search: `%${params.search}%`,
+          })
+          subQb.orWhere(
+            "CONCAT(user.firstName, ' ', user.lastName, ' ', user.email, ' ', leasingAgentInListings.name) ILIKE :search",
+            { search: `%${params.search}%` }
+          )
+        })
+      )
+    }
+
     const distinctIDResult = await paginate<User>(distinctIDQB, options)
 
     qb.andWhere("user.id IN (:...distinctIDs)", {
       distinctIDs: distinctIDResult.items.map((elem) => elem.id),
     })
-    const result = await qb.getMany()
+    const result = distinctIDResult.items.length ? await qb.getMany() : []
     /**
      * admin are the only ones that can access all users
      * so this will throw on the first user that isn't their own (non admin users can access themselves)
@@ -448,19 +466,6 @@ export class UserService {
     return this.authService.generateAccessToken(user)
   }
 
-  private _getQb(withSelect = true) {
-    const qb = this.userRepository.createQueryBuilder("user")
-    if (withSelect) {
-      qb.leftJoinAndSelect("user.leasingAgentInListings", "listings")
-      qb.leftJoinAndSelect("user.roles", "user_roles")
-    } else {
-      qb.leftJoin("user.leasingAgentInListings", "listings")
-      qb.leftJoin("user.roles", "user_roles")
-    }
-
-    return qb
-  }
-
   async invitePartnersPortalUser(dto: UserInviteDto, authContext: AuthContext) {
     const password = crypto.randomBytes(8).toString("hex")
     const user = await this._createUser(

backend/core/src/listings/dto/listings-query-params.ts

@@ -9,6 +9,7 @@ import {
   IsOptional,
   IsString,
   ValidateNested,
+  MinLength,
 } from "class-validator"
 import { ValidationsGroupsEnum } from "../../shared/types/validations-groups-enum"
 import { OrderByFieldsEnum } from "../types/listing-orderby-enum"
@@ -65,4 +66,18 @@ export class ListingsQueryParams extends PaginationAllowsAllQueryParams {
   @IsOptional({ groups: [ValidationsGroupsEnum.default] })
   @IsEnum(OrderDirEnum, { groups: [ValidationsGroupsEnum.default] })
   orderDir?: OrderDirEnum
+
+  @Expose()
+  @ApiProperty({
+    type: String,
+    example: "search",
+    required: false,
+  })
+  @IsOptional({ groups: [ValidationsGroupsEnum.default] })
+  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  @MinLength(3, {
+    message: "Search must be at least 3 characters",
+    groups: [ValidationsGroupsEnum.default],
+  })
+  search?: string
 }

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

@@ -57,7 +57,10 @@ export class ListingsService {
       .groupBy("listings.id")
 
     innerFilteredQuery = ListingsService.addOrderByToQb(innerFilteredQuery, params)
-
+    innerFilteredQuery = ListingsService.addSearchByListingNameCondition(
+      innerFilteredQuery,
+      params.search
+    )
     if (params.filter) {
       addFilters<Array<ListingFilterParams>, typeof filterTypeToFieldMap>(
         params.filter,
@@ -314,6 +317,16 @@ export class ListingsService {
     return { programs, unitTypes }
   }
 
+  private static addSearchByListingNameCondition(
+    qb: SelectQueryBuilder<Listing>,
+    searchName?: string
+  ) {
+    if (searchName) {
+      qb.andWhere(`${qb.alias}.name ILIKE :search`, { search: `%${searchName}%` })
+    }
+    return qb
+  }
+
   private static addOrderByToQb(qb: SelectQueryBuilder<Listing>, params: ListingsQueryParams) {
     switch (params.orderBy) {
       case OrderByFieldsEnum.mostRecentlyUpdated:
@@ -351,6 +364,12 @@ export class ListingsService {
           "listings.name": "ASC",
         })
         break
+      case OrderByFieldsEnum.updatedAt:
+        qb.orderBy({
+          "listings.updatedAt": params.orderDir ?? "ASC",
+          "listings.name": "ASC",
+        })
+        break
       case OrderByFieldsEnum.name:
       case undefined:
         // Default to ordering by applicationDates (i.e. applicationDueDate

backend/core/src/listings/types/listing-orderby-enum.ts

@@ -6,4 +6,5 @@ export enum OrderByFieldsEnum {
   name = "name",
   status = "status",
   verified = "verified",
+  updatedAt = "updatedAt",
 }

backend/core/src/seeder/detroit-seed.ts

@@ -119,7 +119,7 @@ async function seed() {
   const userRepo = app.get<Repository<User>>(getRepositoryToken(User))
   const rolesRepo = app.get<Repository<UserRoles>>(getRepositoryToken(UserRoles))
   const jurisdictions = await createJurisdictions(app)
-  const listings = await seedListings(app, rolesRepo, jurisdictions)
+  await seedListings(app, rolesRepo, jurisdictions)
 
   let user1 = await userService.findByEmail("[email protected]")
   if (user1 === undefined) {

backend/core/src/seeder/seeds/listings/listing-detroit-10136.ts

@@ -5,7 +5,6 @@ import { ListingDefaultSeed } from "./listing-default-seed"
 import { BaseEntity, DeepPartial } from "typeorm"
 import { Listing } from "../../../listings/entities/listing.entity"
 import { UnitGroup } from "../../../units-summary/entities/unit-group.entity"
-import { UnitGroupAmiLevel } from "../../../units-summary/entities/unit-group-ami-level.entity"
 import { MonthlyRentDeterminationType } from "../../../units-summary/types/monthly-rent-determination.enum"
 import { ListingMarketingTypeEnum } from "../../../listings/types/listing-marketing-type-enum"
 

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

@@ -1259,6 +1259,8 @@ export class ListingsService {
       orderBy?: OrderByFieldsEnum
       /**  */
       orderDir?: OrderDirEnum
+      /**  */
+      search?: string
     } = {} as any,
     options: IRequestOptions = {}
   ): Promise<PaginatedListing> {
@@ -1273,6 +1275,7 @@ export class ListingsService {
         view: params["view"],
         orderBy: params["orderBy"],
         orderDir: params["orderDir"],
+        search: params["search"],
       }
       let data = null
 

sites/partners/cypress/integration/listing.spec.ts

@@ -113,8 +113,8 @@ describe("Listing Management Tests", () => {
     cy.fillFormFields("listing", listingDetailsFieldsToType, listingDetailsFieldsToSelect)
 
     cy.getByTestId("addUnitsButton").contains("Add unit group").click()
-    cy.get(`[data-testid="unitTypeCheckBox"]`).first().click()
-    cy.get(`[data-testid="openWaitListQuestion"]`).last().click()
+    cy.get(`[data-test-id="unitTypeCheckBox"]`).first().click()
+    cy.get(`[data-test-id="openWaitListQuestion"]`).last().click()
     cy.fillFormFields("listing", unitFormFieldsToType, unitFormFieldsToSelect)
 
     cy.getByTestId("openAmiDrawer").contains("Add AMI level").click()

sites/partners/lib/hooks.ts

@@ -25,9 +25,17 @@ interface UseSingleApplicationDataProps extends PaginationProps {
   listingId: string
 }
 
-type UseUserListProps = PaginationProps
+type UseUserListProps = PaginationProps & {
+  search?: string
+}
+export interface ColumnOrder {
+  orderBy: string
+  orderDir: string
+}
 
 type UseListingsDataProps = PaginationProps & {
+  search?: string
+  sort?: ColumnOrder[]
   listingIds?: string[]
   view?: string
 }
@@ -48,17 +56,16 @@ export function useSingleListingData(listingId: string) {
 export function useListingsData({
   page,
   limit,
+  search,
   listingIds,
-  orderBy,
-  orderDir,
+  sort,
   view = "base",
 }: UseListingsDataProps) {
   const params = {
     page,
     limit,
+    search,
     view,
-    orderBy,
-    orderDir: OrderDirEnum.ASC,
   }
 
   // filter if logged user is an agent
@@ -73,10 +80,20 @@ export function useListingsData({
     })
   }
 
-  if (orderBy) {
-    Object.assign(params, { orderBy, orderDir })
+  if (search?.length < 3) {
+    delete params.search
+  } else {
+    Object.assign(params, { search })
   }
 
+  if (sort) {
+    Object.assign(params, {
+      orderBy: sort?.filter((item) => item.orderBy).map((item) => item.orderBy)[0],
+    })
+    Object.assign(params, {
+      orderDir: sort?.filter((item) => item.orderDir).map((item) => item.orderDir)[0],
+    })
+  }
   const { listingsService } = useContext(AuthContext)
   const fetcher = () => listingsService.list(params)
 
@@ -115,7 +132,6 @@ export function useApplicationsData(
   }
 
   const paramsString = qs.stringify(params)
-
   const endpoint = `${process.env.backendApiBase}/applications?${paramsString}`
 
   const fetcher = () => applicationsService.list(params)
@@ -353,29 +369,32 @@ export function useReservedCommunityTypeList() {
   }
 }
 
-export function useUserList({ page, limit }: UseUserListProps) {
-  const queryParams = new URLSearchParams()
-  queryParams.append("page", page.toString())
-  queryParams.append("limit", limit.toString())
+export function useUserList({ page, limit, search = "" }: UseUserListProps) {
+  const params = {
+    page,
+    limit,
+    filter: [
+      {
+        isPortalUser: true,
+        $comparison: EnumUserFilterParamsComparison["="],
+      },
+    ],
+    search,
+  }
+
+  if (search?.length < 3) {
+    delete params.search
+  } else {
+    Object.assign(params, { search })
+  }
+
+  const paramsString = qs.stringify(params)
 
   const { userService } = useContext(AuthContext)
 
-  const fetcher = () =>
-    userService.list({
-      page,
-      limit,
-      filter: [
-        {
-          isPortalUser: true,
-          $comparison: EnumUserFilterParamsComparison["NA"],
-        },
-      ],
-    })
+  const fetcher = () => userService.list(params)
 
-  const { data, error } = useSWR(
-    `${process.env.backendApiBase}/user/list?${queryParams.toString()}`,
-    fetcher
-  )
+  const { data, error } = useSWR(`${process.env.backendApiBase}/user/list?${paramsString}`, fetcher)
 
   return {
     data,