Merge pull request #640 from JNU-econovation/feat/#639

[BE/FEAT] 식사 등록 단위에 따른 식사 등록 및 분석 로직 개선

Author: hwangdaesun

resources/gaebaljip-develop-environment/mariadb-init/01_schema.sql

@@ -73,6 +73,7 @@ CREATE TABLE `MEAL_FOOD_TB`
     `MEAL_FK`      bigint(20) DEFAULT NULL,
     `MEAL_FOOD_MULTIPLE` double DEFAULT NULL,
     `MEAL_FOOD_G` int DEFAULT NULL,
+    `MEAL_FOOD_UNIT_TYPE` varchar(255),
     PRIMARY KEY (`MEAL_FOOD_PK`),
     FOREIGN KEY  (`FOOD_FK`) REFERENCES `FOOD_TB` (`FOOD_PK`),
     FOREIGN KEY  (`MEAL_FK`)REFERENCES `MEAL_TB` (`MEAL_PK`)

resources/gaebaljip-local-environment/mariadb-init/01_schema.sql

@@ -54,7 +54,7 @@ public static List<MealFoodEntity> createMealFoods(
                                 i ->
                                         MealFoodEntity.builder()
                                                 .unit(
-                                                        new Unit(
+                                                        Unit.createUnit(
                                                                 eatMealFoodDTOS.get(i).g(),
                                                                 eatMealFoodDTOS.get(i).multiple()))
                                                 .foodEntity(foodEntities.get(i))
@@ -66,22 +66,22 @@ public static List<MealFoodEntity> createMealFoods(
 
     public double getAdjustedCalorie() {
         return this.unit
-                .getStrategy()
+                .getUnitType()
                 .measure(this.foodEntity.getCalorie(), unit, this.foodEntity.getServingSize());
     }
 
     public double getAdjustedCarbohydrate() {
-        return unit.getStrategy()
+        return unit.getUnitType()
                 .measure(this.foodEntity.getCarbohydrate(), unit, this.foodEntity.getServingSize());
     }
 
     public double getAdjustedProtein() {
-        return unit.getStrategy()
+        return unit.getUnitType()
                 .measure(this.foodEntity.getProtein(), unit, this.foodEntity.getServingSize());
     }
 
     public double getAdjustedFat() {
-        return unit.getStrategy()
+        return unit.getUnitType()
                 .measure(this.foodEntity.getFat(), unit, this.foodEntity.getServingSize());
     }
 

src/main/java/com/gaebaljip/exceed/application/domain/meal/GStrategy.java

@@ -6,6 +6,10 @@
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+import com.gaebaljip.exceed.common.exception.meal.InvalidMultipleAndGException;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -22,12 +26,18 @@ public class Unit {
     @Column(name = ENTITY_PREFIX + "_MULTIPLE")
     private Double multiple;
 
-    protected MeasureStrategy getStrategy() {
-        if (this.getG() == null) {
-            return new MultipleStrategy();
-        } else {
-            return new GStrategy();
+    @Enumerated(EnumType.STRING)
+    @Column(name = ENTITY_PREFIX + "_UNIT_TYPE")
+    private UnitType unitType;
+
+    public static Unit createUnit(Integer g, Double multiple) {
+        if (Objects.nonNull(g)) {
+            return new Unit(g, multiple, UnitType.G);
+        }
+        if (Objects.nonNull(multiple)) {
+            return new Unit(g, multiple, UnitType.MULTIPLE);
         }
+        throw InvalidMultipleAndGException.EXCEPTION;
     }
 
     @Override

src/main/java/com/gaebaljip/exceed/application/domain/meal/MealFoodEntity.java

@@ -0,0 +1,18 @@
+package com.gaebaljip.exceed.application.domain.meal;
+
+public enum UnitType {
+    G {
+        @Override
+        public double measure(double nutrients, Unit unit, double servingSize) {
+            return (unit.getG() / servingSize) * nutrients;
+        }
+    },
+    MULTIPLE {
+        @Override
+        public double measure(double nutrients, Unit unit, double servingSize) {
+            return nutrients * unit.getMultiple();
+        }
+    };
+
+    abstract double measure(double nutrients, Unit unit, double servingSize);
+}

src/main/java/com/gaebaljip/exceed/application/domain/meal/MeasureStrategy.java

@@ -13,7 +13,7 @@ spring:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
       dialect: org.hibernate.dialect.MariaDBDialect
-      ddl-auto: validate
+      ddl-auto: create
     properties:
       hibernate:
         show_sql : true