Revert "chore: attempt to remove dunders"

This reverts commit eb30e53.
bcgov · Oct 2, 2024 · 74240c2 · 74240c2
1 parent eb30e53
commit 74240c2
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 32 deletions.
diff --git a/bc_obps/registration/schema/v1/facility_designated_operation_timeline.py b/bc_obps/registration/schema/v1/facility_designated_operation_timeline.py
@@ -4,9 +4,9 @@
 
 
 class FacilityDesignatedOperationTimelineOut(ModelSchema):
-    facility_name: str = Field(..., alias="facility.name")
-    facility_type: str = Field(..., alias="facility.type")
-    facility_bcghg_id: Optional[str] = Field(None, alias="facility.bcghg_id")
+    facility__name: str = Field(..., alias="facility.name")
+    facility__type: str = Field(..., alias="facility.type")
+    facility__bcghg_id: Optional[str] = Field(None, alias="facility.bcghg_id")
 
     class Meta:
         model = FacilityDesignatedOperationTimeline

diff --git a/bciers/apps/administration/app/components/datagrid/models/facilities/facilityColumns.ts b/bciers/apps/administration/app/components/datagrid/models/facilities/facilityColumns.ts
@@ -5,14 +5,14 @@ const facilityColumns = (
 ) => {
   const columns: GridColDef[] = [
     {
-      field: "facility_name",
+      field: "facility__name",
       headerName: "Facility Name",
       // Set flex to 1 to make the column take up all the remaining width if user zooms out
       flex: 1,
     },
-    { field: "facility_type", headerName: "Facility Type", width: 200 },
+    { field: "facility__type", headerName: "Facility Type", width: 200 },
     { field: "status", headerName: "Status", width: 200 },
-    { field: "facility_bcghg_id", headerName: "BC GHG ID", width: 200 },
+    { field: "facility__bcghg_id", headerName: "BC GHG ID", width: 200 },
     {
       field: "action",
       headerName: "Actions",

diff --git a/bciers/apps/administration/app/components/datagrid/models/facilities/facilityGroupColumns.ts b/bciers/apps/administration/app/components/datagrid/models/facilities/facilityGroupColumns.ts
@@ -9,16 +9,16 @@ const facilityGroupColumns = (
 ) => {
   const columnGroupModel: GridColumnGroupingModel = [
     {
-      groupId: "facility_name",
+      groupId: "facility__name",
       headerName: "Facility Name",
       renderHeaderGroup: SearchCell,
-      children: [{ field: "facility_name" }],
+      children: [{ field: "facility__name" }],
     },
     {
-      groupId: "facility_type",
+      groupId: "facility__type",
       headerName: "Facility Type",
       renderHeaderGroup: SearchCell,
-      children: [{ field: "facility_type" }],
+      children: [{ field: "facility__type" }],
     },
     {
       groupId: "status",
@@ -27,10 +27,10 @@ const facilityGroupColumns = (
       children: [{ field: "status" }],
     },
     {
-      groupId: "facility_bcghg_id",
+      groupId: "facility__bcghg_id",
       headerName: "BC GHG ID",
       renderHeaderGroup: SearchCell,
-      children: [{ field: "facility_bcghg_id" }],
+      children: [{ field: "facility__bcghg_id" }],
     },
     {
       groupId: "action",

diff --git a/bciers/apps/administration/tests/components/facilities/FacilitiesDataGrid.test.tsx b/bciers/apps/administration/tests/components/facilities/FacilitiesDataGrid.test.tsx
@@ -21,16 +21,16 @@ const mockResponse = {
   rows: [
     {
       id: 1,
-      facility_name: "Facility 1",
-      facility_type: "Single Facility",
-      facility_bcghg_id: "1-211113-0001",
+      facility__name: "Facility 1",
+      facility__type: "Single Facility",
+      facility__bcghg_id: "1-211113-0001",
       status: "Active",
     },
     {
       id: 2,
-      facility_name: "Facility 2",
-      facility_type: "Large Facility",
-      facility_bcghg_id: "1-211113-0002",
+      facility__name: "Facility 2",
+      facility__type: "Large Facility",
+      facility__bcghg_id: "1-211113-0002",
       status: "Active",
     },
   ],
@@ -96,7 +96,7 @@ describe("FacilitiesDataGrid component", () => {
 
     expect(
       extractParams(String(mockReplace.mock.calls[0][2]), "sort_field"),
-    ).toBe("facility_name");
+    ).toBe("facility__name");
     expect(
       extractParams(String(mockReplace.mock.calls[0][2]), "sort_order"),
     ).toBe("asc");
@@ -107,7 +107,7 @@ describe("FacilitiesDataGrid component", () => {
     });
     expect(
       extractParams(String(mockReplace.mock.calls[1][2]), "sort_field"),
-    ).toBe("facility_name");
+    ).toBe("facility__name");
     expect(
       extractParams(String(mockReplace.mock.calls[1][2]), "sort_order"),
     ).toBe("desc");
@@ -164,7 +164,7 @@ describe("FacilitiesDataGrid component", () => {
     await waitFor(() => {
       // check that the API call was made with the correct params
       expect(
-        extractParams(String(mockReplace.mock.calls), "facility_name"),
+        extractParams(String(mockReplace.mock.calls), "facility__name"),
       ).toBe("facility 1");
     });
   });

diff --git a/...ps/registration/tests/components/operations/registration/FacilityInformationForm.test.tsx b/...ps/registration/tests/components/operations/registration/FacilityInformationForm.test.tsx
@@ -42,19 +42,19 @@ const facilityInitialData = {
   rows: [
     {
       id: "f486f2fb-62ed-438d-bb3e-0819b51e3aeb",
-      facility_name: "Facility 1",
+      facility__name: "Facility 1",
       is_current_year: null,
       starting_date: null,
-      facility_type: "Large Facility",
-      facility_bcghg_id: null,
+      facility__type: "Large Facility",
+      facility__bcghg_id: null,
     },
     {
       id: "f486f2fb-62ed-438d-bb3e-0819b51e3aec",
-      facility_name: "Facility 3",
+      facility__name: "Facility 3",
       is_current_year: null,
       starting_date: null,
-      facility_type: "Medium LFO",
-      facility_bcghg_id: "23219990007",
+      facility__type: "Medium LFO",
+      facility__bcghg_id: "23219990007",
     },
   ],
   row_count: 20,
@@ -429,7 +429,7 @@ describe("the FacilityInformationForm component", () => {
     await waitFor(() => {
       // check that the API call was made with the correct params
       expect(
-        extractParams(String(mockReplace.mock.calls), "facility_name"),
+        extractParams(String(mockReplace.mock.calls), "facility__name"),
       ).toBe("facility 1");
     });
 

diff --git a/...ps/registration/tests/components/operations/registration/FacilityInformationPage.test.tsx b/...ps/registration/tests/components/operations/registration/FacilityInformationPage.test.tsx
@@ -89,14 +89,14 @@ describe("the FacilityInformationPage component", () => {
       items: [
         {
           id: "1",
-          facility_name: "Test Facility 1",
-          facility_type: "Test Facility Type 1",
+          facility__name: "Test Facility 1",
+          facility__type: "Test Facility Type 1",
           status: "Active",
         },
         {
           id: "2",
-          facility_name: "Test Facility 2",
-          facility_type: "Test Facility Type 2",
+          facility__name: "Test Facility 2",
+          facility__type: "Test Facility Type 2",
           status: "Active",
         },
       ],