Merge pull request #10 from bloom-housing/release/2-2-26

feat: release 2-2-26

Author: emilyjablonski

api/.eslintrc.js

@@ -14,7 +14,7 @@ module.exports = {
     node: true,
     jest: true,
   },
-  ignorePatterns: ['.eslintrc.js'],
+  ignorePatterns: ['.eslintrc.js', 'dist/'],
   rules: {
     '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',

api/package.json

@@ -13,7 +13,8 @@
     "dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/src/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lint": "eslint \"**/*.ts\"",
+    "lint:fix": "eslint \"**/*.ts\" --fix",
     "test": "jest --config ./test/jest.config.js",
     "test:watch": "jest --watch",
     "test:cov": "yarn db:resetup && yarn db:migration:run && jest --config ./test/jest-with-coverage.config.js --logHeapUsage",

api/prisma/migrations/45_add_advocate_user_fields/migration.sql

@@ -0,0 +1,28 @@
+-- AlterTable
+ALTER TABLE "user_accounts" 
+ADD COLUMN     "additional_phone_extension" TEXT,
+ADD COLUMN     "additional_phone_number" TEXT,
+ADD COLUMN     "additional_phone_number_type" TEXT,
+ADD COLUMN     "address_id" UUID,
+ADD COLUMN     "agency_id" UUID,
+ADD COLUMN     "is_advocate" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "is_approved" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "phone_extension" TEXT,
+ADD COLUMN     "phone_type" TEXT,
+ADD COLUMN     "title" TEXT;
+
+-- AddForeignKey
+ALTER TABLE "user_accounts" 
+ADD CONSTRAINT "user_accounts_address_id_fkey" 
+FOREIGN KEY ("address_id") 
+REFERENCES "address"("id") 
+ON DELETE NO ACTION 
+ON UPDATE NO ACTION ;
+
+-- AddForeignKey
+ALTER TABLE "user_accounts" 
+ADD CONSTRAINT "user_accounts_agency_id_fkey" 
+FOREIGN KEY ("agency_id") 
+REFERENCES "agency"("id") 
+ON DELETE NO ACTION 
+ON UPDATE NO ACTION ;

api/prisma/schema.prisma

@@ -64,6 +64,7 @@ model Address {
   leasingAgentAddress          Listings[]                   @relation("leasing_agent_address")
   applicationPickUpAddress     Listings[]                   @relation("application_pick_up_address")
   buildingAddress              Listings[]                   @relation("building_address")
+  userAccounts                 UserAccounts[]
 
   @@map("address")
 }
@@ -1042,6 +1043,19 @@ model UserAccounts {
   lastUpdatedListingsByUser Listings[]              @relation("last_updated_by_user")
   wasWarnedOfDeletion       Boolean?                @default(false) @map("was_warned_of_deletion")
 
+  title                     String?
+  address                   Address? @relation(fields: [addressId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+  addressId                 String?  @map("address_id") @db.Uuid
+  phoneType                 String?  @map("phone_type")
+  phoneExtension            String?  @map("phone_extension")
+  additionalPhoneNumber     String?  @map("additional_phone_number")
+  additionalPhoneNumberType String?  @map("additional_phone_number_type")
+  additionalPhoneExtension  String?  @map("additional_phone_extension")
+  agency                    Agency?  @relation(fields: [agencyId], references: [id], onDelete: NoAction, onUpdate: NoAction)
+  agencyId                  String?  @map("agency_id") @db.Uuid
+  isApproved                Boolean  @default(false) @map("is_approved")
+  isAdvocate                Boolean  @default(false) @map("is_advocate")
+
   @@map("user_accounts")
 }
 
@@ -1163,6 +1177,7 @@ model Agency {
   name            String
   jurisdictions   Jurisdictions? @relation(fields: [jurisdictionsId], references: [id], onDelete: NoAction, onUpdate: NoAction)
   jurisdictionsId String?        @map("jurisdictions_id") @db.Uuid
+  userAccounts    UserAccounts[]
 
   @@map("agency")
 }

api/prisma/seed-helpers/unit-group-factory.ts

@@ -77,7 +77,7 @@ export const unitGroupFactoryMany = async (
 ): Promise<Prisma.UnitGroupCreateWithoutListingsInput[]> => {
   const createArray: Promise<Prisma.UnitGroupCreateWithoutListingsInput>[] = [
     ...new Array(numberToMake),
-  ].map(async (_, index) => {
+  ].map(async () => {
     const unitType = await unitTypeFactorySingle(
       prismaClient,
       unitTypes[randomInt(unitTypes.length)],

api/prisma/seed-staging.ts

@@ -478,6 +478,14 @@ export const stagingSeed = async (
       lakeviewJurisdiction.name,
     ),
   });
+  const angelopolisAmiChart = await prismaClient.amiChart.create({
+    data: amiChartFactory(
+      8,
+      angelopolisJurisdiction.id,
+      null,
+      angelopolisJurisdiction.name,
+    ),
+  });
   await prismaClient.amiChart.create({
     data: amiChartFactory(
       8,
@@ -665,7 +673,7 @@ export const stagingSeed = async (
             numBedrooms: 0,
             number: '101',
             sqFeet: '750.00',
-            amiChart: { connect: { id: amiChart.id } },
+            amiChart: { connect: { id: angelopolisAmiChart.id } },
             unitTypes: {
               connect: {
                 id: unitTypes[0].id,
@@ -682,7 +690,7 @@ export const stagingSeed = async (
             numBedrooms: 1,
             number: '101',
             sqFeet: '750.00',
-            amiChart: { connect: { id: amiChart.id } },
+            amiChart: { connect: { id: angelopolisAmiChart.id } },
             unitTypes: {
               connect: {
                 id: unitTypes[1].id,

api/src/controllers/multiselect-question.controller.ts

@@ -27,6 +27,7 @@ import { MultiselectQuestionCreate } from '../dtos/multiselect-questions/multise
 import { MultiselectQuestionFilterParams } from '../dtos/multiselect-questions/multiselect-question-filter-params.dto';
 import { MultiselectQuestionUpdate } from '../dtos/multiselect-questions/multiselect-question-update.dto';
 import { MultiselectQuestionQueryParams } from '../dtos/multiselect-questions/multiselect-question-query-params.dto';
+import { PaginatedMultiselectQuestionDto } from '../dtos/multiselect-questions/paginated-multiselect-question.dto';
 import { IdDTO } from '../dtos/shared/id.dto';
 import { PaginationMeta } from '../dtos/shared/pagination.dto';
 import { SuccessDTO } from '../dtos/shared/success.dto';
@@ -60,10 +61,10 @@ export class MultiselectQuestionController {
 
   @Get()
   @ApiOperation({ summary: 'List multiselect questions', operationId: 'list' })
-  @ApiOkResponse({ type: MultiselectQuestion, isArray: true })
+  @ApiOkResponse({ type: PaginatedMultiselectQuestionDto })
   async list(
     @Query() queryParams: MultiselectQuestionQueryParams,
-  ): Promise<MultiselectQuestion[]> {
+  ): Promise<PaginatedMultiselectQuestionDto> {
     return await this.multiselectQuestionService.list(queryParams);
   }
 

api/src/dtos/multiselect-questions/paginated-multiselect-question.dto.ts

@@ -0,0 +1,6 @@
+import MultiselectQuestion from './multiselect-question.dto';
+import { PaginationFactory } from '../shared/pagination.dto';
+
+export class PaginatedMultiselectQuestionDto extends PaginationFactory<MultiselectQuestion>(
+  MultiselectQuestion,
+) {}

api/src/services/email.service.ts

@@ -14,7 +14,6 @@ import { JurisdictionService } from './jurisdiction.service';
 import { SendGridService } from './sendgrid.service';
 import { TranslationService } from './translation.service';
 import { Application } from '../dtos/applications/application.dto';
-import { ApplicationCreate } from '../dtos/applications/application-create.dto';
 import { Jurisdiction } from '../dtos/jurisdictions/jurisdiction.dto';
 import { Listing } from '../dtos/listings/listing.dto';
 import { IdDTO } from '../dtos/shared/id.dto';

api/src/services/listing.service.ts

@@ -2819,10 +2819,11 @@ export class ListingService implements OnModuleInit {
   */
   addUnitsSummarized = async (listing: Listing) => {
     if (Array.isArray(listing.units) && listing.units.length > 0) {
+      const unitsWithCharts = listing.units.filter((unit) => unit.amiChart?.id);
       const amiChartsRaw = await this.prisma.amiChart.findMany({
         where: {
           id: {
-            in: listing.units.map((unit) => unit.amiChart?.id),
+            in: unitsWithCharts.map((unit) => unit.amiChart?.id),
           },
         },
       });