[Fixes🦾] Add db Column UUID to id fields.

Esekyi · Aug 25, 2024 · 738d242 · 738d242
1 parent 6fed586
commit 738d242
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/app/models/category.py b/app/models/category.py
@@ -1,11 +1,11 @@
 from app import db
 from datetime import datetime
 import uuid
+from sqlalchemy.dialects.postgresql import UUID
 
 
 class Category(db.Model):
-    id = db.Column(db.String(36), primary_key=True,
-                   default=lambda: str(uuid.uuid4()))
+    id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     name = db.Column(db.String(80), unique=True, nullable=False)
     description = db.Column(db.Text)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)

diff --git a/app/models/comment.py b/app/models/comment.py
@@ -1,15 +1,16 @@
 from app import db
 from datetime import datetime
 import uuid
+from sqlalchemy.dialects.postgresql import UUID
 
 
 class Comment(db.Model):
-    id = db.Column(db.String(36), primary_key=True,
-                   default=lambda: str(uuid.uuid4()))
+    id = db.Column(UUID(as_uuid=True), primary_key=True,
+                   default=uuid.uuid4)
     text = db.Column(db.Text, nullable=False)
-    user_id = db.Column(db.String(36), db.ForeignKey(
-        'user.id'), nullable=False)
-    recipe_id = db.Column(db.String(36), db.ForeignKey(
+    user_id = db.Column(UUID(as_uuid=True),
+                        db.ForeignKey('user.id'), nullable=False)
+    recipe_id = db.Column(UUID(as_uuid=True), db.ForeignKey(
         'recipe.id'), nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(

diff --git a/app/models/ingredient.py b/app/models/ingredient.py
@@ -1,14 +1,15 @@
 from app import db
 from datetime import datetime
 import uuid
+from sqlalchemy.dialects.postgresql import UUID
 
 
 class Ingredient(db.Model):
-    id = db.Column(db.String(36), primary_key=True,
-                   default=lambda: str(uuid.uuid4()))
+    id = db.Column(UUID(as_uuid=True), primary_key=True,
+                   default=uuid.uuid4)
     name = db.Column(db.String(120), nullable=False)
     quantity = db.Column(db.String(50), nullable=False)
-    recipe_id = db.Column(db.String(36), db.ForeignKey(
+    recipe_id = db.Column(UUID(as_uuid=True), db.ForeignKey(
         'recipe.id'), nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(

diff --git a/app/models/recipe.py b/app/models/recipe.py
@@ -1,21 +1,22 @@
 from app import db
 from datetime import datetime
 import uuid
+from sqlalchemy.dialects.postgresql import UUID
 
 
 class Recipe(db.Model):
-    id = db.Column(db.String(36), primary_key=True,
-                   default=lambda: str(uuid.uuid4()))
+    id = db.Column(UUID(as_uuid=True), primary_key=True,
+                   default=uuid.uuid4)
     title = db.Column(db.String(120), nullable=False)
     description = db.Column(db.Text, nullable=False)
     instructions = db.Column(db.Text, nullable=False)
     prep_time = db.Column(db.Integer)  # in minutes
     cook_time = db.Column(db.Integer)  # in minutes
     servings = db.Column(db.Integer)
     image_url = db.Column(db.String(255))
-    category_id = db.Column(db.String(36), db.ForeignKey(
+    category_id = db.Column(UUID(as_uuid=True), db.ForeignKey(
         'category.id'), nullable=False)
-    user_id = db.Column(db.String(36), db.ForeignKey(
+    user_id = db.Column(UUID(as_uuid=True), db.ForeignKey(
         'user.id'), nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(

diff --git a/app/models/user.py b/app/models/user.py
@@ -2,14 +2,17 @@
 from datetime import datetime
 import uuid
 from flask_login import UserMixin
+from sqlalchemy.dialects.postgresql import UUID
 
 
 class User(db.Model, UserMixin):
-    id = db.Column(db.String(36), primary_key=True,
-                   default=lambda: str(uuid.uuid4()))
+    id = db.Column(UUID(as_uuid=True), primary_key=True,
+                   default = uuid.uuid4)
+    first_name = db.Column(db.String(50), nullable=False)
+    last_name = db.Column(db.String(50), nullable=False)
     username = db.Column(db.String(80), unique=True, nullable=False, index=True)
     email = db.Column(db.String(120), unique=True, nullable=False, index=True)
-    password_hash = db.Column(db.String(128), nullable=False)
+    password_hash = db.Column(db.String(255), nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     updated_at = db.Column(
         db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)