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

feat: release 2-26-26

Author: emilyjablonski

api/prisma/seed-helpers/jurisdiction-factory.ts

@@ -11,7 +11,9 @@ import { RaceEthnicityConfiguration } from '../../src/dtos/jurisdictions/race-et
 import { SpokenLanguageEnum } from '../../src/enums/applications/spoken-language-enum';
 
 export const jurisdictionFactory = (
-  jurisdictionName = randomName(),
+  jurisdictionName = `${randomName()} ${Math.random()
+    .toString(16)
+    .substring(2, 8)}`,
   optionalFields?: {
     listingApprovalPermissions?: UserRoleEnum[];
     duplicateListingPermissions?: UserRoleEnum[];

api/prisma/seed-helpers/user-factory.ts

@@ -14,6 +14,7 @@ export const userFactory = async (optionalParams?: {
   mfaEnabled?: boolean;
   middleName?: string;
   password?: string;
+  isApproved?: boolean;
   phoneNumber?: string;
   phoneNumberVerified?: boolean;
   roles?: Prisma.UserRolesUncheckedCreateWithoutUserAccountsInput;
@@ -43,6 +44,8 @@ export const userFactory = async (optionalParams?: {
   singleUseCode: optionalParams?.singleUseCode || null,
   singleUseCodeUpdatedAt: optionalParams?.mfaEnabled ? new Date() : undefined,
   language: optionalParams?.language || undefined,
+  isAdvocate: optionalParams?.isAdvocate || undefined,
+  isApproved: optionalParams?.isApproved || undefined,
   favoriteListings: optionalParams?.favoriteListings
     ? {
         connect: optionalParams.favoriteListings.map((listing) => {
@@ -80,8 +83,6 @@ export const userFactory = async (optionalParams?: {
         },
       }
     : undefined,
-  isAdvocate: optionalParams?.isAdvocate,
-  isApproved: optionalParams?.isAdvocate,
   agency: optionalParams?.agencyId
     ? {
         connect: {

api/prisma/seed-staging.ts

@@ -813,6 +813,51 @@ export const stagingSeed = async (
       }),
     },
   );
+  const mobilityAccessibilityNeedsProgramQuestion =
+    await prismaClient.multiselectQuestions.create({
+      data: multiselectQuestionFactory(angelopolisJurisdiction.id, {
+        multiselectQuestion: {
+          text: 'Mobility accessibility needs',
+          description:
+            'Some units require at least one resident to have a mobility accessibility need',
+          applicationSection:
+            MultiselectQuestionsApplicationSectionEnum.programs,
+          optOutText: 'None of the above',
+          options: [
+            { text: 'Wheelchair', ordinal: 0 },
+            { text: 'Walker', ordinal: 1 },
+            { text: 'Power chair', ordinal: 2 },
+            { text: 'Other mobility device', ordinal: 3 },
+          ],
+        },
+      }),
+    });
+  const hearingVisionAccessibilityNeedsProgramQuestion =
+    await prismaClient.multiselectQuestions.create({
+      data: multiselectQuestionFactory(angelopolisJurisdiction.id, {
+        multiselectQuestion: {
+          text: 'Hearing/vision accessibility needs',
+          description:
+            'Some units require at least one resident to have a hearing / vision accessibility need',
+          applicationSection:
+            MultiselectQuestionsApplicationSectionEnum.programs,
+          optOutText: 'None of the above',
+          options: [
+            { text: 'Audible and visual doorbells', ordinal: 0 },
+            {
+              text: 'Fire and smoke alarms with hard wired strobes',
+              ordinal: 1,
+            },
+            {
+              text: 'Documents in screen-reader accessible format',
+              ordinal: 2,
+            },
+            { text: 'Documents in large text or braille', ordinal: 3 },
+          ],
+        },
+      }),
+    });
+
   const multiselectQuestionPrograms =
     await prismaClient.multiselectQuestions.create({
       data: multiselectQuestionFactory(mainJurisdiction.id, {
@@ -932,6 +977,8 @@ export const stagingSeed = async (
           cityEmployeeQuestion,
           workInCityQuestion,
           multiselectQuestionPrograms,
+          mobilityAccessibilityNeedsProgramQuestion,
+          hearingVisionAccessibilityNeedsProgramQuestion,
         ],
         applications: [
           await applicationFactory({

api/src/dtos/users/advocate-user-update.dto.ts

@@ -12,7 +12,6 @@ import {
   ValidateNested,
 } from 'class-validator';
 import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
-import Agency from '../agency/agency.dto';
 import { User } from './user.dto';
 import { EnforceLowerCase } from '../../decorators/enforce-lower-case.decorator';
 import { passwordRegex } from '../../utilities/password-regex';

api/src/dtos/users/user-filter-params.dto.ts

@@ -1,6 +1,6 @@
-import { Expose } from 'class-transformer';
+import { Expose, Transform } from 'class-transformer';
 import { ApiPropertyOptional } from '@nestjs/swagger';
-import { IsString } from 'class-validator';
+import { IsBoolean } from 'class-validator';
 import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
 
 export class UserFilterParams {
@@ -9,6 +9,20 @@ export class UserFilterParams {
     type: Boolean,
     example: true,
   })
-  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  @Transform(({ value }) =>
+    typeof value === 'boolean' ? value : value === 'true',
+  )
+  @IsBoolean({ groups: [ValidationsGroupsEnum.default] })
   isPortalUser?: boolean;
+
+  @Expose()
+  @ApiPropertyOptional({
+    type: Boolean,
+    example: false,
+  })
+  @Transform(({ value }) =>
+    typeof value === 'boolean' ? value : value === 'true',
+  )
+  @IsBoolean({ groups: [ValidationsGroupsEnum.default] })
+  isAdvocateUser?: boolean;
 }

api/src/dtos/users/user-query-param.dto.ts

@@ -1,15 +1,20 @@
 import { PaginationAllowsAllQueryParams } from '../shared/pagination.dto';
-import { Expose, Type } from 'class-transformer';
+import { Expose, Transform, Type } from 'class-transformer';
 import { ApiPropertyOptional, getSchemaPath } from '@nestjs/swagger';
 import { UserFilterParams } from './user-filter-params.dto';
 import {
   ArrayMaxSize,
   IsArray,
+  IsEnum,
   IsString,
   MinLength,
+  Validate,
   ValidateNested,
 } from 'class-validator';
 import { ValidationsGroupsEnum } from '../../enums/shared/validation-groups-enum';
+import { UserOrderByKeys } from '../../enums/listings/order-by-enum';
+import { OrderByEnum } from '../../enums/shared/order-by-enum';
+import { OrderQueryParamValidator } from '../../utilities/order-by-validator';
 
 export class UserQueryParams extends PaginationAllowsAllQueryParams {
   @Expose()
@@ -38,4 +43,42 @@ export class UserQueryParams extends PaginationAllowsAllQueryParams {
     groups: [ValidationsGroupsEnum.default],
   })
   search?: string;
+
+  @Expose()
+  @ApiPropertyOptional({
+    enum: UserOrderByKeys,
+    enumName: 'UserOrderByKeys',
+    example: ['isApproved'],
+    default: ['isApproved'],
+    isArray: true,
+  })
+  @IsArray({ groups: [ValidationsGroupsEnum.default] })
+  @ArrayMaxSize(16, { groups: [ValidationsGroupsEnum.default] })
+  @IsEnum(UserOrderByKeys, {
+    groups: [ValidationsGroupsEnum.default],
+    each: true,
+  })
+  @Validate(OrderQueryParamValidator, {
+    groups: [ValidationsGroupsEnum.default],
+  })
+  orderBy?: UserOrderByKeys[];
+
+  @Expose()
+  @ApiPropertyOptional({
+    enum: OrderByEnum,
+    enumName: 'OrderByEnum',
+    example: ['desc'],
+    default: ['desc'],
+    isArray: true,
+  })
+  @IsArray({ groups: [ValidationsGroupsEnum.default] })
+  @ArrayMaxSize(16, { groups: [ValidationsGroupsEnum.default] })
+  @Transform(({ value }) => {
+    return value ? value.map((val) => val.toLowerCase()) : undefined;
+  })
+  @IsEnum(OrderByEnum, { groups: [ValidationsGroupsEnum.default], each: true })
+  @Validate(OrderQueryParamValidator, {
+    groups: [ValidationsGroupsEnum.default],
+  })
+  orderDir?: OrderByEnum[];
 }

api/src/dtos/users/user.dto.ts

@@ -193,4 +193,9 @@ export class User extends AbstractDTO {
   @IsString({ groups: [ValidationsGroupsEnum.default] })
   @ApiPropertyOptional()
   additionalPhoneExtension?: string;
+
+  @Expose()
+  @IsBoolean({ groups: [ValidationsGroupsEnum.default] })
+  @ApiPropertyOptional()
+  isApproved?: boolean;
 }

api/src/enums/listings/order-by-enum.ts

@@ -12,3 +12,7 @@ export enum ListingOrderByKeys {
   marketingSeason = 'marketingSeason',
   listingType = 'listingType',
 }
+
+export enum UserOrderByKeys {
+  isApproved = 'isApproved',
+}

api/src/services/listing.service.ts

@@ -59,6 +59,7 @@ import {
 import {
   summarizeUnitsByTypeAndRent,
   summarizeUnits,
+  summarizeByPriorityType,
 } from '../utilities/unit-utilities';
 import { fillModelStringFields } from '../utilities/model-fields';
 import { doJurisdictionHaveFeatureFlagSet } from '../utilities/feature-flag-utilities';
@@ -286,6 +287,7 @@ export class ListingService implements OnModuleInit {
             listing.units,
             listing,
           ),
+          priorityTypes: summarizeByPriorityType(listing),
         };
       }
     });

api/src/services/user.service.ts

@@ -147,8 +147,12 @@ export class UserService {
       skip: calculateSkip(params.limit, page),
       take: calculateTake(params.limit),
       orderBy: buildOrderBy(
-        ['firstName', 'lastName'],
-        [OrderByEnum.ASC, OrderByEnum.ASC],
+        ['firstName', 'lastName', ...(params.orderBy ? params.orderBy : [])],
+        [
+          OrderByEnum.ASC,
+          OrderByEnum.ASC,
+          ...(params.orderDir ? params.orderDir : []),
+        ],
       ),
       include: views.full,
       where: whereClause,