From b3187c2057d924ddee99ccfe428ac5dea5bb2b1d Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Thu, 2 Jun 2022 19:50:34 -0400 Subject: [PATCH 1/8] fix: region and variable naming update --- .../1649062179928-add-property-region.ts | 8 ++--- .../core/src/property/types/region-enum.ts | 3 +- backend/core/types/src/backend-swagger.ts | 3 +- sites/public/src/forms/filters/FilterForm.tsx | 2 +- ui-components/src/helpers/filters.ts | 3 +- .../src/helpers/regionNeighborhoodMap.ts | 35 ++----------------- 6 files changed, 11 insertions(+), 43 deletions(-) diff --git a/backend/core/src/migration/1649062179928-add-property-region.ts b/backend/core/src/migration/1649062179928-add-property-region.ts index de7e91f502..de36fb54a7 100644 --- a/backend/core/src/migration/1649062179928-add-property-region.ts +++ b/backend/core/src/migration/1649062179928-add-property-region.ts @@ -21,9 +21,9 @@ export class addPropertyRegion1649062179928 implements MigrationInterface { { name: "Farwell area", region: Region.Eastside }, { name: "Gratiot Town/Kettering area", region: Region.Eastside }, { name: "Gratiot/7 Mile area", region: Region.Eastside }, - { name: "Greater Corktown area", region: Region.Downtown }, - { name: "Greater Downtown area", region: Region.Downtown }, - { name: "Greater Downtown area", region: Region.Downtown }, + { name: "Greater Corktown area", region: Region.GreaterDowntown }, + { name: "Greater Downtown area", region: Region.GreaterDowntown }, + { name: "Greater Downtown area", region: Region.GreaterDowntown }, { name: "Islandview/Greater Villages area", region: Region.Eastside }, { name: "Islandview/Greater Villages area", region: Region.Eastside }, { name: "Islandview/Greater Villages area", region: Region.Westside }, @@ -44,7 +44,7 @@ export class addPropertyRegion1649062179928 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query( - `CREATE TYPE "property_region_enum" AS ENUM('Downtown', 'Eastside', 'Midtown - New Center', 'Southwest', 'Westside')` + `CREATE TYPE "property_region_enum" AS ENUM('Greater Downtown', 'Eastside', 'Southwest', 'Westside')` ) await queryRunner.query(`ALTER TABLE "property" ADD "region" "property_region_enum"`) diff --git a/backend/core/src/property/types/region-enum.ts b/backend/core/src/property/types/region-enum.ts index cdffce35cb..bb5027c17e 100644 --- a/backend/core/src/property/types/region-enum.ts +++ b/backend/core/src/property/types/region-enum.ts @@ -1,7 +1,6 @@ export enum Region { - Downtown = "Downtown", + GreaterDowntown = "Greater Downtown", Eastside = "Eastside", - MidtownNewCenter = "Midtown - New Center", Southwest = "Southwest", Westside = "Westside", } diff --git a/backend/core/types/src/backend-swagger.ts b/backend/core/types/src/backend-swagger.ts index 73babe8a9c..828c20370c 100644 --- a/backend/core/types/src/backend-swagger.ts +++ b/backend/core/types/src/backend-swagger.ts @@ -7102,9 +7102,8 @@ export enum ListingSeasonEnum { } export enum Region { - "Downtown" = "Downtown", + "Greater Downtown" = "Greater Downtown", "Eastside" = "Eastside", - "Midtown - New Center" = "Midtown - New Center", "Southwest" = "Southwest", "Westside" = "Westside", } diff --git a/sites/public/src/forms/filters/FilterForm.tsx b/sites/public/src/forms/filters/FilterForm.tsx index 08fd8735de..6ca346ae42 100644 --- a/sites/public/src/forms/filters/FilterForm.tsx +++ b/sites/public/src/forms/filters/FilterForm.tsx @@ -97,7 +97,7 @@ const FilterForm = (props: FilterFormProps) => { setRegionOptions( Object.entries(Region).map((elem) => ({ value: elem[1], - label: elem[0] === "MidtownNewCenter" ? "Midtown" : elem[1], + label: elem[1], })) ) diff --git a/ui-components/src/helpers/filters.ts b/ui-components/src/helpers/filters.ts index 49f0c2d8c2..7a24861030 100644 --- a/ui-components/src/helpers/filters.ts +++ b/ui-components/src/helpers/filters.ts @@ -124,9 +124,8 @@ export interface ListingFilterState { [FrontendListingFilterStateKeys.SupportiveHousingfortheHomeless]?: string | number // region [FrontendListingFilterStateKeys.region]?: string - [FrontendListingFilterStateKeys.Downtown]?: string | boolean + [FrontendListingFilterStateKeys.GreaterDowntown]?: string | boolean [FrontendListingFilterStateKeys.Eastside]?: string | boolean - [FrontendListingFilterStateKeys.MidtownNewCenter]?: string | boolean [FrontendListingFilterStateKeys.Southwest]?: string | boolean [FrontendListingFilterStateKeys.Westside]?: string | boolean // accessibility diff --git a/ui-components/src/helpers/regionNeighborhoodMap.ts b/ui-components/src/helpers/regionNeighborhoodMap.ts index d6262162eb..45cbb534f1 100644 --- a/ui-components/src/helpers/regionNeighborhoodMap.ts +++ b/ui-components/src/helpers/regionNeighborhoodMap.ts @@ -1,22 +1,17 @@ export enum Region { - Downtown = "Downtown", + GreaterDowntown = "Greater Downtown", Eastside = "Eastside", - MidtownNewCenter = "Midtown - New Center", Southwest = "Southwest", Westside = "Westside", } // TODO(#674): Get official hosted images export const regionImageUrls: Map = new Map([ - [Region.Downtown, "https://pbs.twimg.com/media/DSzZwQKVAAASkw_?format=jpg&name=large"], + [Region.GreaterDowntown, "https://pbs.twimg.com/media/DSzZwQKVAAASkw_?format=jpg&name=large"], [ Region.Eastside, "https://d12kp1agyyb87s.cloudfront.net/wp-content/uploads/2019/10/image001.jpg", ], - [ - Region.MidtownNewCenter, - "https://cdn.pixabay.com/photo/2019/03/17/04/00/detroit-4060269_960_720.jpg", - ], [ Region.Southwest, "https://www.theneighborhoods.org/sites/the-neighborhoods/files/2020-10/Southwest-Mural_1.jpg", @@ -34,7 +29,6 @@ export interface Neighborhood { export const Neighborhoods: Neighborhood[] = [ { name: "Airport Sub", region: Region.Eastside }, - { name: "Arden Park", region: Region.MidtownNewCenter }, { name: "Aviation Sub", region: Region.Westside }, { name: "Bagley", region: Region.Westside }, { name: "Barton-McFarland", region: Region.Westside }, @@ -45,10 +39,7 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Blackstone Park", region: Region.Westside }, { name: "Boston Edison", region: Region.Westside }, { name: "Boynton", region: Region.Southwest }, - { name: "Brewster Douglass", region: Region.MidtownNewCenter }, - { name: "Brewster Homes", region: Region.MidtownNewCenter }, { name: "Brightmoor", region: Region.Westside }, - { name: "Brush Park", region: Region.MidtownNewCenter }, { name: "Buffalo", region: Region.Eastside }, { name: "Butler", region: Region.Eastside }, { name: "Cadillac Community", region: Region.Westside }, @@ -68,7 +59,6 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Corktown", region: Region.Southwest }, { name: "Cornerstone Village", region: Region.Eastside }, { name: "Crary/St Marys", region: Region.Westside }, - { name: "Cultural Center", region: Region.MidtownNewCenter }, { name: "Davison", region: Region.Eastside }, { name: "Davison-Schoolcraft", region: Region.Westside }, { name: "Delray", region: Region.Southwest }, @@ -79,7 +69,6 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Downtown", region: Region.Southwest }, { name: "East English Village", region: Region.Eastside }, { name: "East Village", region: Region.Eastside }, - { name: "Eastern Market", region: Region.MidtownNewCenter }, { name: "Eden Gardens", region: Region.Eastside }, { name: "Elijah McCoy", region: Region.Westside }, { name: "Eliza Howell", region: Region.Westside }, @@ -91,13 +80,10 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Fiskhorn", region: Region.Westside }, { name: "Fitzgerald", region: Region.Westside }, { name: "Five Points", region: Region.Westside }, - { name: "Forest Park", region: Region.MidtownNewCenter }, { name: "Fox Creek", region: Region.Eastside }, - { name: "Foxtown", region: Region.MidtownNewCenter }, { name: "Franklin", region: Region.Eastside }, { name: "Franklin Park", region: Region.Westside }, { name: "Garden View", region: Region.Westside }, - { name: "Gateway Community", region: Region.MidtownNewCenter }, { name: "Gold Coast", region: Region.Eastside }, { name: "Grand River-I96", region: Region.Westside }, { name: "Grand River-St Marys", region: Region.Westside }, @@ -108,7 +94,7 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Gratiot Woods", region: Region.Eastside }, { name: "Gratiot-Findlay", region: Region.Eastside }, { name: "Gratiot-Grand", region: Region.Eastside }, - { name: "Greektown", region: Region.Downtown }, + { name: "Greektown", region: Region.GreaterDowntown }, { name: "Green Acres", region: Region.Westside }, { name: "Greenfield", region: Region.Westside }, { name: "Greenfield Park", region: Region.Eastside }, @@ -118,8 +104,6 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Happy Homes", region: Region.Westside }, { name: "Harmony Village", region: Region.Westside }, { name: "Hawthorne Park", region: Region.Eastside }, - { name: "Henry Ford", region: Region.MidtownNewCenter }, - { name: "Herman Kiefer", region: Region.MidtownNewCenter }, { name: "Historic Atkinson", region: Region.Westside }, { name: "Hubbard Farms", region: Region.Southwest }, { name: "Hubbard Richard", region: Region.Southwest }, @@ -134,7 +118,6 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Joy Community", region: Region.Westside }, { name: "Joy-Schaefer", region: Region.Westside }, { name: "Krainz Woods", region: Region.Eastside }, - { name: "Lafayette Park", region: Region.MidtownNewCenter }, { name: "LaSalle College Park", region: Region.Eastside }, { name: "LaSalle Gardens", region: Region.Westside }, { name: "Littlefield Community", region: Region.Westside }, @@ -144,27 +127,19 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Marina District", region: Region.Eastside }, { name: "Martin Park", region: Region.Westside }, { name: "McDougall-Hunt", region: Region.Eastside }, - { name: "Medbury Park", region: Region.MidtownNewCenter }, - { name: "Medical Center", region: Region.MidtownNewCenter }, { name: "Mexicantown", region: Region.Southwest }, { name: "Michigan-Martin", region: Region.Southwest }, - { name: "Midtown", region: Region.MidtownNewCenter }, { name: "Midwest", region: Region.Westside }, { name: "Miller Grove", region: Region.Westside }, - { name: "Milwaukee Junction", region: Region.MidtownNewCenter }, { name: "Minock Park", region: Region.Westside }, { name: "Mohican Regent", region: Region.Eastside }, { name: "Morningside", region: Region.Eastside }, { name: "Moross-Morang", region: Region.Eastside }, { name: "Mount Olivet", region: Region.Eastside }, { name: "Nardin Park", region: Region.Westside }, - { name: "New Center", region: Region.MidtownNewCenter }, - { name: "New Center Commons", region: Region.MidtownNewCenter }, { name: "Nolan", region: Region.Eastside }, { name: "North Campau", region: Region.Eastside }, { name: "North Corktown", region: Region.Westside }, - { name: "North End", region: Region.MidtownNewCenter }, - { name: "North End Neighborhood", region: Region.MidtownNewCenter }, { name: "North Rosedale Park", region: Region.Westside }, { name: "Northeast Central District", region: Region.Eastside }, { name: "Northwest Community", region: Region.Westside }, @@ -183,7 +158,6 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Penrose Village", region: Region.Eastside }, { name: "Pershing", region: Region.Eastside }, { name: "Petoskey-Otsego", region: Region.Westside }, - { name: "Piety Hill", region: Region.MidtownNewCenter }, { name: "Pilgrim Village", region: Region.Westside }, { name: "Pingree Park", region: Region.Eastside }, { name: "Plymouth-Hubbell", region: Region.Westside }, @@ -211,7 +185,6 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Southwest Detroit", region: Region.Southwest }, { name: "Springwells", region: Region.Southwest }, { name: "State Fair", region: Region.Eastside }, - { name: "Tech Town", region: Region.MidtownNewCenter }, { name: "The Eye", region: Region.Westside }, { name: "Tri-Point", region: Region.Westside }, { name: "University District", region: Region.Westside }, @@ -221,12 +194,10 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Warren Ave Community", region: Region.Westside }, { name: "Warrendale", region: Region.Westside }, { name: "Waterworks Park", region: Region.Eastside }, - { name: "Wayne State", region: Region.MidtownNewCenter }, { name: "We Care Community", region: Region.Westside }, { name: "Weatherby", region: Region.Westside }, { name: "West Side Industrial", region: Region.Southwest }, { name: "West Village", region: Region.Eastside }, - { name: "West Virginia Park", region: Region.MidtownNewCenter }, { name: "West Woodbridge", region: Region.Southwest }, { name: "Westwood Park", region: Region.Westside }, { name: "Wildemere Park", region: Region.Westside }, From 7bfde5334824c48e4a4a65b4a235f1911bdc13d5 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Thu, 2 Jun 2022 20:24:16 -0400 Subject: [PATCH 2/8] fix: updated related tests --- backend/core/src/listings/tests/listings.service.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/core/src/listings/tests/listings.service.spec.ts b/backend/core/src/listings/tests/listings.service.spec.ts index aa21d44ab7..634a958b00 100644 --- a/backend/core/src/listings/tests/listings.service.spec.ts +++ b/backend/core/src/listings/tests/listings.service.spec.ts @@ -252,9 +252,9 @@ describe("ListingsService", () => { mockListingsRepo.createQueryBuilder .mockReturnValueOnce(mockInnerQueryBuilder) .mockReturnValueOnce(mockQueryBuilder) - const expectedRegionString = "Downtown,Eastside," // intentional extra and trailing commas for test + const expectedRegionString = "Greater Downtown,Eastside," // intentional extra and trailing commas for test // lowercased, trimmed spaces, filtered empty - const expectedRegionArray = ["Downtown", "Eastside"] + const expectedRegionArray = ["Greater Downtown", "Eastside"] const queryParams: ListingsQueryParams = { filter: [ @@ -280,9 +280,9 @@ describe("ListingsService", () => { mockListingsRepo.createQueryBuilder .mockReturnValueOnce(mockInnerQueryBuilder) .mockReturnValueOnce(mockQueryBuilder) - const neighborhoodString = "Downtown,Eastside," // intentional extra and trailing commas for test + const neighborhoodString = "Greater Downtown,Eastside," // intentional extra and trailing commas for test // lowercased, trimmed spaces, filtered empty - const expectedNeighborhoodArray = ["Downtown", "Eastside"] + const expectedNeighborhoodArray = ["Greater Downtown", "Eastside"] const queryParams: ListingsQueryParams = { filter: [ From 522d1ef878c89d99840544de35ff2a57489ce38c Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Fri, 3 Jun 2022 01:34:15 -0400 Subject: [PATCH 3/8] fix: mantain full set of neighborhoods --- .../src/helpers/regionNeighborhoodMap.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ui-components/src/helpers/regionNeighborhoodMap.ts b/ui-components/src/helpers/regionNeighborhoodMap.ts index 45cbb534f1..963c877cd7 100644 --- a/ui-components/src/helpers/regionNeighborhoodMap.ts +++ b/ui-components/src/helpers/regionNeighborhoodMap.ts @@ -29,6 +29,7 @@ export interface Neighborhood { export const Neighborhoods: Neighborhood[] = [ { name: "Airport Sub", region: Region.Eastside }, + { name: "Arden Park", region: Region.GreaterDowntown }, { name: "Aviation Sub", region: Region.Westside }, { name: "Bagley", region: Region.Westside }, { name: "Barton-McFarland", region: Region.Westside }, @@ -39,7 +40,10 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Blackstone Park", region: Region.Westside }, { name: "Boston Edison", region: Region.Westside }, { name: "Boynton", region: Region.Southwest }, + { name: "Brewster Douglass", region: Region.GreaterDowntown }, + { name: "Brewster Homes", region: Region.GreaterDowntown }, { name: "Brightmoor", region: Region.Westside }, + { name: "Brush Park", region: Region.GreaterDowntown }, { name: "Buffalo", region: Region.Eastside }, { name: "Butler", region: Region.Eastside }, { name: "Cadillac Community", region: Region.Westside }, @@ -59,6 +63,7 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Corktown", region: Region.Southwest }, { name: "Cornerstone Village", region: Region.Eastside }, { name: "Crary/St Marys", region: Region.Westside }, + { name: "Cultural Center", region: Region.GreaterDowntown }, { name: "Davison", region: Region.Eastside }, { name: "Davison-Schoolcraft", region: Region.Westside }, { name: "Delray", region: Region.Southwest }, @@ -69,6 +74,7 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Downtown", region: Region.Southwest }, { name: "East English Village", region: Region.Eastside }, { name: "East Village", region: Region.Eastside }, + { name: "Eastern Market", region: Region.GreaterDowntown }, { name: "Eden Gardens", region: Region.Eastside }, { name: "Elijah McCoy", region: Region.Westside }, { name: "Eliza Howell", region: Region.Westside }, @@ -80,10 +86,13 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Fiskhorn", region: Region.Westside }, { name: "Fitzgerald", region: Region.Westside }, { name: "Five Points", region: Region.Westside }, + { name: "Forest Park", region: Region.GreaterDowntown }, { name: "Fox Creek", region: Region.Eastside }, + { name: "Foxtown", region: Region.GreaterDowntown }, { name: "Franklin", region: Region.Eastside }, { name: "Franklin Park", region: Region.Westside }, { name: "Garden View", region: Region.Westside }, + { name: "Gateway Community", region: Region.GreaterDowntown }, { name: "Gold Coast", region: Region.Eastside }, { name: "Grand River-I96", region: Region.Westside }, { name: "Grand River-St Marys", region: Region.Westside }, @@ -104,6 +113,8 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Happy Homes", region: Region.Westside }, { name: "Harmony Village", region: Region.Westside }, { name: "Hawthorne Park", region: Region.Eastside }, + { name: "Henry Ford", region: Region.GreaterDowntown }, + { name: "Herman Kiefer", region: Region.GreaterDowntown }, { name: "Historic Atkinson", region: Region.Westside }, { name: "Hubbard Farms", region: Region.Southwest }, { name: "Hubbard Richard", region: Region.Southwest }, @@ -118,6 +129,7 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Joy Community", region: Region.Westside }, { name: "Joy-Schaefer", region: Region.Westside }, { name: "Krainz Woods", region: Region.Eastside }, + { name: "Lafayette Park", region: Region.GreaterDowntown }, { name: "LaSalle College Park", region: Region.Eastside }, { name: "LaSalle Gardens", region: Region.Westside }, { name: "Littlefield Community", region: Region.Westside }, @@ -127,19 +139,27 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Marina District", region: Region.Eastside }, { name: "Martin Park", region: Region.Westside }, { name: "McDougall-Hunt", region: Region.Eastside }, + { name: "Medbury Park", region: Region.GreaterDowntown }, + { name: "Medical Center", region: Region.GreaterDowntown }, { name: "Mexicantown", region: Region.Southwest }, { name: "Michigan-Martin", region: Region.Southwest }, + { name: "Midtown", region: Region.GreaterDowntown }, { name: "Midwest", region: Region.Westside }, { name: "Miller Grove", region: Region.Westside }, + { name: "Milwaukee Junction", region: Region.GreaterDowntown }, { name: "Minock Park", region: Region.Westside }, { name: "Mohican Regent", region: Region.Eastside }, { name: "Morningside", region: Region.Eastside }, { name: "Moross-Morang", region: Region.Eastside }, { name: "Mount Olivet", region: Region.Eastside }, { name: "Nardin Park", region: Region.Westside }, + { name: "New Center", region: Region.GreaterDowntown }, + { name: "New Center Commons", region: Region.GreaterDowntown }, { name: "Nolan", region: Region.Eastside }, { name: "North Campau", region: Region.Eastside }, { name: "North Corktown", region: Region.Westside }, + { name: "North End", region: Region.GreaterDowntown }, + { name: "North End Neighborhood", region: Region.GreaterDowntown }, { name: "North Rosedale Park", region: Region.Westside }, { name: "Northeast Central District", region: Region.Eastside }, { name: "Northwest Community", region: Region.Westside }, @@ -158,6 +178,7 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Penrose Village", region: Region.Eastside }, { name: "Pershing", region: Region.Eastside }, { name: "Petoskey-Otsego", region: Region.Westside }, + { name: "Piety Hill", region: Region.GreaterDowntown }, { name: "Pilgrim Village", region: Region.Westside }, { name: "Pingree Park", region: Region.Eastside }, { name: "Plymouth-Hubbell", region: Region.Westside }, @@ -185,6 +206,7 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Southwest Detroit", region: Region.Southwest }, { name: "Springwells", region: Region.Southwest }, { name: "State Fair", region: Region.Eastside }, + { name: "Tech Town", region: Region.GreaterDowntown }, { name: "The Eye", region: Region.Westside }, { name: "Tri-Point", region: Region.Westside }, { name: "University District", region: Region.Westside }, @@ -194,10 +216,12 @@ export const Neighborhoods: Neighborhood[] = [ { name: "Warren Ave Community", region: Region.Westside }, { name: "Warrendale", region: Region.Westside }, { name: "Waterworks Park", region: Region.Eastside }, + { name: "Wayne State", region: Region.GreaterDowntown }, { name: "We Care Community", region: Region.Westside }, { name: "Weatherby", region: Region.Westside }, { name: "West Side Industrial", region: Region.Southwest }, { name: "West Village", region: Region.Eastside }, + { name: "West Virginia Park", region: Region.GreaterDowntown }, { name: "West Woodbridge", region: Region.Southwest }, { name: "Westwood Park", region: Region.Westside }, { name: "Wildemere Park", region: Region.Westside }, From ed397231a08f4de0b7ddce5747c52fe4584daf07 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Mon, 6 Jun 2022 17:53:51 -0400 Subject: [PATCH 4/8] fix: new migration file --- .../migration/1654549186207-region-rename.ts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 backend/core/src/migration/1654549186207-region-rename.ts diff --git a/backend/core/src/migration/1654549186207-region-rename.ts b/backend/core/src/migration/1654549186207-region-rename.ts new file mode 100644 index 0000000000..07b45ea114 --- /dev/null +++ b/backend/core/src/migration/1654549186207-region-rename.ts @@ -0,0 +1,31 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class regionRename1654549186207 implements MigrationInterface { + name = "regionRename1654549186207" + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TYPE "property_region_enum" RENAME TO "property_region_enum_old"` + ) + await queryRunner.query( + `CREATE TYPE "property_region_enum" AS ENUM('Greater Downtown', 'Eastside', 'Southwest', 'Westside')` + ) + await queryRunner.query( + `ALTER TABLE "property" ALTER COLUMN "region" TYPE "property_region_enum" USING "region"::"text"::"property_region_enum"` + ) + await queryRunner.query(`DROP TYPE "property_region_enum_old"`) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE TYPE "property_region_enum_old" AS ENUM('Greater Downtown', 'Eastside', 'Midtown - New Center', 'Southwest', 'Westside')` + ) + await queryRunner.query( + `ALTER TABLE "property" ALTER COLUMN "region" TYPE "property_region_enum_old" USING "region"::"text"::"property_region_enum_old"` + ) + await queryRunner.query(`DROP TYPE "property_region_enum"`) + await queryRunner.query( + `ALTER TYPE "property_region_enum_old" RENAME TO "property_region_enum"` + ) + } +} From 708ef377ffcefd3584421bb5f744e5dda7913158 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 7 Jun 2022 10:26:09 -0400 Subject: [PATCH 5/8] fix: migration for existing Downtown data --- backend/core/src/migration/1654549186207-region-rename.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/core/src/migration/1654549186207-region-rename.ts b/backend/core/src/migration/1654549186207-region-rename.ts index 07b45ea114..4be4bc6d43 100644 --- a/backend/core/src/migration/1654549186207-region-rename.ts +++ b/backend/core/src/migration/1654549186207-region-rename.ts @@ -4,6 +4,12 @@ export class regionRename1654549186207 implements MigrationInterface { name = "regionRename1654549186207" public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`BEGIN TRANSACTION`) + await queryRunner.query(`ALTER TYPE "property_region_enum" ADD VALUE 'Greater Downtown'`) + await queryRunner.query(`COMMIT TRANSACTION`) + await queryRunner.query( + `UPDATE "property" SET "region" = 'Greater Downtown' WHERE "region" = 'Downtown'` + ) await queryRunner.query( `ALTER TYPE "property_region_enum" RENAME TO "property_region_enum_old"` ) From aa604d1bec2456a8d2835ba84ea318ef1618a44d Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 7 Jun 2022 12:25:07 -0400 Subject: [PATCH 6/8] fix: remove region typing from seed --- .../1649062179928-add-property-region.ts | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/backend/core/src/migration/1649062179928-add-property-region.ts b/backend/core/src/migration/1649062179928-add-property-region.ts index de36fb54a7..b616e20d84 100644 --- a/backend/core/src/migration/1649062179928-add-property-region.ts +++ b/backend/core/src/migration/1649062179928-add-property-region.ts @@ -3,7 +3,7 @@ import { Region } from "../property/types/region-enum" export interface Neighborhood { name: string - region: Region + region: string } export class addPropertyRegion1649062179928 implements MigrationInterface { @@ -12,34 +12,34 @@ export class addPropertyRegion1649062179928 implements MigrationInterface { // NOTE: imported from https://github.com/CityOfDetroit/bloom/blob/main/ui-components/src/helpers/regionNeighborhoodMap.ts // Issue comment: https://github.com/CityOfDetroit/bloom/issues/1015#issuecomment-1068056607 neighborhoods: Neighborhood[] = [ - { name: "Airport Sub area", region: Region.Eastside }, - { name: "Barton McFarland area", region: Region.Westside }, - { name: "Boston-Edison/North End area", region: Region.Westside }, - { name: "Boynton", region: Region.Southwest }, - { name: "Campau/Banglatown", region: Region.Eastside }, - { name: "Dexter Linwood", region: Region.Westside }, - { name: "Farwell area", region: Region.Eastside }, - { name: "Gratiot Town/Kettering area", region: Region.Eastside }, - { name: "Gratiot/7 Mile area", region: Region.Eastside }, - { name: "Greater Corktown area", region: Region.GreaterDowntown }, - { name: "Greater Downtown area", region: Region.GreaterDowntown }, - { name: "Greater Downtown area", region: Region.GreaterDowntown }, - { name: "Islandview/Greater Villages area", region: Region.Eastside }, - { name: "Islandview/Greater Villages area", region: Region.Eastside }, - { name: "Islandview/Greater Villages area", region: Region.Westside }, - { name: "Jefferson Chalmers area", region: Region.Eastside }, - { name: "Livernois/McNichols area", region: Region.Westside }, - { name: "Livernois/McNichols area", region: Region.Westside }, - { name: "Morningside area", region: Region.Eastside }, - { name: "North Campau area", region: Region.Eastside }, - { name: "Northwest Grand River area", region: Region.Westside }, - { name: "Northwest University District area", region: Region.Westside }, - { name: "Palmer Park area", region: Region.Westside }, - { name: "Russell Woods/Nardin Park area", region: Region.Westside }, - { name: "Southwest/Vernor area", region: Region.Southwest }, - { name: "Southwest/Vernor area", region: Region.Southwest }, - { name: "Warrendale/Cody Rouge", region: Region.Westside }, - { name: "West End area", region: Region.Eastside }, + { name: "Airport Sub area", region: "Eastside" }, + { name: "Barton McFarland area", region: "Westside" }, + { name: "Boston-Edison/North End area", region: "Westside" }, + { name: "Boynton", region: "Southwest" }, + { name: "Campau/Banglatown", region: "Eastside" }, + { name: "Dexter Linwood", region: "Westside" }, + { name: "Farwell area", region: "Eastside" }, + { name: "Gratiot Town/Kettering area", region: "Eastside" }, + { name: "Gratiot/7 Mile area", region: "Eastside" }, + { name: "Greater Corktown area", region: "Downtown" }, + { name: "Greater Downtown area", region: "Downtown" }, + { name: "Greater Downtown area", region: "Downtown" }, + { name: "Islandview/Greater Villages area", region: "Eastside" }, + { name: "Islandview/Greater Villages area", region: "Eastside" }, + { name: "Islandview/Greater Villages area", region: "Westside" }, + { name: "Jefferson Chalmers area", region: "Eastside" }, + { name: "Livernois/McNichols area", region: "Westside" }, + { name: "Livernois/McNichols area", region: "Westside" }, + { name: "Morningside area", region: "Eastside" }, + { name: "North Campau area", region: "Eastside" }, + { name: "Northwest Grand River area", region: "Westside" }, + { name: "Northwest University District area", region: "Westside" }, + { name: "Palmer Park area", region: "Westside" }, + { name: "Russell Woods/Nardin Park area", region: "Westside" }, + { name: "Southwest/Vernor area", region: "Southwest" }, + { name: "Southwest/Vernor area", region: "Southwest" }, + { name: "Warrendale/Cody Rouge", region: "Westside" }, + { name: "West End area", region: "Eastside" }, ] public async up(queryRunner: QueryRunner): Promise { From 06d872bbcb40f0173ca49ee3725a48233f5a4467 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 7 Jun 2022 12:56:13 -0400 Subject: [PATCH 7/8] fix: update script to pass unit tests --- backend/core/src/migration/1654549186207-region-rename.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/core/src/migration/1654549186207-region-rename.ts b/backend/core/src/migration/1654549186207-region-rename.ts index 4be4bc6d43..fce12fe40b 100644 --- a/backend/core/src/migration/1654549186207-region-rename.ts +++ b/backend/core/src/migration/1654549186207-region-rename.ts @@ -5,7 +5,7 @@ export class regionRename1654549186207 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query(`BEGIN TRANSACTION`) - await queryRunner.query(`ALTER TYPE "property_region_enum" ADD VALUE 'Greater Downtown'`) + await queryRunner.query(`ALTER TYPE "property_region_enum" ADD VALUE 'Downtown'`) await queryRunner.query(`COMMIT TRANSACTION`) await queryRunner.query( `UPDATE "property" SET "region" = 'Greater Downtown' WHERE "region" = 'Downtown'` From 6efa15ef6d61e9035b76df0fc9c5d932f6ad2f73 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 7 Jun 2022 13:34:21 -0400 Subject: [PATCH 8/8] fix: contain all migration fixes to new file --- backend/core/src/migration/1649062179928-add-property-region.ts | 2 +- backend/core/src/migration/1654549186207-region-rename.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/core/src/migration/1649062179928-add-property-region.ts b/backend/core/src/migration/1649062179928-add-property-region.ts index b616e20d84..d5f09db884 100644 --- a/backend/core/src/migration/1649062179928-add-property-region.ts +++ b/backend/core/src/migration/1649062179928-add-property-region.ts @@ -44,7 +44,7 @@ export class addPropertyRegion1649062179928 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query( - `CREATE TYPE "property_region_enum" AS ENUM('Greater Downtown', 'Eastside', 'Southwest', 'Westside')` + `CREATE TYPE "property_region_enum" AS ENUM('Downtown', 'Eastside', 'Midtown - New Center', 'Southwest', 'Westside')` ) await queryRunner.query(`ALTER TABLE "property" ADD "region" "property_region_enum"`) diff --git a/backend/core/src/migration/1654549186207-region-rename.ts b/backend/core/src/migration/1654549186207-region-rename.ts index fce12fe40b..4be4bc6d43 100644 --- a/backend/core/src/migration/1654549186207-region-rename.ts +++ b/backend/core/src/migration/1654549186207-region-rename.ts @@ -5,7 +5,7 @@ export class regionRename1654549186207 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query(`BEGIN TRANSACTION`) - await queryRunner.query(`ALTER TYPE "property_region_enum" ADD VALUE 'Downtown'`) + await queryRunner.query(`ALTER TYPE "property_region_enum" ADD VALUE 'Greater Downtown'`) await queryRunner.query(`COMMIT TRANSACTION`) await queryRunner.query( `UPDATE "property" SET "region" = 'Greater Downtown' WHERE "region" = 'Downtown'`