From 48da9bb3a6a8f3b5b7c1998585c3baeffbd08040 Mon Sep 17 00:00:00 2001
From: Dominic Wrege <dominic.wrege001@stud.fh-dortmund.de>
Date: Mon, 13 Nov 2023 21:22:25 +0100
Subject: [PATCH] fix getCitiesWithPrivileges filter fn

---
 db/city.ts   | 15 +++++++++++++--
 package.json |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/db/city.ts b/db/city.ts
index 228c00b..bf66cb5 100644
--- a/db/city.ts
+++ b/db/city.ts
@@ -110,12 +110,23 @@ export async function getCitiesWithPrivileges(): Promise<InboxCity[]> {
 		const resultList = await pocketBase
 			.collection("cityInbox")
 			.getFullList<InboxCity>({
-				filter: "approved=true && ((freeParking = true || parkingHours > 0) || untilMaxMarkingHour = true || useBusLane = true)",
+				filter: "approved=true",
 				expand: "city",
 			});
 		return resultList
 			.map(toRecordToInboxCity)
-			.filter((item) => item.approved);
+			.filter(({ approved }) => approved)
+			.filter(
+				({
+					freeParking,
+					parkingHours,
+					untilMaxMarkingHour,
+					useBusLane,
+				}) =>
+					(freeParking = true || parkingHours > 0) ||
+					untilMaxMarkingHour ||
+					useBusLane
+			);
 	} catch (error: Error | any) {
 		console.error("[getCityById]", error.message);
 	}
diff --git a/package.json b/package.json
index bd32b9a..15ddf05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "parkfuchs",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"private": true,
 	"scripts": {
 		"dev": "next dev",