Merge branch 'main' into OPS-5380/fix-agreement-reporting-mismatch

Author: rajohnson90

.github/workflows/build_data_tools.yml

@@ -37,19 +37,19 @@ jobs:
         # https://github.com/docker/metadata-action
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
         # Setting up Docker Buildx with docker-container driver is required
         # at the moment to be able to use a subdirectory with Git context
         # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
         # https://github.com/docker/build-push-action/
       - name: Build and push Docker image
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           context: "{{defaultContext}}:backend" # https://github.com/docker/build-push-action#git-context
           push: true

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - name: TruffleHog OSS
         id: trufflehog
-        uses: trufflesecurity/trufflehog@586f66d7886cd0b037c7c245d4a6e34ef357ab10 # v3.94.1
+        uses: trufflesecurity/trufflehog@6bd2d14f7a4bc1e569fa3550efa7ec632a4fa67b # v3.94.2
         env:
           GITHUB_HEAD_REF_SAFE: ${{ github.head_ref }}
         continue-on-error: true

backend/data_tools/Pipfile

@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 SQLAlchemy = "==2.0.48"
-pandas = "==3.0.1"
+pandas = "==3.0.2"
 json5 = "==0.13.0"
 psycopg2-binary = "==2.9.11"
 cfenv = "==0.5.3"
@@ -37,7 +37,7 @@ pytest-cov = "==7.1.0"
 pytest-mock = "==3.15.1"
 ipython = "==9.11.0"
 pytest-docker = {extras = ["docker-compose-v2"], version = "==3.2.5"}
-black = {extras = ["d"], version = "==25.12.0"}
+black = {extras = ["d"], version = "==26.3.1"}
 isort = "==8.0.1"
 
 [requires]

backend/data_tools/Pipfile.lock

@@ -378,7 +378,14 @@ def team_leaders(self):
 
     @property
     def division_directors(self) -> list[str]:
-        full_names = set()
+        division_directors = self.division_director_user_list
+        full_names = [d.full_name for d in division_directors if d.full_name]
+
+        return sorted(full_names)
+
+    @property
+    def division_director_user_list(self) -> list[User]:
+        users = set()
         for bli in self.budget_line_items:
             if (
                 bli.can
@@ -387,11 +394,13 @@ def division_directors(self) -> list[str]:
                 and bli.can.portfolio.division
                 and hasattr(bli.can.portfolio.division, "division_director")
             ):
-                director = bli.can.portfolio.division.division_director_full_name
-                if director is not None:
-                    full_names.add(director)
+                if (
+                    bli.can.portfolio.division.division_director_id
+                    and bli.can.portfolio.division.division_director_full_name
+                ):
+                    users.add(bli.can.portfolio.division.division_director)
 
-        return sorted(full_names)
+        return sorted(users, key=lambda u: u.full_name or u.email)
 
     @property
     def change_requests_in_review(self):
@@ -830,7 +839,6 @@ def get_required_fields_for_awarded_agreement(cls) -> List[str]:
         return []
 
 
-
 class AgreementMod(BaseModel):
     """Agreement Modification Model"""
 

backend/models/agreements.py

@@ -88,6 +88,8 @@ def project_metadata(self) -> dict:
         start_dates = []
         end_dates = []
         team_members_dict = {}
+        project_officer_dict = {}
+        alternate_project_officer_dict = {}
         division_directors_set = set()
 
         for agreement in self.agreements:
@@ -101,7 +103,7 @@ def project_metadata(self) -> dict:
                 team_members_dict[team_member.id] = team_member
 
             # Collect division directors
-            for director in agreement.division_directors:
+            for director in agreement.division_director_user_list:
                 division_directors_set.add(director)
 
             # Collect all services_component dates
@@ -110,13 +112,37 @@ def project_metadata(self) -> dict:
                     start_dates.append(sc.period_start)
                 if sc.period_end is not None:
                     end_dates.append(sc.period_end)
+            # Collect all project officers
+            if agreement.project_officer is not None:
+                project_officer_dict[agreement.project_officer.id] = (
+                    agreement.project_officer.full_name
+                    if agreement.project_officer.full_name
+                    else agreement.project_officer.email
+                )
+            # Collect all alternate project officers
+            if agreement.alternate_project_officer is not None:
+                alternate_project_officer_dict[agreement.alternate_project_officer.id] = (
+                    agreement.alternate_project_officer.full_name
+                    if agreement.alternate_project_officer.full_name
+                    else agreement.alternate_project_officer.email
+                )
         return {
             "special_topics": sorted(list(special_topics_set)),
             "research_methodologies": sorted(list(research_methodologies_set)),
             "project_start": min(start_dates) if start_dates else None,
             "project_end": max(end_dates) if end_dates else None,
             "team_members": sorted(team_members_dict.values(), key=lambda x: x.full_name if x.full_name else x.email),
-            "division_directors": sorted(list(division_directors_set)),
+            "division_directors": sorted(
+                [{"id": d.id, "name": d.full_name if d.full_name else d.email} for d in division_directors_set],
+                key=lambda x: x["name"],
+            ),
+            "project_officers": sorted(
+                [{"id": user_id, "name": name} for user_id, name in project_officer_dict.items()], key=lambda x: x["name"]
+            ),
+            "alternate_project_officers": sorted(
+                [{"id": user_id, "name": name} for user_id, name in alternate_project_officer_dict.items()],
+                key=lambda x: x["name"],
+            ),
         }
 
     @property