Refactored loading the TestGroups to make the structure of the json load and the DB load the same and clearer

src/testing.py

@@ -210,7 +210,18 @@ class TestGroup:
         self.elapsed = self.end - self.start
 
     @classmethod
-    def load_db_records(cls) -> List[TestGroup]:
+    def load_json_test_groups(cls, reload: bool = False) -> List[TestGroup]:
+        ArchitectureRequestRecord.load_all(reload=reload)
+        test_groups: Dict[str, TestGroup] = {}
+        for arr in ArchitectureRequestRecord.all:
+            if arr.test_group is not None:
+                if arr.test_group not in test_groups:
+                    test_groups[arr.test_group] = TestGroup(arr.test_group)
+                test_groups[arr.test_group].add_record(arr)
+        return list(test_groups.values())
+
+    @classmethod
+    def load_db_test_groups(cls) -> List[TestGroup]:
         """
         Load all the test groups from the DataBase
         """
@@ -238,23 +249,23 @@ class TestGroup:
         return test_groups
 
     @classmethod
-    def load_all(cls, reload=False):
+    def load_all(cls, reload: bool = False):
         """
         Load all the available TestGroups, from both the json file and the DB
         into the class variable - for efficiency do not reload unless requested
         """
         if cls.all is None or reload:
-            ArchitectureRequestRecord.load_all(reload=reload)
-            records = {}
-            for arr in ArchitectureRequestRecord.all:
-                if arr.test_group is not None:
-                    if arr.test_group not in records:
-                        records[arr.test_group] = TestGroup(arr.test_group)
-                    records[arr.test_group].add_record(arr)
-            db_records = cls.load_db_records()
-            for test_group in db_records:
-                records[test_group.test_group] = test_group
-            cls.all = records
+            working_test_groups = {}
+
+            json_tgs = cls.load_json_test_groups(reload=reload)
+            for test_group in json_tgs:
+                working_test_groups[test_group.test_group] = test_group
+
+            db_tgs = cls.load_db_test_groups()
+            for test_group in db_tgs:
+                working_test_groups[test_group.test_group] = test_group
+
+            cls.all = working_test_groups
 
     @classmethod
     def for_test_group_tag(cls, test_group_tag: str) -> TestGroup: