{improvement} - 테이블 수정\n #237

JokerTrickster · Nov 30, 2024 · 8445215 · 8445215
1 parent c17669d
commit 8445215
Show file tree

Hide file tree

Showing 17 changed files with 184 additions and 322 deletions.
diff --git a/src/docs/docs.go b/src/docs/docs.go
@@ -1795,18 +1795,6 @@ const docTemplate = `{
                 },
                 "name": {
                     "type": "string"
-                },
-                "scenario": {
-                    "type": "string"
-                },
-                "theme": {
-                    "type": "string"
-                },
-                "time": {
-                    "type": "string"
-                },
-                "type": {
-                    "type": "string"
                 }
             }
         },

diff --git a/src/docs/swagger.json b/src/docs/swagger.json
@@ -1784,18 +1784,6 @@
                 },
                 "name": {
                     "type": "string"
-                },
-                "scenario": {
-                    "type": "string"
-                },
-                "theme": {
-                    "type": "string"
-                },
-                "time": {
-                    "type": "string"
-                },
-                "type": {
-                    "type": "string"
                 }
             }
         },

diff --git a/src/docs/swagger.yaml b/src/docs/swagger.yaml
@@ -172,6 +172,11 @@ definitions:
       sex:
         type: string
     type: object
+  request.ReqV02GoogleOauth:
+    properties:
+      token:
+        type: string
+    type: object
   request.ReqV12RecommendFood:
     properties:
       previousAnswer:
@@ -208,11 +213,6 @@ definitions:
         example: 한식
         type: string
     type: object
-  request.ReqV02GoogleOauth:
-    properties:
-      token:
-        type: string
-    type: object
   request.ReqValidatePassword:
     properties:
       code:
@@ -281,14 +281,6 @@ definitions:
         type: string
       name:
         type: string
-      scenario:
-        type: string
-      theme:
-        type: string
-      time:
-        type: string
-      type:
-        type: string
     type: object
   response.MetaData:
     properties:
@@ -444,6 +436,20 @@ definitions:
       image:
         type: string
     type: object
+  response.ResV12RecommendFood:
+    properties:
+      foodNames:
+        items:
+          $ref: '#/definitions/response.V12RecommendFood'
+        type: array
+    type: object
+  response.ResV1RecommendFood:
+    properties:
+      foodNames:
+        items:
+          $ref: '#/definitions/response.V1RecommendFood'
+        type: array
+    type: object
   response.ResV02GoogleOauth:
     properties:
       accessToken:
@@ -462,20 +468,6 @@ definitions:
       userID:
         type: integer
     type: object
-  response.ResV12RecommendFood:
-    properties:
-      foodNames:
-        items:
-          $ref: '#/definitions/response.V12RecommendFood'
-        type: array
-    type: object
-  response.ResV1RecommendFood:
-    properties:
-      foodNames:
-        items:
-          $ref: '#/definitions/response.V1RecommendFood'
-        type: array
-    type: object
   response.V12RecommendFood:
     properties:
       amount:

diff --git a/src/features/food/model/interface/IFoodRepository.go b/src/features/food/model/interface/IFoodRepository.go
@@ -13,11 +13,11 @@ type IRecommendFoodRepository interface {
 
 type ISelectFoodRepository interface {
 	FindOneFood(ctx context.Context, foodDTO *mysql.Foods) (uint, error)
-	InsertOneFoodHistory(ctx context.Context, foodHistoryDTO *mysql.FoodHistory) error
+	InsertOneFoodHistory(ctx context.Context, foodHistoryDTO *mysql.FoodHistories) error
 	IncrementFoodRanking(ctx context.Context, foodName string, score float64) error
 }
 type IHistoryFoodRepository interface {
-	FindAllFoodHistory(ctx context.Context, userID uint) ([]mysql.FoodHistory, error)
+	FindAllFoodHistory(ctx context.Context, userID uint) ([]mysql.FoodHistories, error)
 	FindOneFood(ctx context.Context, foodID uint) (*mysql.Foods, error)
 }
 

diff --git a/src/features/food/model/response/historyFood.go b/src/features/food/model/response/historyFood.go
@@ -5,10 +5,6 @@ type ResHistoryFood struct {
 }
 
 type HistoryFood struct {
-	Name     string `json:"name"`
-	Type     string `json:"type"`
-	Time     string `json:"time"`
-	Scenario string `json:"scenario"`
-	Theme    string `json:"theme"`
-	Created  string `json:"created"`
+	Name    string `json:"name"`
+	Created string `json:"created"`
 }
diff --git a/src/features/food/repository/historyFoodRepository.go b/src/features/food/repository/historyFoodRepository.go
@@ -22,8 +22,8 @@ func (g *HistoryFoodRepository) FindOneFood(ctx context.Context, foodID uint) (*
 	return &food, nil
 }
 
-func (g *HistoryFoodRepository) FindAllFoodHistory(ctx context.Context, userID uint) ([]mysql.FoodHistory, error) {
-	foodHistoryList := []mysql.FoodHistory{}
+func (g *HistoryFoodRepository) FindAllFoodHistory(ctx context.Context, userID uint) ([]mysql.FoodHistories, error) {
+	foodHistoryList := []mysql.FoodHistories{}
 	if err := g.GormDB.WithContext(ctx).Where("user_id = ?", userID).Find(&foodHistoryList).Error; err != nil {
 		return nil, utils.ErrorMsg(ctx, utils.ErrInternalDB, utils.Trace(), utils.HandleError(_errors.ErrServerError.Error()+err.Error(), userID), utils.ErrFromMysqlDB)
 	}

diff --git a/src/features/food/repository/recommendFoodRepository.go b/src/features/food/repository/recommendFoodRepository.go
@@ -27,7 +27,7 @@ func (d *RecommendFoodRepository) FindOneUser(ctx context.Context, uID uint) (*m
 func (d *RecommendFoodRepository) SaveRecommendFood(ctx context.Context, foodDTO *mysql.Foods) (*mysql.Foods, error) {
 	foods := mysql.Foods{}
 	// 존재 여부 확인
-	err := d.GormDB.WithContext(ctx).Model(&foods).Where("name = ? AND time_id = ? AND type_id = ? AND scenario_id = ? and theme_id = ? ", foodDTO.Name, foodDTO.TimeID, foodDTO.TypeID, foodDTO.ScenarioID, foodDTO.ThemeID).First(&foods).Error
+	err := d.GormDB.WithContext(ctx).Model(&foods).Where("name = ? ", foodDTO.Name).First(&foods).Error
 
 	if err == nil {
 		// 데이터가 이미 존재함

diff --git a/src/features/food/repository/saveFoodRepository.go b/src/features/food/repository/saveFoodRepository.go
@@ -18,7 +18,7 @@ func NewSaveFoodRepository(gormDB *gorm.DB) _interface.ISaveFoodRepository {
 func (d *SaveFoodRepository) SaveFood(ctx context.Context, foodDTO *mysql.Foods) error {
 	foods := mysql.Foods{}
 	// 존재 여부 확인
-	err := d.GormDB.WithContext(ctx).Model(&foods).Where("name = ? AND time_id = ? AND type_id = ? AND scenario_id = ? and theme_id = ? ", foodDTO.Name, foodDTO.TimeID, foodDTO.TypeID, foodDTO.ScenarioID, foodDTO.ThemeID).First(&foods).Error
+	err := d.GormDB.WithContext(ctx).Model(&foods).Where("name = ?  ", foodDTO.Name).First(&foods).Error
 
 	if err == nil {
 		// 데이터가 이미 존재함

diff --git a/src/features/food/repository/selectFoodRepository.go b/src/features/food/repository/selectFoodRepository.go
@@ -23,7 +23,7 @@ func (g *SelectFoodRepository) FindOneFood(ctx context.Context, foodDTO *mysql.F
 	}
 	return food.ID, nil
 }
-func (g *SelectFoodRepository) InsertOneFoodHistory(ctx context.Context, foodHistoryDTO *mysql.FoodHistory) error {
+func (g *SelectFoodRepository) InsertOneFoodHistory(ctx context.Context, foodHistoryDTO *mysql.FoodHistories) error {
 	if err := g.GormDB.WithContext(ctx).Create(&foodHistoryDTO).Error; err != nil {
 		return utils.ErrorMsg(ctx, utils.ErrInternalDB, utils.Trace(), utils.HandleError(_errors.ErrServerError.Error()+err.Error(), foodHistoryDTO), utils.ErrFromMysqlDB)
 	}

diff --git a/src/features/food/repository/v1RecommendFoodRepository.go b/src/features/food/repository/v1RecommendFoodRepository.go
@@ -36,7 +36,7 @@ func (d *V1RecommendFoodRepository) FindOneV1RecommendFood(ctx context.Context,
 func (d *V1RecommendFoodRepository) SaveRecommendFood(ctx context.Context, foodDTO *mysql.Foods) (*mysql.Foods, error) {
 	foods := mysql.Foods{}
 	// 존재 여부 확인
-	err := d.GormDB.WithContext(ctx).Model(&foods).Where("name = ? AND time_id = ? AND type_id = ? AND scenario_id = ? and theme_id = ? ", foodDTO.Name, foodDTO.TimeID, foodDTO.TypeID, foodDTO.ScenarioID, foodDTO.ThemeID).First(&foods).Error
+	err := d.GormDB.WithContext(ctx).Model(&foods).Where("name = ?  ", foodDTO.Name).First(&foods).Error
 
 	if err == nil {
 		// 데이터가 이미 존재함

diff --git a/src/features/food/usecase/dailyRecommendFoodUseCase.go b/src/features/food/usecase/dailyRecommendFoodUseCase.go
@@ -30,7 +30,7 @@ func (d *DailyRecommendFoodUseCase) DailyRecommend(c context.Context) (response.
 	res := response.ResDailyRecommendFood{}
 	for _, food := range foods {
 		// 음식 이미지를 가져온다.
-		foodImage, err := d.Repository.FindOneFoodImage(ctx, food.FoodImageID)
+		foodImage, err := d.Repository.FindOneFoodImage(ctx, food.ImageID)
 		if err != nil {
 			return response.ResDailyRecommendFood{}, err
 		}

diff --git a/src/features/food/usecase/historyFoodUseCase.go b/src/features/food/usecase/historyFoodUseCase.go
@@ -3,11 +3,8 @@ package usecase
 import (
 	"context"
 
-	_errors "main/features/food/model/errors"
 	_interface "main/features/food/model/interface"
 	"main/features/food/model/response"
-	"main/utils"
-	"main/utils/db/mysql"
 	"time"
 )
 
@@ -34,34 +31,14 @@ func (d *HistoryFoodUseCase) History(c context.Context, userID uint) (response.R
 	foods := make([]response.HistoryFood, 0)
 	//TODO 추후 성능 처리 개선 필요
 	for _, foodHistory := range foodHistoryList {
-		foodDTO, err := d.Repository.FindOneFood(ctx, foodHistory.FoodID)
+		foodDTO, err := d.Repository.FindOneFood(ctx, uint(foodHistory.FoodID))
 		if err != nil {
 			return response.ResHistoryFood{}, err
 		}
-		timeID, ok := mysql.GetTimeKey(foodDTO.TimeID)
-		if !ok {
-			return response.ResHistoryFood{}, utils.ErrorMsg(ctx, utils.ErrInternalServer, utils.Trace(), _errors.ErrServerError.Error()+" timeID is not valid", utils.ErrFromInternal)
-		}
-		typeID, ok := mysql.GetTypeKey(foodDTO.TypeID)
-		if !ok {
-			return response.ResHistoryFood{}, utils.ErrorMsg(ctx, utils.ErrInternalServer, utils.Trace(), _errors.ErrServerError.Error()+" typeID is not valid", utils.ErrFromInternal)
-		}
-		scenarioID, ok := mysql.GetScenarioKey(foodDTO.ScenarioID)
-		if !ok {
-			return response.ResHistoryFood{}, utils.ErrorMsg(ctx, utils.ErrInternalServer, utils.Trace(), _errors.ErrServerError.Error()+" scenarioID is not valid", utils.ErrFromInternal)
-		}
-		themeID, ok := mysql.GetThemeKey(foodDTO.ThemeID)
-		if !ok {
-			return response.ResHistoryFood{}, utils.ErrorMsg(ctx, utils.ErrInternalServer, utils.Trace(), _errors.ErrServerError.Error()+" themeID is not valid", utils.ErrFromInternal)
-		}
 
 		food := response.HistoryFood{
-			Name:     foodDTO.Name,
-			Type:     typeID,
-			Time:     timeID,
-			Scenario: scenarioID,
-			Theme:    themeID,
-			Created:  foodHistory.CreatedAt.Format("2006-01-02 15:04:05"),
+			Name:    foodDTO.Name,
+			Created: foodHistory.CreatedAt.Format("2006-01-02 15:04:05"),
 		}
 		foods = append(foods, food)
 	}