Event password is editable. \n If email is provided, event details se…

…nt on save. Migrations done.

alembic/versions/1216a96fe98b_rename_event_password.py → alembic/versions/6bf5d0febdb0_rename_pw_and_add_email.py

@@ -1,8 +1,8 @@
-"""rename event password
+"""rename pw and add email
 
-Revision ID: 1216a96fe98b
+Revision ID: 6bf5d0febdb0
 Revises: 4b5f97fcf539
-Create Date: 2024-02-27 10:38:56.058806
+Create Date: 2024-02-27 13:45:48.810034
 
 """
 from typing import Sequence, Union
@@ -12,24 +12,22 @@
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = "1216a96fe98b"
+revision: str = "6bf5d0febdb0"
 down_revision: Union[str, None] = "4b5f97fcf539"
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    # op.add_column('events', sa.Column('event_password', sa.String(length=100), nullable=True))
-    # op.drop_column('events', 'auth_token')
+    op.add_column("events", sa.Column("email", sa.String(length=100), nullable=True))
     op.alter_column("events", "auth_token", new_column_name="event_password")
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    # op.add_column('events', sa.Column('auth_token', sa.VARCHAR(length=100), autoincrement=False, nullable=True))
-    # op.drop_column('events', 'event_password')
+    op.add_column("events", sa.Column("auth_token", sa.VARCHAR(length=100), autoincrement=False, nullable=True))
     op.alter_column("events", "event_password", new_column_name="auth_token")
-
+    op.drop_column("events", "email")
     # ### end Alembic commands ###

docker-compose.yml

@@ -4,6 +4,8 @@ version: '3'
 
 services:
   web:
+    env_file:
+      - .env
     build: .
     volumes:
       - ./how2meet:/app/how2meet

how2meet/db/models.py

@@ -21,15 +21,16 @@ class Event(Base):
     __tablename__ = "events"
 
     id = Column(Uuid, primary_key=True, index=True, default=uuid4)
-    event_password = Column(String(100))
     name = Column(String(150), nullable=False)
     organizer = Column(String(100))
+    email = Column(String(100))  # TODO: Add email validation?
     created = Column(DateTime)
     start_time = Column(DateTime)
     end_time = Column(DateTime)
     all_day = Column(Boolean)
     location = Column(String(150))
     description = Column(String(500))
+    event_password = Column(String(100))
     guests = relationship("Guest", primaryjoin="Event.id == Guest.event_id", cascade="all, delete-orphan")
 
     def __repr__(self):

how2meet/db/schemas.py

@@ -20,6 +20,7 @@ class Event(BaseModel):
     id: uuid.UUID
     name: str
     organizer: str
+    email: str
     created: datetime
     start_time: datetime
     end_time: datetime
@@ -32,20 +33,22 @@ class Config:
 
 
 class EventCreate(Event):
-    event_password: str
+    id: Optional[uuid.UUID] = Field(default=None, description="The ID of the event")
+    event_password: Optional[str] = Field(default=None, description="The password of the event")
 
 
 class EventUpdate(Event):
-    event_password: Optional[str] = Field(default=None, description="The password of the event")
     id: Optional[uuid.UUID] = Field(default=None, description="The ID of the event")
     name: Optional[str] = Field(default=None, description="The name of the event")
     organizer: Optional[str] = Field(default=None, description="The organizer of the event")
+    email: Optional[str] = Field(default=None, description="The email of the event")
     created: Optional[datetime] = Field(default=None, description="The creation datetime of the event")
     start_time: Optional[datetime] = Field(default=None, description="The start datetime of the event")
     end_time: Optional[datetime] = Field(default=None, description="The end datetime of the event")
     all_day: Optional[bool] = Field(default=None, description="Whether the event lasts all day")
     location: Optional[str] = Field(default=None, description="The location of the event")
     description: Optional[str] = Field(default=None, description="The description of the event")
+    event_password: Optional[str] = Field(default=None, description="The password of the event")
 
 
 class EventDelete(BaseModel):

how2meet/routers/events.py

@@ -23,7 +23,7 @@ def create_event(event: schemas.EventCreate, db: Session = Depends(get_db)) -> m
 
     Args:
         event: The event to be created.
-        db: The database session. Defaults to Depends(get_db).
+        db: The database session. Defaults to Depends(geft_db).
 
     Returns:
         models.Event: The created event.
@@ -51,7 +51,7 @@ def read_events(skip: int = 0, limit: int = 100, db: Session = Depends(get_db))
     """
     events = crud.get_events(db, skip=skip, limit=limit)
     for event in events:
-        del event.auth_token
+        del event.event_password
     return events
 
 
@@ -88,7 +88,7 @@ def delete_event(event_id: uuid.UUID, event_delete: schemas.EventDelete, db: Ses
     db_event = crud.get_event(db, event_id=event_id)
     if db_event is None:
         raise HTTPException(status_code=404, detail="Event not found")
-    if event_delete.auth_token != db_event.auth_token:
+    if event_delete.event_password != db_event.event_password:
         raise HTTPException(status_code=403, detail="Unauthorized")
     db.delete(db_event)
     db.commit()
@@ -111,7 +111,7 @@ def update_event(event_id: uuid.UUID, updated_event: schemas.EventUpdate, db: Se
     db_event = crud.get_event(db, event_id=event_id)
     if db_event is None:
         raise HTTPException(status_code=404, detail="Event not found")
-    if updated_event.auth_token != db_event.auth_token:
+    if updated_event.event_password != db_event.event_password:
         raise HTTPException(status_code=403, detail="Unauthorized")
     updated_event = crud.update_event(db, db_event, updated_event)
     return updated_event