feat: add integrity check for requests

Author: arunPdl02

src/event/models.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, model_validator
 import datetime
 
 class Event(BaseModel):
@@ -31,6 +31,23 @@ class EventCreate(BaseModel):
     start_date: datetime.date | None = None
     end_date: datetime.date | None = None
 
+    @model_validator(mode="after")
+    def validate_time_range(self) -> "EventCreate":
+        if self.start_time >= self.end_time:
+            raise ValueError("The event start must be before the event end")
+        
+        if self.start_date and self.end_date:
+            if self.start_date > self.end_date:
+                raise ValueError("The event repeat start date must be before the end date")
+        
+        if self.start_date and not self.end_date:
+            raise ValueError("The event can't have start date but not end date")
+
+        if not self.start_date and self.end_date:
+            raise ValueError("The event can't have end date but not start date")
+
+        return self
+
 class EventUpdate(BaseModel):
     name: str | None = None
     start_time: datetime.datetime | None = None
@@ -40,6 +57,13 @@ class EventUpdate(BaseModel):
     start_date: datetime.date | None = None
     end_date: datetime.date | None = None
 
+    @model_validator(mode="after")
+    def validate_time_range(self) -> "EventUpdate":
+        if self.start_time and self.end_time:
+            if self.start_time > self.end_time:
+                raise ValueError("The event start time must be before end time")
+        return self
+
 class EventDelete(BaseModel):
     result: bool
     eid: int

src/event/tables.py

@@ -23,10 +23,18 @@ class EventDB(Base):
         Text,
         nullable=True
     )
-    name: Mapped[str] = mapped_column(String(64))
-    start_time: Mapped[datetime] = mapped_column(DateTime(timezone=True))
-    end_time: Mapped[datetime] = mapped_column(DateTime(timezone=True))
-    repeat: Mapped[str] = mapped_column(String(64))
+    name: Mapped[str] = mapped_column(
+        String(64)
+    )
+    start_time: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True)
+    )
+    end_time: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True)
+    )
+    repeat: Mapped[str] = mapped_column(
+        String(64)
+    )
     start_date: Mapped[date] = mapped_column(
         Date,
         nullable=True

src/event/urls.py

@@ -74,7 +74,9 @@ async def get_events_for_this_year_month(
     description="Create a new event",
     response_model=Event,
     status_code=status.HTTP_201_CREATED,
-    responses={500: {"description": "failed to fetch new event", "model": DetailModel}},
+    responses={
+        500: {"description": "failed to fetch new event", "model": DetailModel},
+    },
     operation_id="create_event",
     # dependecies=[Depends()]
 )
@@ -108,22 +110,53 @@ async def update_event(
     eid: int,
     body: EventUpdate
 ):
-    event_info = await event.crud.get_event_by_eid(db_session, eid)
-    
-    if event_info is None:
+    db_event = await event.crud.get_event_by_eid(db_session, eid)
+    if db_event is None:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
             detail="Event doesn't exist."
         )
+
+    final_start_time = body.start_time if body.start_time is not None else db_event.start_time
+    final_end_time = body.end_time if body.end_time is not None else db_event.end_time
+
+    if final_start_time > final_end_time:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail="The event start time must be before the end time"
+        )
 
-    updated_event = body.model_dump(exclude_unset=True)
-    for key, value in updated_event.items():
-        setattr(event_info, key, value)
+    if not body.start_date and body.end_date:
+        if not db_event.start_date:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail="The event start date and event end date must be initilized at the same time"
+            )
+        if db_event.start_date > body.end_date:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail="The event start date must be before the event end date"
+            )
+    if body.start_date and not body.end_date:
+        if not db_event.end_date:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail="The event start date and event end date must be initilized at the same time"
+            )
+        if body.start_date > db_event.end_date:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail="The event start date must be before the event end date"
+            )
+
+    updated_data = body.model_dump(exclude_unset=True)
+    for key, value in updated_data.items():
+        setattr(db_event, key, value)
 
     await db_session.commit()
-    await db_session.refresh(event_info)
+    await db_session.refresh(db_event)
 
-    return event_info
+    return db_event