fix: enhance sandbox seed data (#527)

bcgov · Jun 4, 2024 · 745bf2d · 745bf2d
1 parent 098452b
commit 745bf2d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/.e2e.yml b/.github/workflows/.e2e.yml
@@ -10,10 +10,12 @@ on:
         required: true
       EXTERNAL_CONSUMER_DELETE_REPORTS_API_KEY:
         required: true
+      OPENSHIFT_FRONTEND_URL:
+        required: false
     inputs:
       frontend-url:
         description: "Frontend URL of the application"
-        required: true
+        required: false
         type: string
       external-api-base-url :
         description: "Base URL to the external service API"
@@ -37,10 +39,12 @@ on:
         required: true
       EXTERNAL_CONSUMER_DELETE_REPORTS_API_KEY:
         required: true
+      OPENSHIFT_FRONTEND_URL:
+        required: false
     inputs:
       frontend-url:
         description: "Frontend URL of the application"
-        required: true
+        required: false
         type: string
       environment:
         description: "Environment to read secrets from GitHub secrets"
@@ -83,7 +87,7 @@ jobs:
           npx playwright install --with-deps 
       - name: Run Tests
         env:
-          E2E_BASE_URL: ${{ inputs.frontend-url }}
+          E2E_BASE_URL: ${{ inputs.frontend-url || secrets.OPENSHIFT_FRONTEND_URL }}
           E2E_USERNAME: ${{ secrets.E2E_USERNAME }}
           E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
           EXTERNAL_CONSUMER_DELETE_REPORTS_API_KEY: ${{ secrets.EXTERNAL_CONSUMER_DELETE_REPORTS_API_KEY }}

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -133,6 +133,5 @@ jobs:
     uses: ./.github/workflows/.e2e.yml
     secrets: inherit
     with:
-      frontend-url: https://dev.paytransparency.fin.gov.bc.ca
       external-api-base-url: https://pay-transparency-dev-backend-external.apps.silver.devops.gov.bc.ca    
 
diff --git a/charts/fin-pay-transparency/templates/seed-data-configmap.yaml b/charts/fin-pay-transparency/templates/seed-data-configmap.yaml
@@ -20,9 +20,9 @@ data:
     TRUNCATE pay_transparency.calculation_code CASCADE;
 
 
-    INSERT INTO pay_transparency.pay_transparency_company VALUES ('570683a9-270c-4dc3-b36a-b2973455d348', '4f9c2a07-c546-4db8-b401-1d115c460708', 'Gitem and Suem LLP', '2024-03-24 18:36:10.973', '2024-04-23 19:17:45.419', '250 E Island HWY', '', 'Parksville', 'BC', 'CA', 'V9P1P3');
     INSERT INTO pay_transparency.pay_transparency_company VALUES ('7ea611ba-e0fd-4dc2-ad94-71da210eb26a', 'f824969c-0b39-41ba-a9ad-1e867d211b74', 'CrownCorpDev1', '2024-03-24 19:23:33.218', '2024-04-23 20:08:53.701', '675 Primrose St', '', 'Qualicum Beach', 'BC', 'CA', 'V9K 0A1');
-    INSERT INTO pay_transparency.pay_transparency_company VALUES ('c066d0df-fb18-41f5-8e27-7d5c7433648a', '8ecaaa63-bbb6-4fc1-9e37-73c1b3f1b263', 'BC Crown Corp', '2024-03-24 18:47:29.6', '2024-04-23 21:02:39.075', '1802 Douglas St', '', 'Victoria ', 'BC', 'CA', 'V8T 4K6');
+    INSERT INTO pay_transparency.pay_transparency_company VALUES ('c066d0df-fb18-41f5-8e27-7d5c7433648a', '8ecaaa63-bbb6-4fc1-9e37-73c1b3f1b263', 'BC Crown Corp', '2024-01-01 18:47:29.6', '2024-01-06 21:02:39.075', '710 Douglas St', '', 'Langford', 'BC', 'CA', 'V8T 4K6');
+    INSERT INTO pay_transparency.company_history VALUES ('5af01369-b59d-4a2e-b75e-d40c38a950e0', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', '8ecaaa63-bbb6-4fc1-9e37-73c1b3f1b263', 'BC Crown Corp', '2024-01-01 18:47:29.6', '2024-01-01 21:02:39.075', '1802 Douglas St', '', 'Victoria', 'BC', 'CA', 'V8T 4K6');
     INSERT INTO pay_transparency.pay_transparency_user VALUES ('b424d365-873c-4f48-b64d-242c825bb599', '92f4d75e-115f-436e-a521-ac7475b854e0', 'f824969c-0b39-41ba-a9ad-1e867d211b74', 'Bruce Bigelow', '2024-05-07 17:21:45.639', '2024-05-07 17:21:45.639');
     INSERT INTO pay_transparency.pay_transparency_user VALUES ('f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '845c0d85-12ff-4765-9fef-d14e49725089', '8ecaaa63-bbb6-4fc1-9e37-73c1b3f1b263', 'Sukanya Rath', '2024-03-24 18:47:29.682', '2024-05-13 17:42:04.825');
     INSERT INTO pay_transparency.calculation_code VALUES ('1edfc34a-917a-481d-8011-2015aa1ff37b', 'PERCENT_RECEIVING_BONUS_PAY_U');
@@ -105,15 +105,15 @@ data:
     INSERT INTO pay_transparency.naics_code VALUES ('72', 'Accommodation and food services', '2024-03-24', NULL, '2024-03-24 18:34:40.366464', '2024-03-24 18:34:40.366464', 'System', 'System', '2022');
     INSERT INTO pay_transparency.naics_code VALUES ('81', 'Other services (except public administration)', '2024-03-24', NULL, '2024-03-24 18:34:40.366464', '2024-03-24 18:34:40.366464', 'System', 'System', '2022');
     INSERT INTO pay_transparency.naics_code VALUES ('91', 'Public administration', '2024-03-24', NULL, '2024-03-24 18:34:40.366464', '2024-03-24 18:34:40.366464', 'System', 'System', '2022');
-    INSERT INTO pay_transparency.pay_transparency_report VALUES ('d016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', 'We are an equal opportunity employer dedicated to fair wages for everyone.', '4492feff-99d7-4b2b-8896-12a59a75d4e1', '54', '2023-05-01', '2024-04-30', '2024-04-19 21:46:53.876', '2024-05-08 15:54:16.494', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', 56, NULL, true, 2024, NULL);
-    INSERT INTO pay_transparency.pay_transparency_report VALUES ('0f62f233-3bcf-4966-ae50-bb0bfb185b97', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', NULL, '4492feff-99d7-4b2b-8896-12a59a75d4e1', '41', '2023-05-01', '2024-04-30', '2024-05-13 17:42:26.776', '2024-05-13 17:42:26.776', 'fin-pay-transparency', 'fin-pay-transparency', 'Draft', 2, NULL, true, 2024, NULL);
-    INSERT INTO pay_transparency.pay_transparency_report VALUES ('04ec2e11-0eab-45d6-87c0-47a80f3c85b2', '7ea611ba-e0fd-4dc2-ad94-71da210eb26a', 'b424d365-873c-4f48-b64d-242c825bb599', 'We are an equal opportunity employer dedicated to fair wages for everyone.', '4492feff-99d7-4b2b-8896-12a59a75d4e1', '54', '2023-05-01', '2024-04-30', '2024-04-19 21:46:53.876', '2024-05-08 15:54:16.494', 'b424d365-873c-4f48-b64d-242c825bb599', 'b424d365-873c-4f48-b64d-242c825bb599', 'Published', 56, NULL, true, 2024, NULL);
-    INSERT INTO pay_transparency.pay_transparency_report VALUES ('4ccdeebc-dc97-44a0-80af-cf85f42381bd', '7ea611ba-e0fd-4dc2-ad94-71da210eb26a', 'b424d365-873c-4f48-b64d-242c825bb599', NULL, '4492feff-99d7-4b2b-8896-12a59a75d4e1', '41', '2023-05-01', '2024-04-30', '2024-05-13 17:42:26.776', '2024-05-13 17:42:26.776', 'b424d365-873c-4f48-b64d-242c825bb599', 'b424d365-873c-4f48-b64d-242c825bb599', 'Draft', 2, NULL, true, 2024, NULL);
-    INSERT INTO pay_transparency.report_history VALUES ('aecdce39-92bd-45f4-a6eb-0aea9cb8d1ac', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-04-19 21:46:53.876', '2024-04-19 21:46:53.876', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 1, true, 2024, NULL);
-    INSERT INTO pay_transparency.report_history VALUES ('caeec275-de1a-4e00-ad62-985674586045', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-04-19 21:46:53.876', '2024-04-19 21:47:47.576', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 2, true, 2024, NULL);
-    INSERT INTO pay_transparency.report_history VALUES ('f6169826-950f-45c0-a5fd-d9e54df8d52d', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-04-19 21:46:53.876', '2024-04-19 21:47:47.576', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 3, true, 2024, NULL);
-    INSERT INTO pay_transparency.report_history VALUES ('c87686b9-a073-4986-a15c-983ea8e38b4d', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-04-19 21:46:53.876', '2024-04-19 21:53:57.609', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 4, true, 2024, NULL);
-    INSERT INTO pay_transparency.report_history VALUES ('eadae2c3-7313-42dd-943b-39b649ce08f4', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', 'We are an equal opportunity employer dedicated to fair wages for everyone. ', '2023-04-01', '2024-03-31', '2024-04-19 21:46:53.876', '2024-04-22 17:10:17.766', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '21', NULL, 5, true, 2024, NULL);
+    INSERT INTO pay_transparency.pay_transparency_report VALUES ('d016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', 'We are an equal opportunity employer dedicated to fair wages for everyone.', '4492feff-99d7-4b2b-8896-12a59a75d4e1', '54', '2023-05-01', '2024-04-30', '2024-05-20 21:46:53.876', '2024-05-28 15:54:16.494', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', 6, NULL, true, 2024, NULL);
+    INSERT INTO pay_transparency.pay_transparency_report VALUES ('0f62f233-3bcf-4966-ae50-bb0bfb185b97', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', NULL, '4492feff-99d7-4b2b-8896-12a59a75d4e1', '41', '2023-05-01', '2024-04-30', '2024-05-13 17:42:26.776', '2024-05-13 17:42:26.776', 'fin-pay-transparency', 'fin-pay-transparency', 'Draft', 1, NULL, true, 2024, NULL);
+    INSERT INTO pay_transparency.pay_transparency_report VALUES ('04ec2e11-0eab-45d6-87c0-47a80f3c85b2', '7ea611ba-e0fd-4dc2-ad94-71da210eb26a', 'b424d365-873c-4f48-b64d-242c825bb599', 'We are an equal opportunity employer dedicated to fair wages for everyone.', '4492feff-99d7-4b2b-8896-12a59a75d4e1', '54', '2023-05-01', '2024-04-30', '2024-04-19 21:46:53.876', '2024-05-08 15:54:16.494', 'b424d365-873c-4f48-b64d-242c825bb599', 'b424d365-873c-4f48-b64d-242c825bb599', 'Published', 1, NULL, true, 2024, NULL);
+    INSERT INTO pay_transparency.pay_transparency_report VALUES ('4ccdeebc-dc97-44a0-80af-cf85f42381bd', '7ea611ba-e0fd-4dc2-ad94-71da210eb26a', 'b424d365-873c-4f48-b64d-242c825bb599', NULL, '4492feff-99d7-4b2b-8896-12a59a75d4e1', '41', '2023-05-01', '2024-04-30', '2024-05-13 17:42:26.776', '2024-05-13 17:42:26.776', 'b424d365-873c-4f48-b64d-242c825bb599', 'b424d365-873c-4f48-b64d-242c825bb599', 'Draft', 1, NULL, true, 2024, NULL);
+    INSERT INTO pay_transparency.report_history VALUES ('aecdce39-92bd-45f4-a6eb-0aea9cb8d1ac', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-05-20 21:46:53.876', '2024-05-21 21:46:53.876', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 1, true, 2024, NULL);
+    INSERT INTO pay_transparency.report_history VALUES ('caeec275-de1a-4e00-ad62-985674586045', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-05-20 21:46:53.876', '2024-05-22 21:47:47.576', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 2, true, 2024, NULL);
+    INSERT INTO pay_transparency.report_history VALUES ('f6169826-950f-45c0-a5fd-d9e54df8d52d', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-05-20 21:46:53.876', '2024-05-23 21:47:47.576', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 3, true, 2024, NULL);
+    INSERT INTO pay_transparency.report_history VALUES ('c87686b9-a073-4986-a15c-983ea8e38b4d', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', NULL, '2023-04-01', '2024-03-31', '2024-05-20 21:46:53.876', '2024-05-25 21:53:57.609', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '11', NULL, 4, true, 2024, NULL);
+    INSERT INTO pay_transparency.report_history VALUES ('eadae2c3-7313-42dd-943b-39b649ce08f4', 'd016105c-66df-4144-939f-cb8ef163c01e', 'c066d0df-fb18-41f5-8e27-7d5c7433648a', 'f84407a9-8bf1-42e6-99ce-4c751eee9c9a', '4492feff-99d7-4b2b-8896-12a59a75d4e1', 'We are an equal opportunity employer dedicated to fair wages for everyone. ', '2023-04-01', '2024-03-31', '2024-05-20 21:46:53.876', '2024-05-28 17:10:17.766', 'fin-pay-transparency', 'fin-pay-transparency', 'Published', '21', NULL, 5, true, 2024, NULL);
     INSERT INTO pay_transparency.pay_transparency_calculated_data VALUES ('68fc951d-865f-4827-a4b6-50ea198e0672', '0f62f233-3bcf-4966-ae50-bb0bfb185b97', '095a5b4f-40d1-47ee-a4e3-cb948099dd0c', '58.119658119658126', false, '2024-05-13 17:42:26.776', '2024-05-13 17:42:26.776', 'fin-pay-transparency', 'fin-pay-transparency');
     INSERT INTO pay_transparency.pay_transparency_calculated_data VALUES ('ff09893c-e02e-43dc-a3d2-12004b61d440', '0f62f233-3bcf-4966-ae50-bb0bfb185b97', '336090ee-e6cd-4e85-b337-6084bc70bc7a', '64.7940074906367', false, '2024-05-13 17:42:26.776', '2024-05-13 17:42:26.776', 'fin-pay-transparency', 'fin-pay-transparency');
     INSERT INTO pay_transparency.pay_transparency_calculated_data VALUES ('d15a02e2-e895-450c-a6ec-0b19da1f8024', '0f62f233-3bcf-4966-ae50-bb0bfb185b97', 'bd0d0905-2373-44fe-917f-d67271f256e3', '11.814345991561181', false, '2024-05-13 17:42:26.776', '2024-05-13 17:42:26.776', 'fin-pay-transparency', 'fin-pay-transparency');