Push

app.py

@@ -186,8 +186,8 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
 
     sorted_df = sorted_df.copy().reset_index(drop=True)
 
-    nogent_2 = sorted_df.copy()[(sorted_df.copy()["name"] == "NOGENT 2") & (sorted_df.copy()["end_date"] >= start_date_str)]
-    print(nogent_2[['updated_date', 'available_capacity']])
+    cruas_2 = sorted_df.copy()[(sorted_df.copy()["name"] == "CRUAS 2") & (sorted_df.copy()["end_date"] >= start_date_str)]
+    print(cruas_2[['updated_date', 'end_date', 'available_capacity']])
 
     # Filter to get identifiers
     filtered_id_df = sorted_df.copy()
@@ -195,8 +195,8 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
 # I commented this out
     filtered_id_df = filtered_id_df.drop_duplicates(subset='identifier', keep='last')
 
-    nogent_2 = filtered_id_df.copy()[(filtered_id_df.copy()["name"] == "NOGENT 2") & (filtered_id_df.copy()["end_date"] >= start_date_str)]
-    print(nogent_2[['updated_date', 'available_capacity']])
+    cruas_2 = filtered_id_df.copy()[(filtered_id_df.copy()["name"] == "CRUAS 2") & (filtered_id_df.copy()["end_date"] >= start_date_str)]
+    print(cruas_2[['updated_date', 'end_date', 'available_capacity']])
 # --------------------------- !!!!!!!!!!!!!!!!!!!!!!! HERE IS POTENTIAL ERROR!!!!!!!!!!!!!!!!!!!!!!! --------------------------- #
 
     filtered_id_df = filtered_id_df.copy().reset_index(drop=True)
@@ -282,6 +282,8 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
                 filtered_values.append(item)
         results_filtered[key] = filtered_values
 
+    # Need to eventually do a filter that takes the most restrictive updated identifier instead of the most recent when there 
+    # is an overlap
 
     sorted_results = results_filtered
     # --------------------- SECOND DATA CLEANING ------------------------ #