app/main.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
-from .routers import users, token, mail, events, tags
+from .routers import users, token, mail, events
 from .dependencies import user_add
 
 import os
@@ -29,7 +29,6 @@ app.include_router(users.router)
 app.include_router(token.router)
 app.include_router(mail.router)
 app.include_router(events.router)
-app.include_router(tags.router)
 
 
 @app.on_event("startup")

app/models/tags.py

@@ -15,7 +15,7 @@ class TagsOut(BaseModel):
 class TagsIn(BaseModel):
     name: str
 
-class TagsIDS(BaseModel):
+class EventIDS(BaseModel):
     ids: list[str]
 
 

app/routers/events.py

@@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException, status, Response
 from fastapi.responses import JSONResponse
 from datetime import datetime
 from ..dependencies import users_token, permissions_checker, database
-from ..models import events, users, tags
+from ..models import events, users
 from pydantic import EmailStr
 from typing import Annotated, Union
 from bson import ObjectId
@@ -330,7 +330,6 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
             detail="Body request is empty"
         )
     event_repository = events.EventRepository(database=database.database)
-    tags_repository = tags.TagsRepository(database=database.database)            
 
     event = event_repository.find_one_by({"name": {'$eq': eventSingle.name}})
     if event is not None:
@@ -348,11 +347,6 @@ async def update_events(authorize: Annotated[bool, Depends(permissions_checker.P
     event.longitude = eventSingle.longitude
     event.imgUrl = eventSingle.imgUrl
     event.tags = eventSingle.tags
-    for tag_name in eventSingle:
-        tag = tags_repository.find_one_by({"name": {'$eq': tag_name}})
-        if tag is None:
-            tag = Tags(name=tag_name)
-            tags_repository.save(tag)
     event.status = 1
     event.created_at = datetime.today()
     event_repository.save(event)
@@ -369,7 +363,7 @@ async def update_events_id(item_id: str, authorize: Annotated[bool, Depends(perm
             detail="Body request is empty"
         )
     event_repository = events.EventRepository(database=database.database)
-    tags_repository = tags.TagsRepository(database=database)
+
     event = event_repository.find_one_by({"id": {'$eq': ObjectId(item_id)}})
     if event is None:
         raise HTTPException(
@@ -384,11 +378,6 @@ async def update_events_id(item_id: str, authorize: Annotated[bool, Depends(perm
     event.end_date = eventSingle.end_date
     event.organizers = eventSingle.organizers
     event.tags = eventSingle.tags
-    for tag_name in eventSingle:
-        tag = tags_repository.find_one_by({"name": {'$eq': tag_name}})
-        if tag is None:
-            tag = Tags(name=tag_name)
-            tags_repository.save(tag)
     event.latitude = eventSingle.latitude
     event.longitude = eventSingle.longitude
     event.updated_at = datetime.today()

app/routers/tags.py

@@ -72,48 +72,159 @@ async def read_tags_id(item_id : str, authorize: Annotated[bool, Depends(permiss
 
 
 @router.delete("/tags/groups",tags=["tags"])
-async def delete_tags_groups(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], tagsids: tags.TagsIDS | None = None):
+async def delete_tags_groups(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], remove: bool = False, tagsids: tags.TagsIDS | None = None):
-    if len(tagsids.ids) == 0:
+    if len(eventids.ids) == 0:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="eventids should be greater than 0"
         )
     
-    tag_repository = tags.TagsRepository(database=database.database)
+    event_repository = event.EventRepository(database=database.database)
-    for i in tagsids.ids:
+    for i in eventids.ids:
-        tag = tag_repository.find_one_by_id(ObjectId(i))
+        event = event_repository.find_one_by_id(ObjectId(i))
-        tag_repository.delete_one(tag)
+        if remove is True:
-    content = {"message": "tags removed"}
+            event.status = -1
+            event.deleted_at = datetime.today()
+            content = {"message": "events are deleted "}
+        else:
+            event.status = 0
+            event.disabled_at = datetime.today()
+            content = {"message": "events are disabled"}
+        event_repository.save(event)
+    
     response = JSONResponse(content=content)
     return response
 
-@router.delete("/tags/{item_id}", tags=["tags"])
+@router.delete("/events/{item_id}", tags=["events"])
-async def delete_tags_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))]):
+async def delete_events_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], remove : bool = False):
-    tag_repository = tags.TagsRepository(database=database.database)
+    event_repository = events.EventRepository(database=database.database)
-    tag = tag_repository.find_one_by_id(ObjectId(item_id))        
+    event = event_repository.find_one_by_id(ObjectId(item_id))
-    event_repository.delete_one(event)
+    if remove is True:
-    content = {"message": "tags delete"}
+        event.status = -1
+        event.deleted_at = datetime.today()
+        content = {"message": "events are deleted"}
+    else:
+        event.status = 0
+        event.disabled_at = datetime.today()
+        content = {"message": "events are disabled"}
+    event_repository.save(event)
     response = JSONResponse(content=content)  
-    return responsed
+    return response
 
-@router.put("/tags", tags=["tags"], status_code=status.HTTP_201_CREATED)
+@router.put("/events/me/{item_id}",tags=["events"])
-async def update_tags(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], tagSingle: tags.TagsIn | None = None):
+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):
-    if tagSingle is None:
+    event_repository = event.EventRepository(database=database.database)
+    event = event_repository.find_one_by_id(ObjectId(item_id))
+    event.name = eventSingle.name
+    event.description = eventSingle.description
+    event.place = eventSingle.place
+    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)  
+    return response
+
+@router.put("/events", tags=["events"], status_code=status.HTTP_201_CREATED)
+async def update_events(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], eventSingle: events.EventIn | None = None):
+    if eventSingle is None:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="Body request is empty"
         )
-    tag_repository = tags.TagsRepository(database=database.database)
+    event_repository = events.EventRepository(database=database.database)
 
-    tag = tag_repository.find_one_by({"name": {'$eq': tagSingle.name}})
+    event = event_repository.find_one_by({"name": {'$eq': eventSingle.name}})
-    if tag is not None:
+    if event is not None:
         raise HTTPException(
             status_code=status.HTTP_204_NO_CONTENT,
             detail="name"
         )
-    tag = tags.Tags(name=tagSingle.name)
+        
-    tag.created_at = datetime.today()
+
-    tag_repository.save(event)
+    event = events.Event(name=eventSingle.name, description=eventSingle.description, place=eventSingle.place)
-    content = {"message": "tags created"}
+    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.status = 1
+    event.created_at = datetime.today()
+    event_repository.save(event)
+    content = {"message": "event is created"}
     response = JSONResponse(content=content, status_code=status.HTTP_201_CREATED)  
     return response
+
+
+@router.put("/events/{item_id}", tags=["events"], status_code=status.HTTP_200_OK)
+async def update_events_id(item_id: str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], eventSingle: events.EventIn | None = None, response: Response = Response):
+    if eventSingle is None:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Body request is empty"
+        )
+    event_repository = events.EventRepository(database=database.database)
+
+    event = event_repository.find_one_by({"id": {'$eq': ObjectId(item_id)}})
+    if event is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Event not found"
+        )
+        
+    event.name = eventSingle.name
+    event.place = eventSingle.place
+    event.description = eventSingle.description
+    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)  
+    return response
+
+
+@router.patch("/events/groups",tags=["events"])
+async def patch_events_groups(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], eventids: events.EventIDS | None = None):
+    if len(eventids.ids) == 0:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="eventids should be greater than 0"
+        )
+    
+    event_repository = events.EventRepository(database=database.database)
+    content = {"message": "events are enabled"}
+    for i in eventids.ids:
+        event = event_repository.find_one_by_id(ObjectId(i))
+        event.status = 1
+        event.disabled_at = None
+        event.deleted_at = None
+        event_repository.save(event)
+    
+    
+    response = JSONResponse(content=content)
+    return response
+
+@router.patch("/events/{item_id}", tags=["events"])
+async def patch_events_id(item_id : str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))]):
+    event_repository = events.EventRepository(database=database.database)
+    event = event_repository.find_one_by_id(ObjectId(item_id))
+    event.status = 1
+    event.disabled_at = None
+    event.deleted_at = None
+    event_repository.save(event)
+    content = {"message": "event is enabled"}
+    response = JSONResponse(content=content)  
+    return response