Merge pull request #231 from sanger/fix-issues-with-reading

Fixing issues with reader schema versions

Author: dasunpubudumal

lab_share_lib/processing/rabbit_message.py

@@ -39,7 +39,7 @@ def decode(self, possible_encoders: List[AvroEncoderBase], reader_schema_version
             try:
                 LOGGER.debug(f"Attempting to decode message with encoder class '{type(encoder).__name__}'.")
                 self._decoded_list = list(
-                    encoder.decode(self.encoded_body, self.writer_schema_version, reader_schema_version)
+                    encoder.decode(self.encoded_body, reader_schema_version, self.writer_schema_version)
                 )
                 if encoder.encoder_type == ENCODER_TYPE_BINARY:
                     MESSAGE_LOGGER.info(f"Decoded binary message body:\n{self._decoded_list}")

tests/processing/test_rabbit_message.py

@@ -52,7 +52,7 @@ def test_schema_version_extracts_the_header_correctly(subject):
 def test_decode_populates_decoded_list(subject, valid_decoder):
     subject.decode([valid_decoder], "1")
 
-    valid_decoder.decode.assert_called_once_with(ENCODED_BODY, HEADERS[RABBITMQ_HEADER_KEY_VERSION], "1")
+    valid_decoder.decode.assert_called_once_with(ENCODED_BODY, "1", HEADERS[RABBITMQ_HEADER_KEY_VERSION])
     assert subject._decoded_list == DECODED_LIST
 
 
@@ -71,8 +71,8 @@ def test_decode_returns_the_successful_second_decoder(subject, error_decoder, va
 def test_decode_successfully_decodes_if_second_decoder_works(subject, error_decoder, valid_decoder):
     subject.decode([error_decoder, valid_decoder], "1")
 
-    error_decoder.decode.assert_called_once_with(ENCODED_BODY, HEADERS[RABBITMQ_HEADER_KEY_VERSION], "1")
-    valid_decoder.decode.assert_called_once_with(ENCODED_BODY, HEADERS[RABBITMQ_HEADER_KEY_VERSION], "1")
+    error_decoder.decode.assert_called_once_with(ENCODED_BODY, "1", HEADERS[RABBITMQ_HEADER_KEY_VERSION])
+    valid_decoder.decode.assert_called_once_with(ENCODED_BODY, "1", HEADERS[RABBITMQ_HEADER_KEY_VERSION])
     assert subject._decoded_list == DECODED_LIST
 
 

tests/rabbit/test_avro_encoder.py

@@ -137,7 +137,7 @@ def json_writer(string_writer, schema, record_list):
     def test_decode_decodes_the_message(self, json_subject, fastavro, schema_version):
         fastavro.json_reader.return_value = SCHEMA_DICT
 
-        result = json_subject.decode(MESSAGE_BODY.encode(), schema_version, "1")
+        result = json_subject.decode(MESSAGE_BODY.encode(), "1", schema_version)
 
         fastavro.json_reader.assert_called_once_with(ANY, fastavro.parse_schema.return_value)
         string_reader = fastavro.json_reader.call_args.args[0]
@@ -150,7 +150,7 @@ def test_both_encode_and_decode_actions_work_together(self, json_subject, schema
         records = [MESSAGE_BODY]
 
         message = json_subject.encode(records, schema_version)
-        result = json_subject.decode(message.body, schema_version, "1")
+        result = json_subject.decode(message.body, "1", schema_version)
 
         assert list(result) == records
 
@@ -179,7 +179,7 @@ def test_encode_encodes_the_message(self, binary_file_subject, schema_version):
     def test_decode_decodes_the_message(self, binary_file_subject, schema_version, file):
         records = [MESSAGE_BODY]
 
-        result = binary_file_subject.decode(file, schema_version, "1")
+        result = binary_file_subject.decode(file, "1", schema_version)
 
         assert list(result) == records
 
@@ -188,7 +188,7 @@ def test_both_encode_and_decode_actions_work_together(self, binary_file_subject,
         records = [MESSAGE_BODY]
 
         message = binary_file_subject.encode(records, schema_version)
-        result = binary_file_subject.decode(message.body, schema_version, "1")
+        result = binary_file_subject.decode(message.body, "1", schema_version)
 
         assert list(result) == records
 
@@ -224,7 +224,7 @@ def test_encode_single_object_encodes_the_message(self, binary_message_subject,
     def test_decode_decodes_the_message(self, binary_message_subject, schema_version, message):
         records = [MESSAGE_BODY]
 
-        result = binary_message_subject.decode(message, schema_version, "1")
+        result = binary_message_subject.decode(message, "1", schema_version)
 
         assert result == records
 
@@ -233,7 +233,7 @@ def test_both_encode_and_decode_actions_work_together(self, binary_message_subje
         records = [MESSAGE_BODY]
 
         message = binary_message_subject.encode(records, schema_version)
-        result = binary_message_subject.decode(message.body, schema_version, "1")
+        result = binary_message_subject.decode(message.body, "1", schema_version)
 
         assert result == records
 
@@ -242,7 +242,7 @@ def test_both_encode_single_object_and_decode_actions_work_together(self, binary
         records = [MESSAGE_BODY]
 
         message = binary_message_subject.encode_single_object(records[0], schema_version)
-        result = binary_message_subject.decode(message.body, schema_version, "1")
+        result = binary_message_subject.decode(message.body, "1", schema_version)
 
         assert result == records