ユーザー作成時にメモとマッチするように

Author: KaichiManabe

server/src/database/requests.ts

@@ -184,20 +184,18 @@ export async function getMatchedUser(userId: UserID): Promise<Result<User[]>> {
   }
 }
 
-export async function autoMatch(userId: UserID) {
+export async function matchWithMemo(userId: UserID) {
   try {
     const result = await prisma.relationship.create({
       data: {
         status: "MATCHED",
         sendingUserId: userId,
-        receivingUserId: 0, //Keepメモ
+        receivingUserId: 0, //KeepメモのUserId
       },
     });
 
-    console.log("New relationship record created:", result);
     return result;
   } catch (error) {
-    console.error("Error creating new relationship:", error);
-    throw new Error("Failed to create a new match.");
+    return Err(error);
   }
 }

server/src/router/requests.ts

@@ -4,7 +4,6 @@ import express, { type Request, type Response } from "express";
 import { safeParseInt } from "common/lib/result/safeParseInt";
 import {
   approveRequest,
-  autoMatch,
   cancelRequest,
   rejectRequest,
   sendRequest,
@@ -85,18 +84,4 @@ router.put("/reject/:opponentId", async (req: Request, res: Response) => {
   }
 });
 
-//オートマッチ(メモ帳、運営等に使用)
-router.post("/autoMatch", async (req: Request, res: Response) => {
-  const requesterId = await safeGetUserId(req);
-  if (!requesterId.ok) return res.status(401).send("auth error");
-
-  try {
-    await autoMatch(requesterId.value as UserID);
-    res.status(204).send();
-  } catch (error) {
-    console.error("Error rejecting match request:", error);
-    res.status(500).json({ error: "Failed to reject match request" });
-  }
-});
-
 export default router;

server/src/router/users.ts

@@ -9,6 +9,7 @@ import express, { type Request, type Response } from "express";
 import {
   getPendingRequestsFromUser,
   getPendingRequestsToUser,
+  matchWithMemo,
 } from "../database/requests";
 import {
   createUser,
@@ -124,10 +125,20 @@ router.get("/id/:id", async (req: Request, res: Response) => {
 // INSERT INTO "User" VALUES (body...)
 router.post("/", async (req: Request, res: Response) => {
   const partialUser = InitUserSchema.safeParse(req.body);
-  if (!partialUser.success) return res.status(400).send("invalid format");
+  if (!partialUser.success)
+    return res.status(400).send({
+      error: "Invalid input format",
+      details: partialUser.error.errors,
+    });
 
   const user = await createUser(partialUser.data);
-  if (!user.ok) return res.status(500).send();
+  if (!user.ok) return res.status(500).send({ error: "Failed to create user" });
+
+  //ユーザー作成と同時にメモとマッチング
+  const result = await matchWithMemo(user.value.id);
+  if ("ok" in result && !result.ok) {
+    return res.status(500).send({ error: "Failed to match user with memo" });
+  }
   res.status(201).json(user.value);
 });
 

web/api/internal/endpoints.ts

@@ -280,10 +280,6 @@ export const rejectRequest = (opponentId: UserID) => {
   return `${origin}/requests/reject/${opponentId}`;
 };
 
-export const autoMatch = () => {
-  return `${origin}/requests/autoMatch/`;
-};
-
 /**
  * []実装済み
  * GET -> get personalized room overviews.
@@ -385,7 +381,6 @@ export default {
   sendRequest,
   acceptRequest,
   rejectRequest,
-  autoMatch,
   cancelRequest,
   coursesUserId,
   coursesDayPeriod,

web/api/request.ts

@@ -26,15 +26,8 @@ export async function accept(senderId: UserID) {
   return data;
 }
 
-export async function autoMatch() {
-  const res = await credFetch("POST", endpoints.autoMatch());
-  const data = await res.text();
-  return data;
-}
-
 export default {
   send,
   reject,
   accept,
-  autoMatch,
 };

web/app/signup/page.tsx

@@ -5,7 +5,6 @@ import { useState } from "react";
 
 import type { Step1User } from "common/zod/types";
 import { useRouter } from "next/navigation";
-import request from "~/api/request";
 import Header from "~/components/Header";
 import { NavigateByAuthState } from "~/components/common/NavigateByAuthState";
 import { register } from "./functions";
@@ -14,10 +13,6 @@ import Step2, { type Step2Data } from "./steps/step2_img";
 import Confirmation from "./steps/step3_confirmation";
 import Step4 from "./steps/step4_course";
 
-function matchWithMemo() {
-  request.autoMatch();
-}
-
 function Registration() {
   const { enqueueSnackbar } = useSnackbar();
   const router = useRouter();
@@ -63,7 +58,6 @@ function Registration() {
             };
             try {
               await register(concat, { enqueueSnackbar, router });
-              matchWithMemo();
               setStep(4);
             } catch (error) {
               enqueueSnackbar("サインアップに失敗しました", {

web/components/chat/RoomList.tsx

@@ -19,7 +19,9 @@ export function RoomList(props: RoomListProps) {
    */
   const navigateToRoom = (room: Extract<RoomOverview, { isDM: true }>) => {
     router.push(
-      `./?friendId=${room.friendId}&roomData=${encodeURIComponent(JSON.stringify(room))}`,
+      `./?friendId=${room.friendId}&roomData=${encodeURIComponent(
+        JSON.stringify(room),
+      )}`,
     );
   };
 
@@ -41,27 +43,6 @@ export function RoomList(props: RoomListProps) {
       </p>
       {roomsData?.map((room) => {
         if (room.isDM) {
-          if (room.friendId === 0) {
-            //Keepメモ
-            return (
-              <Box
-                key={room.friendId}
-                onClick={() => {
-                  // `state`を使って`room`データを渡す
-                  navigate("./memo", { state: { room } });
-                }}
-              >
-                <HumanListItem
-                  key={room.friendId}
-                  id={room.friendId}
-                  name={room.name}
-                  pictureUrl={room.thumbnail}
-                  rollUpName={true}
-                  lastMessage={room.lastMsg?.content}
-                />
-              </Box>
-            );
-          }
           return (
             <Box
               key={room.friendId}