Search by multiple tags gregordr#59

unyacat · Dec 27, 2021 · 818483a · 818483a
1 parent 75e9929
commit 818483a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/backend/src/database/mediaDatabase.ts b/backend/src/database/mediaDatabase.ts
@@ -11,20 +11,23 @@ export const media = (async () => {
 })()
 
 export async function getMedia(searchTerm: string, label: string): Promise<unknown[]> {
+    const queryWords = label.split(/\s+/);
     return transaction(async (client) => {
-        const result = await client.query(`SELECT OID::text as id, ${photo} as name, h as height, w as width, date as date, type as type, coordX as coordX, coordY as coordY FROM ${await media} WHERE         
+        const result = await client.query(`SELECT OID::text as id, ${photo} as name, h as height, w as width, date as date, type as type, coordX as coordX, coordY as coordY FROM ${await media} WHERE
         (
             ${photo} like $1::text
             OR
             OID IN
             (
                 SELECT photo
                 FROM ${await labelTable}
-                WHERE label = $2::text
+                WHERE label = ANY ($2)
+                GROUP BY photo
+                HAVING COUNT( photo )=$3::integer
             )
         )
         ORDER BY date DESC
-        ;`, [searchTerm, label]);
+        ;`, [searchTerm, queryWords, queryWords.length]);
         return result.rows;
     });
 }