配列を生で返すように修正

feature-backend-tobuy-stock
Masaharu.Kato 5 months ago
parent b048eb01d5
commit 46963ed46c
  1. 4
      backend/src/main/java/com/example/todoapp/controller/ToBuysController.java
  2. 2
      frontend/src/pages/StockPage.tsx
  3. 4
      frontend/src/pages/TaskListPage.tsx
  4. 82
      frontend/src/services/api.ts

@ -106,8 +106,8 @@ public class ToBuysController {
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
Map<String, Object> responseBody = new HashMap<>(); // Map<String, Object> responseBody = new HashMap<>();
responseBody.put("tobuy_array", responseList); // responseBody.put("tobuy_array", responseList);
return ResponseEntity.ok(responseList); return ResponseEntity.ok(responseList);
} }

@ -47,7 +47,7 @@ const StockPage: React.FC = () => {
const fetchStocks = async () => { const fetchStocks = async () => {
try { try {
const stocks = await stockApi.getStocks(); const stocks = await stockApi.getStocks();
setStocks(stocks.stock_array); setStocks(stocks);
} catch (error) { } catch (error) {
console.error(`${TASK_ERRORS.FETCH_FAILED}:`, error); console.error(`${TASK_ERRORS.FETCH_FAILED}:`, error);
} }

@ -77,7 +77,7 @@ const TaskListPage: React.FC = () => {
const fetchTasks = async () => { const fetchTasks = async () => {
try { try {
const tobuys = await toBuyApi.getToBuys(); const tobuys = await toBuyApi.getToBuys();
setToBuys(tobuys.tobuy_array); setToBuys(tobuys);
} catch (error) { } catch (error) {
console.error(`${TASK_ERRORS.FETCH_FAILED}:`, error); console.error(`${TASK_ERRORS.FETCH_FAILED}:`, error);
} }
@ -86,7 +86,7 @@ const TaskListPage: React.FC = () => {
const onChangeCategory = async (category: string) => { const onChangeCategory = async (category: string) => {
setNewToBuy({ ...newToBuy, category }) setNewToBuy({ ...newToBuy, category })
const result = await stuffApi.getStuffs(category) const result = await stuffApi.getStuffs(category)
setStuffs(result.stuff_array) setStuffs(result)
} }
// /** // /**

@ -92,7 +92,7 @@ export const toBuyApi = {
* *
* @returns * @returns
*/ */
getToBuys: async (): Promise<{ "tobuy_array": ToBuy[] }> => { getToBuys: async (): Promise<ToBuy[]> => {
const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, { const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, {
headers: getHeaders(), // 認証トークンを含むヘッダー headers: getHeaders(), // 認証トークンを含むヘッダー
}); });
@ -101,27 +101,7 @@ export const toBuyApi = {
throw new Error(TOBUY_ERRORS.FETCH_FAILED); throw new Error(TOBUY_ERRORS.FETCH_FAILED);
} }
const tobuy_array = await response.json(); return 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
// }
// ]
// }
}, },
/** /**
@ -176,7 +156,7 @@ export const toBuyApi = {
} }
export const stuffApi = { export const stuffApi = {
getStuffs: async (category: string): Promise<{ stuff_array: Stuff[] }> => { getStuffs: async (category: string): Promise<Stuff[]> => {
const data = [ const data = [
{ stuffId: 1, stuffName: "牛乳", category: "乳製品" }, { stuffId: 1, stuffName: "牛乳", category: "乳製品" },
{ stuffId: 2, stuffName: "ヨーグルト", category: "乳製品" }, { stuffId: 2, stuffName: "ヨーグルト", category: "乳製品" },
@ -211,9 +191,7 @@ export const stuffApi = {
const filtered = data.filter(stuff => stuff.category == category) const filtered = data.filter(stuff => stuff.category == category)
return { return filtered
"stuff_array": filtered
}
} }
} }
@ -223,7 +201,7 @@ export const stockApi = {
* *
* @returns * @returns
*/ */
getStocks: async (): Promise<{ "stock_array": Stock[] }> => { getStocks: async (): Promise<Stock[]> => {
// const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, { // const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, {
// headers: getHeaders(), // 認証トークンを含むヘッダー // headers: getHeaders(), // 認証トークンを含むヘッダー
// }); // });
@ -234,32 +212,30 @@ export const stockApi = {
// return response.json(); // return response.json();
return { return [
"stock_array": [ {
{ "stockId": 1,
"stockId": 1, "stuffId": 10,
"stuffId": 10, "stuffName": "豚肉",
"stuffName": "豚肉", "amount": 100,
"amount": 100, "price": 200,
"price": 200, "buyDate": "2025-05-18T09:00:00.000Z",
"buyDate": "2025-05-18T09:00:00.000Z", "lastUpdate": "2025-05-18T09:00:00.000Z",
"lastUpdate": "2025-05-18T09:00:00.000Z", "expDate": "2025-05-19T10:15:00.000Z",
"expDate": "2025-05-19T10:15:00.000Z", "category": "肉"
"category": "肉" },
}, {
{ "stockId": 2,
"stockId": 2, "stuffId": 1,
"stuffId": 1, "stuffName": "トマト",
"stuffName": "トマト", "amount": 10,
"amount": 10, "price": 200,
"price": 200, "buyDate": "2025-05-18T09:00:00.000Z",
"buyDate": "2025-05-18T09:00:00.000Z", "lastUpdate": "2025-05-18T09:00:00.000Z",
"lastUpdate": "2025-05-18T09:00:00.000Z", "expDate": "2025-05-19T10:15:00.000Z",
"expDate": "2025-05-19T10:15:00.000Z", "category": "野菜"
"category": "野菜" }
} ]
]
}
}, },

Loading…
Cancel
Save