Update main.py

main.py

@@ -1,53 +1,103 @@
-# Additional imports
-from typing import List, Dict
+# # Additional imports
+# from typing import List, Dict
+# from fastapi import FastAPI, HTTPException
+# from pydantic import BaseModel
+# import json
+# from datetime import datetime
+
+# # Initialize FastAPI
+# app = FastAPI()
+# # Merge roadmaps
+# def merge_roadmaps(regular_roadmap: Dict, test_roadmap: Dict) -> Dict:
+#     """Merge two roadmaps into one, combining overlapping and non-overlapping dates."""
+#     def schedule_to_dict(schedule: List[Dict]) -> Dict:
+#         """Convert a roadmap's schedule into a dictionary indexed by dates."""
+#         return {day["date"]: day for day in schedule}
+
+#     # Convert schedules to dictionaries for quick lookup
+#     regular_schedule_dict = schedule_to_dict(regular_roadmap["schedule"])
+#     test_schedule_dict = schedule_to_dict(test_roadmap["schedule"])
+
+#     # Parse dates from schedules
+#     regular_dates = [datetime.strptime(day["date"], "%Y-%m-%d") for day in regular_roadmap["schedule"]]
+#     test_dates = [datetime.strptime(day["date"], "%Y-%m-%d") for day in test_roadmap["schedule"]]
+
+#     # Identify start and end dates for both roadmaps
+#     regular_start, regular_end = min(regular_dates), max(regular_dates)
+#     test_start, test_end = min(test_dates), max(test_dates)
+
+#     # Merge overlapping dates
+#     for date, test_day in test_schedule_dict.items():
+#         if date in regular_schedule_dict:
+#             # Append test roadmap subjects to matching days in regular roadmap
+#             regular_schedule_dict[date]["subjects"].extend(test_day["subjects"])
+#         else:
+#             # Add non-overlapping test roadmap dates
+#             regular_schedule_dict[date] = test_day
+
+#     # Convert the merged schedule dictionary back to a sorted list
+#     merged_schedule = sorted(regular_schedule_dict.values(), key=lambda x: x["date"])
+
+#     return {"schedule": merged_schedule}
+
+# # New endpoint for merging roadmaps
+# @app.post("/merge-roadmaps/")
+# def merge_roadmaps_endpoint(roadmap1: Dict, roadmap2: Dict):
+#     """
+#     Merge two roadmaps into one, combining overlapping and non-overlapping dates.
+#     """
+#     try:
+#         merged_roadmap = merge_roadmaps(roadmap1, roadmap2)
+#         return merged_roadmap
+#     except Exception as e:
+#         raise HTTPException(status_code=500, detail=f"Error merging roadmaps: {e}")
+
+
 from fastapi import FastAPI, HTTPException
 from pydantic import BaseModel
+from typing import List, Dict, Any
 import json
-from datetime import datetime
 
-# Initialize FastAPI
 app = FastAPI()
-# Merge roadmaps
-def merge_roadmaps(regular_roadmap: Dict, test_roadmap: Dict) -> Dict:
-    """Merge two roadmaps into one, combining overlapping and non-overlapping dates."""
-    def schedule_to_dict(schedule: List[Dict]) -> Dict:
-        """Convert a roadmap's schedule into a dictionary indexed by dates."""
+
+class Roadmap(BaseModel):
+    schedule: List[Dict[str, Any]]
+
+@app.post("/merge_roadmaps/")
+def merge_roadmaps_endpoint(regular_roadmap: str, test_roadmaps: List[str]):
+    try:
+        # Parse input strings to JSON
+        regular_roadmap_json = json.loads(regular_roadmap)
+        test_roadmaps_json = [json.loads(test_roadmap) for test_roadmap in test_roadmaps]
+
+        # Perform the merge
+        merged_roadmap = merge_roadmaps(regular_roadmap_json, test_roadmaps_json)
+        return merged_roadmap
+    except Exception as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+
+# Helper function
+def merge_roadmaps(regular_roadmap, test_roadmaps):
+    def schedule_to_dict(schedule):
         return {day["date"]: day for day in schedule}
 
-    # Convert schedules to dictionaries for quick lookup
     regular_schedule_dict = schedule_to_dict(regular_roadmap["schedule"])
-    test_schedule_dict = schedule_to_dict(test_roadmap["schedule"])
-
-    # Parse dates from schedules
-    regular_dates = [datetime.strptime(day["date"], "%Y-%m-%d") for day in regular_roadmap["schedule"]]
-    test_dates = [datetime.strptime(day["date"], "%Y-%m-%d") for day in test_roadmap["schedule"]]
-
-    # Identify start and end dates for both roadmaps
-    regular_start, regular_end = min(regular_dates), max(regular_dates)
-    test_start, test_end = min(test_dates), max(test_dates)
-
-    # Merge overlapping dates
-    for date, test_day in test_schedule_dict.items():
-        if date in regular_schedule_dict:
-            # Append test roadmap subjects to matching days in regular roadmap
-            regular_schedule_dict[date]["subjects"].extend(test_day["subjects"])
-        else:
-            # Add non-overlapping test roadmap dates
-            regular_schedule_dict[date] = test_day
-
-    # Convert the merged schedule dictionary back to a sorted list
+
+    for test_roadmap in test_roadmaps:
+        test_schedule_dict = schedule_to_dict(test_roadmap["schedule"])
+
+        for date, test_day in test_schedule_dict.items():
+            if date in regular_schedule_dict:
+                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"])
+
+        for date, test_day in test_schedule_dict.items():
+            if date not in regular_schedule_dict:
+                regular_schedule_dict[date] = test_day
+
     merged_schedule = sorted(regular_schedule_dict.values(), key=lambda x: x["date"])
 
     return {"schedule": merged_schedule}
-
-# New endpoint for merging roadmaps
-@app.post("/merge-roadmaps/")
-def merge_roadmaps_endpoint(roadmap1: Dict, roadmap2: Dict):
-    """
-    Merge two roadmaps into one, combining overlapping and non-overlapping dates.
-    """
-    try:
-        merged_roadmap = merge_roadmaps(roadmap1, roadmap2)
-        return merged_roadmap
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Error merging roadmaps: {e}")