Merge pull request #80 from TaskarCenterAtUW/stage

Stage to Prod

Author: sujata-m

requirements.txt

@@ -3,4 +3,4 @@ pydantic==1.10.16
 html_testRunner==1.2.1
 uvicorn==0.20.0
 python-ms-core==0.0.23
-gtfs-canonical-validator==0.0.6
+gtfs-canonical-validator==0.0.8

src/gtfx_flex_validator.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 from .config import Settings
 from python_ms_core import Core
+from gtfs_canonical_validator import CanonicalValidator
 from .models.file_upload_msg import FileUploadMsg
 from .gtfs_flex_validation import GTFSFlexValidation
 from python_ms_core.core.queue.models.queue_message import QueueMessage
@@ -74,7 +75,11 @@ def send_status(self, valid: bool, upload_message: FileUploadMsg, validation_mes
             'user_id': upload_message.data.user_id,
             'tdei_project_group_id': upload_message.data.tdei_project_group_id,
             'success': valid,
-            'message': validation_message
+            'message': validation_message,
+            'package': {
+                'python-ms_core': Core.__version__,
+                'gtfs-canonical-validator': CanonicalValidator.__version__
+            }
         }
         logger.info(
             f' Publishing new message with ID: {upload_message.messageId} with status: {valid} and Message: {validation_message}')

tests/unit_tests/test_gtfx_flex_validator.py

@@ -1,6 +1,8 @@
 import unittest
 from unittest.mock import MagicMock, patch, call
 from src.gtfx_flex_validator import GTFSFlexValidator
+import python_ms_core
+from gtfs_canonical_validator import CanonicalValidator
 
 
 class TestGTFSFlexValidator(unittest.TestCase):
@@ -49,7 +51,6 @@ def test_subscribe_with_valid_message(self, mock_request_message, mock_queue_mes
         # Assert
         self.validator.process_message.assert_called_once_with(mock_request_message)
 
-
     @patch('src.gtfx_flex_validator.GTFSFlexValidation')
     def test_process_message_with_valid_file_path(self, mock_gtfs_flex_validation):
         # Arrange
@@ -68,7 +69,7 @@ def test_process_message_with_valid_file_path(self, mock_gtfs_flex_validation):
         # Assert
 
         self.validator.send_status.assert_called_once_with(valid=True, upload_message=mock_request_message,
-                                                         validation_message='Validation successful')
+                                                           validation_message='Validation successful')
 
     @patch('src.gtfx_flex_validator.GTFSFlexValidation')
     def test_process_message_when_file_path_is_none_and_valid_is_false(self, mock_gtfs_flex_validation):
@@ -89,7 +90,6 @@ def test_process_message_when_file_path_is_none_and_valid_is_false(self, mock_gt
             validation_message='Validation error'
         )
 
-
     @patch('src.gtfx_flex_validator.GTFSFlexValidation')
     def test_process_message_when_exception_is_raised(self, mock_gtfs_flex_validation):
         # Arrange
@@ -117,7 +117,17 @@ def test_send_status_success(self, mock_queue_message):
         # Arrange
         mock_request_message = MagicMock()
         mock_response_topic = self.validator.core.get_topic.return_value
-        mock_data = {'messageId': '1234', 'messageType': 'test', 'data': {'success': True}}
+        mock_data = {
+            'messageId': '1234',
+            'messageType': 'test',
+            'data': {
+                'success': True,
+                     'package': {
+                         'python-ms_core': python_ms_core.__version__,
+                         'gtfs-canonical-validator': CanonicalValidator.__version__
+                     }
+            }
+        }
         mock_queue_message.data_from.return_value = mock_data
 
         # Act