Merge pull request #43 from yuvabe-ai-labs/feat/journaling

alembic/versions/3380d93055a7_delete_posts_comments_likes_table.py

@@ -0,0 +1,74 @@
+"""delete posts,comments,likes table
+
+Revision ID: 3380d93055a7
+Revises: 217db60578fa
+Create Date: 2025-12-06 21:27:45.958044
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = '3380d93055a7'
+down_revision: Union[str, Sequence[str], None] = '217db60578fa'
+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.drop_constraint("likes_post_id_fkey", "likes", type_="foreignkey")
+    op.drop_constraint("comments_post_id_fkey", "comments", type_="foreignkey")
+    op.drop_table("posts")
+    op.drop_table("likes")
+    op.drop_table("comments")
+    op.alter_column('app_version', 'apk_download_link',
+               existing_type=sa.VARCHAR(),
+               nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('app_version', 'apk_download_link',
+               existing_type=sa.VARCHAR(),
+               nullable=True)
+    op.create_table('comments',
+    sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('post_id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('user_id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('comment', sa.VARCHAR(), autoincrement=False, nullable=False),
+    sa.Column('created_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=False),
+    sa.ForeignKeyConstraint(['post_id'], ['posts.id'], name=op.f('comments_post_id_fkey'), ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('comments_user_id_fkey'), ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id', name=op.f('comments_pkey'))
+    )
+    op.create_table('likes',
+    sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('post_id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('user_id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('liked_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=False),
+    sa.ForeignKeyConstraint(['post_id'], ['posts.id'], name=op.f('likes_post_id_fkey'), ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('likes_user_id_fkey'), ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id', name=op.f('likes_pkey')),
+    sa.UniqueConstraint('user_id', 'post_id', name=op.f('likes_user_id_post_id_key'), postgresql_include=[], postgresql_nulls_not_distinct=False)
+    )
+    op.create_table('posts',
+    sa.Column('id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('user_id', sa.UUID(), autoincrement=False, nullable=True),
+    sa.Column('type', postgresql.ENUM('BIRTHDAY', 'NOTICE', 'BANNER', 'JOB_REQUEST', name='posttype'), autoincrement=False, nullable=False),
+    sa.Column('category', postgresql.ENUM('TEAM', 'GLOBAL', name='postcategory'), autoincrement=False, nullable=False),
+    sa.Column('caption', sa.VARCHAR(), autoincrement=False, nullable=True),
+    sa.Column('image', sa.VARCHAR(), autoincrement=False, nullable=True),
+    sa.Column('created_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=False),
+    sa.Column('edited_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=False),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('posts_user_id_fkey'), ondelete='SET NULL'),
+    sa.PrimaryKeyConstraint('id', name=op.f('posts_pkey'))
+    )
+    # ### end Alembic commands ###

src/core/__init__.py

@@ -1,7 +1,6 @@
 from src.auth import models as auth_models
 from src.chatbot import models as chatbot_models
 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/feed/config.py

@@ -1,6 +0,0 @@
-from pydantic import BaseSettings
-
-class HomeSettings(BaseSettings):
-    FEATURE_ENABLED: bool = True
-
-home_settings = HomeSettings()

src/feed/constants.py

@@ -1,2 +0,0 @@
-WELCOME_MESSAGE = "Welcome to Yuvabe's Home Screen"
-EXIT_MESSAGE = "Thank You have a wonderful day"

src/feed/models.py

@@ -1,75 +0,0 @@
-import uuid
-from datetime import datetime
-from enum import Enum
-from typing import Optional
-
-from sqlalchemy import UniqueConstraint, ForeignKey, Column
-from sqlmodel import Field, SQLModel
-from sqlalchemy.dialects.postgresql import UUID
-
-
-class PostType(str, Enum):
-    BIRTHDAY = "Birthday"
-    NOTICE = "Notice"
-    BANNER = "Banner"
-    JOB_REQUEST = "Job Request"
-
-
-class PostCategory(str, Enum):
-    TEAM = "Team"
-    GLOBAL = "Global"
-
-
-class Posts(SQLModel, table=True):
-    __tablename__ = "posts"
-    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="SET NULL"),
-            nullable=True
-        )
-    )
-    type: PostType = Field(default=PostType.NOTICE)
-    category: PostCategory = Field(default=PostCategory.GLOBAL)
-    caption: Optional[str] = None
-    image: Optional[str] = None
-    created_at: datetime = Field(default_factory=datetime.now, nullable=False)
-    edited_at: datetime = Field(default_factory=datetime.now)
-
-
-class Comments(SQLModel, table=True):
-    __tablename__ = "comments"
-    id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
-    post_id: uuid.UUID = Field(
-        sa_column=Column(UUID(as_uuid=True),
-            ForeignKey("posts.id", ondelete="CASCADE"),
-            nullable=False
-        )
-    )
-    user_id: uuid.UUID = Field(
-        sa_column=Column(UUID(as_uuid=True),
-            ForeignKey("users.id", ondelete="CASCADE"),
-            nullable=False
-        )
-    )
-    comment: str = Field(nullable=False)
-    created_at: datetime = Field(default_factory=datetime.now, nullable=False)
-
-
-class Likes(SQLModel, table=True):
-    __tablename__ = "likes"
-    __table_args__ = (UniqueConstraint("user_id", "post_id"),)
-    id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
-    post_id: uuid.UUID = Field(
-        sa_column=Column(UUID(as_uuid=True),
-            ForeignKey("posts.id", ondelete="CASCADE"),
-            nullable=False
-        )
-    )
-    user_id: uuid.UUID = Field(
-        sa_column=Column(UUID(as_uuid=True),
-            ForeignKey("users.id", ondelete="CASCADE"),
-            nullable=False
-        )
-    )
-    liked_at: datetime = Field(default_factory=datetime.now, nullable=False)

src/feed/service.py

@@ -1,2 +0,0 @@
-from typing import List
-from uuid import UUID

src/profile/models.py

@@ -63,6 +63,4 @@ class UserDevices(SQLModel, table=True):
     )
     device_token: str
     last_seen: datetime = Field(default_factory=datetime.now)
-    device_model: str
-    platform: str
     updated_at: datetime = Field(default_factory=datetime.now)