refactor(Methods): change Methods methods names

Author: Nigma-Ks

backend/launch_service/app_setup.py

@@ -37,10 +37,8 @@ def build_container():
 
 def update_frontend_selection_options(dataset_file, selection_options_file):
     print("Updating frontend selection options...")
-    selection_tree = Methods.parse_dataset_file_for_front_selection(dataset_file)
-    Methods.write_selection_dataset_to_front_file(
-        selection_tree, selection_options_file
-    )
+    selection_tree = Methods.build_selection_tree_from_dataset(dataset_file)
+    Methods.save_selection_to_frontend_file(selection_tree, selection_options_file)
 
 
 if __name__ == "__main__":

backend/main.py

@@ -7,9 +7,7 @@
 from backend.utils.methods_handler import Methods
 from backend.utils.task import process_and_cleanup_task
 
-DATASET_DLLS_AND_METHODS = (
-    Methods.get_dlls_with_all_methods_dict_from_front_options_file(METHODS_TS_FILE)
-)
+DATASET_DLLS_AND_METHODS = Methods.parse_frontend_file_to_dll_methods(METHODS_TS_FILE)
 
 app = FastAPI()
 

backend/utils/data_uploader.py

@@ -15,7 +15,7 @@ def handle_upload(
     methods: str,
     dataset_dll_and_methods: defaultdict,
 ) -> None:
-    launch_methods = Methods.get_launch_info_list_from_selected(
+    launch_methods = Methods.expand_selected_items_to_methods(
         dataset_dll_and_methods, json.loads(methods)
     )
 

backend/utils/methods_handler.py

@@ -4,15 +4,15 @@
 
 class Methods:
     @staticmethod
-    def write_selection_dataset_to_front_file(
+    def save_selection_to_frontend_file(
         selection_dataset, front_selection_resource_path
     ):
         with open(front_selection_resource_path, "w") as f:
             f.write("export const METHODS = ")
             json.dump(selection_dataset, f, indent=4)
 
     @staticmethod
-    def get_dlls_with_all_methods_dict_from_front_options_file(
+    def parse_frontend_file_to_dll_methods(
         front_selection_resource_path,
     ):
         with open(front_selection_resource_path, "r") as f:
@@ -30,7 +30,7 @@ def get_dlls_with_all_methods_dict_from_front_options_file(
         return dll_methods
 
     @staticmethod
-    def parse_dataset_file_for_front_selection(data_filepath):
+    def build_selection_tree_from_dataset(data_filepath):
         with open(data_filepath, "r") as f:
             data = json.load(f)
 
@@ -54,7 +54,7 @@ def parse_dataset_file_for_front_selection(data_filepath):
         return dataset_tree
 
     @staticmethod
-    def get_launch_info_list_from_selected(dll_methods: defaultdict, selected):
+    def expand_selected_items_to_methods(dll_methods: defaultdict, selected):
         launch_info_methods = []
         for item in selected:
             if item in dll_methods.keys():

backend/utils/tests/test_methods_handler.py

@@ -12,24 +12,24 @@ def test_write_selection_dataset_to_front_file():
     ]
 
     with NamedTemporaryFile(mode="w+", suffix=".js") as temp_file:
-        Methods.write_selection_dataset_to_front_file(test_data, temp_file.name)
+        Methods.save_selection_to_frontend_file(test_data, temp_file.name)
 
         temp_file.seek(0)
         content = temp_file.read()
 
         assert content.startswith("export const METHODS = ")
-        json_str = content[len("export const METHODS = ") :]
+        json_str = content[len("export const METHODS = "):]
         written_data = json.loads(json_str)
         assert written_data == test_data
 
 
 def test_write_selection_dataset_to_front_file_empty():
     with NamedTemporaryFile(mode="w+", suffix=".js") as temp_file:
-        Methods.write_selection_dataset_to_front_file([], temp_file.name)
+        Methods.save_selection_to_frontend_file([], temp_file.name)
 
         temp_file.seek(0)
         content = temp_file.read()
-        json_str = content[len("export const METHODS = ") :]
+        json_str = content[len("export const METHODS = "):]
         assert json.loads(json_str) == []
 
 
@@ -51,11 +51,9 @@ def test_get_dlls_with_all_methods_dict_from_front_options_file():
     ]
 
     with NamedTemporaryFile(mode="w+", suffix=".js") as temp_file:
-        Methods.write_selection_dataset_to_front_file(test_data, temp_file.name)
+        Methods.save_selection_to_frontend_file(test_data, temp_file.name)
 
-        result = Methods.get_dlls_with_all_methods_dict_from_front_options_file(
-            temp_file.name
-        )
+        result = Methods.parse_frontend_file_to_dll_methods(temp_file.name)
 
         expected = defaultdict(
             list,
@@ -70,11 +68,9 @@ def test_get_dlls_with_all_methods_dict_from_front_options_file():
 
 def test_get_dlls_with_all_methods_dict_empty_file():
     with NamedTemporaryFile(mode="w+", suffix=".js") as temp_file:
-        Methods.write_selection_dataset_to_front_file([], temp_file.name)
+        Methods.save_selection_to_frontend_file([], temp_file.name)
 
-        result = Methods.get_dlls_with_all_methods_dict_from_front_options_file(
-            temp_file.name
-        )
+        result = Methods.parse_frontend_file_to_dll_methods(temp_file.name)
 
         assert dict(result) == {}
 
@@ -90,7 +86,7 @@ def test_parse_dataset_file_for_front_selection():
         json.dump(test_data, temp_file)
         temp_file.flush()
 
-        result = Methods.parse_dataset_file_for_front_selection(temp_file.name)
+        result = Methods.build_selection_tree_from_dataset(temp_file.name)
 
         assert len(result) == 2
 
@@ -115,7 +111,7 @@ def test_parse_dataset_file_duplicate_methods():
         json.dump(test_data, temp_file)
         temp_file.flush()
 
-        result = Methods.parse_dataset_file_for_front_selection(temp_file.name)
+        result = Methods.build_selection_tree_from_dataset(temp_file.name)
 
         assert len(result[0]["children"]) == 1
 
@@ -131,7 +127,7 @@ def test_get_launch_info_list_from_selected():
 
     selected = ["Assembly1.dll", "Assembly2.dll,Method3", "Assembly2.dll,Method4"]
 
-    result = Methods.get_launch_info_list_from_selected(dll_methods, selected)
+    result = Methods.expand_selected_items_to_methods(dll_methods, selected)
 
     expected = [
         "Assembly1.dll,Method1",
@@ -150,15 +146,15 @@ def test_get_launch_info_list_from_selected_no_dlls():
         "Assembly3.dll,Method3",
     ]
 
-    result = Methods.get_launch_info_list_from_selected(dll_methods, selected)
+    result = Methods.expand_selected_items_to_methods(dll_methods, selected)
 
     assert result == selected
 
 
 def test_get_launch_info_list_from_selected_empty():
     dll_methods = defaultdict(list, {"Assembly1.dll": ["Method1"]})
 
-    result = Methods.get_launch_info_list_from_selected(dll_methods, [])
+    result = Methods.expand_selected_items_to_methods(dll_methods, [])
 
     assert result == []
 
@@ -176,16 +172,14 @@ def test_integration_full_flow():
         json.dump(original_data, data_file)
         data_file.flush()
 
-        frontend_data = Methods.parse_dataset_file_for_front_selection(data_file.name)
+        frontend_data = Methods.build_selection_tree_from_dataset(data_file.name)
 
-        Methods.write_selection_dataset_to_front_file(frontend_data, front_file.name)
+        Methods.save_selection_to_frontend_file(frontend_data, front_file.name)
 
-        dll_methods = Methods.get_dlls_with_all_methods_dict_from_front_options_file(
-            front_file.name
-        )
+        dll_methods = Methods.parse_frontend_file_to_dll_methods(front_file.name)
 
         selected = ["Test.dll"]
-        launch_info = Methods.get_launch_info_list_from_selected(dll_methods, selected)
+        launch_info = Methods.expand_selected_items_to_methods(dll_methods, selected)
 
         assert len(launch_info) == 2
         assert "Test.dll,Method1" in launch_info