export_json export only key present in data_schema of each object now

Author: Zat-Code

src/log_analyser/objects/character.py

@@ -9,8 +9,6 @@ def __init__(self, **kwargs):
                        "played_time": list,
                        "kills": list,
                        "deads": list,
-                       "offensive_assists": list,
-                       "defensive_assists": list,
                        "ultimate_charged": list,
                        "ultimate_use": list}
 

src/log_analyser/objects/match.py

@@ -50,7 +50,7 @@ def add_character(self, data):
         if data["character_name"] in self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].characters:
             return -2
         else:
-            self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].add_character({"name": data["character_name"], "stats": {}, "played_time": [], "kills": [], "deads": [], "offensive_assists": [], "defensive_assists": [], "ultimate_charged": [], "ultimate_use": []})
+            self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].add_character({"name": data["character_name"], "stats": {}, "played_time": [], "kills": [], "deads": [], "ultimate_charged": [], "ultimate_use": []})
 
         if len(self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].characters[data["character_name"]].played_time) > 0:
             self.rounds[self.actual_round].teams[data["team_name"]].players[data["player_name"]].characters[data["character_name"]].played_time[-1]["end"] = data["time"]

src/log_analyser/objects/object.py

@@ -6,6 +6,7 @@ def __init__(self, class_model, **kwargs):
 
         self.from_json_ok = True
         self.class_name = self.__class__.__name__
+        self.class_model = class_model
 
         for key, value in kwargs.items():
             if key in class_model:
@@ -25,9 +26,15 @@ def __init__(self, class_model, **kwargs):
 
     def export_json_recursive(self, data):
         if issubclass(type(data), Object):
+
             dict_class = data.__dict__.copy()
-            dict_class.pop("from_json_ok")
-            return data.export_json_recursive(dict_class)
+            dict_class_final = dict_class.copy()
+
+            for key, value in dict_class.items():
+                if not key in data.class_model:
+                    dict_class_final.pop(key)
+
+            return data.export_json_recursive(dict_class_final)
         elif isinstance(data, datetime):
             return data.strftime("%Y-%m-%d %H:%M:%S")
         elif isinstance(data, list):
@@ -40,11 +47,15 @@ def export_json_recursive(self, data):
     def export_json(self):
 
         dict_class = self.__dict__.copy()
-        dict_class.pop("from_json_ok")
-        for key, value in dict_class.items():
-            dict_class[key] = self.export_json_recursive(value)
 
-        return json.dumps(dict_class, indent=4, sort_keys=True, default=str)
+        dict_class_final = dict_class.copy()
+
+        for key, value in dict_class.items():
+            if not key in self.class_model:
+                dict_class_final.pop(key)
+            else:
+                dict_class_final[key] = self.export_json_recursive(value)
+        return json.dumps(dict_class_final, indent=4, sort_keys=True, default=str)
 
     def convert_timefile_to_datetime(self, time_string):
 

src/main.py

@@ -8,8 +8,7 @@ class DatastrikePythonProcessing:
     def __init__(self):
 
         self.running = True
-        
-        
+
         self.producer_thread = ProducerThread("localhost:29093")
 
         self.consumer_thread = ConsumerThread("localhost:29093")