Merge pull request #5613 from HHS/OPS-1639/budget-team-requisition-approval

feat: OPS-1639 PR1 - Budget Team Requisition Approval Backend

Author: josbell

backend/alembic/versions/2026_04_30_1543-b9c8d7e6f5a4_add_pre_award_requisition_fields.py

@@ -0,0 +1,78 @@
+"""Add pre_award requisition fields for budget team approval
+
+Adds four new fields to support budget team requisition approval workflow (OPS-1639):
+- pre_award_requisition_number: Requisition number entered by budget team
+- pre_award_requisition_date: Date of requisition
+- pre_award_requisition_approved_by: FK to user who approved requisition
+- pre_award_requisition_approved_date: Date of requisition approval
+
+Revision ID: b9c8d7e6f5a4
+Revises: f1a2b3c4d5e6
+Create Date: 2026-04-30 15:43:00.000000+00:00
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b9c8d7e6f5a4'
+down_revision: Union[str, None] = 'f1a2b3c4d5e6'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Add columns to main table
+    op.add_column('procurement_tracker_step',
+                  sa.Column('pre_award_requisition_number', sa.String(100), nullable=True))
+    op.add_column('procurement_tracker_step',
+                  sa.Column('pre_award_requisition_date', sa.Date(), nullable=True))
+    op.add_column('procurement_tracker_step',
+                  sa.Column('pre_award_requisition_approved_by', sa.Integer(), nullable=True))
+    op.add_column('procurement_tracker_step',
+                  sa.Column('pre_award_requisition_approved_date', sa.Date(), nullable=True))
+
+    # Create foreign key constraint
+    op.create_foreign_key(
+        'fk_procurement_tracker_step_requisition_approved_by',
+        'procurement_tracker_step',
+        'ops_user',
+        ['pre_award_requisition_approved_by'],
+        ['id'],
+        ondelete='SET NULL'
+    )
+
+    # Add columns to version table (audit history)
+    op.add_column('procurement_tracker_step_version',
+                  sa.Column('pre_award_requisition_number', sa.String(100),
+                            autoincrement=False, nullable=True))
+    op.add_column('procurement_tracker_step_version',
+                  sa.Column('pre_award_requisition_date', sa.Date(),
+                            autoincrement=False, nullable=True))
+    op.add_column('procurement_tracker_step_version',
+                  sa.Column('pre_award_requisition_approved_by', sa.Integer(),
+                            autoincrement=False, nullable=True))
+    op.add_column('procurement_tracker_step_version',
+                  sa.Column('pre_award_requisition_approved_date', sa.Date(),
+                            autoincrement=False, nullable=True))
+
+
+def downgrade() -> None:
+    # Drop from version table first
+    op.drop_column('procurement_tracker_step_version', 'pre_award_requisition_approved_date')
+    op.drop_column('procurement_tracker_step_version', 'pre_award_requisition_approved_by')
+    op.drop_column('procurement_tracker_step_version', 'pre_award_requisition_date')
+    op.drop_column('procurement_tracker_step_version', 'pre_award_requisition_number')
+
+    # Drop foreign key constraint
+    op.drop_constraint('fk_procurement_tracker_step_requisition_approved_by',
+                       'procurement_tracker_step', type_='foreignkey')
+
+    # Drop from main table
+    op.drop_column('procurement_tracker_step', 'pre_award_requisition_approved_date')
+    op.drop_column('procurement_tracker_step', 'pre_award_requisition_approved_by')
+    op.drop_column('procurement_tracker_step', 'pre_award_requisition_date')
+    op.drop_column('procurement_tracker_step', 'pre_award_requisition_number')

backend/models/procurement_tracker.py

@@ -448,6 +448,25 @@ class DefaultProcurementTrackerStep(ProcurementTrackerStep):
         nullable=True,
     )
 
+    # PRE_AWARD budget team requisition fields (OPS-1639)
+    pre_award_requisition_number: Mapped[Optional[str]] = mapped_column(
+        String(100),
+        nullable=True,
+    )
+    pre_award_requisition_date: Mapped[Optional[date]] = mapped_column(
+        Date,
+        nullable=True,
+    )
+    pre_award_requisition_approved_by: Mapped[Optional[int]] = mapped_column(
+        Integer,
+        ForeignKey("ops_user.id"),
+        nullable=True,
+    )
+    pre_award_requisition_approved_date: Mapped[Optional[date]] = mapped_column(
+        Date,
+        nullable=True,
+    )
+
     # Relationship for pre_award completed by user
     pre_award_completed_by_user: Mapped[Optional["User"]] = relationship(
         "User",
@@ -469,6 +488,13 @@ class DefaultProcurementTrackerStep(ProcurementTrackerStep):
         viewonly=True,
     )
 
+    # Relationship for pre_award requisition approved by user
+    pre_award_requisition_approved_by_user: Mapped[Optional["User"]] = relationship(
+        "User",
+        foreign_keys=[pre_award_requisition_approved_by],
+        viewonly=True,
+    )
+
     # Polymorphic configuration
     __mapper_args__ = {
         "polymorphic_identity": "default_step",

backend/ops_api/ops/schemas/procurement_tracker_steps.py

@@ -109,6 +109,12 @@ class ProcurementTrackerStepResponseSchema(Schema):
     approval_responded_date = fields.Date(allow_none=True)
     reviewer_notes = fields.String(allow_none=True)
 
+    # OPS-1639: PRE_AWARD budget team requisition fields
+    requisition_number = fields.String(allow_none=True)
+    requisition_date = fields.Date(allow_none=True)
+    requisition_approved_by = fields.Integer(allow_none=True)
+    requisition_approved_date = fields.Date(allow_none=True)
+
     # BaseModel fields
     display_name = fields.String(dump_only=True)
     created_on = fields.DateTime(dump_only=True)
@@ -184,6 +190,11 @@ def map_step_specific_fields(self, obj, **_kwargs):
             data["approval_responded_by"] = getattr(obj, "pre_award_approval_responded_by", None)
             data["approval_responded_date"] = getattr(obj, "pre_award_approval_responded_date", None)
             data["reviewer_notes"] = getattr(obj, "pre_award_approval_reviewer_notes", None)
+            # OPS-1639: Budget team requisition fields
+            data["requisition_number"] = getattr(obj, "pre_award_requisition_number", None)
+            data["requisition_date"] = getattr(obj, "pre_award_requisition_date", None)
+            data["requisition_approved_by"] = getattr(obj, "pre_award_requisition_approved_by", None)
+            data["requisition_approved_date"] = getattr(obj, "pre_award_requisition_approved_date", None)
 
         return data
 
@@ -264,6 +275,10 @@ def remove_none_values(self, data, **_kwargs):
                 "approval_responded_by",
                 "approval_responded_date",
                 "reviewer_notes",
+                "requisition_number",
+                "requisition_date",
+                "requisition_approved_by",
+                "requisition_approved_date",
             }
             # Remove PRE_SOLICITATION-only fields
             data.pop("draft_solicitation_date", None)
@@ -324,6 +339,11 @@ class ProcurementTrackerStepPatchRequestSchema(Schema):
     # approval_responded_by and approval_responded_date are server-controlled - not accepted from client
     reviewer_notes = fields.String(required=False, allow_none=True, validate=validate.Length(max=150))
 
+    # OPS-1639: Budget team requisition fields (user-provided only)
+    requisition_number = fields.String(required=False, allow_none=True, validate=validate.Length(max=100))
+    requisition_date = fields.Date(required=False, allow_none=True)
+    # requisition_approved_by and requisition_approved_date are SERVER-CONTROLLED - not accepted from client
+
 
 class ProcurementTrackerStepSchema(Schema):
     """Schema for procurement tracker step serialization."""
@@ -361,6 +381,12 @@ class Meta:
     approval_responded_date = fields.Date(allow_none=True)
     reviewer_notes = fields.String(allow_none=True)
 
+    # OPS-1639: Budget team requisition fields
+    requisition_number = fields.String(allow_none=True)
+    requisition_date = fields.Date(allow_none=True)
+    requisition_approved_by = fields.Integer(allow_none=True)
+    requisition_approved_date = fields.Date(allow_none=True)
+
     @pre_dump
     def map_step_specific_fields(self, obj, **_kwargs):
         """
@@ -426,6 +452,11 @@ def map_step_specific_fields(self, obj, **_kwargs):
             data["approval_responded_by"] = getattr(obj, "pre_award_approval_responded_by", None)
             data["approval_responded_date"] = getattr(obj, "pre_award_approval_responded_date", None)
             data["reviewer_notes"] = getattr(obj, "pre_award_approval_reviewer_notes", None)
+            # OPS-1639: Budget team requisition fields
+            data["requisition_number"] = getattr(obj, "pre_award_requisition_number", None)
+            data["requisition_date"] = getattr(obj, "pre_award_requisition_date", None)
+            data["requisition_approved_by"] = getattr(obj, "pre_award_requisition_approved_by", None)
+            data["requisition_approved_date"] = getattr(obj, "pre_award_requisition_approved_date", None)
 
         return data
 
@@ -513,6 +544,10 @@ def remove_none_step_specific_fields(self, data, **_kwargs):
                 "approval_responded_by",
                 "approval_responded_date",
                 "reviewer_notes",
+                "requisition_number",
+                "requisition_date",
+                "requisition_approved_by",
+                "requisition_approved_date",
             }
             preserve_keys = base_fields | pre_award_fields
             # Remove PRE_SOLICITATION-only fields

backend/ops_api/ops/services/notification_constants.py

@@ -0,0 +1,10 @@
+"""Notification title constants for pre-award approval workflow."""
+
+
+class PreAwardNotificationTitle:
+    """Notification titles for pre-award approval process."""
+
+    APPROVAL_REQUEST = "Pre-Award Approval Request"
+    APPROVAL_DECLINED = "Pre-Award Approval Declined"
+    REQUISITION_APPROVED = "Pre-Award Requisition Approved"
+    BUDGET_TEAM_REVIEW_REQUIRED = "Budget Team Requisition Review Required"

backend/ops_api/ops/services/notifications.py

@@ -13,9 +13,16 @@ class NotificationService(OpsService[Notification]):
     def __init__(self, db_session):
         self.db_session = db_session
 
-    def create(self, data: dict[str, Any]) -> Notification:
+    def create(self, data: dict[str, Any], commit: bool = True) -> Notification:
         """
         Create a new notification.
+
+        Args:
+            data: Notification data dictionary
+            commit: If True, commits immediately. If False, only flushes to get ID.
+
+        Returns:
+            Created notification instance
         """
         notification_type = data.get("notification_type", NotificationType.NOTIFICATION)
 
@@ -30,7 +37,12 @@ def create(self, data: dict[str, Any]) -> Notification:
 
         notification = cls(**data)
         self.db_session.add(notification)
-        self.db_session.commit()
+
+        if commit:
+            self.db_session.commit()
+        else:
+            self.db_session.flush()  # Get ID without committing
+
         return notification
 
     def update(self, notification_id: int, updated_fields: dict[str, Any]) -> tuple[Notification, int]: