Revert "LLSC-65: Created form_status column on users table that keeps track of where the user is in terms of onboarding process. We use this to automatically redirect participants/volunteers to where they should be"

This reverts commit 3c722d0.

Author: YashK2005

AGENTS.md

@@ -1,24 +1,13 @@
 import uuid
-from enum import Enum as PyEnum
 
-from sqlalchemy import Boolean, Column, Enum as SQLEnum, ForeignKey, Integer, String
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 
 from .Base import Base
 from .Match import Match
 
 
-class FormStatus(str, PyEnum):
-    INTAKE_TODO = "intake-todo"
-    INTAKE_SUBMITTED = "intake-submitted"
-    RANKING_TODO = "ranking-todo"
-    RANKING_SUBMITTED = "ranking-submitted"
-    SECONDARY_APPLICATION_TODO = "secondary-application-todo"
-    SECONDARY_APPLICATION_SUBMITTED = "secondary-application-submitted"
-    COMPLETED = "completed"
-
-
 class User(Base):
     __tablename__ = "users"
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
@@ -29,16 +18,6 @@ class User(Base):
     auth_id = Column(String, nullable=False)
     approved = Column(Boolean, default=False)
     active = Column(Boolean, nullable=False, default=True)
-    form_status = Column(
-        SQLEnum(
-            FormStatus,
-            name="form_status_enum",
-            create_type=False,
-            values_callable=lambda enum_cls: [member.value for member in enum_cls],
-        ),
-        nullable=False,
-        default=FormStatus.INTAKE_TODO,
-    )
 
     role = relationship("Role")
 

CLAUDE.md

@@ -21,7 +21,7 @@
 from .SuggestedTime import suggested_times
 from .TimeBlock import TimeBlock
 from .Treatment import Treatment
-from .User import FormStatus, User
+from .User import User
 from .UserData import UserData
 
 # Used to avoid import errors for the models
@@ -42,7 +42,6 @@
     "RankingPreference",
     "Form",
     "FormSubmission",
-    "FormStatus",
 ]
 
 log = logging.getLogger(LOGGER_NAME("models"))

backend/app/models/User.py

@@ -127,7 +127,6 @@ async def get_current_user(
             role_id=user.role_id,
             auth_id=user.auth_id,
             approved=user.approved,
-            form_status=user.form_status,
         )
     except HTTPException:
         raise

backend/app/models/__init__.py

@@ -35,16 +35,6 @@ def to_role_id(cls, role: "UserRole") -> int:
         return role_map[role]
 
 
-class FormStatus(str, Enum):
-    INTAKE_TODO = "intake-todo"
-    INTAKE_SUBMITTED = "intake-submitted"
-    RANKING_TODO = "ranking-todo"
-    RANKING_SUBMITTED = "ranking-submitted"
-    SECONDARY_APPLICATION_TODO = "secondary-application-todo"
-    SECONDARY_APPLICATION_SUBMITTED = "secondary-application-submitted"
-    COMPLETED = "completed"
-
-
 class UserBase(BaseModel):
     """
     Base schema for user model with common attributes shared across schemas.
@@ -101,7 +91,6 @@ class UserUpdateRequest(BaseModel):
     email: Optional[EmailStr] = None
     role: Optional[UserRole] = None
     approved: Optional[bool] = None
-    form_status: Optional[FormStatus] = None
 
 
 class UserCreateResponse(BaseModel):
@@ -116,7 +105,6 @@ class UserCreateResponse(BaseModel):
     role_id: int
     auth_id: str
     approved: bool
-    form_status: FormStatus
 
     # from_attributes enables automatic mapping from SQLAlchemy model to Pydantic model
     model_config = ConfigDict(from_attributes=True)
@@ -135,7 +123,6 @@ class UserResponse(BaseModel):
     auth_id: str
     approved: bool
     role: "RoleResponse"
-    form_status: FormStatus
 
     model_config = ConfigDict(from_attributes=True)
 

backend/app/routes/auth.py

@@ -7,7 +7,7 @@
 
 from app.models.Experience import Experience
 from app.models.Treatment import Treatment
-from app.models.User import FormStatus, User
+from app.models.User import User
 from app.models.UserData import UserData
 from app.utilities.form_constants import ExperienceId, TreatmentId
 
@@ -316,7 +316,6 @@ def seed_users(session: Session) -> None:
             auth_id=user_info["user_data"]["auth_id"],
             approved=True,
             active=True,
-            form_status=FormStatus.INTAKE_TODO,
         )
         session.add(user)
         session.flush()  # Get user ID

backend/app/schemas/user.py

@@ -5,7 +5,7 @@
 
 from sqlalchemy.orm import Session
 
-from app.models import Experience, FormStatus, Treatment, User, UserData
+from app.models import Experience, Treatment, User, UserData
 
 logger = logging.getLogger(__name__)
 
@@ -72,14 +72,6 @@ def process_form_submission(self, user_id: str, form_data: Dict[str, Any]) -> Us
                 if owning_user and owning_user.email:
                     user_data.email = owning_user.email
 
-            # Update form status for the owning user without regressing progress
-            owning_user = self.db.query(User).filter(User.id == user_data.user_id).first()
-            if owning_user and owning_user.form_status in {
-                FormStatus.INTAKE_TODO,
-                FormStatus.INTAKE_SUBMITTED,
-            }:
-                owning_user.form_status = FormStatus.INTAKE_SUBMITTED
-
             # Commit all changes
             self.db.commit()
             self.db.refresh(user_data)

backend/app/seeds/users.py

@@ -2,7 +2,7 @@
 
 from sqlalchemy.orm import Session
 
-from app.models import FormStatus, Quality, User, UserData
+from app.models import Quality, User, UserData
 from app.models.RankingPreference import RankingPreference
 
 
@@ -205,11 +205,4 @@ def save_preferences(self, user_auth_id: str, target: str, items: List[Dict]) ->
         )
         if normalized:
             self.db.bulk_save_objects(normalized)
-
-        if user.form_status in (
-            FormStatus.RANKING_TODO,
-            FormStatus.RANKING_SUBMITTED,
-        ):
-            user.form_status = FormStatus.RANKING_SUBMITTED
-
         self.db.commit()