Adding additional error handling to upload_files_to_microservice func…

…tion

server/oceandbs/apps.py

@@ -5,7 +5,6 @@ class OceandbsConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'oceandbs'
 
-    print(f"AppConfig: {AppConfig}")
     def ready(self):
       from . import tasks
       tasks.start()

server/oceandbs/utils.py

@@ -12,6 +12,7 @@
 from web3 import Web3
 from web3.middleware import geth_poa_middleware
 from eth_account.messages import encode_defunct
+from requests.exceptions import RequestException
 
 from .models import File
 
@@ -93,23 +94,39 @@ def create_allowance(quote, user_private_key, abi):
         print(f"Unexpected error: {e}")
         return Response(f"Unexpected error: {e}", status=500)
 
+    print(f"Transaction completed successfully")
     return Response("Transaction completed successfully.", status=200)
 
+
 # This function is used to upload the files to the target microservice
 def upload_files_to_microservice(quote, params, files_reference):
+
+    # Initial data validations
+    if not quote or not hasattr(quote, 'storage') or not hasattr(quote.storage, 'url') or not hasattr(quote, 'quoteId'):
+        raise ValueError("Invalid quote object provided.")
+
+    if not params or 'nonce' not in params or 'signature' not in params:
+        raise ValueError("Invalid params provided.")
+
     data = {
         "quoteId": quote.quoteId,
         "nonce": params['nonce'][0],
         "signature": params['signature'][0],
         "files": files_reference
     }
 
-    response = requests.post(
-        quote.storage.url + 'upload/?quoteId=' +
-        str(quote.quoteId) + '&nonce=' +
-        data['nonce'] + '&signature=' + data['signature'],
-        data
-    )
+    url = quote.storage.url + 'upload/?quoteId=' + str(quote.quoteId) + '&nonce=' + data['nonce'] + '&signature=' + data['signature']
+
+    try:
+        print(f"Sending request to microservice url: {url}")
+        response = requests.post(url, data)
+        response.raise_for_status()  # This will raise an HTTPError if the HTTP request returned an unsuccessful status code
+    except RequestException as e:
+    # Extract more detailed message from the response content, if available
+        detailed_message = e.response.text if hasattr(e, 'response') and hasattr(e.response, 'text') else "No detailed message provided."
+        raise RuntimeError(f"Error occurred while making the request: {str(e)}. Detailed message: {detailed_message}")
+    except Exception as e:  # Catches any unforeseen exceptions
+        raise RuntimeError(f"Unexpected error occurred: {str(e)}")
 
     return response
 

server/oceandbs/views.py

@@ -458,20 +458,24 @@ def post(self, request, format="multipart"):
             return Response(f"Error uploading to micro-service: {str(e)}", status=500)
 
         if (response.status_code == 200):
+            print("File upload to microservice succeeded.")
             quote.status = UPLOAD_CODE[5][0]
             try:
                 quote.save()
             except Exception as e:
                 return Response(f"Error saving quote after successful upload: {str(e)}", status=500)
             return Response("File upload succeeded.", status=200)
+
+        else:
+            print(f"Microservice upload failed with status code: {response.status_code}. Error message: {response.content}")
+            quote.status = UPLOAD_CODE[6][0]
+            try:
+                quote.save()
+            except Exception as e:
+                return Response(f"Error updating quote status after failed upload: {str(e)}", status=500)
+
+            return Response(f"Microservice upload failed with status code: {response.status_code}", status=401)
 
-        quote.status = UPLOAD_CODE[6][0]
-        try:
-            quote.save()
-        except Exception as e:
-            return Response(f"Error updating quote status after failed upload: {str(e)}", status=500)
-
-        return Response(f"Microservice upload failed with status code: {response.status_code}", status=401)
 
 
 class QuoteLink(APIView):