feat(SRC): :rocket: Return dict into function find_macros_that_match_dates_of_user to get more information

find_matches.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 import json
-from queries import query_formularios, query_usuarios, get_macros_differences
+from queries import query_formularios, query_usuarios, get_macros_differences, get_days_between_dates
                      
 formularios_weight_difference_path = 'anonymized_formularios_weight_difference'
 usuarios_macros_difference_path = 'usuarios_macros_difference'
@@ -87,23 +87,39 @@ def find_user_dates_matches(query, debug=False):
     return matches_dict
 
 def find_macros_that_match_dates_of_users(matches_dict, debug=False):
+    limit_days = 11
+
     # Create a list to store the macros differences
-    macros_differences_list = []
-    macros_differences_list_subir_macros = ["0 20 0 0 0 0 20 0"]
-    macros_differences_list_bajar_macros = ["0 -20 0 0 0 0 -20 0"]
+    macros_differences_dict = {}
+    macros_differences_dict_subir_macros = {
+        "costo subir macros": {
+            "date_of_match": "1990-01-01",
+            "date_of_macros_asignation": "1990-01-02",
+            "days_between_match_and_macros_asignation": 1,
+            "macros_difference": "0 20 0 0 0 0 20 0"
+        }
+    }
+    macros_differences_dict_bajar_macros = {
+        "costo bajar macros": {
+            "date_of_match": "1990-01-01",
+            "date_of_macros_asignation": "1990-01-02",
+            "days_between_match_and_macros_asignation": 1,
+            "macros_difference": "0 -20 0 0 0 0 -20 0"
+        }
+    }
 
     # If matches_dict is empty, then return empty list
     if len(matches_dict) == 0:
         print("[find_macros_that_match_dates_of_users] matches_dict is empty")
-        return macros_differences_list
+        return macros_differences_dict_bajar_macros
     
     # If matches_dict is costo subir macros, then return empty list
     if list(matches_dict.keys())[0] == 'costo subir macros':
         print("[find_macros_that_match_dates_of_users] matches_dict is \"costo subir macros\"")
-        return macros_differences_list_subir_macros
+        return macros_differences_dict_subir_macros
     elif list(matches_dict.keys())[0] == 'costo bajar macros':
         print("[find_macros_that_match_dates_of_users] matches_dict is \"costo bajar macros\"")
-        return macros_differences_list_bajar_macros
+        return macros_differences_dict_bajar_macros
 
     # Iterate over the matches dictionary
     for match_user in matches_dict:
@@ -123,21 +139,37 @@ def find_macros_that_match_dates_of_users(matches_dict, debug=False):
         # Load user data
         user_data = json.load(open(user_data, 'r'))
 
-        # Query usuarios
-        dates_that_match = query_usuarios(user_data, dates_list_from_user, debug=False, limit_days=31)
+        # Get dates that match and macros differences dates
+        dates_that_match, macros_differences_dates = query_usuarios(user_data, dates_list_from_user, debug=False, limit_days=limit_days)
+
+        # If there are dates that match
         if len(dates_that_match) > 0:
-            if debug: print(f"\tdates that match: {dates_that_match}")
-
-            # Get macros differences
-            macros_differences = get_macros_differences(user_data, dates_that_match)
-            if type(macros_differences) == list:
-                if len(macros_differences) > 0:
-                    for macros_difference in macros_differences:
-                        macros_differences_list.append(macros_difference)
-                        if debug: print(f"\tmacros_differences: {macros_difference}")
-                    if debug: print("")
-            else:
-                macros_differences_list.append(macros_differences)
-                if debug: print(f"\tmacros_differences: {macros_differences}\n")
+
+            # Iterate over the dates that match
+            for i, date_of_match in enumerate(dates_that_match):
+                if debug: print(f"\tdates that match: {dates_that_match}")
+
+                # Get macros differences
+                macros_differences = get_macros_differences(user_data, dates_that_match)
+                if type(macros_differences) == list:
+                    if len(macros_differences) > 0:
+                        for macros_difference in macros_differences:
+                            days_between = get_days_between_dates(macros_differences_dates[i], date_of_match)
+                            match_dict = {
+                                "date_of_match": date_of_match,
+                                "date_of_macros_asignation": macros_differences_dates[i],
+                                "days_between_match_and_macros_asignation": days_between,
+                                "macros_difference": macros_difference
+                            }
+                            macros_differences_dict[match_user] = match_dict
+                            if debug: print(f"\tmacros_differences: {macros_difference}")
+                        if debug: print("")
+                else:
+                    if debug: print(f"\tmacros_differences: {macros_differences}\n")
+                    match_dict = {
+                        "date_of_macros_asignation": dates_that_match[0],
+                        "macros_difference": macros_differences
+                    }
+                    macros_differences_dict[match_user] = match_dict
     
-    return macros_differences_list
+    return macros_differences_dict