upgrading search + adding title of brand in front of model in search …

…items + fixing model editor
filipc30 · Feb 7, 2024 · f666d24 · f666d24
1 parent 1cca6d3
commit f666d24
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 21 deletions.
diff --git a/app/routes/_base+/index.tsx b/app/routes/_base+/index.tsx
@@ -32,27 +32,36 @@ export async function loader({ request }: DataFunctionArgs) {
 	}
 
 	const like = `%${searchTerm ?? ''}%`
+	const likeParts = searchTerm.split(' ').map(part => `%${part}%`)
 
+	// TODO: in future, extend search params to look for individual string parts - e.g. "500 speciale" and "speciale 500" should find the same item.. (TBD)
 	const rawSearchResults = await prisma.$queryRaw`
-      SELECT 
-        m.id, 
-        m.url, 
-        m.title, 
-        'CarModel' as type,
-        b.title as carBrandTitle
-      FROM CarModel m
-      JOIN CarBrand b ON m.carBrandId = b.id
-      WHERE m.title LIKE ${like} OR m.url LIKE ${like}
-      UNION
-      SELECT id, url, title, 'CarBrand' as type, NULL as carBrandTitle
-      FROM CarBrand
-      WHERE title LIKE ${like}
-      UNION
-      SELECT id, url, name as title, 'Dealer' as type, NULL as carBrandTitle
-      FROM Dealer
-      WHERE name LIKE ${like}
-      LIMIT 20
-    `
+		SELECT 
+			m.id, 
+			m.url, 
+			m.title, 
+			'CarModel' as type,
+			b.title as carBrandTitle
+		FROM CarModel m
+		JOIN CarBrand b ON m.carBrandId = b.id
+			WHERE (m.visibility = true)
+			AND (
+				m.title LIKE ${like}
+				OR m.url LIKE ${like}
+				OR m.carBrandId LIKE ${like}
+				OR m.carBrandId LIKE ${likeParts[0]} AND m.title LIKE ${likeParts[1]}
+				OR m.title LIKE ${likeParts[0]} AND m.carBrandId LIKE ${likeParts[1]}
+			)
+		UNION
+		SELECT id, url, title, 'CarBrand' as type, NULL as carBrandTitle
+		FROM CarBrand
+			WHERE (visibility = true AND title LIKE ${like})
+		UNION
+		SELECT id, url, name as title, 'Dealer' as type, NULL as carBrandTitle
+		FROM Dealer
+			WHERE name LIKE ${like}
+		LIMIT 20
+	`;
 
 	const result = SearchResultsSchema.safeParse(rawSearchResults)
 	if (!result.success) {
@@ -157,7 +166,7 @@ export default function Index() {
 														className="flex flex-col items-center justify-center rounded-lg bg-muted px-5 py-8 transition duration-200 hover:bg-highlight hover:text-highlight-foreground"
 													>
 														<span className="overflow-hidden text-ellipsis whitespace-nowrap text-center text-body-md">
-															{result.title}
+															{result.carBrandTitle} {result.title}
 														</span>
 													</Link>
 												</li>

diff --git a/app/routes/resources+/__model-editor.tsx b/app/routes/resources+/__model-editor.tsx
@@ -115,7 +115,7 @@ export async function action({ request, params }: DataFunctionArgs) {
 					? carModelFacility[0].map(facilityId => ({ id: facilityId }))
 					: [],
 			},
-			carBrandId: carBrandId,
+			carBrandId,
 		},
 		update: {
 			url,
@@ -129,6 +129,7 @@ export async function action({ request, params }: DataFunctionArgs) {
 					? carModelFacility[0].map(facilityId => ({ id: facilityId }))
 					: [],
 			},
+			carBrandId,
 		},
 	})