add join

Author: KaichiManabe

server/prisma/schema.prisma

@@ -2,7 +2,7 @@
 generator client {
   provider        = "prisma-client-js"
   binaryTargets   = ["native", "debian-openssl-3.0.x"]
-  previewFeatures = ["typedSql"]
+  previewFeatures = ["typedSql","relationJoins"]
 }
 
 datasource db {

server/src/database/courses.ts

@@ -5,6 +5,7 @@ import { prisma } from "./client";
 export async function getCourseByCourseId(courseId: string): Promise<Course> {
   return (
     (await prisma.course.findUnique({
+      relationLoadStrategy: "join",
       where: {
         id: courseId,
       },
@@ -20,6 +21,7 @@ export async function getCourseByCourseId(courseId: string): Promise<Course> {
  */
 export async function getCoursesByUserId(userId: UserID): Promise<Course[]> {
   return await prisma.course.findMany({
+    relationLoadStrategy: "join",
     where: {
       enrollments: {
         some: {
@@ -43,6 +45,7 @@ export async function getCourseByDayPeriodAndUserId(
 ): Promise<Course | null> {
   // TODO: findUnique で取れるような制約を掛ける
   return await prisma.course.findFirst({
+    relationLoadStrategy: "join",
     where: {
       enrollments: {
         some: {
@@ -70,6 +73,7 @@ export async function getCoursesByDayAndPeriod(
   period: number,
 ): Promise<Course[]> {
   return await prisma.course.findMany({
+    relationLoadStrategy: "join",
     where: {
       slots: {
         some: {

server/src/database/requests.ts

@@ -103,6 +103,7 @@ export async function getPendingRequestsToUser(
   userId: UserID,
 ): Promise<UserWithCoursesAndSubjects[]> {
   const found = await prisma.user.findMany({
+    relationLoadStrategy: "join",
     where: {
       sendingUsers: {
         some: {
@@ -146,6 +147,7 @@ export async function getPendingRequestsFromUser(
   userId: UserID,
 ): Promise<UserWithCoursesAndSubjects[]> {
   const found = await prisma.user.findMany({
+    relationLoadStrategy: "join",
     where: {
       receivingUsers: {
         some: {
@@ -190,6 +192,7 @@ export async function getMatchedUser(
   userId: UserID,
 ): Promise<UserWithCoursesAndSubjects[]> {
   const found = await prisma.user.findMany({
+    relationLoadStrategy: "join",
     where: {
       OR: [
         {

server/src/database/users.ts

@@ -23,6 +23,7 @@ export async function createUser(partialUser: Omit<User, "id">): Promise<User> {
 // ユーザーの取得
 export async function getUser(guid: GUID): Promise<UserWithCoursesAndSubjects> {
   const user = await prisma.user.findUnique({
+    relationLoadStrategy: "join",
     where: {
       guid: guid,
     },
@@ -75,6 +76,7 @@ export async function getUserByID(
   id: UserID,
 ): Promise<UserWithCoursesAndSubjects> {
   const user = await prisma.user.findUnique({
+    relationLoadStrategy: "join",
     where: {
       id,
     },
@@ -140,6 +142,7 @@ export async function getAllUsers(): Promise<
   (User & { courses: Course[]; interestSubjects: InterestSubject[] })[]
 > {
   const users = await prisma.user.findMany({
+    relationLoadStrategy: "join",
     include: {
       enrollments: {
         include: {

server/src/firebase/auth/lib.ts

@@ -11,7 +11,7 @@ type DecodedIdToken = admin.DecodedIdToken;
 // THROWS: if idToken is not present in request cookie, or when the token is not valid.
 export async function getGUID(c: Context): Promise<GUID> {
   const idToken = c.req.header("Authorization");
-  if (typeof idToken !== "string") error("token not found in query", 401);
+  if (typeof idToken !== "string") error("token not found in header", 401);
   return await getGUIDFromToken(idToken);
 }
 

server/src/index.ts

@@ -31,6 +31,7 @@ if (corsOptions.origin.length > 1) {
 const app = new Hono()
   .onError((err, c) => {
     if (err instanceof HTTPException) {
+      console.error(err);
       c.status(err.status);
       return c.json({ error: err });
     }