Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added rudimentary recurrent event creation #142

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api_schemas/event_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ class EventCreate(BaseSchema):
closed: bool
can_signup: bool
drink_package: bool
recur_interval_days: int | None # Set this to None if you don't want a recurring event
recur_until: datetime_utc


class EventUpdate(BaseSchema):
Expand Down
34 changes: 32 additions & 2 deletions routes/event_router.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import copy
import datetime
from fastapi import APIRouter, HTTPException, status
from database import DB_dependency
from db_models.event_model import Event_DB
from api_schemas.event_schemas import EventCreate, EventRead, EventUpdate
from api_schemas.user_schemas import UserRead
from db_models.event_user_model import EventUser_DB
from db_models.priority_model import Priority_DB
from db_models.user_model import User_DB
from services.event_service import create_new_event, delete_event, update_event
from user.permission import Permission
import random
from typing import List
from helpers.types import datetime_utc

event_router = APIRouter()

Expand All @@ -19,10 +23,36 @@ def get_all_events(db: DB_dependency):
return events


@event_router.post("/", dependencies=[Permission.require("manage", "Event")], response_model=EventRead)
@event_router.post("/", dependencies=[Permission.require("manage", "Event")], response_model=list[EventRead])
def create_event(data: EventCreate, db: DB_dependency):
event = create_new_event(data, db)
return event
event_list: list["Event_DB"] = [event]

if not data.recur_interval_days is None:
if data.recur_interval_days < 1:
raise HTTPException(status.HTTP_400_BAD_REQUEST, "Invalid argument for recurring interval days")

delta = datetime.timedelta(days=data.recur_interval_days)
current_start = data.starts_at + delta

while current_start <= data.recur_until:
event_clone = data.model_copy(
update={
"starts_at": current_start,
"ends_at": data.ends_at + delta,
"signup_start": data.signup_start + delta,
"signup_end": data.signup_end + delta,
}
)
event = create_new_event(event_clone, db)
event_list.append(event)

delta += datetime.timedelta(days=data.recur_interval_days)
current_start = data.starts_at + delta

db.add_all(event_list)
db.commit()
return event_list


@event_router.delete(
Expand Down