Cleaned up code

Removed unneeded files
refactored code from ingest service into blaise service
got some basic tests running (needs more work)

README.md

@@ -37,3 +37,8 @@ To give you the path to python for your virtual env run:
 ```
 echo "$(poetry env info | grep Path | awk '{print $2}')/bin/python"
 ```
+
+Run unit tests:
+```shell
+poetry run python -m pytest
+```

appconfig/config.py

@@ -6,21 +6,14 @@
 class Config:
     blaise_api_url: str
     blaise_server_park: str
-    project_id: str
-    topic_name: str
-    env: str
 
     @classmethod
     def from_env(cls):
         return cls(
             blaise_api_url=os.getenv("BLAISE_API_URL"),
             blaise_server_park=os.getenv("BLAISE_SERVER_PARK"),
-            project_id=os.getenv("PROJECT_ID"),
-            topic_name=os.getenv("TOPIC_NAME"),
-            env=os.getenv("ENV"),
         )
 
     def log(self):
-        print(f"Configuration: Project ID: {self.project_id}")
-        print(f"Configuration: Topic Name: {self.topic_name}")
-        print(f"Configuration: Env: {self.env}")
+        print(f"Configuration: Blaise API Url: {self.blaise_api_url}")
+        print(f"Configuration: Blaise Server Park: {self.blaise_server_park}")

main.py

@@ -1,7 +1,6 @@
 import logging
 
 import utils
-from services.ingest_service import IngestService
 from services.validation_service import ValidationService
 from appconfig.config import Config
 from services.blaise_service import BlaiseService
@@ -10,7 +9,6 @@
     BlaiseError,
     ConfigError,
     GuidError,
-    QuestionnaireNotFound,
     RequestError,
     UsersError,
     IngestError,
@@ -20,7 +18,7 @@
 setup_logger()
 
 
-def process_zip_file(data, context):
+def process_zip_file(data):
     try:
         logging.info("Running Cloud Function - 'ingest data'")
         validation_service = ValidationService()
@@ -34,7 +32,7 @@ def process_zip_file(data, context):
             print(f"File {file_name} is not a zip file, skipping.")
             return
 
-        print(f"Processing ZIP file: {file_name}")
+        print(f"Processing ZIP file: {file_name} from bucket {bucket_name}")
 
         # Initialize the client
         storage_client = storage.Client()
@@ -56,17 +54,19 @@ def process_zip_file(data, context):
 
         questionnaire_name = utils.get_questionnaire_name(file_name)
 
-        # Blaise Handler TODO: Get questionnaire_name from somewhere and validate it exists
+        # Blaise Handler
         validation_service.validate_questionnaire_exists(
             questionnaire_name, blaise_config
         )
 
         # Ingest Handler
         blaise_service = BlaiseService(blaise_config)
-        ingest_service = IngestService(blaise_service)
 
-        logging.info(f"Calling Ingest Service with server park: {blaise_server_park} and questionnaire name: {questionnaire_name}")
-        ingest_service.ingest(blaise_server_park, questionnaire_name)
+        logging.info(f"Calling Ingest Service with "
+                     f"server park: {blaise_server_park}, "
+                     f"questionnaire name: {questionnaire_name}, "
+                     f"file name: {file_name}")
+        blaise_service.get_ingest(blaise_server_park, questionnaire_name, file_name)
         logging.info("Finished Running Cloud Function - 'ingest data'")
 
         return f"Successfully ingested file from bucket", 200
@@ -83,3 +83,6 @@ def process_zip_file(data, context):
         error_message = f"Error occurred during Ingest: {e}"
         logging.error(error_message)
         return error_message, 500
+
+# Testing
+process_zip_file()

mypi.ini

@@ -0,0 +1,7 @@
+[mypy]
+disallow_untyped_defs = False
+namespace_packages = True
+exclude = "scripts/"
+
+[mypy-blaise_restapi.*]
+ignore_missing_imports = True