[Deploy] develop -> main

.github/workflows/cd-with-discord.yml

@@ -1,4 +1,4 @@
-name: CI and request Discord Message to review
+name: CD and request Discord Message to deploy
 
 on:
   push:

.github/workflows/ci-with-discord.yml

@@ -25,7 +25,7 @@ jobs:
       mysql:
         image: mysql:8.0
         ports:
-          - 3306:3306
+          - 3307:3306
         env:
           MYSQL_DATABASE: testdb
           MYSQL_ROOT_PASSWORD: testdb
@@ -35,6 +35,16 @@ jobs:
           --health-timeout=5s
           --health-retries=3
 
+      redis:
+        image: redis
+        ports:
+          - 6380:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     steps:
       - uses: actions/checkout@v4
       - name: JDK 17 를 준비한다.
@@ -49,13 +59,33 @@ jobs:
       - name: Gradle 를 준비한다.
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
 
+      - name: ACT 환경에 대해서 패키지를 업데이터 & 설치한다
+        if: ${{ env.ACT }}
+        run: |
+          apt-get update && apt-get install sudo -y
+
+      - name: sudo 설치 테스트한다
+        if: ${{ env.ACT }}
+        run: |
+          sudo id
+
+      - name: DDL 경로 확인
+        run: |
+          ls -al infra/sql/
+          cat infra/sql/ddl.sql
+
+      - name: DDL 파일을 실행하여 테이블을 생성한다.
+        run: |
+          sudo apt-get install -y default-mysql-client
+          mysql -h 127.0.0.1 -P 3307 -uroot -ptestdb testdb --verbose < infra/sql/ddl.sql
+
       - name: 빌드한다.
         env:
-          SPRING_DATASOURCE_URL: jdbc:mysql://127.0.0.1:3306/testdb
+          SPRING_DATASOURCE_URL: jdbc:mysql://127.0.0.1:3307/testdb
           SPRING_DATASOURCE_USERNAME: root
           SPRING_DATASOURCE_PASSWORD: testdb
-          SPRING_JPA_HIBERNATE_DDL_AUTO: update
-          SPRING_DATA_REDIS_HOST: localhost
+          SPRING_DATA_REDIS_HOST: 127.0.0.1
+          SPRING_DATA_REDIS_PORT: 6380
           SPRING_DATA_REDIS_PASSWORD:
           MONGO_URL: ${{ secrets.MONGO_URL }}
           S3_BUCKET: ${{ secrets.S3_BUCKET }}

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+.DS_Store
 
 ### STS ###
 .apt_generated
@@ -37,3 +38,4 @@ out/
 .vscode/
 
 .env
+.act_secrets

infra/docker/docker-compose.yml

@@ -21,3 +21,5 @@ services:
       S3_SECRET_KEY: ${S3_SECRET_KEY}
       SPRING_SWAGGER_SERVER_URL: ${URL}
       DEFAULT_BUCKET_URL: ${DEFAULT_BUCKET_URL}
+    volumes:
+      - /var/log/springboot/:/var/log/springboot/

infra/sql/ddl.sql

@@ -0,0 +1,136 @@
+SET FOREIGN_KEY_CHECKS = 0;
+
+create table home_question_answer (
+                                      id bigint not null auto_increment,
+                                      user_id bigint,
+                                      answer enum ('DISLIKE','LIKE','MOUNTAIN','RAINY','SEA','SPICY','SUMMER','SUNNY','SWEET','WINTER'),
+                                      question enum ('FEEL','SEASON','STRESS','TRIP','WEATHER'),
+                                      primary key (id)
+) engine=InnoDB;
+
+create table map (
+                     created_at datetime(6),
+                     id bigint not null auto_increment,
+                     modified_at datetime(6),
+                     location POINT SRID 4326 not null,
+                     primary key (id)
+) engine=InnoDB;
+
+create table meal_time (
+                           meal_time time(6),
+                           created_at datetime(6),
+                           id bigint not null auto_increment,
+                           modified_at datetime(6),
+                           user_id bigint,
+                           primary key (id)
+) engine=InnoDB;
+
+create table menu (
+                      is_crawled bit,
+                      pin tinyint check (pin between 0 and 22),
+                      price integer not null,
+                      created_at datetime(6),
+                      id bigint not null auto_increment,
+                      modified_at datetime(6),
+                      store_id bigint,
+                      user_id bigint not null,
+                      memo_content varchar(255),
+                      memo_title varchar(255),
+                      title varchar(255) not null,
+                      primary key (id)
+) engine=InnoDB;
+
+create table menu_folder (
+                             custom_index integer not null,
+                             icon tinyint check (icon between 0 and 31),
+                             created_at datetime(6),
+                             id bigint not null auto_increment,
+                             modified_at datetime(6),
+                             user_id bigint not null,
+                             img_url varchar(255),
+                             title varchar(255) not null,
+                             primary key (id)
+) engine=InnoDB;
+
+create table menu_menu_folder (
+                                  created_at datetime(6),
+                                  folder_id bigint,
+                                  id bigint not null auto_increment,
+                                  menu_id bigint,
+                                  modified_at datetime(6),
+                                  primary key (id)
+) engine=InnoDB;
+
+create table menu_img (
+                          created_at datetime(6),
+                          id bigint not null auto_increment,
+                          menu_id bigint,
+                          modified_at datetime(6),
+                          img_url varchar(255),
+                          primary key (id)
+) engine=InnoDB;
+
+create table menu_tag (
+                          created_at datetime(6),
+                          id bigint not null auto_increment,
+                          menu_id bigint not null,
+                          modified_at datetime(6),
+                          tag enum ('ASIA','BREAD','BUSINESS','BUY_FOOD','CAFE','CHINA','COOL','DATE','DESSERT','FAST_FOOD','FISH','HOT','HOT_SPICY','JAPAN','KOREA','MEAT','NOODLE','ORGANIZATION','PROMISE','RICE','SOLO','SPICY','SWEET','WESTERN'),
+                          primary key (id)
+) engine=InnoDB;
+
+create table not_owned_search_history (
+                                          created_at datetime(6),
+                                          id bigint not null auto_increment,
+                                          modified_at datetime(6),
+                                          user_id bigint not null,
+                                          address varchar(255) not null,
+                                          title varchar(255) not null,
+                                          primary key (id)
+) engine=InnoDB;
+
+create table not_found_store (
+                                 mapx float(53) not null,
+                                 mapy float(53) not null,
+                                 created_at datetime(6),
+                                 id bigint not null auto_increment,
+                                 modified_at datetime(6),
+                                 address varchar(255) not null,
+                                 store_id varchar(255),
+                                 title varchar(255) not null,
+                                 primary key (id)
+) engine=InnoDB;
+
+create table owned_menu_search (
+                                   created_at datetime(6),
+                                   id bigint not null auto_increment,
+                                   menu_id bigint not null,
+                                   modified_at datetime(6),
+                                   user_id bigint not null,
+                                   menu_title varchar(255) not null,
+                                   store_address varchar(255) not null,
+                                   store_title varchar(255) not null,
+                                   primary key (id)
+) engine=InnoDB;
+
+create table store (
+                       created_at datetime(6),
+                       id bigint not null auto_increment,
+                       map_id bigint,
+                       modified_at datetime(6),
+                       address varchar(255),
+                       title varchar(255) not null,
+                       primary key (id)
+) engine=InnoDB;
+
+create table user (
+                      created_at datetime(6),
+                      id bigint not null auto_increment,
+                      modified_at datetime(6),
+                      email varchar(255),
+                      password varchar(255),
+                      sign_in_type enum ('EMAIL','KAKAO'),
+                      primary key (id)
+) engine=InnoDB;
+
+SET FOREIGN_KEY_CHECKS = 1;

src/main/java/com/ourmenu/backend/domain/cache/application/CacheService.java

@@ -33,7 +33,7 @@ public GetCacheInfoResponse getCacheInfo() {
     private List<SimpleMenuFolderIconResponse> getMenuFolderIconInfo() {
         return Arrays.stream(MenuFolderIcon.values())
                 .map(menuFolderIcon -> {
-                    String menuFolderIconUrl = urlConvertor.getMenuFolderUrl(menuFolderIcon);
+                    String menuFolderIconUrl = urlConvertor.getMenuFolderImgUrl(menuFolderIcon);
                     return SimpleMenuFolderIconResponse.of(menuFolderIcon, menuFolderIconUrl);
                 })
                 .toList();
@@ -44,7 +44,7 @@ private List<SimpleMenuPinResponse> getMenuPinInfo() {
                 .map(menuPin -> {
                     String menuPinMapUrl = urlConvertor.getMenuPinMapUrl(menuPin);
                     String menuPinAddUrl = urlConvertor.getMenuPinAddUrl(menuPin);
-                    String menuPinMapAddDiable = urlConvertor.getMenuPinMapAddDiable(menuPin);
+                    String menuPinMapAddDiable = urlConvertor.getMenuPinMapAddDisable(menuPin);
                     return SimpleMenuPinResponse.of(menuPin, menuPinMapUrl, menuPinAddUrl,
                             menuPinMapAddDiable);
                 })

src/main/java/com/ourmenu/backend/domain/cache/util/MenuPinConverter.java

@@ -0,0 +1,27 @@
+package com.ourmenu.backend.domain.cache.util;
+
+import com.ourmenu.backend.domain.cache.domain.MenuPin;
+import java.util.List;
+
+public class MenuPinConverter {
+
+    private MenuPinConverter() {
+
+    }
+
+    public static MenuPin of(List<MenuPin> menuPins) {
+        if (menuPins.size() == 1) {
+            return menuPins.get(0);
+        }
+        if (menuPins.size() == 2) {
+            return MenuPin.TWO;
+        }
+        if (menuPins.size() == 3) {
+            return MenuPin.THREE;
+        }
+        if (menuPins.size() == 4) {
+            return MenuPin.FOUR;
+        }
+        return MenuPin.FIVE;
+    }
+}

src/main/java/com/ourmenu/backend/domain/cache/util/UrlConverter.java

@@ -3,6 +3,7 @@
 import com.ourmenu.backend.domain.cache.domain.HomeImg;
 import com.ourmenu.backend.domain.cache.domain.MenuFolderIcon;
 import com.ourmenu.backend.domain.cache.domain.MenuPin;
+import com.ourmenu.backend.domain.home.domain.Answer;
 import com.ourmenu.backend.domain.tag.domain.Tag;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -14,24 +15,21 @@ public class UrlConverter {
     private String url;
 
     public String getMenuPinMapUrl(MenuPin pin) {
-        return url + "/menu-pins/" + pin.getImgUrl() + "_map.svg";
+        return url + "/menu-pins/" + pin.getImgUrl() + "_map.png";
     }
 
     public String getMenuPinAddUrl(MenuPin pin) {
         if (isETCMenuPin(pin)) {
             return null;
         }
-        return url + "/menu-pins/" + pin.getImgUrl() + "_add.svg";
+        return url + "/menu-pins/" + pin.getImgUrl() + "_add.png";
     }
 
-    public String getMenuPinMapAddDiable(MenuPin pin) {
-        if (isETCMenuPin(pin)) {
-            return null;
-        }
-        return url + "/menu-pins/" + pin.getImgUrl() + "_add_disable.svg";
+    public String getMenuPinMapAddDisable(MenuPin pin) {
+        return url + "/menu-pins/" + pin.getImgUrl() + "_add_disable.png";
     }
 
-    public String getMenuFolderUrl(MenuFolderIcon icon) {
+    public String getMenuFolderImgUrl(MenuFolderIcon icon) {
         return url + "/menu-folder-icons/" + icon.getImgUrl() + ".svg";
     }
 
@@ -47,6 +45,14 @@ public String getWhiteTagImgUrl(Tag tag) {
         return url + "/tags/" + tag.getImgUrl() + "_white.svg";
     }
 
+    public String getAnswerImgUrl(Answer answer) {
+        return url + "/answers/" + answer.toString() + ".svg";
+    }
+
+    public String getHomeRecommendTagImgUrl(Tag tag) {
+        return url + "/home_tags/" + tag.getTagEnum() + ".svg";
+    }
+
     private boolean isETCMenuPin(MenuPin pin) {
         return pin.equals(MenuPin.TWO) || pin.equals(MenuPin.THREE) || pin.equals(MenuPin.FOUR) || pin.equals(
                 MenuPin.FIVE);

src/main/java/com/ourmenu/backend/domain/home/application/HomeService.java

@@ -1,5 +1,6 @@
 package com.ourmenu.backend.domain.home.application;
 
+import com.ourmenu.backend.domain.cache.util.UrlConverter;
 import com.ourmenu.backend.domain.home.dao.HomeQuestionAnswerRepository;
 import com.ourmenu.backend.domain.home.domain.Answer;
 import com.ourmenu.backend.domain.home.domain.HomeQuestionAnswer;
@@ -29,6 +30,7 @@ public class HomeService {
     private final RecommendMenuCacheService recommendMenuCacheService;
     private final MenuService menuService;
     private final MealTimeService mealTimeService;
+    private final UrlConverter urlConverter;
 
     /**
      * 홈 질문 응답 값을 저장 및 추천 메뉴를 캐싱한다. 질문에 관련 없는 응답이면 에러를 반환한다.
@@ -68,12 +70,12 @@ public SaveAndGetQuestionRequest updateQuestion(Long userId) {
                     .userId(userId)
                     .build();
             HomeQuestionAnswer saveHomeQuestionAnswer = homeQuestionAnswerRepository.save(homeQuestionAnswer);
-            return SaveAndGetQuestionRequest.from(saveHomeQuestionAnswer);
+            return SaveAndGetQuestionRequest.from(saveHomeQuestionAnswer, urlConverter);
         }
 
         HomeQuestionAnswer homeQuestionAnswer = optionalHomeQuestionAnswer.get();
         homeQuestionAnswer.update(randomQuestion);
-        return SaveAndGetQuestionRequest.from(homeQuestionAnswer);
+        return SaveAndGetQuestionRequest.from(homeQuestionAnswer, urlConverter);
     }
 
     /**
@@ -91,7 +93,7 @@ public GetHomeRecommendResponse getRecommendMenus(Long userId) {
         List<GetRecommendMenuResponse> randomRecommendMenus = getRandomRecommendMenu();
 
         return GetHomeRecommendResponse.of(answer, questionRecommendMenus, tagRandomRecommendDto.getTag(),
-                tagRandomRecommendDto.getGetRecommendMenuResponses(), randomRecommendMenus);
+                tagRandomRecommendDto.getGetRecommendMenuResponses(), randomRecommendMenus, urlConverter);
     }
 
     /**

src/main/java/com/ourmenu/backend/domain/home/domain/Answer.java

@@ -22,6 +22,7 @@
 import com.ourmenu.backend.domain.tag.domain.Tag;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
 import lombok.Getter;
 
 @Getter
@@ -38,6 +39,7 @@ public enum Answer {
     SUMMER("여름", Tag.COOL, SUMMER1, SUMMER2, SUMMER3),
     WINTER("겨울", Tag.HOT, WINTER1, WINTER2);
 
+    private static final Random RANDOM = new Random();
     private String answer;
     private Tag tag;
     private List<HomeImg> homeImgs;
@@ -47,4 +49,9 @@ public enum Answer {
         this.tag = tag;
         this.homeImgs = Arrays.asList(homeImgs);
     }
+
+    public HomeImg getRandomHomeImg() {
+        return homeImgs.get(RANDOM.nextInt(homeImgs.size()));
+    }
+
 }