From b21c4a6c49c0ee89ac051b1ccb37832dfd6ae7ab Mon Sep 17 00:00:00 2001 From: Kushal Dotel Date: Sat, 11 Jan 2025 18:51:46 +0545 Subject: [PATCH] fix: mazil's db mistake --- backend/blueprints/profile/__init__.py | 4 ++-- backend/db/model.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/blueprints/profile/__init__.py b/backend/blueprints/profile/__init__.py index bcaa5b3..3f1a9a9 100644 --- a/backend/blueprints/profile/__init__.py +++ b/backend/blueprints/profile/__init__.py @@ -174,6 +174,6 @@ def login(): #make a get request to get json on hello word @profile.route('/hello') @auth_required() -@requires_role([UserRole.ADMIN]) +@requires_role([UserRole.USER]) def hello(): - return jsonify({"message": f"Hello {g.current_user.firstame}"}), 200 + return jsonify({"message": f"Hello {g.current_user.firstName}"}), 200 diff --git a/backend/db/model.py b/backend/db/model.py index dae1a0c..40edac3 100644 --- a/backend/db/model.py +++ b/backend/db/model.py @@ -19,7 +19,7 @@ class User(db.Model): email: Mapped[str] = mapped_column(String(64), nullable=False, unique=True) firstName: Mapped[str] = mapped_column(String(32), nullable=False) lastName: Mapped[str] = mapped_column(String(32), nullable=False) - username: Mapped[str] = mapped_column(String(32), nullable=False) + username: Mapped[str] = mapped_column(String(32), nullable=False, unique=True) hash_password: Mapped[str] = mapped_column(String(256), nullable=False) activationKey: Mapped[str] = mapped_column(String(128), nullable=False) sessions: Mapped[List["Session"]] = relationship(back_populates="user", cascade="all, delete-orphan") @@ -29,6 +29,7 @@ class User(db.Model): chats: Mapped[List["Chat"]] = relationship(back_populates="user", cascade="all, delete-orphan") notifications: Mapped[List["Notification"]] = relationship(back_populates="user", cascade="all, delete-orphan") user_badges: Mapped[List["UserBadge"]] = relationship(back_populates="user", cascade="all, delete-orphan") + publications: Mapped[List["Course"]] = relationship(back_populates="author", cascade="all, delete-orphan") dob: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=datetime.fromisocalendar(2002, 1, 1)) pfpFilename: Mapped[str] = mapped_column(String(256), nullable=False, default=DEFAULT_PROFILE_FILE) joinedDate: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=func.now()) @@ -69,6 +70,8 @@ class Course(db.Model): enrollments: Mapped[List["Enrollment"]] = relationship(back_populates="course", cascade="all, delete-orphan") quizzes: Mapped[List['Quiz']] = relationship(back_populates="course", cascade="all, delete-orphan") chats: Mapped[List["Chat"]] = relationship(back_populates="course", cascade="all, delete-orphan") + authorID: Mapped[uuid.UUID] = mapped_column(ForeignKey("user.id")) + author: Mapped["User"] = relationship(back_populates="publications") description: Mapped[str] = mapped_column(String(1024), nullable=False, default='') isActive: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True) publishedStatus: Mapped[int] = mapped_column(SmallInteger, nullable=False, default=PublishedStatus.DRAFT)