Merge pull request 'add tags for event models' (#17) from feature/category into master

Reviewed-on: #17

app/main.py

@@ -10,6 +10,9 @@ app = FastAPI()
 
 origins = [
     "http://localhost:8084",
+    "https://backend.valczeryba.ovh",
+    "https://facebook.com",
+    "https://fetlife.com",
     "https://backoffice.valczeryba.ovh"
 ]
 
@@ -41,4 +44,4 @@ async def startup_event():
 
 @app.get("/")
 async def root():
-    return {"message": "Hello World !"}
+    return {"message": "Hello World !"}

app/models/events.py

@@ -6,10 +6,16 @@ class Event(BaseModel):
     id: ObjectIdField = None
     name: str
     place: str
+    zip_code: str
+    city: str
+    country: str
+    description: str
+    imgUrl: str | None = None
     status: int = 0
     latitude: float = 0.0
     longitude: float = 0.0
     organizers: list[str] = []
+    tags: list[str] = []
     start_date: datetime | None = None
     end_date: datetime | None = None
     created_at: datetime = datetime.today()
@@ -21,15 +27,27 @@ class EventOut(BaseModel):
     id: ObjectIdField = None
     name: str
     place: str
+    zip_code: str
+    city: str
+    country: str
+    description: str
+    imgUrl: str | None = None
     status: int = 0
     start_date: datetime | None = None
     end_date: datetime | None = None
+    tags: list[str] = []
 
 class EventIn(BaseModel):
     name: str
     place: str
+    zip_code: str
+    city: str
+    country: str
+    description: str
+    imgUrl: str | None = None
     status: int = 0
     organizers: list[str] = []
+    tags: list[str] = []
     start_date: datetime | None = None
     end_date: datetime | None = None
     latitude: float = 0.0

app/routers/events.py

@@ -35,7 +35,7 @@ async def read_events(authorize: Annotated[bool, Depends(permissions_checker.Per
 
 
     for event_index in event_repository.find_by(object_search, limit=limit, skip=skip):
-        event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
+        event = events.EventOut(id=event_index.id, tags=event_index.tags, imgUrl=event_index.imgUrl, name=event_index.name, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country,  status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
         listEvents.append(event)
     return listEvents
 
@@ -46,7 +46,7 @@ async def read_users_me(current_user: Annotated[users.User, Depends(users_token.
     listOrganizers = []
 
     for event_index in event_repository.find_by({"organizers":{"$eq": current_user.username}}, limit=limit, skip=skip):
-        event = events.EventOut(id=event_index.id, name=event_index.name, place=event_index.place, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
+        event = events.EventOut(id=event_index.id, name=event_index.name, tags=event_index.tags, imgUrl=event_index.imgUrl, description=event_index.description, place=event_index.place, zip_code=event_index.zip_code, city=event_index.city, country=event_index.country, status=event_index.status, start_date=event_index.start_date, end_date=event_index.end_date)
         listOrganizers.append(event)
 
     content = {"organizers":listOrganizers}
@@ -128,13 +128,19 @@ async def delete_events_id(item_id : str, authorize: Annotated[bool, Depends(per
 async def update_events_me(item_id: str, current_user: Annotated[users.User, Depends(users_token.get_current_active_user)], authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin", "User"]))], eventSingle: events.EventIn | None = None):
     event_repository = event.EventRepository(database=database.database)
     event = event_repository.find_one_by_id(ObjectId(item_id))
-    event.name = EventSingle.name
-    event.place = EventSingle.place
+    event.name = eventSingle.name
+    event.description = eventSingle.description
+    event.place = eventSingle.place
+    event.zip_code = eventSingle.zip_code
+    event.city = eventSingle.city
+    event.country = eventSingle.country
     event.start_date = eventSingle.start_date
+    event.tags = eventSingle.tags
     event.end_date = eventSingle.end_date
     event.latitude = eventSingle.latitude
     event.longitude = eventSingle.longitude
     event.updated_at = datetime.today()
+    event.imgUrl = eventSingle.imgUrl
     event_repository.save(event)
     content = {"message": "event is updated"}
     response = JSONResponse(content=content)  
@@ -157,12 +163,14 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
         )
         
 
-    event = events.Event(name=eventSingle.name,  place=eventSingle.place)
+    event = events.Event(name=eventSingle.name, description=eventSingle.description, place=eventSingle.place, zip_code=eventSingle.zip_code, city=eventSingle.city, country=eventSingle.country)
     event.start_date = eventSingle.start_date
     event.end_date = eventSingle.end_date
     event.organizers = eventSingle.organizers
     event.latitude = eventSingle.latitude
     event.longitude = eventSingle.longitude
+    event.imgUrl = eventSingle.imgUrl
+    event.tags = eventSingle.tags
     event.created_at = datetime.today()
     event_repository.save(event)
     content = {"message": "event is created"}
@@ -188,12 +196,18 @@ async def update_events_id(item_id: str, authorize: Annotated[bool, Depends(perm
         
     event.name = eventSingle.name
     event.place = eventSingle.place
+    event.description = eventSingle.description
+    event.zip_code = eventSingle.zip_code
+    event.city = eventSingle.city
+    event.country = eventSingle.country
     event.start_date = eventSingle.start_date
     event.end_date = eventSingle.end_date
     event.organizers = eventSingle.organizers
+    event.tags = eventSingle.tags
     event.latitude = eventSingle.latitude
     event.longitude = eventSingle.longitude
     event.updated_at = datetime.today()
+    event.imgUrl = eventSingle.imgUrl
     event_repository.save(event)
     content = {"message": "event is updated"}
     response = JSONResponse(content=content)