Update main.py

main.py

@@ -67,39 +67,10 @@ class MergeRoadmapResponse(BaseModel):
     merged_roadmap: str
 
 def merge_roadmaps(regular_roadmap_str, test_roadmaps_str_list):
-    # # Convert input strings to JSON
-    # regular_roadmap = json.loads(regular_roadmap_str)
-    # test_roadmaps = [json.loads(roadmap) for roadmap in test_roadmaps_str_list]
-
-    # # Helper to convert a roadmap's schedule into a dictionary indexed by dates
-    # def schedule_to_dict(schedule):
-    #     return {day["date"]: day for day in schedule}
-
-    # # Convert the regular roadmap's schedule to a dictionary
-    # regular_schedule_dict = schedule_to_dict(regular_roadmap["schedule"])
-
-    # # Process each test roadmap
-    # for test_roadmap in test_roadmaps:
-    #     # Convert the test roadmap's schedule to a dictionary
-    #     test_schedule_dict = schedule_to_dict(test_roadmap["schedule"])
-
-    #     # Merge overlapping dates
-    #     for date, test_day in test_schedule_dict.items():
-    #         if date in regular_schedule_dict:
-    #             # Append test roadmap subjects to matching day in regular roadmap
-    #             if "test_study" not in regular_schedule_dict[date]:
-    #                 regular_schedule_dict[date]["test_study"] = []
-    #             regular_schedule_dict[date]["test_study"].extend(test_day["subjects"])
-
-    #     # Extend the regular roadmap to include missing days from the test roadmap
-    #     for date, test_day in test_schedule_dict.items():
-    #         if date not in regular_schedule_dict:
-    #             regular_schedule_dict[date] = test_day
-
-    # # Convert the dictionary back to a sorted list
-    # merged_schedule = sorted(regular_schedule_dict.values(), key=lambda x: x["date"])
-
-    # return {"schedule": merged_schedule}
+    # Convert input strings to JSON
+    regular_roadmap = json.loads(regular_roadmap_str)
+    test_roadmaps = [json.loads(roadmap) for roadmap in test_roadmaps_str_list]
+
     # Helper to convert a roadmap's schedule into a dictionary indexed by dates
     def schedule_to_dict(schedule):
         return {day["date"]: day for day in schedule}
@@ -125,13 +96,11 @@ def merge_roadmaps(regular_roadmap_str, test_roadmaps_str_list):
             if date not in regular_schedule_dict:
                 regular_schedule_dict[date] = test_day
 
-    # Convert the dictionary back to a sorted list and filter out the exclude_date
-    merged_schedule = sorted(
-        (day for day in regular_schedule_dict.values() if day["date"] != 'YYYY-MM-DD'),
-        key=lambda x: x["date"]
-    )
+    # Convert the dictionary back to a sorted list
+    merged_schedule = sorted(regular_schedule_dict.values(if day["date"] != 'YYYY-MM-DD'), key=lambda x: x["date"])
 
     return {"schedule": merged_schedule}
+ 
 
 
 @app.post("/merge-roadmaps", response_model=MergeRoadmapResponse)