KeepMemo

server/src/database/requests.ts

@@ -183,3 +183,21 @@ export async function getMatchedUser(userId: UserID): Promise<Result<User[]>> {
     return Err(e);
   }
 }
+
+export async function autoMatch(userId: UserID) {
+  try {
+    const result = await prisma.relationship.create({
+      data: {
+        status: "MATCHED",
+        sendingUserId: userId,
+        receivingUserId: 0, //Keepメモ
+      },
+    });
+
+    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.");
+  }
+}

server/src/router/requests.ts

@@ -4,6 +4,7 @@ import type { UserID } from "../common/types";
 import { safeParseInt } from "../common/lib/result/safeParseInt";
 import {
   approveRequest,
+  autoMatch,
   cancelRequest,
   rejectRequest,
   sendRequest,
@@ -84,4 +85,18 @@ 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;

web/src/api/internal/endpoints.ts

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

web/src/api/request.ts

@@ -26,8 +26,15 @@ 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/src/components/chat/RoomList.tsx

@@ -29,6 +29,27 @@ 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}

web/src/components/match/matching.tsx

@@ -34,17 +34,24 @@ export default function Matchings() {
         <p>Error: {error.message}</p>
       ) : (
         <List>
-          {data?.map((matchedUser) => (
-            <HumanListItem
-              key={matchedUser.id}
-              id={matchedUser.id}
-              name={matchedUser.name}
-              pictureUrl={matchedUser.pictureUrl}
-              onOpen={() => openModal(matchedUser)}
-              onDelete={() => deleteMatch(matchedUser.id).then(() => reload())}
-              hasDots
-            />
-          ))}
+          {data?.map((matchedUser) =>
+            matchedUser.id === 0 ? (
+              //メモ帳
+              <div key={0} />
+            ) : (
+              <HumanListItem
+                key={matchedUser.id}
+                id={matchedUser.id}
+                name={matchedUser.name}
+                pictureUrl={matchedUser.pictureUrl}
+                onOpen={() => openModal(matchedUser)}
+                onDelete={() =>
+                  deleteMatch(matchedUser.id).then(() => reload())
+                }
+                hasDots
+              />
+            ),
+          )}
         </List>
       )}
     </Box>

web/src/routes/registration/index.tsx

@@ -2,6 +2,7 @@ import { Box } from "@mui/material";
 import { useSnackbar } from "notistack";
 import { useState } from "react";
 import { useNavigate } from "react-router-dom";
+import request from "../../api/request";
 import type { Step1User } from "../../common/zod/types";
 import Header from "../../components/Header";
 import { register } from "./functions";
@@ -10,6 +11,10 @@ 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 navigate = useNavigate();
@@ -55,6 +60,7 @@ function Registration() {
             };
             try {
               await register(concat, { enqueueSnackbar, navigate });
+              matchWithMemo();
               setStep(4);
             } catch (error) {
               enqueueSnackbar("サインアップに失敗しました", {