Merge pull request #5492 from HHS/OPS-5077/procurement-dashboard-details

Ops 5077/procurement dashboard details

Author: Santi-3rd

backend/data_tools/data/agreements_and_blin_data.json5

@@ -122,7 +122,15 @@ def load_new_data(
                 with Session(conn) as session:
                     if "id" in data_without_associations:
                         seq_needs_reset = True
-                    obj = model(**data_without_associations)
+                    # Resolve polymorphic subclass when discriminator is present in data
+                    obj_model = model
+                    mapper = model.__mapper__
+                    if mapper.polymorphic_on is not None:
+                        discriminator_key = mapper.polymorphic_on.key
+                        identity = data_without_associations.get(discriminator_key)
+                        if identity is not None:
+                            obj_model = mapper.polymorphic_map.get(identity, mapper).class_
+                    obj = obj_model(**data_without_associations)
                     session.add(obj)
                     session.commit()
                     insert_associated_data(data_with_associations, obj, session)

backend/data_tools/src/import_static_data/import_data.py

@@ -207,6 +207,7 @@ def get(self) -> Response:
                 "totals": metadata["totals"],
                 "procurement_overview": metadata["procurement_overview"],
                 "procurement_step_summary": metadata["procurement_step_summary"],
+                "procurement_days_in_step": metadata["procurement_days_in_step"],
             }
 
             return make_response_with_headers(response_data)

backend/ops_api/ops/resources/agreements.py

@@ -474,12 +474,14 @@ def get_list(
         # Calculate procurement overview and step summary before pagination (only when requested)
         procurement_overview = None
         procurement_step_summary = None
+        procurement_days_in_step = None
         if include_procurement:
             overview_fiscal_year = (
                 filters.fiscal_year[0] if filters.fiscal_year and len(filters.fiscal_year) == 1 else None
             )
             procurement_overview = _compute_procurement_overview(all_results, overview_fiscal_year)
             procurement_step_summary = _compute_procurement_step_summary(all_results, overview_fiscal_year)
+            procurement_days_in_step = _compute_days_in_procurement_step(all_results)
 
         # Apply pagination slicing
         if filters.limit is not None and filters.offset is not None:
@@ -498,6 +500,7 @@ def get_list(
             "totals": totals,
             "procurement_overview": procurement_overview,
             "procurement_step_summary": procurement_step_summary,
+            "procurement_days_in_step": procurement_days_in_step,
         }
 
         return paginated_results, metadata
@@ -1016,6 +1019,56 @@ def _compute_procurement_step_summary(all_results: list[Agreement], fiscal_year:
     }
 
 
+def _compute_days_in_procurement_step(
+    all_results: list[Agreement],
+) -> dict[int, dict[int, int]]:
+    """Compute days in procurement step for each agreement's active step.
+
+    For each agreement with an active procurement tracker:
+    - Finds the active step
+    - If the step is completed, days = step_completed_date - step_start_date
+    - If the step is not completed, days = today - step_start_date
+
+    Returns a nested map: { step_number: { agreement_id: days_in_step } }
+    """
+    today = date.today()
+    days_in_step: dict[int, dict[int, int]] = {}
+
+    for agreement in all_results:
+        tracker = next(
+            (
+                tracker
+                for tracker in agreement.procurement_trackers
+                if tracker.status == ProcurementTrackerStatus.ACTIVE and tracker.active_step_number is not None
+            ),
+            None,
+        )
+        if tracker is None:
+            continue
+
+        step_number = tracker.active_step_number
+        if step_number < 1 or step_number > 6:
+            continue
+
+        active_step = next(
+            (step for step in tracker.steps if step.step_number == step_number),
+            None,
+        )
+        if active_step is None or active_step.step_start_date is None:
+            continue
+
+        if active_step.step_completed_date:
+            diff_days = (active_step.step_completed_date - active_step.step_start_date).days
+        else:
+            diff_days = (today - active_step.step_start_date).days
+
+        if step_number not in days_in_step:
+            days_in_step[step_number] = {}
+        days_in_step[step_number][agreement.id] = diff_days
+
+    return days_in_step
+
+
 def _get_agreements(
     session: Session,
     agreement_cls: Type[Agreement],

backend/ops_api/ops/services/agreements.py

@@ -24,6 +24,7 @@
 from ops_api.ops.services.agreements import (
     AgreementsService,
     _compute_agreement_totals,
+    _compute_days_in_procurement_step,
     _compute_procurement_overview,
     _compute_procurement_step_summary,
 )
@@ -1810,3 +1811,152 @@ def test_zero_division_guard(self):
         result = _compute_procurement_step_summary([], fiscal_year=2025)
         for step in result["step_data"]:
             assert step["agreements_percent"] == 0.0
+
+
+def _make_mock_step(step_number, step_start_date=None, step_completed_date=None):
+    """Helper to create a mock procurement tracker step."""
+    step = MagicMock()
+    step.step_number = step_number
+    step.step_start_date = step_start_date
+    step.step_completed_date = step_completed_date
+    return step
+
+
+def _make_mock_tracker_with_steps(active_step_number, steps, status=None):
+    """Helper to create a mock procurement tracker with steps."""
+    from models.procurement_tracker import ProcurementTrackerStatus
+
+    tracker = MagicMock()
+    tracker.active_step_number = active_step_number
+    tracker.status = status if status is not None else ProcurementTrackerStatus.ACTIVE
+    tracker.steps = steps
+    return tracker
+
+
+class TestComputeDaysInProcurementStep:
+    def test_empty_list(self):
+        result = _compute_days_in_procurement_step([])
+        assert result == {}
+
+    def test_agreement_without_tracker(self):
+        ag = _make_mock_procurement_agreement(trackers=[])
+        result = _compute_days_in_procurement_step([ag])
+        assert result == {}
+
+    def test_completed_step_uses_completed_date(self):
+        step = _make_mock_step(3, step_start_date=date(2025, 1, 1), step_completed_date=date(2025, 1, 11))
+        tracker = _make_mock_tracker_with_steps(3, steps=[step])
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=10)
+
+        result = _compute_days_in_procurement_step([ag])
+
+        assert result == {3: {10: 10}}
+
+    @patch("ops_api.ops.services.agreements.date")
+    def test_incomplete_step_uses_today(self, mock_date):
+        mock_date.today.return_value = date(2025, 3, 1)
+        mock_date.side_effect = lambda *args, **kwargs: date(*args, **kwargs)
+
+        step = _make_mock_step(2, step_start_date=date(2025, 1, 1), step_completed_date=None)
+        tracker = _make_mock_tracker_with_steps(2, steps=[step])
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=5)
+
+        result = _compute_days_in_procurement_step([ag])
+
+        assert result == {2: {5: 59}}
+
+    def test_skips_inactive_tracker(self):
+        from models.procurement_tracker import ProcurementTrackerStatus
+
+        step = _make_mock_step(1, step_start_date=date(2025, 1, 1))
+        tracker = _make_mock_tracker_with_steps(1, steps=[step], status=ProcurementTrackerStatus.INACTIVE)
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=1)
+
+        result = _compute_days_in_procurement_step([ag])
+        assert result == {}
+
+    def test_skips_completed_tracker(self):
+        from models.procurement_tracker import ProcurementTrackerStatus
+
+        step = _make_mock_step(1, step_start_date=date(2025, 1, 1))
+        tracker = _make_mock_tracker_with_steps(1, steps=[step], status=ProcurementTrackerStatus.COMPLETED)
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=1)
+
+        result = _compute_days_in_procurement_step([ag])
+        assert result == {}
+
+    def test_skips_step_out_of_range(self):
+        step = _make_mock_step(7, step_start_date=date(2025, 1, 1))
+        tracker = _make_mock_tracker_with_steps(7, steps=[step])
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=1)
+
+        result = _compute_days_in_procurement_step([ag])
+        assert result == {}
+
+    def test_skips_step_zero(self):
+        step = _make_mock_step(0, step_start_date=date(2025, 1, 1))
+        tracker = _make_mock_tracker_with_steps(0, steps=[step])
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=1)
+
+        result = _compute_days_in_procurement_step([ag])
+        assert result == {}
+
+    def test_skips_step_without_start_date(self):
+        step = _make_mock_step(3, step_start_date=None)
+        tracker = _make_mock_tracker_with_steps(3, steps=[step])
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=1)
+
+        result = _compute_days_in_procurement_step([ag])
+        assert result == {}
+
+    def test_skips_when_active_step_not_in_steps_list(self):
+        step = _make_mock_step(1, step_start_date=date(2025, 1, 1))
+        tracker = _make_mock_tracker_with_steps(4, steps=[step])  # active_step_number=4 but only step 1 exists
+        ag = _make_mock_procurement_agreement(trackers=[tracker], agreement_id=1)
+
+        result = _compute_days_in_procurement_step([ag])
+        assert result == {}
+
+    def test_multiple_agreements_same_step(self):
+        step1 = _make_mock_step(2, step_start_date=date(2025, 1, 1), step_completed_date=date(2025, 1, 6))
+        tracker1 = _make_mock_tracker_with_steps(2, steps=[step1])
+        ag1 = _make_mock_procurement_agreement(trackers=[tracker1], agreement_id=10)
+
+        step2 = _make_mock_step(2, step_start_date=date(2025, 1, 1), step_completed_date=date(2025, 1, 21))
+        tracker2 = _make_mock_tracker_with_steps(2, steps=[step2])
+        ag2 = _make_mock_procurement_agreement(trackers=[tracker2], agreement_id=20)
+
+        result = _compute_days_in_procurement_step([ag1, ag2])
+
+        assert result == {2: {10: 5, 20: 20}}
+
+    def test_multiple_agreements_different_steps(self):
+        step1 = _make_mock_step(1, step_start_date=date(2025, 1, 1), step_completed_date=date(2025, 1, 4))
+        tracker1 = _make_mock_tracker_with_steps(1, steps=[step1])
+        ag1 = _make_mock_procurement_agreement(trackers=[tracker1], agreement_id=1)
+
+        step2 = _make_mock_step(5, step_start_date=date(2025, 2, 1), step_completed_date=date(2025, 2, 15))
+        tracker2 = _make_mock_tracker_with_steps(5, steps=[step2])
+        ag2 = _make_mock_procurement_agreement(trackers=[tracker2], agreement_id=2)
+
+        result = _compute_days_in_procurement_step([ag1, ag2])
+
+        assert result == {1: {1: 3}, 5: {2: 14}}
+
+    def test_uses_active_tracker_ignores_completed(self):
+        from models.procurement_tracker import ProcurementTrackerStatus
+
+        step_completed = _make_mock_step(2, step_start_date=date(2025, 1, 1), step_completed_date=date(2025, 1, 5))
+        completed_tracker = _make_mock_tracker_with_steps(
+            2, steps=[step_completed], status=ProcurementTrackerStatus.COMPLETED
+        )
+
+        step_active = _make_mock_step(4, step_start_date=date(2025, 3, 1), step_completed_date=date(2025, 3, 11))
+        active_tracker = _make_mock_tracker_with_steps(4, steps=[step_active])
+
+        ag = _make_mock_procurement_agreement(trackers=[completed_tracker, active_tracker], agreement_id=7)
+
+        result = _compute_days_in_procurement_step([ag])
+
+        assert result == {4: {7: 10}}
+        assert 2 not in result

backend/ops_api/tests/ops/services/test_agreements.py

@@ -174,7 +174,8 @@ export const opsApi = createApi({
                         offset: response.offset,
                         totals: response.totals ?? null,
                         procurement_overview: response.procurement_overview ?? null,
-                        procurement_step_summary: response.procurement_step_summary ?? null
+                        procurement_step_summary: response.procurement_step_summary ?? null,
+                        procurement_days_in_step: response.procurement_days_in_step ?? null
                     };
                 }
                 // Backward compatibility with old "agreements" key
@@ -186,7 +187,8 @@ export const opsApi = createApi({
                         offset: response.offset,
                         totals: response.totals ?? null,
                         procurement_overview: response.procurement_overview ?? null,
-                        procurement_step_summary: response.procurement_step_summary ?? null
+                        procurement_step_summary: response.procurement_step_summary ?? null,
+                        procurement_days_in_step: response.procurement_days_in_step ?? null
                     };
                 }
                 // Legacy array format (no pagination)
@@ -197,7 +199,8 @@ export const opsApi = createApi({
                     offset: 0,
                     totals: null,
                     procurement_overview: null,
-                    procurement_step_summary: null
+                    procurement_step_summary: null,
+                    procurement_days_in_step: null
                 };
             },
             providesTags: ["Agreements", "BudgetLineItems"]

frontend/src/api/opsAPI.js

@@ -214,7 +214,8 @@ describe("opsAPI - Agreements Pagination", () => {
                 offset: 0,
                 totals: null,
                 procurement_overview: null,
-                procurement_step_summary: null
+                procurement_step_summary: null,
+                procurement_days_in_step: null
             });
         });
 
@@ -262,7 +263,8 @@ describe("opsAPI - Agreements Pagination", () => {
                 offset: 0,
                 totals: null,
                 procurement_overview: null,
-                procurement_step_summary: null
+                procurement_step_summary: null,
+                procurement_days_in_step: null
             });
         });
 
@@ -303,7 +305,8 @@ describe("opsAPI - Agreements Pagination", () => {
                 offset: 0,
                 totals: null,
                 procurement_overview: null,
-                procurement_step_summary: null
+                procurement_step_summary: null,
+                procurement_days_in_step: null
             });
         });
 
@@ -345,7 +348,8 @@ describe("opsAPI - Agreements Pagination", () => {
                 offset: 0,
                 totals: null,
                 procurement_overview: null,
-                procurement_step_summary: null
+                procurement_step_summary: null,
+                procurement_days_in_step: null
             });
         });
 
@@ -735,7 +739,8 @@ describe("opsAPI - Agreements Pagination", () => {
                 offset: 0,
                 totals: null,
                 procurement_overview: null,
-                procurement_step_summary: null
+                procurement_step_summary: null,
+                procurement_days_in_step: null
             });
         });
     });

frontend/src/api/opsAPI.test.js

@@ -14,7 +14,7 @@ const FiscalYear = ({ fiscalYear, handleChangeFiscalYear, fiscalYears = [], show
 
     return (
         <div
-            className="display-flex flex-justify flex-align-center"
+            className="display-flex flex-justify flex-align-center flex-align-baseline"
             style={{ width: "10.625rem" }}
         >
             <label

frontend/src/components/UI/FiscalYear/FiscalYear.jsx

@@ -12,3 +12,8 @@
     vertical-align: top;
     padding-bottom: 0 !important;
 }
+
+.procurementDetailsTable td:nth-child(2),
+.procurementDetailsTable th:nth-child(2) {
+    padding-left: 2rem !important;
+}