Merge pull request #48 in RMS/api-main-service from red-develop to dev

* commit '61d8ecf5':
  added code to use upload

api/utils.py

@@ -10,6 +10,7 @@ from rest_framework.pagination import PageNumberPagination
 from rest_framework.response import Response
 import datetime
 from django.db.models.functions import Lower
+import copy
 
 
 VALIDATE_TOKEN_URL = settings.VALIDATE_TOKEN_URL
@@ -46,16 +47,33 @@ class Helper:
                                        req.status_code,
                                        self._headers)
         elif request.method == 'POST':
-            data = request.data
-            json_body = json.dumps(data)
+
+            data = copy.deepcopy(request.data)
+
+            filesBody = {}
+            if not request.FILES == {}:
+                for fileKey in request.FILES.keys():
+                    filesBody[fileKey] = data[fileKey]
+                    data.pop(fileKey, None)
+
+                # Content type will be set to default
+                # as MultiPart when files header is
+                # not empty
+                headers.pop('Content-Type', None) 
+                json_body = data
+            else:
+                json_body = json.dumps(data)
+
             req = requests.post(
                 final_endpoint,
                 data=json_body,
-                headers=headers
+                headers=headers,
+                files=filesBody
             )
             return self._response_data(req.json(),
-                                       req.status_code,
-                                       self._headers)
+                                    req.status_code,
+                                    self._headers)
+
         elif request.method == 'PUT':
             data = request.data
             json_body = json.dumps(data)