From 46963ed46c216aac4a53aa3e5a7516acf4f1c5f8 Mon Sep 17 00:00:00 2001 From: "Masaharu.Kato" Date: Mon, 9 Jun 2025 13:25:42 +0900 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=88=97=E3=82=92=E7=94=9F=E3=81=A7?= =?UTF-8?q?=E8=BF=94=E3=81=99=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todoapp/controller/ToBuysController.java | 4 +- frontend/src/pages/StockPage.tsx | 2 +- frontend/src/pages/TaskListPage.tsx | 4 +- frontend/src/services/api.ts | 82 +++++++------------ 4 files changed, 34 insertions(+), 58 deletions(-) diff --git a/backend/src/main/java/com/example/todoapp/controller/ToBuysController.java b/backend/src/main/java/com/example/todoapp/controller/ToBuysController.java index 196f8a8..c644e14 100644 --- a/backend/src/main/java/com/example/todoapp/controller/ToBuysController.java +++ b/backend/src/main/java/com/example/todoapp/controller/ToBuysController.java @@ -106,8 +106,8 @@ public class ToBuysController { }) .collect(Collectors.toList()); - Map responseBody = new HashMap<>(); - responseBody.put("tobuy_array", responseList); + // Map responseBody = new HashMap<>(); + // responseBody.put("tobuy_array", responseList); return ResponseEntity.ok(responseList); } diff --git a/frontend/src/pages/StockPage.tsx b/frontend/src/pages/StockPage.tsx index 67103b5..3904178 100644 --- a/frontend/src/pages/StockPage.tsx +++ b/frontend/src/pages/StockPage.tsx @@ -47,7 +47,7 @@ const StockPage: React.FC = () => { const fetchStocks = async () => { try { const stocks = await stockApi.getStocks(); - setStocks(stocks.stock_array); + setStocks(stocks); } catch (error) { console.error(`${TASK_ERRORS.FETCH_FAILED}:`, error); } diff --git a/frontend/src/pages/TaskListPage.tsx b/frontend/src/pages/TaskListPage.tsx index 340381d..6686e47 100644 --- a/frontend/src/pages/TaskListPage.tsx +++ b/frontend/src/pages/TaskListPage.tsx @@ -77,7 +77,7 @@ const TaskListPage: React.FC = () => { const fetchTasks = async () => { try { const tobuys = await toBuyApi.getToBuys(); - setToBuys(tobuys.tobuy_array); + setToBuys(tobuys); } catch (error) { console.error(`${TASK_ERRORS.FETCH_FAILED}:`, error); } @@ -86,7 +86,7 @@ const TaskListPage: React.FC = () => { const onChangeCategory = async (category: string) => { setNewToBuy({ ...newToBuy, category }) const result = await stuffApi.getStuffs(category) - setStuffs(result.stuff_array) + setStuffs(result) } // /** diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts index d360657..221b16f 100644 --- a/frontend/src/services/api.ts +++ b/frontend/src/services/api.ts @@ -92,7 +92,7 @@ export const toBuyApi = { * 全買うものリストを取得 * @returns 買うものリスト一覧 */ - getToBuys: async (): Promise<{ "tobuy_array": ToBuy[] }> => { + getToBuys: async (): Promise => { const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, { headers: getHeaders(), // 認証トークンを含むヘッダー }); @@ -101,27 +101,7 @@ export const toBuyApi = { throw new Error(TOBUY_ERRORS.FETCH_FAILED); } - const tobuy_array = await response.json(); - return {tobuy_array}; - - // return { - // "tobuy_array": [ - // { - // "tobuyId": 1, - // "stuffId": 2, - // "stuffName": "じゃがいも", - // "amount": 3, - // "shop": "shopXXX" - // }, - // { - // "tobuyId": 2, - // "stuffId": 5, - // "stuffName": "にんじん", - // "amount": 1 - // } - // ] - // } - + return await response.json(); }, /** @@ -176,7 +156,7 @@ export const toBuyApi = { } export const stuffApi = { - getStuffs: async (category: string): Promise<{ stuff_array: Stuff[] }> => { + getStuffs: async (category: string): Promise => { const data = [ { stuffId: 1, stuffName: "牛乳", category: "乳製品" }, { stuffId: 2, stuffName: "ヨーグルト", category: "乳製品" }, @@ -211,9 +191,7 @@ export const stuffApi = { const filtered = data.filter(stuff => stuff.category == category) - return { - "stuff_array": filtered - } + return filtered } } @@ -223,7 +201,7 @@ export const stockApi = { * 全在庫リストを取得 * @returns 買在庫リスト一覧 */ - getStocks: async (): Promise<{ "stock_array": Stock[] }> => { + getStocks: async (): Promise => { // const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, { // headers: getHeaders(), // 認証トークンを含むヘッダー // }); @@ -234,32 +212,30 @@ export const stockApi = { // return response.json(); - return { - "stock_array": [ - { - "stockId": 1, - "stuffId": 10, - "stuffName": "豚肉", - "amount": 100, - "price": 200, - "buyDate": "2025-05-18T09:00:00.000Z", - "lastUpdate": "2025-05-18T09:00:00.000Z", - "expDate": "2025-05-19T10:15:00.000Z", - "category": "肉" - }, - { - "stockId": 2, - "stuffId": 1, - "stuffName": "トマト", - "amount": 10, - "price": 200, - "buyDate": "2025-05-18T09:00:00.000Z", - "lastUpdate": "2025-05-18T09:00:00.000Z", - "expDate": "2025-05-19T10:15:00.000Z", - "category": "野菜" - } - ] - } + return [ + { + "stockId": 1, + "stuffId": 10, + "stuffName": "豚肉", + "amount": 100, + "price": 200, + "buyDate": "2025-05-18T09:00:00.000Z", + "lastUpdate": "2025-05-18T09:00:00.000Z", + "expDate": "2025-05-19T10:15:00.000Z", + "category": "肉" + }, + { + "stockId": 2, + "stuffId": 1, + "stuffName": "トマト", + "amount": 10, + "price": 200, + "buyDate": "2025-05-18T09:00:00.000Z", + "lastUpdate": "2025-05-18T09:00:00.000Z", + "expDate": "2025-05-19T10:15:00.000Z", + "category": "野菜" + } + ] },