Merge pull request #34 from 4GeeksAcademy/modeling

modelin y vistas de panel de admin

Author: JesusFpz

migrations/versions/9ea39839a29b_.py migrations/versions/49ae031ded2d_.py

@@ -1,16 +1,16 @@
 """empty message
 
-Revision ID: 9ea39839a29b
+Revision ID: 49ae031ded2d
 Revises: 
-Create Date: 2025-03-16 15:09:02.935381
+Create Date: 2025-03-16 17:16:41.870761
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '9ea39839a29b'
+revision = '49ae031ded2d'
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -23,7 +23,9 @@ def upgrade():
     sa.Column('name', sa.String(length=120), nullable=False),
     sa.Column('email', sa.String(length=120), nullable=False),
     sa.Column('password', sa.String(length=500), nullable=False),
+    sa.Column('gender', sa.Enum('MALE', 'FEMALE', 'NON_BINARY', 'OTHER', 'PREFER_NOT_TO_SAY', name='gender'), nullable=False),
     sa.Column('is_active', sa.Boolean(), nullable=False),
+    sa.Column('role', sa.Enum('ADMIN', 'MODERATOR', 'USER', name='role'), nullable=False),
     sa.PrimaryKeyConstraint('id'),
     sa.UniqueConstraint('email')
     )

src/api/admin.py

@@ -1,20 +1,23 @@
-  
 import os
 from flask_admin import Admin
 from .models import db, User, Notes, Habits, Goals, Projects
 from flask_admin.contrib.sqla import ModelView
 
+class UserView(ModelView):
+    column_list = ('name', 'email','password', 'gender', 'is_active', 'role')
+    form_columns = ('name', 'email','password', 'gender', 'is_active', 'role')
+
 class NotesView(ModelView):
     column_list = ('title', 'description','category', 'user_id', 'projects_id')
     form_columns = ('title', 'description','category', 'user_id', 'projects_id')
 
 class HabitsView(ModelView):
-    column_list = ('name', 'description','category', 'user_id', 'goals_id', 'ready')
-    form_columns = ('name', 'description','category', 'user_id', 'goals_id','ready')
+    column_list = ('name', 'description', 'category', 'ready', 'user_id', 'goals_id')
+    form_columns = ('name', 'description', 'category', 'ready', 'user_id', 'goals_id')
 
 class GoalsView(ModelView):
-    column_list = ('target', 'description' ,'user_id', 'projects_id', 'ready')
-    form_columns = ('target', 'description','user_id', 'projects_id', 'ready')
+    column_list = ('target', 'description', 'ready', 'user_id', 'projects_id')
+    form_columns = ('target', 'description', 'ready', 'user_id', 'projects_id')
 
 class ProjectsView(ModelView):
     column_list = ('name', 'description', 'category', 'user_id')
@@ -28,7 +31,7 @@ def setup_admin(app):
 
 
     # Add your models here, for example this is how we add a the User model to the admin
-    admin.add_view(ModelView(User, db.session))
+    admin.add_view(UserView(User, db.session))
     admin.add_view(NotesView(Notes, db.session))
     admin.add_view(HabitsView(Habits, db.session))
     admin.add_view(GoalsView(Goals, db.session))

src/api/models.py

@@ -1,18 +1,32 @@
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.orm import mapped_column, Mapped, relationship
-from sqlalchemy import Integer, String, ForeignKey
+from sqlalchemy import Integer, Enum, String, ForeignKey, Boolean
+from enum import Enum as PyEnum
 
 db = SQLAlchemy()
 
+class Gender(PyEnum):
+    MALE = "Male"
+    FEMALE = "Female"
+    NON_BINARY = "Non-binary"
+    OTHER = "Other"
+    PREFER_NOT_TO_SAY = "Prefer not to say"
+
+class Role(PyEnum):
+    ADMIN = "Admin"
+    MODERATOR = "Moderator"
+    USER = "User"
+
 class User(db.Model):
     __tablename__ = "user"
 
     id: Mapped[int] = mapped_column(primary_key=True)
     name: Mapped[str] = mapped_column(String(120), nullable=False)
     email: Mapped[str] = mapped_column(String(120), unique=True, nullable=False)
     password: Mapped[str] = mapped_column(String(500))
-    is_active: Mapped[bool]
-    # role: Mapped[int] = mapped_column(Integer, nullable=False)
+    gender: Mapped[Gender] = mapped_column(Enum(Gender), nullable=False)
+    is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
+    role: Mapped[Role] = mapped_column(Enum(Role), nullable=False, default=Role.USER)
     notes: Mapped["Notes"] = relationship(back_populates="user")
     habits: Mapped["Habits"] = relationship(back_populates="user")
     goals: Mapped["Goals"] = relationship(back_populates="user")
@@ -24,8 +38,9 @@ def serialize(self):
             "id": self.id,
             "name": self.name,
             "email": self.email,
+            "gender": self.gender.value,
             "is_active": self.is_active,
-            # "role": self.role
+            "role": self.role.value
         }
 
 class Notes(db.Model):