Restructure units summary table

backend/core/archer.ts

@@ -354,6 +354,7 @@ export const ArcherListing: Listing = {
   householdSizeMax: 3,
   smokingPolicy: "Non-smoking building",
   unitsAvailable: 0,
+  unitsSummary: [],
   unitsSummarized: undefined,
   unitAmenities: "Dishwasher",
   developer: "Charities Housing ",

backend/core/src/listings/entities/listing.entity.ts

@@ -42,6 +42,7 @@ import { ListingApplicationAddressType } from "../types/listing-application-addr
 import { ListingEvent } from "./listing-event.entity"
 import { Address } from "../../shared/entities/address.entity"
 import { ApplicationMethod } from "../../application-methods/entities/application-method.entity"
+import { UnitsSummary } from "../../units-summary/entities/units-summary.entity"
 
 @Entity({ name: "listings" })
 class Listing extends BaseEntity {
@@ -460,6 +461,17 @@ class Listing extends BaseEntity {
   @IsOptional({ groups: [ValidationsGroupsEnum.default] })
   @IsBoolean({ groups: [ValidationsGroupsEnum.default] })
   customMapPin?: boolean | null
+
+  @OneToMany(() => UnitsSummary, (summary) => summary.listing, {
+    nullable: false,
+    eager: true,
+    cascade: true,
+  })
+  @Expose()
+  @ValidateNested({ groups: [ValidationsGroupsEnum.default], each: true })
+  @Type(() => UnitsSummary)
+  unitsSummary: UnitsSummary[]
+
 }
 
 export { Listing as default, Listing }

backend/core/src/migration/1629225262377-update-units-summary-structure.ts

@@ -0,0 +1,28 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class updateUnitsSummaryStructure1629225262377 implements MigrationInterface {
+    name = 'updateUnitsSummaryStructure1629225262377'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "units_summary" DROP CONSTRAINT "FK_a2b6519fc3d102d4611a0e2b879"`);
+        await queryRunner.query(`ALTER TABLE "units_summary" DROP CONSTRAINT "PK_dd5b004243c1536a412e425a9ec"`);
+        await queryRunner.query(`ALTER TABLE "units_summary" DROP COLUMN "property_id"`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ADD "id" uuid NOT NULL DEFAULT uuid_generate_v4()`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ADD "listing_id" uuid`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ALTER COLUMN "unit_type_id" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ALTER COLUMN "monthly_rent" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ADD CONSTRAINT "PK_8d8c4940fab2a9d1b2e7ddd9e49" PRIMARY KEY ("id")`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "units_summary" DROP CONSTRAINT "PK_8d8c4940fab2a9d1b2e7ddd9e49"`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ALTER COLUMN "monthly_rent" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ALTER COLUMN "unit_type_id" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "units_summary" DROP COLUMN "listing_id"`);
+        await queryRunner.query(`ALTER TABLE "units_summary" DROP COLUMN "id"`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ADD "property_id" uuid NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ADD CONSTRAINT "PK_dd5b004243c1536a412e425a9ec" PRIMARY KEY ("monthly_rent", "unit_type_id", "property_id")`);
+        await queryRunner.query(`ALTER TABLE "units_summary" ADD CONSTRAINT "FK_a2b6519fc3d102d4611a0e2b879" FOREIGN KEY ("property_id") REFERENCES "property"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+}

backend/core/src/seeds/listings/listings.ts

@@ -50,6 +50,7 @@ export type ListingSeedType = Omit<
   | "unitAmenities"
   | "servicesOffered"
   | "yearBuilt"
+  | "unitsSummary"
   | "unitsSummarized"
 >
 

backend/core/src/units-summary/dto/units-summary.dto.ts

@@ -1,6 +1,15 @@
 import { OmitType } from "@nestjs/swagger"
+import { Expose } from "class-transformer"
+import { IsString, IsUUID } from "class-validator"
+import { ValidationsGroupsEnum } from "../../shared/types/validations-groups-enum"
 import { UnitsSummary } from "../entities/units-summary.entity"
 
 export class UnitsSummaryDto extends OmitType(UnitsSummary, [] as const) {}
-export class UnitsSummaryCreateDto extends OmitType(UnitsSummaryDto, [] as const) {}
-export class UnitsSummaryUpdateDto extends OmitType(UnitsSummaryDto, [] as const) {}
+
+export class UnitsSummaryCreateDto extends OmitType(UnitsSummaryDto, ["id"] as const) {}
+export class UnitsSummaryUpdateDto extends OmitType(UnitsSummaryCreateDto, [] as const) {
+  @Expose()
+  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  @IsUUID()
+  id: string
+}

backend/core/src/units-summary/entities/units-summary.entity.ts

@@ -1,28 +1,41 @@
-import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"
-import { IsNumber, IsNumberString, IsOptional, IsString, ValidateNested } from "class-validator"
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from "typeorm"
+import {
+  IsNumber,
+  IsNumberString,
+  IsOptional,
+  IsString,
+  IsUUID,
+  ValidateNested,
+} from "class-validator"
 import { Expose, Type } from "class-transformer"
-import { Property } from "../../property/entities/property.entity"
 import { ValidationsGroupsEnum } from "../../shared/types/validations-groups-enum"
 import { UnitType } from "../../unit-types/entities/unit-type.entity"
 import { UnitAccessibilityPriorityType } from "../../unit-accessbility-priority-types/entities/unit-accessibility-priority-type.entity"
+import { Listing } from "../..//listings/entities/listing.entity"
 
 @Entity({ name: "units_summary" })
 class UnitsSummary {
-  @ManyToOne(() => UnitType, { primary: true, eager: true })
+  @PrimaryGeneratedColumn("uuid")
+  @Expose()
+  @IsUUID(4, { groups: [ValidationsGroupsEnum.default] })
+  @IsString({ groups: [ValidationsGroupsEnum.default] })
+  id: string
+
+  @ManyToOne(() => UnitType, { eager: true })
   @Expose()
   @IsOptional({ groups: [ValidationsGroupsEnum.default] })
   @ValidateNested({ groups: [ValidationsGroupsEnum.default] })
   @Type(() => UnitType)
   unitType: UnitType
 
-  @ManyToOne(() => Property, { primary: true, eager: true })
-  property: Property
+  @ManyToOne(() => Listing, (listing) => listing.unitsSummary, {})
+  listing: Listing
 
-  @PrimaryColumn()
+  @Column({ nullable: true, type: "integer" })
   @Expose()
   @IsOptional({ groups: [ValidationsGroupsEnum.default] })
   @IsNumberString({}, { groups: [ValidationsGroupsEnum.default] })
-  monthlyRent: string
+  monthlyRent?: string
 
   @Column({ nullable: true, type: "numeric", precision: 8, scale: 2 })
   @Expose()

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

@@ -3799,6 +3799,59 @@ export interface ReservedCommunityType {
   description?: string
 }
 
+export interface UnitsSummary {
+  /**  */
+  id: string
+
+  /**  */
+  unitType: UnitType
+
+  /**  */
+  listing: Listing
+
+  /**  */
+  monthlyRent?: string
+
+  /**  */
+  monthlyRentAsPercentOfIncome?: string
+
+  /**  */
+  amiPercentage?: string
+
+  /**  */
+  minimumIncomeMin?: string
+
+  /**  */
+  minimumIncomeMax?: string
+
+  /**  */
+  maxOccupancy?: number
+
+  /**  */
+  minOccupancy?: number
+
+  /**  */
+  floorMin?: number
+
+  /**  */
+  floorMax?: number
+
+  /**  */
+  sqFeetMin?: string
+
+  /**  */
+  sqFeetMax?: string
+
+  /**  */
+  priorityType?: UnitAccessibilityPriorityType
+
+  /**  */
+  totalCount?: number
+
+  /**  */
+  totalAvailable?: number
+}
+
 export interface UnitType {
   /**  */
   id: string
@@ -4252,6 +4305,9 @@ export interface Listing {
 
   /**  */
   waitlistOpenSpots?: number
+
+  /** */
+  unitsSummary: UnitsSummary[]
 }
 
 export interface PaginatedListing {

sites/partners/src/listings/PaperListingForm/index.tsx

@@ -196,6 +196,7 @@ const defaults: FormListing = {
   urlSlug: undefined,
   showWaitlist: false,
   reviewOrderType: null,
+  unitsSummary: [],
   unitsSummarized: {
     unitTypes: [],
     priorityTypes: [],