Split CT into three groups (#315)

Author: Eric-Arellano

packages/ct/data/city-stats.json

@@ -4,13 +4,15 @@
     "percentage": "26%",
     "population": "121,054",
     "reforms": "adopted",
-    "url": "https://parkingreform.org/mandates-map/city_detail/Hartford_CT.html"
+    "url": "https://parkingreform.org/mandates-map/city_detail/Hartford_CT.html",
+    "group": "Group 1"
   },
   "new-haven": {
     "name": "New Haven",
     "percentage": "34%",
     "population": "134,023",
     "reforms": "adopted",
-    "url": "https://parkingreform.org/mandates-map/city_detail/NewHaven_CT.html"
+    "url": "https://parkingreform.org/mandates-map/city_detail/NewHaven_CT.html",
+    "group": "Group 2"
   }
 }

packages/ct/src/js/dropdownGroups.ts

@@ -1,15 +1,44 @@
-import { DropdownGroup } from "@prn-parking-lots/shared/src/js/city-ui/dropdownUtils";
+import {
+  DropdownChoiceId,
+  DropdownGroup,
+} from "@prn-parking-lots/shared/src/js/city-ui/dropdownUtils";
 import type { CityStatsCollection } from "@prn-parking-lots/shared/src/js/model/types";
 
 import type { CityStats } from "./types";
 
 export default function createDropdownGroups(
   data: CityStatsCollection<CityStats>,
 ): DropdownGroup[] {
+  const group1: DropdownChoiceId[] = [];
+  const group2: DropdownChoiceId[] = [];
+  const group3: DropdownChoiceId[] = [];
+  Object.entries(data).forEach(([id, { name, group }]) => {
+    switch (group) {
+      case "Group 1":
+        group1.push({ name, id });
+        break;
+      case "Group 2":
+        group2.push({ name, id });
+        break;
+      case "Group 3":
+        group3.push({ name, id });
+        break;
+      default:
+        throw new Error(`Unrecognized group '${group}' for ${id}`);
+    }
+  });
   return [
     {
       label: "Group 1",
-      cities: Object.entries(data).map(([id, { name }]) => ({ id, name })),
+      cities: group1,
+    },
+    {
+      label: "Group 2",
+      cities: group2,
+    },
+    {
+      label: "Group 3",
+      cities: group3,
     },
   ];
 }

packages/ct/src/js/types.ts

@@ -1,3 +1,3 @@
 import type { CommonCityStats } from "@prn-parking-lots/shared/src/js/model/types";
 
-export type CityStats = CommonCityStats;
+export type CityStats = CommonCityStats & { group: string };

packages/ct/tests/dropdownGroups.test.ts

@@ -13,19 +13,39 @@ test("createDropdownGroups", () => {
     city1: {
       ...common,
       name: "City 1",
+      group: "Group 1",
     },
     city2: {
       ...common,
       name: "City 2",
+      group: "Group 2",
+    },
+    city3: {
+      ...common,
+      name: "City 3",
+      group: "Group 3",
+    },
+    city4: {
+      ...common,
+      name: "City 4",
+      group: "Group 1",
     },
   };
   expect(createDropdownGroups(input)).toEqual([
     {
       label: "Group 1",
       cities: [
         { id: "city1", name: "City 1" },
-        { id: "city2", name: "City 2" },
+        { id: "city4", name: "City 4" },
       ],
     },
+    {
+      label: "Group 2",
+      cities: [{ id: "city2", name: "City 2" }],
+    },
+    {
+      label: "Group 3",
+      cities: [{ id: "city3", name: "City 3" }],
+    },
   ]);
 });

packages/ct/tests/scorecard.test.ts

@@ -12,6 +12,7 @@ test.describe("formatScorecard", () => {
       population: "42,412",
       reforms: "adopted",
       url: "https://parkingreform.org",
+      group: "",
     });
     expect(listEntries).toEqual([
       "42,412 city residents",
@@ -26,6 +27,7 @@ test.describe("formatScorecard", () => {
       population: "42,412",
       reforms: null,
       url: null,
+      group: "",
     });
     expect(listEntries).toEqual(["42,412 city residents"]);
   });

packages/scripts/src/add-city.ts

@@ -23,7 +23,10 @@ async function addScoreCard(
   };
   let newEntry;
   if (pkg === "ct") {
-    newEntry = { ...common };
+    newEntry = {
+      ...common,
+      group: "FILL ME IN, either 'Group 1', 'Group 2', or 'Group 3'",
+    };
   } else {
     newEntry = {
       ...common,