made required in src and refactoring for test now

Author: Akol125

filenameprocessor/poetry.lock

@@ -7,7 +7,7 @@ authors = ["Your Name <[email protected]>"]
 packages = [{ include = "src" }]
 
 [tool.poetry.dependencies]
-python = "~3.10"
+python = "~3.11"
 "fhir.resources" = "~7.0.2"
 boto3 = "~1.38.42"
 boto3-stubs-lite = { extras = ["dynamodb"], version = "~1.38.42" }

filenameprocessor/pyproject.toml

@@ -19,8 +19,17 @@
 
 dynamodb_resource = boto3_resource("dynamodb", region_name=REGION_NAME)
 
-# Redis Client
-redis_client = redis.StrictRedis(host=os.getenv("REDIS_HOST"), port=os.getenv("REDIS_PORT"), decode_responses=True)
+
+REDIS_HOST = os.getenv("REDIS_HOST", "")
+REDIS_PORT = int(os.getenv("REDIS_PORT", 6379))
+
+
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
+logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
+
+redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
+
 
 # Logger
 logging.basicConfig(level="INFO")

filenameprocessor/src/clients.py

@@ -57,7 +57,10 @@ class Constants:
     # NOTE: Any ODS code not found in this dictionary's keys is invalid for this service
     ODS_TO_SUPPLIER_MAPPINGS = {
         "YGM41": "EMIS",
+
         "8J1100001": "PINNACLE",
+        "V0V8L":"MAVIS",
+        "X8E5B":"RAVS",
         "8HK48": "SONAR",
         "YGA": "TPP",
         "0DE": "AGEM-NIVS",

filenameprocessor/src/constants.py

@@ -3,7 +3,7 @@
 from re import match
 from datetime import datetime
 from constants import Constants
-from elasticache import get_valid_vaccine_types_from_cache
+from vaccine_types import get_valid_vaccine_types_from_cache
 from utils_for_filenameprocessor import identify_supplier
 from errors import InvalidFileKeyError
 

filenameprocessor/src/elasticache.py

@@ -14,7 +14,6 @@
 from make_and_upload_ack_file import make_and_upload_the_ack_file
 from audit_table import upsert_audit_table, get_next_queued_file_details, ensure_file_is_not_a_duplicate
 from clients import logger
-from elasticache import upload_to_elasticache
 from logging_decorator import logging_decorator
 from supplier_permissions import validate_vaccine_type_permissions
 from errors import (
@@ -140,23 +139,12 @@ def handle_record(record) -> dict:
                 "supplier": supplier
             }
 
-    elif "config" in bucket_name:
-        try:
-            upload_to_elasticache(file_key, bucket_name)
-            logger.info("%s content successfully uploaded to cache", file_key)
-            message = "File content successfully uploaded to cache"
-            return {"statusCode": 200, "message": message, "file_key": file_key}
-        except Exception as error:  # pylint: disable=broad-except
-            logger.error("Error uploading to cache for file '%s': %s", file_key, error)
-            message = "Failed to upload file content to cache"
-            return {"statusCode": 500, "message": message, "file_key": file_key, "error": str(error)}
-
     else:
         try:
             vaccine_type, supplier = validate_file_key(file_key)
             logger.error("Unable to process file %s due to unexpected bucket name %s", file_key, bucket_name)
             message = f"Failed to process file due to unexpected bucket name {bucket_name}"
-
+            print(f"vaccine_type {vaccine_type}, supplier {supplier}")
             return {"statusCode": 500, "message": message, "file_key": file_key,
                     "vaccine_type": vaccine_type, "supplier": supplier}
 

filenameprocessor/src/file_key_validation.py

@@ -0,0 +1,32 @@
+"""Functions for fetching supplier permissions"""
+
+from clients import logger, redis_client
+import json
+from errors import VaccineTypePermissionsError
+
+
+def get_supplier_permissions(supplier: str) -> list[str]:
+    """
+    Returns the permissions for the given supplier.
+    Defaults return value is an empty list, including when the supplier has no permissions.
+    """
+     
+    permissions_data = redis_client.hget("supplier_permissions", supplier)
+    if not permissions_data:
+        return []
+    return json.loads(permissions_data)
+
+def validate_vaccine_type_permissions(vaccine_type: str, supplier: str) -> list:
+    """
+    Returns the list of permissions for the given supplier.
+    Raises an exception if the supplier does not have at least one permission for the vaccine type.
+    """
+    supplier_permissions = get_supplier_permissions(supplier)
+
+    # Validate that supplier has at least one permissions for the vaccine type
+    if not any(permission.split(".")[0] == vaccine_type for permission in supplier_permissions):
+        error_message = f"Initial file validation failed: {supplier} does not have permissions for {vaccine_type}"
+        logger.error(error_message)
+        raise VaccineTypePermissionsError(error_message)
+
+    return supplier_permissions

filenameprocessor/src/file_name_processor.py

@@ -1,17 +1,26 @@
 """Functions for fetching supplier permissions"""
 
-from clients import logger
+from clients import logger, redis_client
+import json
+from constants import PERMISSIONS_CONFIG_FILE_KEY, VACCINE_TYPE_TO_DISEASES_HASH_KEY
 from errors import VaccineTypePermissionsError
 from elasticache import get_permissions_config_json_from_cache
 
 
-def get_supplier_permissions(supplier: str) -> list:
+def get_supplier_permissions(supplier: str) -> list[str]:
     """
     Returns the permissions for the given supplier.
     Defaults return value is an empty list, including when the supplier has no permissions.
     """
-    permissions_config = get_permissions_config_json_from_cache()
-    return permissions_config.get("all_permissions", {}).get(supplier, [])
+     
+    permissions_data = redis_client.hget(PERMISSIONS_CONFIG_FILE_KEY, supplier)
+    if not permissions_data:
+        return []
+    return json.loads(permissions_data)
+
+def get_permissions_config_json_from_cache() -> dict:
+    """Gets and returns the permissions config file content from ElastiCache (Redis)."""
+    return json.loads(redis_client.get(PERMISSIONS_CONFIG_FILE_KEY))
 
 
 def validate_vaccine_type_permissions(vaccine_type: str, supplier: str) -> list:
@@ -22,7 +31,7 @@ def validate_vaccine_type_permissions(vaccine_type: str, supplier: str) -> list:
     supplier_permissions = get_supplier_permissions(supplier)
 
     # Validate that supplier has at least one permissions for the vaccine type
-    if not any(vaccine_type in permission for permission in supplier_permissions):
+    if not any(permission.split(".")[0] == vaccine_type for permission in supplier_permissions):
         error_message = f"Initial file validation failed: {supplier} does not have permissions for {vaccine_type}"
         logger.error(error_message)
         raise VaccineTypePermissionsError(error_message)

filenameprocessor/src/supplier_permissions copy.py

@@ -0,0 +1,6 @@
+import json
+from clients import redis_client
+from constants import VACCINE_TYPE_TO_DISEASES_HASH_KEY
+
+def get_valid_vaccine_types_from_cache() -> list[str]:
+    return redis_client.hkeys(VACCINE_TYPE_TO_DISEASES_HASH_KEY)