Merge pull request #379 from COS301-SE-2024/hotfix/location_filtering…

…_error Hotfix/location filtering error
COS301-SE-2024 · Oct 1, 2024 · 727e460 · 727e460
2 parents 76cd288 + c2ef270
commit 727e460
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/backend/src/modules/issues/repositories/issueRepository.ts b/backend/src/modules/issues/repositories/issueRepository.ts
@@ -48,7 +48,7 @@ export default class IssueRepository {
         category: category_id (
           name
         ),
-        location: location_id (
+        location: location_id!inner (
           province,
           city,
           suburb,

diff --git a/frontend/app/(home)/organization/page.tsx b/frontend/app/(home)/organization/page.tsx
@@ -175,8 +175,8 @@ export default function OrganizationPage() {
     items: [
       { value: "all", label: "All Locations" },
       ...(locations?.map(loc => ({
-        value: loc.location_id.toString(),
-        label: `${loc.suburb ? loc.suburb + ", " : ""}${loc.city}, ${loc.province}`,
+        value: loc.location_id?.toString() ?? '',
+        label: `${loc.suburb ? loc.suburb + ", " : ""}${loc.city ?? ''}, ${loc.province ?? ''}`,
       })) || []),
     ],
   };