filter and sort fixes

cdleveille · Oct 30, 2024 · d901004 · d901004
1 parent f462270
commit d901004
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/helpers/util.ts b/src/helpers/util.ts
@@ -25,15 +25,14 @@ export const filterDiscsByQuery = (discs: TDisc[], query: TDiscQuery) => {
 	return discs.filter(disc => {
 		return (
 			(!id || disc.id === id) &&
-			(!name ||
-				(disc.name_slug.includes(name) &&
-					(!brand || disc.brand_slug.includes(brand)) &&
-					(!category || disc.category_slug.includes(category)) &&
-					(!stability || disc.stability_slug === stability.toLowerCase()) &&
-					(!speed || disc.speed === speed) &&
-					(!glide || disc.glide === glide) &&
-					(!turn || disc.turn === turn) &&
-					(!fade || disc.fade === fade)))
+			(!name || disc.name_slug.includes(name)) &&
+			(!brand || disc.brand_slug.includes(brand)) &&
+			(!category || disc.category_slug.includes(category)) &&
+			(!stability || disc.stability_slug === stability.toLowerCase()) &&
+			(!speed || disc.speed === speed) &&
+			(!glide || disc.glide === glide) &&
+			(!turn || disc.turn === turn) &&
+			(!fade || disc.fade === fade)
 		);
 	});
 };
diff --git a/src/models/disc.ts b/src/models/disc.ts
@@ -95,7 +95,7 @@ const getDiscsFromFile = async () => {
 };
 
 const writeDiscsToFile = async () => {
-	const discs = await DiscModel.find({}, projection);
+	const discs = await DiscModel.find({}, projection).sort({ name: 1 });
 	await Bun.write(DISCS_FILENAME, JSON.stringify(discs));
 	return discs;
 };