From 1a83275f2bf337ac9bc4aa00a9759444618426c5 Mon Sep 17 00:00:00 2001
From: MurakawaTakuya <murakawatakuya5@gmail.com>
Date: Mon, 13 Jan 2025 00:38:47 +0900
Subject: [PATCH] =?UTF-8?q?fixup!=20=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E6=A9=9F=E8=83=BD=E3=82=92API=E3=81=AB?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 functions/src/routers/reactionRouter.ts | 15 +++++++--------
 functions/src/types.ts                  |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/functions/src/routers/reactionRouter.ts b/functions/src/routers/reactionRouter.ts
index b3b98b8..043733c 100644
--- a/functions/src/routers/reactionRouter.ts
+++ b/functions/src/routers/reactionRouter.ts
@@ -1,7 +1,7 @@
 import express, { Request, Response } from "express";
 import admin from "firebase-admin";
 import { logger } from "firebase-functions";
-import { Reaction, reactionTypeMap } from "../types";
+import { Reaction, ReactionTypeMap } from "../types";
 
 const router = express.Router();
 const db = admin.firestore();
@@ -27,15 +27,16 @@ router.put("/:goalId", async (req: Request, res: Response) => {
 
     const goalData = goalDoc.data();
 
-    const currentReactions = goalData?.post?.reaction || {};
+    const currentReactions = goalData?.reaction || {}; // 元のリアクションデータ
     if (!reactionType) {
       // リアクション削除
       delete currentReactions[userId];
     } else {
       // リアクション追加
+      // リアクションタイプが正しいか確認
       const validReactionTypes = [
-        ...reactionTypeMap.success,
-        ...reactionTypeMap.failed,
+        ...ReactionTypeMap.success,
+        ...ReactionTypeMap.failed,
       ];
       if (!validReactionTypes.includes(reactionType)) {
         return res.status(400).json({ message: "Invalid reactionType" });
@@ -45,10 +46,8 @@ router.put("/:goalId", async (req: Request, res: Response) => {
     }
 
     await goalRef.update({
-      post: {
-        ...goalData?.post,
-        reaction: currentReactions,
-      },
+      ...goalData,
+      reaction: currentReactions,
     });
 
     return res.json({ message: "Reaction updated successfully", goalId });
diff --git a/functions/src/types.ts b/functions/src/types.ts
index 45f04b8..d7e5433 100644
--- a/functions/src/types.ts
+++ b/functions/src/types.ts
@@ -44,7 +44,7 @@ export interface ReactionType {
   failed: "sad" | "angry" | "muscle";
 }
 
-export const reactionTypeMap = {
+export const ReactionTypeMap = {
   success: ["laugh", "surprised", "clap"] as const,
   failed: ["sad", "angry", "muscle"] as const,
 };