Merge remote-tracking branch 'origin/develop' into develop

Author: aweiland

src/apps/activity_assignments/db/schemas.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Column, ForeignKey, Index
+from sqlalchemy.dialects.postgresql import UUID
 
 from infrastructure.database import Base
 
@@ -8,10 +9,10 @@
 class ActivityAssigmentSchema(Base):
     __tablename__ = "activity_assignments"
 
-    activity_flow_id = Column(ForeignKey("flows.id", ondelete="RESTRICT"), nullable=True)
-    activity_id = Column(ForeignKey("activities.id", ondelete="RESTRICT"), nullable=True)
-    respondent_subject_id = Column(ForeignKey("subjects.id", ondelete="RESTRICT"), nullable=False)
-    target_subject_id = Column(ForeignKey("subjects.id", ondelete="RESTRICT"), nullable=False)
+    activity_flow_id = Column(UUID(as_uuid=True), nullable=True)
+    activity_id = Column(UUID(as_uuid=True), nullable=True)
+    respondent_subject_id = Column(ForeignKey("subjects.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
+    target_subject_id = Column(ForeignKey("subjects.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
 
     __table_args__ = (
         Index(

src/apps/alerts/db/schemas.py

@@ -20,7 +20,7 @@ class AlertSchema(Base):
         nullable=True,
     )
     subject_id = Column(
-        ForeignKey("subjects.id", ondelete="RESTRICT"),
+        ForeignKey("subjects.id", ondelete="RESTRICT", onupdate="CASCADE"),
         nullable=True,
     )
     is_watched = Column(Boolean(), nullable=False, default=False)

src/apps/answers/db/schemas.py

@@ -9,6 +9,7 @@
     Text,
     Time,
     Unicode,
+    UniqueConstraint,
     and_,
     asc,
     false,
@@ -31,9 +32,9 @@ class AnswerSchema(HistoryAware, Base):
     version = Column(Text())
     submit_id = Column(UUID(as_uuid=True))
     client = Column(JSONB())
-    applet_history_id = Column(Text(), nullable=False, index=True)
-    flow_history_id = Column(Text(), nullable=True, index=True)
-    activity_history_id = Column(Text(), nullable=False, index=True)
+    applet_history_id = Column(String(), nullable=False, index=True)
+    flow_history_id = Column(String(), nullable=True, index=True)
+    activity_history_id = Column(String(), nullable=False, index=True)
     respondent_id = Column(UUID(as_uuid=True), nullable=True, index=True)
     is_flow_completed = Column(Boolean(), nullable=True)
     migrated_data = Column(JSONB())
@@ -42,8 +43,8 @@ class AnswerSchema(HistoryAware, Base):
     input_subject_id = Column(UUID(as_uuid=True), nullable=True, index=True)
     relation = Column(String(length=20), nullable=True)
     consent_to_share = Column(Boolean(), default=False)
-    event_history_id = Column(String(), nullable=True, index=True)
-    device_id = Column(Text(), nullable=True, index=True)
+    event_history_id = Column(String(), nullable=True)
+    device_id = Column(Text(), nullable=True)
 
     answer_item = relationship(
         "AnswerItemSchema",
@@ -101,8 +102,10 @@ def is_identifier_encrypted(cls):
 class AnswerEHRSchema(Base):
     __tablename__ = "answers_ehr"
 
-    submit_id = Column(UUID(as_uuid=True), index=True)
-    activity_id = Column(UUID(as_uuid=True), index=True)
+    submit_id = Column(UUID(as_uuid=True))
+    activity_id = Column(UUID(as_uuid=True))
     ehr_storage_uri = Column(Text())
     ehr_ingestion_status = Column(Text())
     meta = Column(JSONB())
+
+    __table_args__ = (UniqueConstraint("submit_id", "activity_id", name="answers_ehr_submit_activity_key"),)

src/apps/authentication/db/schemas.py

@@ -11,7 +11,7 @@ class TokenBlacklistSchema(Base):
     jti = Column(Text(), index=True, unique=True, nullable=False)
     user_id = Column(UUID(as_uuid=True), nullable=False)
     exp = Column(DateTime(), index=True, nullable=False)
-    type = Column(Enum(TokenPurpose), nullable=False)
+    type = Column(Enum(TokenPurpose, name="token_purpose"), nullable=False)
     rjti = Column(Text(), index=True, nullable=True)
 
 

src/apps/schedule/db/schemas.py

@@ -16,12 +16,13 @@ class _BaseEventSchema:
     timer_type = Column(String(10), nullable=False)  # NOT_SET, TIMER, IDLE
     version = Column(
         String(13),
+        nullable=False,
         default=lambda: datetime.datetime.now(datetime.UTC).strftime("%Y%m%d") + "-1",
         server_default=text("TO_CHAR(timezone('utc', now()), 'YYYYMMDD') || '-1'"),
     )
 
     # Periodicity columns
-    periodicity = Column(String(10))  # Options: ONCE, DAILY, WEEKLY, WEEKDAYS, MONTHLY, ALWAYS
+    periodicity = Column(String(10), nullable=False)  # Options: ONCE, DAILY, WEEKLY, WEEKDAYS, MONTHLY, ALWAYS
     start_date = Column(Date, nullable=True)
     end_date = Column(Date, nullable=True)
     selected_date = Column(Date, nullable=True)
@@ -50,7 +51,7 @@ class AppletEventsSchema(Base):
     __tablename__ = "applet_events"
 
     applet_id = Column(ForeignKey("applet_histories.id_version", ondelete="CASCADE"), nullable=False)
-    event_id = Column(ForeignKey("event_histories.id_version", ondelete="CASCADE"), nullable=False)
+    event_id = Column(ForeignKey("event_histories.id_version", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
 
     __table_args__ = (
         UniqueConstraint(
@@ -73,15 +74,15 @@ class _BaseNotificationSchema:
 class NotificationSchema(_BaseNotificationSchema, Base):
     __tablename__ = "notifications"
 
-    event_id = Column(ForeignKey("events.id", ondelete="CASCADE"), nullable=False)
+    event_id = Column(ForeignKey("events.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
 
 
 class NotificationHistorySchema(_BaseNotificationSchema, HistoryAware, Base):
     __tablename__ = "notification_histories"
 
     id_version = Column(String(), primary_key=True)
     id = Column(UUID(as_uuid=True))
-    event_id = Column(ForeignKey("event_histories.id_version", ondelete="RESTRICT"), nullable=False)
+    event_id = Column(ForeignKey("event_histories.id_version", ondelete="RESTRICT", onupdate="CASCADE"), nullable=False)
 
 
 class _BaseReminderSchema:
@@ -92,15 +93,15 @@ class _BaseReminderSchema:
 class ReminderSchema(_BaseReminderSchema, Base):
     __tablename__ = "reminders"
 
-    event_id = Column(ForeignKey("events.id", ondelete="CASCADE"), nullable=False)
+    event_id = Column(ForeignKey("events.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=False)
 
 
 class ReminderHistorySchema(_BaseReminderSchema, HistoryAware, Base):
     __tablename__ = "reminder_histories"
 
     id_version = Column(String(), primary_key=True)
     id = Column(UUID(as_uuid=True))
-    event_id = Column(ForeignKey("event_histories.id_version", ondelete="RESTRICT"), nullable=False)
+    event_id = Column(ForeignKey("event_histories.id_version", ondelete="RESTRICT", onupdate="CASCADE"), nullable=False)
 
 
 class UserDeviceEventsHistorySchema(Base):

src/apps/subjects/db/schemas.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Column, ForeignKey, Index, String, Unicode
+from sqlalchemy import Boolean, Column, ForeignKey, Index, String, Unicode
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy_utils import StringEncryptedType
 
@@ -10,6 +10,7 @@
 
 class SubjectSchema(Base):
     __tablename__ = "subjects"
+    is_deleted = Column(Boolean(), nullable=False, default=False)
     applet_id = Column(ForeignKey("applets.id", ondelete="RESTRICT"), nullable=False)
     creator_id = Column(ForeignKey("users.id", ondelete="RESTRICT"), nullable=False)
     user_id = Column(ForeignKey("users.id", ondelete="RESTRICT"), nullable=True)
@@ -19,29 +20,25 @@ class SubjectSchema(Base):
     nickname = Column(StringEncryptedType(Unicode, get_key), default=None, nullable=True)
     tag = Column(String, default=None, nullable=True)
     secret_user_id = Column(String, nullable=False)
-    language = Column(String(length=5))
+    language = Column(String(length=20))
     integration_source = Column(String(length=20), nullable=True, default=None)
     meta = Column(JSONB(), nullable=True)
 
     __table_args__ = (
-        Index(
-            None,
-            "user_id",
-            "applet_id",
-            unique=True,
-        ),
+        Index(None, "user_id", "applet_id", unique=True),
+        Index("idx_subjects_meta", "meta", postgresql_using="gin"),
     )
 
 
 class SubjectRelationSchema(Base):
     __tablename__ = "subject_relations"
     source_subject_id = Column(
-        ForeignKey("subjects.id", ondelete="RESTRICT"),
+        ForeignKey("subjects.id", ondelete="RESTRICT", onupdate="CASCADE"),
         nullable=False,
         index=True,
     )
     target_subject_id = Column(
-        ForeignKey("subjects.id", ondelete="RESTRICT"),
+        ForeignKey("subjects.id", ondelete="RESTRICT", onupdate="CASCADE"),
         nullable=False,
         index=True,
     )

src/apps/users/db/schemas.py

@@ -11,14 +11,14 @@
 class UserSchema(Base):
     __tablename__ = "users"
 
-    email = Column(String(length=56), unique=True)
+    email = Column(String(length=100), unique=True)
     email_encrypted = Column(StringEncryptedType(Unicode, get_key), default=None)
     first_name = Column(StringEncryptedType(Unicode, get_key))
     last_name = Column(StringEncryptedType(Unicode, get_key))
     hashed_password = Column(String(length=100))
     last_seen_at = Column(DateTime(), default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
     is_super_admin = Column(Boolean(), default=False, server_default="false")
-    mfa_enabled = Column(Boolean(), default=False, server_default="false")
+    mfa_enabled = Column(Boolean(), nullable=False, default=False, server_default="false")
     mfa_secret = Column(Text(), nullable=True)  # Changed from String(100) to Text() for encrypted values
     pending_mfa_secret = Column(Text(), nullable=True)
     pending_mfa_created_at = Column(DateTime(), nullable=True)

src/apps/workspaces/db/schemas/user_applet_access.py

@@ -111,6 +111,6 @@ class UserPinSchema(Base):
 
     user_id = Column(ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
     pinned_user_id = Column(ForeignKey("users.id", ondelete="CASCADE"), nullable=True)
-    pinned_subject_id = Column(ForeignKey("subjects.id", ondelete="CASCADE"), nullable=True)
+    pinned_subject_id = Column(ForeignKey("subjects.id", ondelete="CASCADE", onupdate="CASCADE"), nullable=True)
     owner_id = Column(ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
     role = Column(Enum(UserPinRole, name="user_pin_role"), nullable=False)

src/config/__init__.py

@@ -121,12 +121,12 @@ def uploads_dir(self):
         "applets",
         "activities",
         "activity_flows",
+        "activity_assignments",
         "themes",
         "logs",
         "schedule",
         "answers",
         "folders",
-        "answers",
         "invitations",
         "workspaces",
         "transfer_ownership",
@@ -136,6 +136,7 @@ def uploads_dir(self):
         "job",
         "subjects",
         "integrations",
+        "integrations.loris",
     ],
 )
 

src/infrastructure/database/migrations/base.py

@@ -7,8 +7,6 @@
 Import all SQLAlchemy models here
 """
 
-import os
-
 from config import settings
 from infrastructure.database import Base  # noqa: F401, F403
 
@@ -18,10 +16,7 @@ def import_db_schemas():
     of database schemas that are used by SQLAlchemy.
     """
 
-    for app in os.listdir(settings.apps_dir):
-        if app not in settings.migrations_apps:
-            continue
-
+    for app in settings.migrations_apps:
         __import__(f"apps.{app}.db.schemas")