Rest Gateway / Trace Retrieval: fixed communication

rest-gateway/app/configs/swagger.yml

@@ -76,9 +76,13 @@ definitions:
       TransactionFrom:
         type: "string"
         format: "uuid"
+      TransactionFromLatLng:
+        type: "string"
       TransactionTo:
         type: "string"
         format: "uuid"
+      TransactionToLatLng:
+        type: "string"
       TransferredAsset:
         type: "string"
       ResourceIds:

rest-gateway/app/main.py

@@ -21,10 +21,6 @@ from MessageList import MessageList
 
 messages = MessageList.getInstance()
 
-message_sender = MessageSender()
-message_sender.connect()
-message_sender.create_exchange('inhub', 'direct')
-
 # init message handler
 def message_received_callback(channel, method, properties, body):
     messages.appendMessage(body)

rest-gateway/app/rest/blockchain_trace.py

 from flask import request, Response
-import main
+from messaging.MessageSender import MessageSender
+import json
+# import main
+
+message_sender = MessageSender()
+message_sender.connect()
+message_sender.create_exchange('inhub', 'direct')
 
 def receive():
     body = request.json
     if isBlockchainTraceValid(body):
-        message = {'type': 'blockchain-transaction', 'content': body}
-        main.message_sender.send('inhub', message, 'trace-retrieval')
-
+        message = {'type': 'blockchain-transaction', 'content': json.dumps(body)}
+        message_sender.send('inhub', json.dumps(message), 'trace-retrieval')
         return Response(status=201)
         
+    return Response(status=400)
+
 def isBlockchainTraceValid(trace) -> bool:
     return 'TransactionId' in trace \
         and 'Timestamp' in trace \

transaction-hub-in/trace-retrieval-microservice/app/db/MongoRepository.py

 import pymongo
 
 MONGO_DB_HOST = 'trace-retrieval-db'
+# MONGO_DB_HOST = '143.205.173.36'
 MONGO_DB_PORT = '27017'
+# MONGO_DB_PORT = '30003'
 
 class MongoRepository:
     # TODO extract to docker env var

transaction-hub-in/trace-retrieval-microservice/app/messaging/MessageHandler.py

 from db.MongoRepository import MongoRepository
+import json
 
 import logging
 LOGGER = logging.getLogger(__name__)
@@ -11,12 +12,13 @@ class MessageHandler:
 
     def handle_message(self, body):
         LOGGER.info(f"Received message: {body}")
-        if not 'type' in body:
+        message = json.loads(body)
+        if not 'type' in message:
             LOGGER.warning(f"Message has no type field")
             return
         
-        if body['type'] == 'blockchain-transaction':
-            self.handle_blockchain_transaction(body['content'])
+        if message['type'] == 'blockchain-transaction':
+            self.handle_blockchain_transaction(json.loads(message['content']))
             
     def handle_blockchain_transaction(self, transaction):
         self._mongo_repo.insert_trace(transaction)