recommend でユーザ情報を JOIN する

Author: nakaterm

server/prisma/sql/recommend.sql

@@ -1,6 +1,33 @@
 -- $1 = senderId
 SELECT
-    *, 
+    recv.id,
+    recv.name,
+    recv.gender,
+    recv.grade,
+    recv.faculty,
+    recv.department,
+    recv.intro,
+    recv."guid",
+    recv."pictureUrl",
+    json_agg(DISTINCT jsonb_build_object(
+        'id', c.id,
+        'name', c.name,
+        'teacher', c.teacher,
+        'slots', (
+          SELECT json_agg(
+            jsonb_build_object(
+              'courseId', "Slot"."courseId",
+              'day', "Slot"."day",
+              'period', "Slot"."period"
+            )
+          ) FROM "Slot" WHERE "Slot"."courseId" = c.id)
+        )
+      ) FILTER (WHERE c.id IS NOT NULL) AS "courses",
+    json_agg(DISTINCT jsonb_build_object(
+        'id', s.id,
+        'name', s.name,
+        'group', s.group
+      )) FILTER (WHERE s.id IS NOT NULL) AS "interestSubjects",
     -- course overlap
     (SELECT COUNT(1) FROM "Course" course
         WHERE EXISTS (SELECT 1 FROM "Enrollment" e WHERE e."courseId" = course.id AND e."userId" = recv.id)
@@ -12,6 +39,13 @@ SELECT
         AND EXISTS (SELECT 1 FROM "Interest" i WHERE i."subjectId" = subj.id AND i."userId" = $1)
     ) AS overlap
 FROM "User" recv
+
+LEFT JOIN "Enrollment" ON "Enrollment"."userId" = recv.id
+LEFT JOIN "Course" c on c.id = "Enrollment"."courseId"
+LEFT JOIN "Slot" ON "Slot"."courseId" = c.id
+LEFT JOIN "Interest" ON "Interest"."userId" = recv.id
+LEFT JOIN "InterestSubject" s ON s.id = "Interest"."subjectId"
+
 WHERE recv.id <> $1
 
 AND NOT EXISTS (
@@ -39,5 +73,7 @@ AND (
   )
 )
 
+GROUP BY recv.id
+
 ORDER BY overlap DESC
 LIMIT $2 OFFSET $3;

server/src/functions/engines/recommendation.ts

@@ -1,9 +1,11 @@
 import { recommend } from "@prisma/client/sql";
-import type { UserID, UserWithCoursesAndSubjects } from "common/types";
+import type {
+  Course,
+  InterestSubject,
+  UserID,
+  UserWithCoursesAndSubjects,
+} from "common/types";
 import { prisma } from "../../database/client";
-import { getCoursesByUserId } from "../../database/courses";
-import * as interest from "../../database/interest";
-import { getUserByID } from "../../database/users";
 
 export async function recommendedTo(
   user: UserID,
@@ -15,23 +17,17 @@ export async function recommendedTo(
     count: number;
   }>
 > {
-  const result = await prisma.$queryRawTyped(recommend(user, limit, offset));
-  return Promise.all(
-    result.map(async (res) => {
-      const { overlap: count, ...u } = res;
-      if (count === null) throw new Error("count is null: something is wrong");
-      // TODO: user の情報はここで再度 DB に問い合わせるのではなく、 recommend の sql で取得
-      const user = await getUserByID(u.id);
-      const courses = getCoursesByUserId(u.id);
-      const subjects = interest.of(u.id);
-      return {
-        count: Number(count),
-        u: {
-          ...user,
-          courses: await courses,
-          interestSubjects: await subjects,
-        },
-      };
-    }),
-  );
+  const users = await prisma.$queryRawTyped(recommend(user, limit, offset));
+  console.log("🚀", users);
+  return users.map((user) => {
+    const { overlap: count, ...u } = user;
+    return {
+      count: Number(count),
+      u: {
+        ...u,
+        interestSubjects: (u.interestSubjects ?? []) as InterestSubject[], // TODO: type
+        courses: (u.courses ?? []) as Course[], // TODO: type
+      },
+    };
+  });
 }