From 9a3b22d2e726077122737efaddfeb62aba0d6b9a Mon Sep 17 00:00:00 2001
From: "Yuna.Suzuki" <yuna.suzuki@ivis.co.jp>
Date: Thu, 12 Jun 2025 15:12:12 +0900
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=AB=E3=81=AE=E6=96=B0=E8=A6=8F?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E6=A9=9F=E8=83=BD=E3=82=92=E5=AE=9F=E8=A3=85?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/StockPage.tsx | 42 +++++++++++++++++---------------
 frontend/src/services/api.ts     |  2 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/frontend/src/pages/StockPage.tsx b/frontend/src/pages/StockPage.tsx
index 6bd440c..91fa07a 100644
--- a/frontend/src/pages/StockPage.tsx
+++ b/frontend/src/pages/StockPage.tsx
@@ -88,7 +88,13 @@ const StockPage: React.FC = () => {
             }
             console.log(newStock)
             const today = new Date().toISOString().substring(0, 10);
-            await stockApi.addStock(newStock);
+
+            const updatedStock = { ...newStock, lastUpdate: today }; // lastUpdate に today を設定
+            console.log("送信するデータ:", updatedStock); // 送信前のデータを確認
+            await stockApi.addStock(updatedStock); // 修正したオブジェクトを API に送信
+
+
+            // await stockApi.addStock(newStock);
             setIsAddOpen(false); // ダイアログを閉じる
             setNewStock(EMPTY_STOCK); // 入力内容をリセット
             fetchStocks(); // 作成後のタスク一覧を再取得
@@ -249,8 +255,8 @@ const StockPage: React.FC = () => {
                                 <TableCell>食材名</TableCell>
                                 <TableCell>数量</TableCell>
                                 <TableCell>購入価格</TableCell>
-                                <TableCell>賞味・消費期限</TableCell>
                                 <TableCell>購入日</TableCell>
+                                <TableCell>消費・賞味期限</TableCell>
                             </TableRow>
                         </TableHead>
                         <TableBody>
@@ -269,12 +275,12 @@ const StockPage: React.FC = () => {
                                         <TableCell>{stock.stuffName}</TableCell>
                                         <TableCell>{stock.amount}</TableCell>
                                         <TableCell>{stock.price}</TableCell>
+                                        <TableCell>{formatDate(stock.buyDate)}</TableCell>
                                         <TableCell
                                             style={daysLeft <= 3 ? { color: "red", fontWeight: "bold" } : {}}
                                         >
                                             {formatDate(stock.expDate)}
                                         </TableCell>
-                                        <TableCell>{formatDate(stock.buyDate)}</TableCell>
                                     </TableRow>
                                 );
                             })}
@@ -309,19 +315,19 @@ const StockPage: React.FC = () => {
                                     onChange={handleChange}
                                 />
                                 <TextField
-                                    label="賞味・消費期限 (yyyy-MM-dd)"
+                                    label="購入日 (yyyy-MM-dd)"
                                     fullWidth
                                     margin="normal"
-                                    name="expDate"
-                                    value={editStock.expDate}
+                                    name="buyDate"
+                                    value={editStock.buyDate}
                                     onChange={handleChange}
                                 />
                                 <TextField
-                                    label="購入日 (yyyy-MM-dd)"
+                                    label="消費・賞味期限 (yyyy-MM-dd)"
                                     fullWidth
                                     margin="normal"
-                                    name="buyDate"
-                                    value={editStock.buyDate}
+                                    name="expDate"
+                                    value={editStock.expDate}
                                     onChange={handleChange}
                                 />
 
@@ -364,8 +370,6 @@ const StockPage: React.FC = () => {
                         )}
                     </DialogContent>
                 </Dialog>
-
-
             </>
         );
     };
@@ -474,22 +478,22 @@ const StockPage: React.FC = () => {
                             inputProps={{ inputMode: "numeric", pattern: "[0-9]*" }} // ここで整数のみ許可
                         />
 
-                        {/* 賞味・消費期限入力フィールド */}
+                        {/* 購入日入力フィールド */}
                         <TextField
                             margin="dense"
-                            label="消費・賞味期限(yyyy/MM/dd)"
+                            label="購入日(yyyy/MM/dd)"
                             fullWidth
-                            value={newStock.expDate}
-                            onChange={(e) => setNewStock({ ...newStock, expDate: e.target.value })}
+                            value={newStock.buyDate}
+                            onChange={(e) => setNewStock({ ...newStock, buyDate: e.target.value })}
                         />
 
-                        {/* 購入日入力フィールド */}
+                        {/* 賞味・消費期限入力フィールド */}
                         <TextField
                             margin="dense"
-                            label="購入日(yyyy/MM/dd)"
+                            label="消費・賞味期限(yyyy/MM/dd)"
                             fullWidth
-                            value={newStock.buyDate}
-                            onChange={(e) => setNewStock({ ...newStock, buyDate: e.target.value })}
+                            value={newStock.expDate}
+                            onChange={(e) => setNewStock({ ...newStock, expDate: e.target.value })}
                         />
                     </Box>
                 </DialogContent>
diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts
index 75c5c67..707b792 100644
--- a/frontend/src/services/api.ts
+++ b/frontend/src/services/api.ts
@@ -268,7 +268,7 @@ export const stockApi = {
 
     console.log("レスポンスステータス:", response.status);
     console.log("レスポンスヘッダー:", response.headers);
-    console.log("レスポンス内容:", await response.text());
+    // console.log("レスポンス内容:", await response.text());
 
 
     if (!response.ok) {