Add search logging

LetsChurch · Dec 31, 2024 · 7260598 · 7260598
1 parent 83c2164
commit 7260598
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 15 deletions.
diff --git a/apps/web-next/src/__generated__/graphql-types.ts b/apps/web-next/src/__generated__/graphql-types.ts
diff --git a/apps/web/src/__generated__/graphql-types.ts b/apps/web/src/__generated__/graphql-types.ts
diff --git a/services/gateway/prisma/migrations/20241231210020_add_search_log/migration.sql b/services/gateway/prisma/migrations/20241231210020_add_search_log/migration.sql
@@ -0,0 +1,9 @@
+-- CreateTable
+CREATE TABLE "search_log_entry" (
+    "id" UUID NOT NULL DEFAULT gen_random_uuid(),
+    "query" TEXT NOT NULL,
+    "params" JSONB NOT NULL DEFAULT '{}',
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "search_log_entry_pkey" PRIMARY KEY ("id")
+);
diff --git a/services/gateway/prisma/migrations/migration_lock.toml b/services/gateway/prisma/migrations/migration_lock.toml
@@ -1,3 +1,3 @@
 # Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
+# It should be added in your version-control system (e.g., Git)
 provider = "postgresql"
diff --git a/services/gateway/prisma/schema.prisma b/services/gateway/prisma/schema.prisma
@@ -534,3 +534,12 @@ model UploadList {
   @@unique([createdAt, id])
   @@map("upload_list")
 }
+
+model SearchLogEntry {
+  id        String   @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  query     String
+  params    Json     @default("{}")
+  createdAt DateTime @default(now()) @map("created_at")
+
+  @@map("search_log_entry")
+}
diff --git a/services/gateway/src/schema/types/search.ts b/services/gateway/src/schema/types/search.ts
@@ -274,9 +274,8 @@ builder.queryFields((t) => ({
             },
           ),
       },
-      resolve: async (
-        _root,
-        {
+      resolve: async (_root, args, context, _info) => {
+        const {
           query,
           focus,
           channels,
@@ -287,11 +286,9 @@ builder.queryFields((t) => ({
           orgType,
           organization,
           tags,
-          ...args
-        },
-        context,
-        _info,
-      ) => {
+          ...restArgs
+        } = args;
+
         let totalCount = 0;
         let uploadHitCount = 0;
         let transcriptHitCount = 0;
@@ -301,7 +298,7 @@ builder.queryFields((t) => ({
         let dateAggData: { min: Date; max: Date } | null = null;
 
         const publishedAt: { lte?: string; gte?: string } = {};
-        const orderBy = OrderByEnum.parse(args.orderBy ?? 'avg');
+        const orderBy = OrderByEnum.parse(restArgs.orderBy ?? 'avg');
 
         if (minPublishedAt) {
           publishedAt.gte =
@@ -345,7 +342,7 @@ builder.queryFields((t) => ({
           : null;
 
         const res = await resolveOffsetConnection(
-          { args },
+          { args: restArgs },
           async ({ offset, limit }) => {
             const esRes = await esClient.msearch({
               searches: [
@@ -543,6 +540,11 @@ builder.queryFields((t) => ({
           },
         );
 
+        const { query: logQuery, ...logParams } = args;
+        await prisma.searchLogEntry.create({
+          data: { query: logQuery, params: logParams },
+        });
+
         return {
           ...res,
           totalCount,