🔀 [MERGE] develop → main 브랜치 병합

.github/workflows/cd.yml

@@ -51,14 +51,14 @@ jobs:
           token: ${{ secrets.GIT_ACTION_TOKEN }}
           submodules: true
 
-      - name: Copy docker-compose.yml to Server
+      - name: Copy compose & prometheus.yml to Server
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.SSH_HOST }}
           port: ${{ secrets.SSH_PORT }}
           username: ${{ secrets.SSH_USERNAME }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
-          source: "docker-compose.yml"
+          source: "docker-compose.yml,prometheus.yml"
           target: "~/app"
 
       - name: Deploy on server

build.gradle

@@ -59,6 +59,10 @@ dependencies {
     // Flyway
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'
+
+    // Grafana & Prometheus
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -66,6 +66,8 @@ services:
     depends_on:
       - app
       - dozzle
+      - grafana
+      - prometheus
     networks:
       - danchu-network
     restart: unless-stopped
@@ -74,9 +76,66 @@ services:
     image: amir20/dozzle:latest
     container_name: dozzle
     volumes:
-     - /var/run/docker.sock:/var/run/docker.sock:ro  # 로그 접근을 위한 도커 소켓 마운트
+      - /var/run/docker.sock:/var/run/docker.sock:ro  # 로그 접근을 위한 도커 소켓 마운트
     networks:
-     - danchu-network
+      - danchu-network
+    restart: unless-stopped
+
+  grafana:
+    image: grafana/grafana
+    container_name: grafana
+    environment:
+      - GF_SERVER_ROOT_URL=https://grafana.danchu.site/
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD}
+      - GF_USERS_ALLOW_SIGN_UP=false
+    volumes:
+      - grafana-storage:/var/lib/grafana
+    networks:
+      - danchu-network
+    restart: unless-stopped
+
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+    networks:
+      - danchu-network
+    restart: unless-stopped
+
+  node-exporter:
+    image: prom/node-exporter
+    container_name: node-exporter
+    command:
+      - '--path.rootfs=/host'
+    volumes:
+      - '/:/host:ro,rslave'
+    networks:
+      - danchu-network
+    restart: unless-stopped
+
+  mysqld-exporter:
+    image: prom/mysqld-exporter:v0.14.0
+    container_name: mysqld-exporter
+    environment:
+      - DATA_SOURCE_NAME=exporter:${MYSQL_EXPORTER_PASSWORD}@(mysql:3306)/danchu
+    depends_on:
+      mysql:
+        condition: service_healthy
+    networks:
+      - danchu-network
+    restart: unless-stopped
+
+  redis-exporter:
+    image: oliver006/redis_exporter:v1.67.0
+    container_name: redis-exporter
+    environment:
+      - REDIS_ADDR=redis:6379
+    depends_on:
+      redis:
+        condition: service_healthy
+    networks:
+      - danchu-network
     restart: unless-stopped
 
 networks:
@@ -85,4 +144,5 @@ networks:
 
 volumes:
   mysql-data:
-  redis-data:
+  redis-data:
+  grafana-storage:

prometheus.yml

@@ -0,0 +1,49 @@
+global:
+  scrape_interval: 5s
+  evaluation_interval: 5s
+  scrape_timeout: 4s
+
+scrape_configs:
+  # Prometheus
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['prometheus:9090']
+        labels:
+          application: prometheus
+          service: prometheus
+
+  # Spring Boot
+  - job_name: 'danchu'
+    metrics_path: /actuator/prometheus
+    static_configs:
+      - targets: ['app:8080']
+        labels:
+          application: danchu
+          service: app
+          component: spring-boot
+
+  # node-exporter
+  - job_name: 'node-exporter'
+    static_configs:
+      - targets: ['node-exporter:9100']
+        labels:
+          application: danchu
+          service: node-exporter
+
+  # MySQL
+  - job_name: 'mysql'
+    static_configs:
+      - targets: ['mysqld-exporter:9104']
+        labels:
+          application: danchu
+          service: mysql
+          component: exporter
+
+  # Redis
+  - job_name: 'redis'
+    static_configs:
+      - targets: ['redis-exporter:9121']
+        labels:
+          application: danchu
+          service: redis
+          component: exporter

src/main/java/com/likelion/danchu/domain/menu/controller/MenuController.java

@@ -7,6 +7,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -69,4 +70,13 @@ public ResponseEntity<BaseResponse<List<MenuResponse>>> getMenus(@PathVariable L
     List<MenuResponse> responses = menuService.getMenus(storeId);
     return ResponseEntity.ok(BaseResponse.success("메뉴 전체 조회에 성공했습니다.", responses));
   }
+
+  @Operation(summary = "특정 메뉴 삭제", description = "storeId와 menuId로 특정 메뉴를 삭제합니다.")
+  @DeleteMapping("/{menuId}")
+  public ResponseEntity<BaseResponse> deleteMenu(
+      @Parameter(description = "가게 ID", example = "1") @PathVariable Long storeId,
+      @Parameter(description = "메뉴 ID", example = "3") @PathVariable Long menuId) {
+    menuService.deleteMenu(storeId, menuId);
+    return ResponseEntity.ok(BaseResponse.success("메뉴 삭제에 성공했습니다."));
+  }
 }

src/main/java/com/likelion/danchu/domain/menu/service/MenuService.java

@@ -86,4 +86,43 @@ public List<MenuResponse> getMenus(Long storeId) {
         .map(menuMapper::toResponse) // priceFormatted 포함됨
         .toList();
   }
+
+  /**
+   * 특정 메뉴 삭제
+   *
+   * @param storeId 대상 가게 ID
+   * @param menuId 삭제할 메뉴 ID
+   * @throws CustomException {@code STORE_NOT_FOUND} - 가게가 존재하지 않는 경우
+   * @throws CustomException {@code MENU_NOT_FOUND} - 해당 가게에 메뉴가 존재하지 않는 경우
+   */
+  public void deleteMenu(Long storeId, Long menuId) {
+    // 가게 존재 확인
+    if (!storeRepository.existsById(storeId)) {
+      throw new CustomException(
+          com.likelion.danchu.domain.store.exception.StoreErrorCode.STORE_NOT_FOUND);
+    }
+
+    // 메뉴 조회 (storeId 일치 여부 검증)
+    Menu menu =
+        menuRepository
+            .findById(menuId)
+            .orElseThrow(() -> new CustomException(MenuErrorCode.MENU_NOT_FOUND));
+
+    if (!menu.getStore().getId().equals(storeId)) {
+      throw new CustomException(MenuErrorCode.MENU_NOT_FOUND); // 다른 가게의 메뉴를 잘못 요청한 경우
+    }
+
+    // S3 이미지 삭제 (있을 경우)
+    String url = menu.getImageUrl(); // 엔티티 필드명 맞춰 사용
+    if (url != null && !url.isBlank()) {
+      try {
+        s3Service.deleteByUrl(url);
+      } catch (Exception ignored) {
+        // 이미지 삭제 실패는 무시하고 메뉴 삭제 진행
+      }
+    }
+
+    // 메뉴 삭제
+    menuRepository.delete(menu);
+  }
 }

src/main/java/com/likelion/danchu/domain/openAI/dto/response/MissionRecommendResponse.java

@@ -16,7 +16,7 @@ public class MissionRecommendResponse {
   private String title;
 
   @Schema(description = "미션 보상(이름/설명)", example = "사이다 1잔")
-  private String rewardName;
+  private String reward;
 
   @Schema(description = "가게 이름", example = "동방손칼국수")
   private String storeName;

src/main/java/com/likelion/danchu/domain/openAI/service/MissionRecommendService.java

@@ -195,7 +195,7 @@ private MissionRecommendResponse toDto(Mission m) {
     return MissionRecommendResponse.builder()
         .missionId(m.getId())
         .title(m.getTitle())
-        .rewardName(m.getReward())
+        .reward(m.getReward())
         .storeName(s != null ? s.getName() : null)
         .build();
   }

src/main/java/com/likelion/danchu/domain/store/controller/StoreController.java

@@ -23,6 +23,7 @@
 import com.likelion.danchu.domain.store.dto.request.StoreRequest;
 import com.likelion.danchu.domain.store.dto.response.PageableResponse;
 import com.likelion.danchu.domain.store.dto.response.StoreDistanceResponse;
+import com.likelion.danchu.domain.store.dto.response.StoreListItemResponse;
 import com.likelion.danchu.domain.store.dto.response.StoreResponse;
 import com.likelion.danchu.domain.store.exception.StoreErrorCode;
 import com.likelion.danchu.domain.store.service.StoreHashtagService;
@@ -56,7 +57,7 @@ public class StoreController {
               - 가게 이름: **1자 이상, 10자 이내**
               - 주소: **1자 이상, 50자 이내**
               - 가게 소개: **1자 이상, 200자 이내**
-              - 전화번호: **010-1234-5678** 또는 **02-345-6789** 형식
+              - 전화번호: **010-1234-5678** / **02-345-6789** / **0507-1418-3557** 형식
               - 오픈/마감 시간: **HH:mm** 형식 (예: 09:00, 21:00)
               - 인증 코드: **숫자 4자리 (예: 0123)**
               - 이미지 파일: **multipart/form-data** 형식
@@ -98,10 +99,11 @@ public ResponseEntity<BaseResponse<StoreResponse>> createStore(
               - size : 페이지 당 보여줄 가게 수입니다. (기본값: 3)
               """)
   @GetMapping
-  public ResponseEntity<BaseResponse<PageableResponse<StoreResponse>>> getPaginatedStores(
+  public ResponseEntity<BaseResponse<PageableResponse<StoreListItemResponse>>> getPaginatedStores(
       @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "3") int size) {
 
-    PageableResponse<StoreResponse> storeResponses = storeService.getPaginatedStores(page, size);
+    PageableResponse<StoreListItemResponse> storeResponses =
+        storeService.getPaginatedStores(page, size);
     return ResponseEntity.ok(BaseResponse.success("가게 페이징 조회에 성공했습니다.", storeResponses));
   }
 

src/main/java/com/likelion/danchu/domain/store/dto/request/StoreRequest.java

@@ -46,8 +46,8 @@ public class StoreRequest {
 
   @NotBlank(message = "전화번호는 필수입니다.")
   @Pattern(
-      regexp = "^\\d{2,3}-\\d{3,4}-\\d{4}$",
-      message = "전화번호는 형식에 맞게 입력해주세요. (예: 010-1234-5678 / 02-345-6789)")
+      regexp = "^(?:\\d{2,3}-\\d{3,4}-\\d{4}|050\\d-\\d{3,4}-\\d{4})$",
+      message = "전화번호는 형식에 맞게 입력해주세요. (예: 010-1234-5678 / 02-345-6789 / 0507-1418-3557)")
   @Schema(description = "전화번호", example = "010-1234-5678")
   private String phoneNumber;
 

src/main/java/com/likelion/danchu/domain/store/dto/response/StoreListItemResponse.java

@@ -0,0 +1,18 @@
+package com.likelion.danchu.domain.store.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(title = "StoreListItemResponse", description = "목록 아이템(가게 정보를 store로 래핑)")
+public class StoreListItemResponse {
+
+  @Schema(description = "가게 정보", requiredMode = Schema.RequiredMode.REQUIRED)
+  private StoreResponse store;
+}

src/main/java/com/likelion/danchu/domain/store/dto/response/StoreResponse.java

@@ -35,6 +35,9 @@ public class StoreResponse {
   @Schema(description = "마감 시간 (HH:mm)", example = "21:00")
   private String closeTime;
 
+  @Schema(description = "가게 인증 코드")
+  private String authCode;
+
   @Schema(description = "대표 이미지 URL", example = "https://s3.amazonaws.com/bucket/image.jpg")
   private String mainImageUrl;
 

src/main/java/com/likelion/danchu/domain/store/mapper/StoreMapper.java

@@ -10,6 +10,7 @@
 import com.likelion.danchu.domain.hashtag.dto.response.HashtagResponse;
 import com.likelion.danchu.domain.menu.dto.response.MenuResponse;
 import com.likelion.danchu.domain.store.dto.request.StoreRequest;
+import com.likelion.danchu.domain.store.dto.response.StoreListItemResponse;
 import com.likelion.danchu.domain.store.dto.response.StoreResponse;
 import com.likelion.danchu.domain.store.entity.Store;
 
@@ -58,6 +59,7 @@ public StoreResponse toResponse(
         .phoneNumber(store.getPhoneNumber())
         .openTime(store.getOpenTime())
         .closeTime(store.getCloseTime())
+        .authCode(store.getAuthCode())
         .mainImageUrl(store.getMainImageUrl())
         .hashtags(hashtags != null ? hashtags : List.of()) // null 방어
         .isOpen(isOpen)
@@ -72,4 +74,18 @@ public StoreResponse toResponse(Store store, List<HashtagResponse> hashtags) {
   public StoreResponse toResponse(Store store) {
     return toResponse(store, List.of(), List.of());
   }
+
+  // StoreResponse를 store로 감싼 목록 아이템으로 변환
+  public StoreListItemResponse toListItem(
+      Store store, List<HashtagResponse> hashtags, List<MenuResponse> menus) {
+    return StoreListItemResponse.builder().store(toResponse(store, hashtags, menus)).build();
+  }
+
+  public StoreListItemResponse toListItem(Store store, List<HashtagResponse> hashtags) {
+    return StoreListItemResponse.builder().store(toResponse(store, hashtags)).build();
+  }
+
+  public StoreListItemResponse toListItem(Store store) {
+    return StoreListItemResponse.builder().store(toResponse(store)).build();
+  }
 }