Merge pull request #32 from yuvabe-ai-labs/feat/chatbot

alembic/versions/1cbb7317540a_fix_water_log_id_uuid.py

@@ -0,0 +1,32 @@
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import uuid
+
+# revision identifiers, used by Alembic.
+revision: str = '1cbb7317540a'
+down_revision: Union[str, Sequence[str], None] = '9176b44b89ba'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # Drop the old id column (this will remove the INTEGER id column)
+    op.drop_column('water_logs', 'id')
+    
+    # Add the new UUID id column
+    op.add_column('water_logs', sa.Column('id', sa.UUID(), nullable=False, primary_key=True, default=uuid.uuid4))
+    
+    # Optional: If you had any foreign key constraints or other indexes on the old id, you might need to add them back.
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # Drop the UUID id column
+    op.drop_column('water_logs', 'id')
+    
+    # Add the original INTEGER id column back
+    op.add_column('water_logs', sa.Column('id', sa.Integer(), nullable=False, primary_key=True))
+    
+    # Optional: Restore any other changes you might have made during the downgrade

alembic/versions/9176b44b89ba_added_water_logs_table.py

@@ -0,0 +1,42 @@
+"""added: water_logs table
+
+Revision ID: 9176b44b89ba
+Revises: e96769f268bc
+Create Date: 2025-11-29 21:28:42.789611
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9176b44b89ba'
+down_revision: Union[str, Sequence[str], None] = 'e96769f268bc'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('water_logs',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('user_id', sa.UUID(), nullable=False),
+    sa.Column('amount_ml', sa.Integer(), nullable=False),
+    sa.Column('logged_at', sa.DateTime(), nullable=False),
+    sa.Column('goal_ml', sa.Integer(), nullable=True),
+    sa.Column('recommended_ml', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('water_logs')
+    # ### end Alembic commands ###

src/core/__init__.py

@@ -4,3 +4,4 @@ from src.core import models as core_models
 from src.feed import models as feed_models
 from src.home import models as home_models
 from src.profile import models as profile_models
+from src.wellbeing import models as wellbeing_models

src/wellbeing/models.py

@@ -0,0 +1,18 @@
+from sqlmodel import Field, SQLModel, Relationship, ForeignKey,Column
+import uuid
+from datetime import datetime
+from typing import Optional
+from sqlalchemy.dialects.postgresql import UUID
+
+class WaterLogs(SQLModel, table=True):
+    __tablename__ = "water_logs"
+    id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
+    user_id: uuid.UUID = Field(
+        sa_column=Column(UUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
+    )
+    amount_ml: int = Field(..., nullable=False)
+    logged_at: datetime = Field(default_factory=datetime.now, nullable=False)
+    goal_ml: Optional[int] = Field(default=None, nullable=True)
+    recommended_ml: Optional[int] = Field(default=None, nullable=True)
+    
+    user: "Users" = Relationship(back_populates="water_logs")