feat: search functionality

Author: VulpoTheDev

docker-compose.yml

@@ -1,15 +1,15 @@
 version: "3.8"
 services:
-  app:
-    build: .
-    container_name: my_app
-    depends_on:
-      - postgres
-    env_file:
-      - .env
-    ports:
-      - "8081:8081"
-    restart: unless-stopped
+  # app:
+  #   build: .
+  #   container_name: my_app
+  #   depends_on:
+  #     - postgres
+  #   env_file:
+  #     - .env
+  #   ports:
+  #     - "8081:8081"
+  #   restart: unless-stopped
 
   postgres:
     image: postgres:latest

src/index.d.ts

@@ -8,28 +8,30 @@ import swagger from "@fastify/swagger"
 import swaggerUI from "@fastify/swagger-ui"
 import * as dotenv from "dotenv"
 import fastify from "fastify"
-import nodemailer, { type SentMessageInfo } from "nodemailer"
-import type { DataSource } from "typeorm"
+import nodemailer, { SentMessageInfo } from "nodemailer"
 import authRoutes from "./routes/v1/Auth/routes"
 import { characterRoutes } from "./routes/v1/Characters/routes"
 import profileRoutes from "./routes/v1/Profile/routes"
-import verifyToken from "./utils/auth"
+import { authMiddleware, optionalAuthMiddleware } from "./utils/auth"
 import connectDatabase from "./utils/database"
 import { checkModAbovePermissions } from "./utils/permission"
 import artRoutes from "./routes/v1/Art/routes"
 import relationshipRoutes from "./routes/v1/Relationships/routes"
 import StaffRoutes from "./routes/v1/Staff/routes"
 import { oauthProviders } from "./config/oauth"
-import fastifyOauth2 from "@fastify/oauth2"
+import fastifyOauth2, { OAuth2Namespace } from "@fastify/oauth2"
 import fastifySession from "@fastify/session"
 import folderRoutes from "./routes/v1/Folder/routes"
 import dashboardRoutes from "./routes/v1/Dashboard/routes"
+import { DataSource } from "typeorm"
+import { generalRoutes } from "./routes/v1/General/routes"
 
 declare module "fastify" {
   interface FastifyInstance {
     db: DataSource
     auth: any
     permissionAboveMod: any
+    optionalAuth: any
     mailer: nodemailer.Transporter<SentMessageInfo>
     s3: S3Client
   }
@@ -40,6 +42,11 @@ declare module "fastify" {
       profileId: string
     }
   }
+
+  interface FastifyInstance {
+    facebookOAuth2: OAuth2Namespace;
+    googleOAuth: OAuth2Namespace;
+  }
 }
 
 const app = async () => {
@@ -76,7 +83,8 @@ const app = async () => {
   // server.decorateRequest('db', connection);
 
   // Auth Decorator
-  server.decorate("auth", verifyToken)
+  server.decorate("auth", authMiddleware)
+  server.decorate("optionalAuth", optionalAuthMiddleware)
 
   // Register all OAuth providers
   oauthProviders.forEach(({ name, config }) => {
@@ -161,6 +169,7 @@ const app = async () => {
   server.register(folderRoutes, { prefix: "/v1/folders" })
   server.register(dashboardRoutes, { prefix: "/v1/dashboard" })
   server.register(artRoutes, { prefix: "/v1/art" })
+  server.register(generalRoutes, { prefix: "/v1" })
   server.register(StaffRoutes, { prefix: "/v1/staff" })
 
   // Starting server

src/index.ts

@@ -10,6 +10,7 @@ import {
 import User from "./Users"
 import Artwork from "./Artwork"
 import Comment from "./Comments"
+import Character from "./Character"
 
 @Entity("notifications")
 export default class Notification {
@@ -38,6 +39,10 @@ export default class Notification {
   @JoinColumn()
   comment: Comment
 
+  @ManyToOne(() => Character, { nullable: true, onDelete: "CASCADE" })
+  @JoinColumn()
+  character: Character
+
   @CreateDateColumn()
   createdAt: Date
 }

src/models/Notifications.ts

@@ -179,6 +179,9 @@ export default class User {
   @OneToMany(() => Dashboard, (dashboard) => dashboard.user)
   dashboards: Dashboard[];
 
+  @Column("jsonb", { default: [], nullable: true })
+  recentSearches: string[]
+
 
   // Statistics
 

src/models/Users.ts

@@ -1,8 +1,8 @@
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { Character, Commission, Image, User } from "../../../models"
 import Artwork from "../../../models/Artwork"
-import { Comment } from "../../../models/Comments"
-import { Notification } from "../../../models/Notifications"
+import Comment from "../../../models/Comments"
+import Notification from "../../../models/Notifications"
 import { sendNotification } from "../../../utils/notification"
 
 export const uploadArt = async (request: FastifyRequest, reply: FastifyReply) => {
@@ -179,7 +179,7 @@ export const commentArtwork = async (request: FastifyRequest, reply: FastifyRepl
   await sendNotification(
     request.server.db,
     author,
-    `${author.handle} commented on your artwork`,
+    `%user% commented on your artwork`,
     artwork.owner,
     artwork,
     comment

src/routes/v1/Art/controllers.ts

@@ -282,7 +282,12 @@ export const whoami = async (request: FastifyRequest, reply: FastifyReply) => {
     relations: {
       user: {
         characters: true,
-        notifications: true,
+        notifications: {
+          sender: true,
+          artwork: true,
+          comment: true,
+          character: true
+        },
       }
     }
   })

src/routes/v1/Auth/controllers.ts

@@ -0,0 +1,55 @@
+import { FastifyReply, FastifyRequest } from "fastify"
+import { Artwork, Character, User } from "../../../models"
+
+export const search = async (request: FastifyRequest, reply: FastifyReply) => {
+    const { query, type } = request.query as { query?: string; type?: string }
+    const profileId = request.user as { id: string; profileId?: string }
+
+    if (!query) {
+        return reply.status(400).send({ error: "Search query is required" })
+    }
+
+    const repoMap = {
+        artwork: { entity: Artwork, fields: ["title"] },
+        user: { entity: User, fields: ["displayName", "handle"] },
+        character: { entity: Character, fields: ["name"] },
+    }
+
+    const searchTypes = type && type in repoMap ? [type] : Object.keys(repoMap)
+
+    const results = await Promise.all(
+        searchTypes.map(async (key) => {
+            const { entity, fields } = repoMap[key as keyof typeof repoMap]
+            const repo = request.server.db.getRepository(entity)
+
+            let queryBuilder = repo.createQueryBuilder(key)
+
+            fields.forEach((field, index) => {
+                if (index === 0) {
+                    queryBuilder.where(`${key}.${field} ILIKE :query`, { query: `%${query}%` })
+                } else {
+                    queryBuilder.orWhere(`${key}.${field} ILIKE :query`, { query: `%${query}%` })
+                }
+            })
+
+            return queryBuilder
+                .getMany()
+                .then((res) => ({ type: key, results: res }))
+        })
+    )
+
+    if (profileId) {
+        const user = await request.server.db.getRepository(User).findOne({ where: { id: profileId} })
+        if (!user) {
+            return reply.status(404).send({ error: "User not found" })
+        }
+        const recentSearches = new Set([query, ...(user.recentSearches || []).slice(0, 4)])
+        user.recentSearches = [...recentSearches]
+        await request.server.db.getRepository(User).save(user)
+    }
+
+    return results.reduce((acc: Record<string, any[]>, res) => {
+        if (res.results.length) acc[res.type] = res.results
+        return acc
+    }, {})
+}

src/routes/v1/General/controllers.ts

@@ -0,0 +1,6 @@
+import { FastifyInstance } from "fastify";
+import { search } from "./controllers";
+
+export async function generalRoutes(server: FastifyInstance) {
+      server.get('/search', { onRequest: [server.optionalAuth] }, search)
+}

src/routes/v1/General/routes.ts

@@ -177,7 +177,7 @@ export const commentProfile = async (request: FastifyRequest, reply: FastifyRepl
     return reply.code(500).send({ error: "Error commenting" })
   }
 
-  await sendNotification(request.server.db, profile, "New comment on your profile", author, undefined, comment)
+  await sendNotification(request.server.db, profile, "%user% commented on your profile", author, undefined, comment)
 
   return reply.code(200).send({ message: "Commented" })
 }