From 6f5c67692e182c7d21949bb9af31dcd1c95a2955 Mon Sep 17 00:00:00 2001
From: weimiao67 <wmiao@flexion.us>
Date: Thu, 27 Feb 2025 13:30:05 -0700
Subject: [PATCH] fix: fixed can id filtering

---
 frontend/cypress/e2e/portfolioDetail.cy.js    | 27 +++++++++++++++++++
 .../portfolios/detail/PortfolioDetail.jsx     |  4 +--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/frontend/cypress/e2e/portfolioDetail.cy.js b/frontend/cypress/e2e/portfolioDetail.cy.js
index 87903c90a0..86e8b68a45 100644
--- a/frontend/cypress/e2e/portfolioDetail.cy.js
+++ b/frontend/cypress/e2e/portfolioDetail.cy.js
@@ -69,5 +69,32 @@ describe("Portfolio Detail Page", () => {
             .should("contain", "$200,000.00 ")
             .should("contain", "$0")
             .should("contain", "Previous FYs Carry-Forward");
+
+        // check the can list for FY 2023
+        cy.get("#fiscal-year-select").select("2023");
+        // summary cards
+        cy.get('[data-cy="line-graph-with-legend-card"]')
+            .should("contain", "$10,200,000.00")
+            .should("contain", "51%")
+            .should("contain", "$20,000,000.00")
+            .should("contain", "100%");
+        cy.get('[data-cy="portfolio-budget-card"]')
+            .should("contain", "$20,000,000.00")
+            .should("contain", "$10,200,000.00");
+        // check the first can card for the correct values
+        cy.get('[data-cy="can-card-G990136"]')
+            .should("contain", "G990136")
+            .should("contain", "$6,000,000.00")
+            .should("contain", "$4,000,000.00")
+            .should("contain", "$0")
+            .should("contain", "$10,000,000.00")
+            .should("contain", "FY 2023 New Funding");
+        cy.get('[data-cy="can-card-G99IA14"]')
+            .should("contain", "G99IA14")
+            .should("contain", "$6,000,000.00")
+            .should("contain", "$4,000,000.00")
+            .should("contain", "$0")
+            .should("contain", "$10,000,000.00")
+            .should("contain", "FY 2023 New Funding");
     });
 });
diff --git a/frontend/src/pages/portfolios/detail/PortfolioDetail.jsx b/frontend/src/pages/portfolios/detail/PortfolioDetail.jsx
index fd7ed495be..2133fd3b44 100644
--- a/frontend/src/pages/portfolios/detail/PortfolioDetail.jsx
+++ b/frontend/src/pages/portfolios/detail/PortfolioDetail.jsx
@@ -50,8 +50,8 @@ const PortfolioDetail = () => {
     const canIds =
         portfolioCans
             ?.filter(
-                /** @param {{id: number, appropriation_date: number}} can */
-                (can) => can.appropriation_date === fiscalYear
+                /** @param {import("../../../components/CANs/CANTypes").CAN} can */
+                (can) => can.funding_budgets?.some((budget) => budget.fiscal_year === fiscalYear)
             )
             .map(
                 /** @param {{id: number}} can */