diff --git a/backend/src/main/java/com/example/todoapp/model/RecipeStuffs.java b/backend/src/main/java/com/example/todoapp/model/RecipeStuffs.java index 5c3a933..74d5738 100644 --- a/backend/src/main/java/com/example/todoapp/model/RecipeStuffs.java +++ b/backend/src/main/java/com/example/todoapp/model/RecipeStuffs.java @@ -28,7 +28,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @Entity -@Table(name = "recipe_stuffs") +@Table(name = "recipeStuffs") public class RecipeStuffs { @@ -37,7 +37,7 @@ public class RecipeStuffs { */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name="recipe_stuffs_id") + @Column(name="recipeStuffsId") private Long recipeStuffsId ; /** diff --git a/backend/src/main/java/com/example/todoapp/model/Task.java b/backend/src/main/java/com/example/todoapp/model/Task.java index 9e3ad8a..c2ba9bd 100644 --- a/backend/src/main/java/com/example/todoapp/model/Task.java +++ b/backend/src/main/java/com/example/todoapp/model/Task.java @@ -51,7 +51,7 @@ public class Task { * 多対一の関係で、遅延ロードを使用 */ @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "user_id", nullable = false) + @JoinColumn(name = "userId", nullable = false) private User user; /** diff --git a/backend/src/main/java/com/example/todoapp/service/StocksService.java b/backend/src/main/java/com/example/todoapp/service/StocksService.java index 07dad3c..e793f1f 100644 --- a/backend/src/main/java/com/example/todoapp/service/StocksService.java +++ b/backend/src/main/java/com/example/todoapp/service/StocksService.java @@ -45,7 +45,7 @@ public class StocksService { /** * 指定されたユーザのすべての在庫を取得する * @param username ユーザー名 - * @return ユーザーの在庫リスト(stock_id昇順) + * @return ユーザーの在庫リスト(stockId昇順) */ public List getALLStocksByUser(String username) { User user = getUserByUsername(username); diff --git a/frontend/src/pages/AddDishes1.tsx b/frontend/src/pages/AddDishes1.tsx index d003ebd..5c28373 100644 --- a/frontend/src/pages/AddDishes1.tsx +++ b/frontend/src/pages/AddDishes1.tsx @@ -60,7 +60,7 @@ const AddDishes1: React.FC = () => { InputLabelProps={{ style: { fontSize: "40px" }}} style={{width: "80%" }} InputProps={{ style: { fontSize: "40px"} }} - name="dish_name" + name="dishName" // autoComplete="username" autoFocus value={dish} diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts index 221b16f..f214404 100644 --- a/frontend/src/services/api.ts +++ b/frontend/src/services/api.ts @@ -120,8 +120,8 @@ export const toBuyApi = { throw new Error(TOBUY_ERRORS.CREATE_FAILED); } - // return response.json(); - return {result: true} + return response.json(); + // return {result: true} // return { // "result": true, @@ -202,40 +202,42 @@ export const stockApi = { * @returns 買在庫リスト一覧 */ getStocks: async (): Promise => { - // const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, { - // headers: getHeaders(), // 認証トークンを含むヘッダー - // }); + const response = await fetch(`${API_BASE_URL}/api/tobuy/get`, { + headers: getHeaders(), // 認証トークンを含むヘッダー + }); - // if (!response.ok) { - // throw new Error(TASK_ERRORS.FETCH_FAILED); - // } + if (!response.ok) { + throw new Error(TASK_ERRORS.FETCH_FAILED); + } - // return response.json(); - - 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": "野菜" - } - ] + 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": "野菜" + // } + // ] + // } }, diff --git a/frontend/src/types/types.ts b/frontend/src/types/types.ts index 1a93f80..0f2e897 100644 --- a/frontend/src/types/types.ts +++ b/frontend/src/types/types.ts @@ -4,7 +4,7 @@ */ export interface Task { id: number; // タスクの一意識別子 - stuff_name: string; // タスクのタイトル + stuffName: string; // タスクのタイトル amount: number; //材料の数量 price: number; //材料の値段 buyDate:Date; //購入日時