Add additional permissions for DPS in non-prod. Add RAVS ODS code. (#747)

* Add additional permissions for DPS in non-prod. Add RAVS ODS code.

* Remove test which was asserting on the value of non-test data.

Author: mfjarvis

config/dev/permissions_config.json

@@ -1,12 +1,28 @@
 [
   {
     "supplier": "DPSFULL",
-    "permissions": ["COVID19.CRUDS", "FLU.CRUDS", "MMR.CRUDS", "RSV.CRUDS"],
+    "permissions": [
+      "COVID19.CRUDS",
+      "FLU.CRUDS",
+      "MMR.CRUDS",
+      "RSV.CRUDS",
+      "HPV.CRUDS",
+      "MENACWY.CRUDS",
+      "3IN1.CRUDS"
+    ],
     "ods_codes": ["DPSFULL"]
   },
   {
     "supplier": "DPSREDUCED",
-    "permissions": ["COVID19.CRUD", "FLU.CRUD", "MMR.CRUD", "RSV.CRUD"],
+    "permissions": [
+      "COVID19.CRUDS",
+      "FLU.CRUDS",
+      "MMR.CRUDS",
+      "RSV.CRUDS",
+      "HPV.CRUDS",
+      "MENACWY.CRUDS",
+      "3IN1.CRUDS"
+    ],
     "ods_codes": ["DPSREDUCED"]
   },
   {
@@ -33,11 +49,7 @@
   {
     "supplier": "RAVS",
     "permissions": ["RSV.CRUDS", "MMR.CRUDS"],
-    "ods_codes": ["X26"]
-  },
-  {
-    "supplier": "AGEM-RAVS-Integration",
-    "permissions": ["RSV.CRUDS", "MMR.CRUDS"]
+    "ods_codes": ["X26", "X8E5B"]
   },
   {
     "supplier": "EMIS",
@@ -125,7 +137,6 @@
       "RSV.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
-      "PERTUSSIS.CRUDS",
       "3IN1.CRUDS"
     ]
   },
@@ -138,16 +149,7 @@
       "RSV.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
-      "PERTUSSIS.CRUDS",
       "3IN1.CRUDS"
     ]
-  },
-  {
-    "supplier": "EVA",
-    "ods_codes": ["8HA94"]
-  },
-  {
-    "supplier": "SONAR",
-    "ods_codes": ["8HK48"]
   }
 ]

config/preprod/permissions_config.json

@@ -1,12 +1,28 @@
 [
   {
     "supplier": "DPSFULL",
-    "permissions": ["COVID19.CRUDS", "FLU.CRUDS", "MMR.CRUDS", "RSV.CRUDS"],
+    "permissions": [
+      "COVID19.CRUDS",
+      "FLU.CRUDS",
+      "MMR.CRUDS",
+      "RSV.CRUDS",
+      "HPV.CRUDS",
+      "MENACWY.CRUDS",
+      "3IN1.CRUDS"
+    ],
     "ods_codes": ["DPSFULL"]
   },
   {
     "supplier": "DPSREDUCED",
-    "permissions": ["COVID19.CRUDS", "FLU.CRUDS", "MMR.CRUDS", "RSV.CRUDS"],
+    "permissions": [
+      "COVID19.CRUDS",
+      "FLU.CRUDS",
+      "MMR.CRUDS",
+      "RSV.CRUDS",
+      "HPV.CRUDS",
+      "MENACWY.CRUDS",
+      "3IN1.CRUDS"
+    ],
     "ods_codes": ["DPSREDUCED"]
   },
   {
@@ -23,11 +39,7 @@
   {
     "supplier": "RAVS",
     "permissions": ["RSV.CRUDS", "MMR.CRUDS"],
-    "ods_codes": ["X26"]
-  },
-  {
-    "supplier": "AGEM-RAVS-Integration",
-    "permissions": ["RSV.CRUDS", "MMR.CRUDS"]
+    "ods_codes": ["X26", "X8E5B"]
   },
   {
     "supplier": "EMIS",
@@ -71,7 +83,6 @@
       "RSV.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
-      "PERTUSSIS.CRUDS",
       "3IN1.CRUDS"
     ]
   },
@@ -84,7 +95,6 @@
       "RSV.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
-      "PERTUSSIS.CRUDS",
       "3IN1.CRUDS"
     ]
   },

config/prod/permissions_config.json

@@ -16,7 +16,7 @@
   {
     "supplier": "RAVS",
     "permissions": ["RSV.RS"],
-    "ods_codes": ["X26"]
+    "ods_codes": ["X26", "X8E5B"]
   },
   {
     "supplier": "PINNACLE",

redis_sync/tests/test_transform_config.py

@@ -43,33 +43,6 @@ def test_ods_code_to_supplier(self):
         result = transform_supplier_permissions(self.supplier_data)
         self.assertEqual(result["ods_code_to_supplier"], expected)
 
-    def test_dev_ods_code_to_supplier_dev(self):
-        self.ods_code_to_supplier_file_tester("dev")
-
-    def test_dev_ods_code_to_supplier_preprod(self):
-        self.ods_code_to_supplier_file_tester("preprod")
-
-    def test_dev_ods_code_to_supplier_prod(self):
-        self.ods_code_to_supplier_file_tester("prod")
-
-    def ods_code_to_supplier_file_tester(self, env):
-        with open("./tests/test_data/expected_ods_code_to_supplier.json") as expected_file:
-            expected = json.load(expected_file)
-            file_path = f"../config/{env}/permissions_config.json"
-
-            with open(file_path) as f:
-                supplier_data = json.load(f)
-                result = transform_supplier_permissions(supplier_data)
-                result_data = result["ods_code_to_supplier"]
-                if result_data != expected:
-                    # loop through all keys and values to find the mismatch
-                    for key in result_data:
-                        if key not in expected:
-                            print(f"Key: {key} not found")
-                        elif result_data[key] != expected[key]:
-                            print(f"Key: {key}, Result: {result_data[key]}, Expected: {expected[key]}")
-                    self.assertEqual(result_data, expected)
-
     def test_empty_input(self):
         result = transform_supplier_permissions([])
         self.assertEqual(result, {