Ensure top_level_agency_name is always set

HHS · Feb 10, 2025 · a7c7aa0 · a7c7aa0
1 parent 8a81eaf
commit a7c7aa0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/api/src/db/models/agency_models.py b/api/src/db/models/agency_models.py
@@ -98,7 +98,7 @@ class Agency(ApiSchemaTable, TimestampMixin):
         ForeignKey(agency_id),
         nullable=True,
     )
-    top_level_agency: Mapped["Agency"] = relationship(
+    top_level_agency: Mapped["Agency | None"] = relationship(
         lambda: Agency,
         remote_side=[agency_id],
     )

diff --git a/api/src/db/models/opportunity_models.py b/api/src/db/models/opportunity_models.py
@@ -97,8 +97,9 @@ def agency(self) -> str | None:
     def top_level_agency_name(self) -> str | None:
         if self.agency_record is not None and self.agency_record.top_level_agency is not None:
             return self.agency_record.top_level_agency.agency_name
+
+        return self.agency_name
 
-        return None
 
     @property
     def agency_name(self) -> str | None: