Merge branch 'elastic' into 'develop'

Issue #45: sortable filters

See merge request !67

package.json

@@ -10,12 +10,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.750.0",
+    "@elastic/elasticsearch": "^8.17.0",
     "@hono/swagger-ui": "^0.5.0",
     "@hono/zod-openapi": "^0.18.3",
-    "@elastic/elasticsearch": "^8.17.0",
     "@hono/zod-validator": "^0.2.2",
     "@scalar/hono-api-reference": "^0.8.0",
     "archiver": "^7.0.1",
+    "bun": "1.2.10",
     "dotenv": "^16.4.5",
     "dotenv-expand": "^11.0.6",
     "drizzle-orm": "^0.31.2",

src/db/repo/search.repo.ts

@@ -83,7 +83,7 @@ export class SearchRepo {
           created_at: sql`users.created_at`,
           is_active: sql`users.is_active`,
           score: sql`usst.score`,
-          likes_received: sql`usst.likes_received`,
+          likes: sql`usst.likes_received`,
           followers: sql`usst.followers`,
           approved_resources: sql`usst.approved_resources`,
       })
@@ -128,7 +128,7 @@ export class SearchRepo {
         downloads: sql`colst.downloads`,
         likes: sql`colst.likes`,
         shares: sql`colst.shares`,
-        follows: sql`colst.follows`,
+        followers: sql`colst.follows`,
       })
       .from(sql`collections col`)
       .leftJoin(sql`users`, sql`users.id = col.user_id`)

src/db/schema/search.schema.ts

 import { z } from "zod";
-import { resourceEnumSchema } from '../schema/resource-enum.schema'
 
 export const resourceIndexSchema = z.object({
   id: z.number(),
@@ -13,7 +12,7 @@ export const resourceIndexSchema = z.object({
   subjects: z.string().nullable(), 
   license: z.string(),
   object_type: z.string(),
-  state: resourceEnumSchema,
+  state: z.number(),
   user: z.string(),
   views: z.number(),
   downloads: z.number(),
@@ -33,7 +32,7 @@ export const userIndexSchema = z.object({
   created_at: z.string(),
   is_active: z.boolean(),
   score: z.number(),
-  likes_received: z.number(),
+  likes: z.number(),
   followers: z.number(),
   approved_resources: z.number()
 });
@@ -49,7 +48,7 @@ export const collectionIndexSchema = z.object({
   downloads: z.number(),
   likes: z.number(),
   shares: z.number(),
-  follows: z.number()
+  followers: z.number()
 });
 
 // export type LearningObjectIndex = z.infer<typeof learningObjectIndexSchema>;

src/routes/search.route.ts

@@ -21,7 +21,7 @@ export const searchRouter = new Hono()
       try {
         const { query } = c.req.valid('query');
 
-        const results = await searchService.searchIndex(query, {});
+        const results = await searchService.searchIndex(query);
 
         return c.json({ results });
       } catch (e) {

src/routes/user.route.ts

@@ -219,6 +219,8 @@ export const userRouter = honoWithJwt()
           await service.update(input)
         )
 
+        await searchService.indexUser(user.id)
+
         return c.json({ user })
       } catch (e) {
 

src/services/search.service.ts

@@ -3,12 +3,25 @@ import es from '@/search'
 import env from '@/env'
 import  { SearchRepo } from "@/db/repo/search.repo";
 
-type ExactFilterFields = {
+export type ExactFilterFields = {
   language?: string;
   objectType?: string;
   institution?: string;
+  state?: number;
 };
 
+export type SortableFilterFields = {
+  created_at?: string;
+  views?: number;
+  downloads?: number;
+  likes?: number;
+  shares?: number;
+  score?: number;
+  comments?: number;
+  followers?: number;
+  approved_resources?: number;
+}
+
 @Service()
 export class SearchService {
   @Inject('ElasticSearchClient')
@@ -81,7 +94,7 @@ export class SearchService {
               downloads: document.downloads,
               likes: document.likes,
               shares: document.shares,
-              follows: document.follows
+              followers: document.followers,
             },
         });
     
@@ -113,7 +126,7 @@ export class SearchService {
               created_at: document.created_at,
               is_active: document.is_active,
               score: document.score,
-              likes_received: document.likes_received,
+              likes: document.likes,
               followers: document.followers,
               approved_resources: document.approved_resources
           },
@@ -133,25 +146,31 @@ export class SearchService {
   // page_size: tamanho da página
   async searchIndex(
     query: string,
-    filters: Partial<ExactFilterFields>,
-    sortBy?: 'created_at',
+    filters: Partial<ExactFilterFields> = {},
+    sortBy: Partial<SortableFilterFields> = {},
+    // sortBy?: 'created_at',
     sortOrder: 'asc' | 'desc' = 'desc',
     index: string[] = [env.ELASTIC_INDEX_USERS, env.ELASTIC_INDEX_COLLECTIONS, env.ELASTIC_INDEX_RESOURCES],
     offset: number = 0,
     page_size: number = 1000
   ) {
 
-    const filterClauses = Object.entries(filters)
+    const userFilters = Object.entries(filters)
     .filter(([, value]) => value !== undefined)
-    .map(([key, value]) => ({
-      term: { [key]: value },
-    }));
+    .map(([key, value]) => {
+      if (Array.isArray(value)) {
+        return { terms: { [key]: value } };
+      } else {
+        return { term: { [key]: value } };
+      }
+    });
 
     let sort: Array<{ [key: string]: { order: 'asc' | 'desc' } }> = [];
-    if (sortBy) {
+    if (sortBy && Object.keys(sortBy).length > 0) {
+      const sortField = Object.keys(sortBy)[0];
       sort = [
         {
-          [sortBy]: {
+          [sortField]: {
             order: sortOrder,
           },
         },
@@ -174,7 +193,6 @@ export class SearchService {
                            'author',
                            'description',
                            'link',
-                           'fileFormats',
                            'educational_stages',
                            'languages',
                            'subjects',
@@ -185,9 +203,9 @@ export class SearchService {
                            'roles',
                            'institution',
                            'city',
-                           'views',
-                           'downloads',
-                           'likes',
+                          //  'views',
+                          //  'downloads',
+                          //  'likes',
                            'shares',
                            'score',
                            'comments',
@@ -195,7 +213,7 @@ export class SearchService {
                 },
               },
             ],
-            filter: filterClauses,
+            filter: userFilters,
           },
         },
         sort: sort.length > 0 ? sort : undefined,