Merge branch 'develop' of https://github.com/dinesh-aot/EPIC.compliance into regulatory_fix

Author: dinesh-aot

.github/workflows/api-ci.yml

@@ -46,14 +46,14 @@ jobs:
           sudo apt update
           sudo apt install libsasl2-dev libldap2-dev libssl-dev --yes
           make setup
-      - name: Lint with pylint
-        id: pylint
-        run: |
-          make pylint
       - name: Lint with flake8
         id: flake8
         run: |
           make flake8
+      - name: Lint with pylint
+        id: pylint
+        run: |
+          make pylint
 
   testing:
     needs: setup-job

compliance-api/Makefile

@@ -68,7 +68,7 @@ install-dev: ## Install local application
 ci: lint flake8 test ## CI flow
 
 pylint: ## Linting with pylint
-	. venv/bin/activate && pylint --rcfile=setup.cfg  src/$(PROJECT_NAME)
+	. venv/bin/activate && pylint --rcfile=setup.cfg --persistent=yes --jobs=4 src/$(PROJECT_NAME)
 
 flake8: ## Linting with flake8
 	. venv/bin/activate && flake8 --ignore=Q000,W503 src/$(PROJECT_NAME) tests

compliance-api/requirements/dev.txt

@@ -14,7 +14,7 @@ flake8==4.0.1
 flake8-blind-except
 flake8-debugger
 flake8-docstrings
-flake8-isort
+flake8-isort==6.1.1
 flake8-quotes
 pep8-naming
 autopep8

compliance-api/requirements/prod.txt

@@ -7,7 +7,7 @@ Flask-SQLAlchemy
 SQLAlchemy-Continuum
 flask-restx
 flask-marshmallow==1.2.1
-flask-jwt-oidc
+flask-jwt-oidc==0.7.0
 python-dotenv
 psycopg2-binary
 marshmallow-sqlalchemy==1.0.0

compliance-api/src/compliance_api/auth.py

@@ -57,7 +57,7 @@ def decorated(f):
             @wraps(f)
             def wrapper(*args, **kwargs):
                 mapped_groups = _map_permission_to_groups(permissions)
-                if jwt.contains_role(mapped_groups):
+                if jwt.contains_role(roles=mapped_groups):
                     return f(*args, **kwargs)
 
                 raise PermissionDeniedError(
@@ -72,13 +72,13 @@ def wrapper(*args, **kwargs):
     @classmethod
     def has_role(cls, role):
         """Validate the role."""
-        return jwt.validate_roles(role)
+        return jwt.validate_roles(required_roles=role)
 
     @classmethod
     def has_permission(cls, permissions):
         """Check to see if the user has right permissions."""
         mapped_groups = _map_permission_to_groups(permissions)
-        return jwt.contains_role(mapped_groups)
+        return jwt.contains_role(roles=mapped_groups)
 
 
 def _map_permission_to_groups(permissions):

compliance-api/src/compliance_api/schemas/inspection_requirement.py

@@ -16,7 +16,8 @@
 from marshmallow_enum import EnumField
 
 from compliance_api.models import (
-    InspectionReqDetailDocument, InspectionReqSourceDetail, InspectionRequirement, InspectionRequirementTypeEnum)
+    EnforcementActionOptionEnum, InspectionReqDetailDocument, InspectionReqSourceDetail, InspectionRequirement,
+    InspectionRequirementTypeEnum)
 from compliance_api.models.requirement_source import RequirementSourceEnum
 
 from .base_schema import AutoSchemaBase, BaseSchema
@@ -182,7 +183,7 @@ class InspectionRequirementCreateSchema(BaseSchema):
     )
     compliance_finding_id = fields.Int(
         metadata={"description": "The unique identifier of the compliance findings."},
-        allow_none=True
+        allow_none=True,
     )
     findings = fields.Str(
         metadata={"description": "The requirement findings in html format."},
@@ -204,6 +205,16 @@ def validate_agency_id(
                 "Agency is required if the requirement type is Regulatory Consideration",
                 field_name="agency_id",
             )
+        enforcement_action_ids = data.get("enforcement_action_ids")
+        if (
+            EnforcementActionOptionEnum.REFERRAL_TO_ANOTHER_AGENCY
+            in enforcement_action_ids
+            and not agency_id
+        ):
+            raise ValidationError(
+                "Agency is required if the enforcement actions include REFERRAL_TO_ANOTHER_AGENCY",
+                field_name="agency_id",
+            )
 
 
 class InspectionRequirementUpdateSchema(InspectionRequirementCreateSchema):

compliance-api/src/compliance_api/schemas/staff_user.py

@@ -33,9 +33,10 @@ class Meta(AutoSchemaBase.Meta):  # pylint: disable=too-few-public-methods
         include_fk = True
 
     position = fields.Nested(KeyValueSchema, dump_only=True)
-    permission = fields.Str(
-        metadata={"description": "The permission level of the user in the app"}
-    )
+    # permission = fields.Str(
+    #     metadata={"description": "The permission level of the user in the app"}
+    # )
+    permission = fields.Raw()
     name = fields.Method("get_full_name")
 
     def get_full_name(self, obj):  # pylint: disable=no-self-use
@@ -52,7 +53,11 @@ def nullify_nested(
         if data.get("supervisor_id") is None:
             data["supervisor"] = None
         if data.get("permission") in [p.name for p in PermissionEnum]:
-            data["permission"] = getattr(PermissionEnum, data.get("permission")).name
+            # data["permission"] = getattr(PermissionEnum, data.get("permission")).value
+            data["permission"] = {
+                "id": getattr(PermissionEnum, data.get("permission")).name,
+                "name": getattr(PermissionEnum, data.get("permission")).value
+            }
         return data
 
 

compliance-api/src/compliance_api/services/staff_user.py

@@ -109,7 +109,7 @@ def _create_staff_user_object(user_data: dict, auth_user: dict):
         "deputy_director_id": user_data.get("deputy_director_id"),
         "supervisor_id": user_data.get("supervisor_id", None),
         "auth_user_guid": auth_user.get("username", None),
-        "is_active": auth_user.get("is_active")
+        "is_active": auth_user.get("is_active"),
     }
 
 
@@ -129,7 +129,11 @@ def _set_permission_level_in_compliance_user_obj(
     """Set the permission level in compliance user."""
     if auth_user and auth_user.get("groups", None):
         sorted_groups = sorted(auth_user.get("groups", None), key=_get_level)
-        if sorted_groups[-1] and sorted_groups[-1]["name"]:
+        if (
+            sorted_groups[-1]
+            and sorted_groups[-1]["name"]
+            and sorted_groups[-1]["name"] in [p.name for p in PermissionEnum]
+        ):
             setattr(compliance_user, "permission", sorted_groups[-1]["name"])
     return compliance_user
 

compliance-api/tests/integration/api/test_staff_user.py

@@ -68,7 +68,7 @@ def test_create_staff_user_mandatory(
     print(result.json)
     assert result.status_code == HTTPStatus.CREATED
     assert result.json["auth_user_guid"] == staff_user_data["auth_user_guid"]
-    assert result.json["permission"] == "VIEWER"
+    assert result.json["permission"]["id"] == "VIEWER"
     assert result.json["position_id"] == staff_user_data["position_id"]
     assert result.json["first_name"] == firstname
     assert result.json["last_name"] == lastname
@@ -109,7 +109,7 @@ def test_create_staff_user_all_fields(
 
     assert result.status_code == HTTPStatus.CREATED
     assert result.json["auth_user_guid"] == staff_user_data["auth_user_guid"]
-    assert result.json["permission"] == "USER"
+    assert result.json["permission"]["id"] == "USER"
     assert result.json["position_id"] == staff_user_data["position_id"]
     assert result.json["deputy_director_id"] == staff_user_data["deputy_director_id"]
     assert result.json["supervisor_id"] == staff_user_data["supervisor_id"]
@@ -188,7 +188,7 @@ def test_get_users(mock_auth_service, mocker, client, auth_header_super_user):
     )
     print(filtered_user)
     assert filtered_user is not None
-    assert filtered_user.get("permission", None) == "USER"
+    assert filtered_user.get("permission", {}).get("id", None) == "USER"
     assert result.status_code == HTTPStatus.OK
 
 

compliance-web/src/components/App/CaseFiles/Profile/CaseFileGeneralInformation.tsx

@@ -1,11 +1,11 @@
+import FileProfileProperty from "@/components/App/FileProfileProperty";
+import { CaseFile } from "@/models/CaseFile";
+import { formatAuthorization } from "@/utils/appUtils";
 import dateUtils from "@/utils/dateUtils";
 import { EditRounded } from "@mui/icons-material";
 import { Box, Button, Stack, Typography } from "@mui/material";
-import FileProfileProperty from "@/components/App/FileProfileProperty";
-import { CaseFile } from "@/models/CaseFile";
-import CaseFileInspectionsTable from "./CaseFileInspectionsTable";
 import CaseFileComplaintsTable from "./CaseFileComplaintsTable";
-import { formatAuthorization } from "@/utils/appUtils";
+import CaseFileInspectionsTable from "./CaseFileInspectionsTable";
 
 interface CaseFileGeneralInformationProps {
   caseFileData: CaseFile;
@@ -47,7 +47,7 @@ const CaseFileGeneralInformation: React.FC<CaseFileGeneralInformationProps> = ({
             size="small"
           />
           <FileProfileProperty
-            propertyName="Certificate Holder"
+            propertyName="Regulated Party"
             propertyValue={caseFileData.regulated_party}
             size="small"
           />