feat: updated emotion tag

src/core/models.py

@@ -7,7 +7,7 @@ from typing import List, Optional
 
 
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy import CheckConstraint, UniqueConstraint, ForeignKey
+from sqlalchemy import CheckConstraint, UniqueConstraint, ForeignKey, SAEnum
 from sqlmodel import Field, Relationship, SQLModel
 
 
@@ -17,6 +17,14 @@ class AssetStatus(str, Enum):
     ON_REQUEST = "On Request"
     IN_SERVICE = "In Service"
 
+class Emotion(str, Enum):
+    JOYFUL = "joyful"
+    HAPPY = "happy"
+    CALM = "calm"
+    NEUTRAL = "neutral"
+    ANXIOUS = "anxious"
+    SAD = "sad"
+    FRUSTRATED = "frustrated"
 
 class Users(SQLModel, table=True):
     __tablename__ = "users"
@@ -81,23 +89,28 @@ class Assets(SQLModel, table=True):
     name: str = Field(nullable=False)
     type: str = Field(nullable=False)
     status: AssetStatus = Field(default=AssetStatus.UNAVAILABLE)
-    user: "Users" = Relationship(back_populates="asset")
+    user: "Users" = Relationship(back_populatealmosts="asset")
 
 
 class EmotionLogs(SQLModel, table=True):
     __tablename__ = "emotion_logs"
     __table_args__ = (
         UniqueConstraint("user_id", "log_date"),
-        CheckConstraint("morning_emotion BETWEEN 1 AND 7 or morning_emotion IS NULL"),
-        CheckConstraint("evening_emotion BETWEEN 1 AND 7 or evening_emotion IS NULL"),
     )
     id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
     user_id: uuid.UUID = Field(
-        sa_column=Column(UUID(as_uuid=True),
+        sa_column=Column(
+            UUID(as_uuid=True),
             ForeignKey("users.id", ondelete="CASCADE"),
             nullable=False
         )
     )
-    morning_emotion: Optional[int] = Field(default=None, ge=1, le=7)
-    evening_emotion: Optional[int] = Field(default=None, ge=1, le=7)
+    morning_emotion: Optional[Emotion] = Field(
+        default=None,
+        sa_column=Column(SAEnum(Emotion, native_enum=False), nullable=True)
+    )
+    evening_emotion: Optional[Emotion] = Field(
+        default=None,
+        sa_column=Column(SAEnum(Emotion, native_enum=False), nullable=True)
+    )
     log_date: date = Field(default_factory=date.today)

src/home/schemas.py

@@ -1,22 +1,19 @@
-# pylint: disable=no-name-in-module
-# pylint: disable=no-self-argument
 from datetime import date
-from typing import List, Optional, Union
-
+from typing import List, Optional
 from pydantic import BaseModel
-
+from src.core.enums import Emotion
 
 class EmotionLogCreate(BaseModel):
     user_id: str
-    morning_emotion: Optional[int] = None
-    evening_emotion: Optional[int] = None
+    morning_emotion: Optional[Emotion] = None
+    evening_emotion: Optional[Emotion] = None
     log_date: date
 
 
 class EmotionLogResponse(BaseModel):
     log_date: date
-    morning_emotion: Optional[int]
-    evening_emotion: Optional[int]
+    morning_emotion: Optional[Emotion]
+    evening_emotion: Optional[Emotion]
 
 
 class HomeResponseData(BaseModel):
@@ -25,6 +22,7 @@ class HomeResponseData(BaseModel):
     philosophy_text: str
     recent_emotions: List[EmotionLogResponse]
 
+
 class BroadcastNotificationRequest(BaseModel):
     title: str
     body: str

src/home/service.py

@@ -46,6 +46,7 @@ async def get_home_data(user_id: str, session: AsyncSession) -> HomeResponseData
 async def add_or_update_emotion(
     data: EmotionLogCreate, session: AsyncSession
 ) -> EmotionLogResponse:
+
     user_exists = await session.exec(select(Users).where(Users.id == data.user_id))
     if not user_exists.first():
         raise ValueError("User not found. Cannot add emotion log.")