@@ -47,13 +47,11 @@ def convert(cls, source_version, target_version, edxl_json):
4747 # Convert directly if version are consecutive
4848 if abs (source_version_index - target_version_index ) == 1 :
4949 if source_version_index < target_version_index :
50- logger . info ( f"Upgrading message version from { source_version } " )
51- return cls .upgrade (source_version , source_version_index , edxl_json )
50+ target_version = version_order_list [ source_version_index + 1 ]
51+ return cls .upgrade (source_version , target_version , edxl_json )
5252 else :
53- logger .info (f"Downgrading message version from { source_version } " )
54- return cls .downgrade (
55- source_version , source_version_index , edxl_json
56- )
53+ target_version = version_order_list [source_version_index - 1 ]
54+ return cls .downgrade (source_version , target_version , edxl_json )
5755
5856 # Convert message to consecutive version
5957 version_delta = 1 if source_version_index < target_version_index else - 1
@@ -76,26 +74,28 @@ def convert(cls, source_version, target_version, edxl_json):
7674 cls .raise_conversion_not_implemented_error (source_version , target_version )
7775
7876 @classmethod
79- def upgrade (cls , source_version , source_version_index , edxl_json ):
77+ def upgrade (cls , source_version , target_version , edxl_json ):
78+ logger .info (
79+ f"Upgrading message version from { source_version } to { target_version } "
80+ )
8081 if source_version == "v1" :
8182 return cls .convert_v1_to_v2 (edxl_json )
8283 elif source_version == "v2" :
8384 return cls .convert_v2_to_v3 (edxl_json )
8485 else :
85- return cls .raise_conversion_impossible_error (
86- source_version , version_order_list [source_version_index + 1 ]
87- )
86+ return cls .raise_conversion_impossible_error (source_version , target_version )
8887
8988 @classmethod
90- def downgrade (cls , source_version , source_version_index , edxl_json ):
89+ def downgrade (cls , source_version , target_version , edxl_json ):
90+ logger .info (
91+ f"Downgrading message version from { source_version } to { target_version } "
92+ )
9193 if source_version == "v2" :
9294 return cls .convert_v2_to_v1 (edxl_json )
9395 elif source_version == "v3" :
9496 return cls .convert_v3_to_v2 (edxl_json )
9597 else :
96- return cls .raise_conversion_impossible_error (
97- source_version , version_order_list [source_version_index - 1 ]
98- )
98+ return cls .raise_conversion_impossible_error (source_version , target_version )
9999
100100 @classmethod
101101 def convert_v1_to_v2 (cls , edxl_json ):
0 commit comments