* [JpaRepository 메서드 쿼리]
- * 특정 문자열로 시작하는 칵테일 최대 5개 조회
+ * 특정 문자열로 시작하는 칵테일 최대 5개 조회 (한글 이름)
*
* @param searchText 검색어
*/
List
* recommendCount 기준으로 내림차순 정렬하여 상위 10개의 칵테일 엔티티를 조회합니다.
diff --git a/src/main/java/com/application/domain/cocktail/repository/GuideDetailRepository.java b/src/main/java/com/application/domain/cocktail/repository/GuideDetailRepository.java
new file mode 100644
index 0000000..48cf9c2
--- /dev/null
+++ b/src/main/java/com/application/domain/cocktail/repository/GuideDetailRepository.java
@@ -0,0 +1,44 @@
+package com.application.domain.cocktail.repository;
+
+import com.application.domain.cocktail.entity.guide.GuideDetail;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 가이드 세부 단계 Repository.
+ *
+ * UNIQUE(guide_part, display_order) 제약이 있어 reorder 시 임시 음수 offset 트릭이 필요하므로
+ * 벌크 업데이트용 native query 두 개를 함께 제공한다.
+ */
+public interface GuideDetailRepository extends JpaRepository {
+
+ List findByGuide_PartOrderByDisplayOrderAsc(Integer guidePart);
+
+ Optional findByGuide_PartAndDisplayOrder(Integer guidePart, Integer displayOrder);
+
+ long countByGuide_Part(Integer guidePart);
+
+ /**
+ * reorder 1단계: 해당 guide_part 의 모든 detail 의 display_order 를 음수 영역으로 옮긴다.
+ * (UNIQUE(guide_part, display_order) 충돌 회피용 임시 값.)
+ */
+ @Modifying
+ @Query(value = "UPDATE guide_detail SET display_order = -display_order - 100000 " +
+ "WHERE guide_part = :guidePart", nativeQuery = true)
+ int shiftToTemporaryNegative(@Param("guidePart") Integer guidePart);
+
+ /**
+ * reorder 2단계: 한 행씩 새 display_order 로 갱신.
+ */
+ @Modifying
+ @Query(value = "UPDATE guide_detail SET display_order = :newOrder " +
+ "WHERE id = :id AND guide_part = :guidePart", nativeQuery = true)
+ int updateDisplayOrder(@Param("id") Long id,
+ @Param("guidePart") Integer guidePart,
+ @Param("newOrder") Integer newOrder);
+}
diff --git a/src/main/java/com/application/domain/cocktail/repository/Impl/CocktailRepositoryImpl.java b/src/main/java/com/application/domain/cocktail/repository/Impl/CocktailRepositoryImpl.java
index 8b2f441..e5323cd 100644
--- a/src/main/java/com/application/domain/cocktail/repository/Impl/CocktailRepositoryImpl.java
+++ b/src/main/java/com/application/domain/cocktail/repository/Impl/CocktailRepositoryImpl.java
@@ -56,8 +56,11 @@ public Page getCocktails(CocktailSearchConditionDto condition, Pageabl
// --- WHERE 절 조립 ---
BooleanBuilder builder = new BooleanBuilder();
- builder.and(korNameContains(condition.korName()));
- builder.and(engNameContains(condition.engName()));
+ // 단일 검색창 패턴: korName 또는 engName 어느 쪽으로 들어와도 둘 다 OR 매칭 (case-insensitive).
+ // 앱이 항상 korName 만 채워서 보내기 때문에 영문 검색이 안 되던 버그 대응.
+ builder.and(nameContainsBilingual(
+ StringUtils.hasText(condition.korName()) ? condition.korName() : condition.engName()
+ ));
builder.and(abvBandEq(condition.abvBand()));
builder.and(styleEq(condition.style()));
// builder.and(baseEq(condition.base())); // base 다중선택 가능하도록 변경
@@ -346,6 +349,13 @@ private BooleanExpression engNameContains(String engName) {
return StringUtils.hasText(engName) ? cocktail.engName.contains(engName) : null;
}
+ /** 한국어/영어 컬럼 둘 다 case-insensitive contains 매칭 (OR). */
+ private BooleanExpression nameContainsBilingual(String term) {
+ if (!StringUtils.hasText(term)) return null;
+ return cocktail.korName.containsIgnoreCase(term)
+ .or(cocktail.engName.containsIgnoreCase(term));
+ }
+
// [추가] 도수 레벨 (예: "약함", "보통", "강함") 정확히 일치
private BooleanExpression abvBandEq(AbvLevel abvBand) {
return abvBand != null ? cocktail.abvBand.stringValue().eq(abvBand.getAbvLevel()) : null;
diff --git a/src/main/java/com/application/domain/cocktail/service/CocktailService.java b/src/main/java/com/application/domain/cocktail/service/CocktailService.java
index 7340da9..f0e7338 100644
--- a/src/main/java/com/application/domain/cocktail/service/CocktailService.java
+++ b/src/main/java/com/application/domain/cocktail/service/CocktailService.java
@@ -233,11 +233,15 @@ public CocktailResponseDto getRecommendation(CocktailRecommendationDto dto) {
}
public List getCocktailSuggestions(String searchText) {
- List projections =
- cocktailRepository.findTop5ByKorNameStartingWith(searchText);
+ if (searchText == null || searchText.isBlank()) return List.of();
+ String q = searchText.trim();
+ // 한글/영어 양쪽 contains 매칭 (case-insensitive). 매칭된 쪽 이름 반환.
+ List projections =
+ cocktailRepository.findTop5SuggestionsBilingual(q);
+ String lowerQ = q.toLowerCase();
return projections.stream()
- .map(CocktailRepository.CocktailNameProjection::getKorName)
+ .map(p -> p.getKorName().toLowerCase().contains(lowerQ) ? p.getKorName() : p.getEngName())
.toList();
}
diff --git a/src/main/java/com/application/domain/inquiry/controller/InquiryController.java b/src/main/java/com/application/domain/inquiry/controller/InquiryController.java
new file mode 100644
index 0000000..d56bd46
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/controller/InquiryController.java
@@ -0,0 +1,109 @@
+package com.application.domain.inquiry.controller;
+
+import com.application.common.auth.dto.oauth2Dto.CustomOAuth2User;
+import com.application.common.exception.custom.CustomApiException;
+import com.application.common.response.ResponseDto;
+import com.application.domain.inquiry.dto.request.InquiryCreateReq;
+import com.application.domain.inquiry.dto.response.InquiryCreateRes;
+import com.application.domain.inquiry.dto.response.InquiryPageRes;
+import com.application.domain.inquiry.dto.response.InquiryRes;
+import com.application.domain.inquiry.service.InquiryService;
+import com.application.domain.member.entity.Member;
+import com.application.domain.member.service.MemberService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/v2/inquiry")
+@RequiredArgsConstructor
+@Tag(name = "1:1 문의", description = "사용자 1:1 문의 등록 / 조회 API")
+public class InquiryController {
+
+ private final InquiryService inquiryService;
+ private final MemberService memberService;
+
+ @Operation(
+ summary = "1:1 문의 등록",
+ description = "로그인 사용자 / 비로그인 사용자 모두 사용 가능합니다. " +
+ "비로그인 시 device_number(body 또는 X-Device-Number 헤더) 필수."
+ )
+ @PostMapping
+ public ResponseEntity> create(
+ @Valid @RequestBody InquiryCreateReq req,
+ @RequestHeader(value = "X-Device-Number", required = false) String deviceHeader
+ ) {
+ Member member = resolveMemberOrNull();
+ InquiryCreateRes res = inquiryService.create(req, member, deviceHeader);
+ return ResponseEntity.ok(ResponseDto.onSuccess("문의가 접수되었습니다.", res));
+ }
+
+ @Operation(
+ summary = "내 1:1 문의 목록 조회",
+ description = "인증 필요. 본인이 등록한 문의만 페이지네이션으로 반환합니다."
+ )
+ @GetMapping("/mine")
+ public ResponseEntity> listMine(
+ @PageableDefault(size = 20, sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable
+ ) {
+ Member member = resolveMemberOrThrow();
+ InquiryPageRes res = inquiryService.listMine(member.getId(), pageable);
+ return ResponseEntity.ok(ResponseDto.onSuccess(res));
+ }
+
+ @Operation(
+ summary = "1:1 문의 단건 조회",
+ description = "인증 필요. 본인 문의 또는 ADMIN만 조회 가능합니다."
+ )
+ @GetMapping("/{id}")
+ public ResponseEntity> getOne(@PathVariable Long id) {
+ Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+ if (auth == null || !(auth.getPrincipal() instanceof CustomOAuth2User principal)) {
+ throw new CustomApiException("인증이 필요합니다.");
+ }
+ String role = principal.getAuthorities().stream()
+ .findFirst().map(a -> a.getAuthority()).orElse("USER");
+ boolean isAdmin = "ADMIN".equalsIgnoreCase(role);
+
+ Member member = memberService.getMemberByCredentialId(principal.getCredentialId());
+ Long memberId = member != null ? member.getId() : null;
+
+ InquiryRes res = inquiryService.getOneForMemberOrAdmin(id, memberId, isAdmin);
+ return ResponseEntity.ok(ResponseDto.onSuccess(res));
+ }
+
+ // ------------------------------------------------------------------
+ // private helpers
+ // ------------------------------------------------------------------
+
+ private Member resolveMemberOrNull() {
+ Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+ if (auth == null || !(auth.getPrincipal() instanceof CustomOAuth2User principal)) {
+ return null;
+ }
+ try {
+ return memberService.getMemberByCredentialId(principal.getCredentialId());
+ } catch (Exception e) {
+ log.warn("[INQUIRY] resolveMemberOrNull failed: {}", e.getMessage());
+ return null;
+ }
+ }
+
+ private Member resolveMemberOrThrow() {
+ Member member = resolveMemberOrNull();
+ if (member == null) {
+ throw new CustomApiException("인증이 필요합니다.");
+ }
+ return member;
+ }
+}
diff --git a/src/main/java/com/application/domain/inquiry/dto/request/InquiryCreateReq.java b/src/main/java/com/application/domain/inquiry/dto/request/InquiryCreateReq.java
new file mode 100644
index 0000000..c02e5e4
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/dto/request/InquiryCreateReq.java
@@ -0,0 +1,35 @@
+package com.application.domain.inquiry.dto.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Schema(description = "1:1 문의 등록 요청 DTO")
+public class InquiryCreateReq {
+
+ @NotBlank(message = "title is required")
+ @Size(max = 200, message = "title max length is 200")
+ @JsonProperty("title")
+ @Schema(description = "문의 제목", example = "앱이 느려요", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String title;
+
+ @NotBlank(message = "content is required")
+ @JsonProperty("content")
+ @Schema(description = "문의 내용", example = "iPhone 15 Pro에서 앱 로딩이 너무 느립니다.", requiredMode = Schema.RequiredMode.REQUIRED)
+ private String content;
+
+ @Size(max = 255)
+ @JsonProperty("contact")
+ @Schema(description = "답변 받을 연락처 / 이메일 (선택)", example = "user@example.com")
+ private String contact;
+
+ @Size(max = 255)
+ @JsonProperty("device_number")
+ @Schema(description = "기기 고유 번호 (비로그인 사용자는 필수)", example = "device_unique_identifier_12345")
+ private String deviceNumber;
+}
diff --git a/src/main/java/com/application/domain/inquiry/dto/response/InquiryCreateRes.java b/src/main/java/com/application/domain/inquiry/dto/response/InquiryCreateRes.java
new file mode 100644
index 0000000..df4c0a4
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/dto/response/InquiryCreateRes.java
@@ -0,0 +1,20 @@
+package com.application.domain.inquiry.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Schema(description = "1:1 문의 등록 응답 DTO")
+public class InquiryCreateRes {
+
+ @JsonProperty("id")
+ @Schema(description = "등록된 문의 ID", example = "1")
+ private final Long id;
+
+ @Builder
+ public InquiryCreateRes(Long id) {
+ this.id = id;
+ }
+}
diff --git a/src/main/java/com/application/domain/inquiry/dto/response/InquiryPageRes.java b/src/main/java/com/application/domain/inquiry/dto/response/InquiryPageRes.java
new file mode 100644
index 0000000..7cd2810
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/dto/response/InquiryPageRes.java
@@ -0,0 +1,50 @@
+package com.application.domain.inquiry.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Schema(description = "1:1 문의 목록 응답 DTO")
+public class InquiryPageRes {
+
+ @JsonProperty("content")
+ private final List content;
+
+ @JsonProperty("page")
+ private final int page;
+
+ @JsonProperty("size")
+ private final int size;
+
+ @JsonProperty("total_elements")
+ private final long totalElements;
+
+ @JsonProperty("total_pages")
+ private final int totalPages;
+
+ @Builder
+ public InquiryPageRes(List content, int page, int size,
+ long totalElements, int totalPages) {
+ this.content = content;
+ this.page = page;
+ this.size = size;
+ this.totalElements = totalElements;
+ this.totalPages = totalPages;
+ }
+
+ public static InquiryPageRes fromPage(Page page, List content) {
+ return InquiryPageRes.builder()
+ .content(content)
+ .page(page.getNumber())
+ .size(page.getSize())
+ .totalElements(page.getTotalElements())
+ .totalPages(page.getTotalPages())
+ .build();
+ }
+}
diff --git a/src/main/java/com/application/domain/inquiry/dto/response/InquiryRes.java b/src/main/java/com/application/domain/inquiry/dto/response/InquiryRes.java
new file mode 100644
index 0000000..e6dffac
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/dto/response/InquiryRes.java
@@ -0,0 +1,76 @@
+package com.application.domain.inquiry.dto.response;
+
+import com.application.domain.inquiry.entity.Inquiry;
+import com.application.domain.inquiry.entity.InquiryStatus;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Schema(description = "1:1 문의 응답 DTO")
+public class InquiryRes {
+
+ @JsonProperty("id")
+ private final Long id;
+
+ @JsonProperty("member_id")
+ private final Long memberId;
+
+ @JsonProperty("device_number")
+ private final String deviceNumber;
+
+ @JsonProperty("title")
+ private final String title;
+
+ @JsonProperty("content")
+ private final String content;
+
+ @JsonProperty("contact")
+ private final String contact;
+
+ @JsonProperty("status")
+ private final InquiryStatus status;
+
+ @JsonProperty("admin_memo")
+ private final String adminMemo;
+
+ @JsonProperty("created_at")
+ private final LocalDateTime createdAt;
+
+ @JsonProperty("updated_at")
+ private final LocalDateTime updatedAt;
+
+ @Builder
+ public InquiryRes(Long id, Long memberId, String deviceNumber, String title,
+ String content, String contact, InquiryStatus status,
+ String adminMemo, LocalDateTime createdAt, LocalDateTime updatedAt) {
+ this.id = id;
+ this.memberId = memberId;
+ this.deviceNumber = deviceNumber;
+ this.title = title;
+ this.content = content;
+ this.contact = contact;
+ this.status = status;
+ this.adminMemo = adminMemo;
+ this.createdAt = createdAt;
+ this.updatedAt = updatedAt;
+ }
+
+ public static InquiryRes fromEntity(Inquiry inquiry) {
+ return InquiryRes.builder()
+ .id(inquiry.getId())
+ .memberId(inquiry.getMember() != null ? inquiry.getMember().getId() : null)
+ .deviceNumber(inquiry.getDeviceNumber())
+ .title(inquiry.getTitle())
+ .content(inquiry.getContent())
+ .contact(inquiry.getContact())
+ .status(inquiry.getStatus())
+ .adminMemo(inquiry.getAdminMemo())
+ .createdAt(inquiry.getCreatedAt())
+ .updatedAt(inquiry.getUpdatedAt())
+ .build();
+ }
+}
diff --git a/src/main/java/com/application/domain/inquiry/entity/Inquiry.java b/src/main/java/com/application/domain/inquiry/entity/Inquiry.java
new file mode 100644
index 0000000..199240e
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/entity/Inquiry.java
@@ -0,0 +1,70 @@
+package com.application.domain.inquiry.entity;
+
+import com.application.common.time.BaseTimeEntity;
+import com.application.domain.member.entity.Member;
+import jakarta.persistence.*;
+import lombok.*;
+
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Getter
+@Setter
+@NoArgsConstructor
+@Entity(name = "inquiry")
+public class Inquiry extends BaseTimeEntity {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "member_id")
+ private Member member;
+
+ @Column(name = "device_number")
+ private String deviceNumber;
+
+ @Column(name = "title", nullable = false, length = 200)
+ private String title;
+
+ @Column(name = "content", nullable = false, columnDefinition = "TEXT")
+ private String content;
+
+ @Column(name = "contact")
+ private String contact;
+
+ @Enumerated(EnumType.STRING)
+ @Column(name = "status", nullable = false, length = 20)
+ private InquiryStatus status = InquiryStatus.NEW;
+
+ @Column(name = "admin_memo", columnDefinition = "TEXT")
+ private String adminMemo;
+
+ @Builder
+ public Inquiry(Member member, String deviceNumber, String title, String content,
+ String contact, InquiryStatus status, String adminMemo) {
+ this.member = member;
+ this.deviceNumber = deviceNumber;
+ this.title = title;
+ this.content = content;
+ this.contact = contact;
+ this.status = status != null ? status : InquiryStatus.NEW;
+ this.adminMemo = adminMemo;
+ }
+
+ public void markRead() {
+ if (this.status == InquiryStatus.NEW) {
+ this.status = InquiryStatus.READ;
+ }
+ }
+
+ public void updateStatus(InquiryStatus status) {
+ if (status != null) {
+ this.status = status;
+ }
+ }
+
+ public void updateAdminMemo(String memo) {
+ this.adminMemo = memo;
+ }
+}
diff --git a/src/main/java/com/application/domain/inquiry/entity/InquiryStatus.java b/src/main/java/com/application/domain/inquiry/entity/InquiryStatus.java
new file mode 100644
index 0000000..5ba8936
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/entity/InquiryStatus.java
@@ -0,0 +1,19 @@
+package com.application.domain.inquiry.entity;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum InquiryStatus {
+ NEW,
+ READ,
+ REPLIED;
+
+ public static Optional fromString(String value) {
+ if (value == null) {
+ return Optional.empty();
+ }
+ return Arrays.stream(values())
+ .filter(s -> s.name().equalsIgnoreCase(value.trim()))
+ .findFirst();
+ }
+}
diff --git a/src/main/java/com/application/domain/inquiry/repository/InquiryRepository.java b/src/main/java/com/application/domain/inquiry/repository/InquiryRepository.java
new file mode 100644
index 0000000..7be476d
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/repository/InquiryRepository.java
@@ -0,0 +1,16 @@
+package com.application.domain.inquiry.repository;
+
+import com.application.domain.inquiry.entity.Inquiry;
+import com.application.domain.inquiry.entity.InquiryStatus;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface InquiryRepository extends JpaRepository {
+
+ Page findByMemberId(Long memberId, Pageable pageable);
+
+ Page findAllByStatus(InquiryStatus status, Pageable pageable);
+}
diff --git a/src/main/java/com/application/domain/inquiry/service/InquiryService.java b/src/main/java/com/application/domain/inquiry/service/InquiryService.java
new file mode 100644
index 0000000..7aa75a3
--- /dev/null
+++ b/src/main/java/com/application/domain/inquiry/service/InquiryService.java
@@ -0,0 +1,116 @@
+package com.application.domain.inquiry.service;
+
+import com.application.common.exception.custom.CustomApiException;
+import com.application.domain.inquiry.dto.request.InquiryCreateReq;
+import com.application.domain.inquiry.dto.response.InquiryCreateRes;
+import com.application.domain.inquiry.dto.response.InquiryPageRes;
+import com.application.domain.inquiry.dto.response.InquiryRes;
+import com.application.domain.inquiry.entity.Inquiry;
+import com.application.domain.inquiry.entity.InquiryStatus;
+import com.application.domain.inquiry.repository.InquiryRepository;
+import com.application.domain.member.entity.Member;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class InquiryService {
+
+ private final InquiryRepository inquiryRepository;
+
+ @Transactional
+ public InquiryCreateRes create(InquiryCreateReq req, Member memberOrNull, String deviceHeader) {
+ String deviceNumber = (req.getDeviceNumber() != null && !req.getDeviceNumber().isBlank())
+ ? req.getDeviceNumber()
+ : deviceHeader;
+
+ if (memberOrNull == null && (deviceNumber == null || deviceNumber.isBlank())) {
+ throw new CustomApiException("비로그인 사용자는 device_number가 필요합니다.");
+ }
+
+ Inquiry inquiry = Inquiry.builder()
+ .member(memberOrNull)
+ .deviceNumber(deviceNumber)
+ .title(req.getTitle())
+ .content(req.getContent())
+ .contact(req.getContact())
+ .status(InquiryStatus.NEW)
+ .build();
+
+ Inquiry saved = inquiryRepository.save(inquiry);
+ log.info("[INQUIRY] Created id={}, memberId={}, device={}",
+ saved.getId(),
+ memberOrNull != null ? memberOrNull.getId() : null,
+ deviceNumber);
+
+ return InquiryCreateRes.builder().id(saved.getId()).build();
+ }
+
+ @Transactional(readOnly = true)
+ public InquiryPageRes listMine(Long memberId, Pageable pageable) {
+ Page page = inquiryRepository.findByMemberId(memberId, pageable);
+ List content = page.getContent().stream()
+ .map(InquiryRes::fromEntity)
+ .toList();
+ return InquiryPageRes.fromPage(page, content);
+ }
+
+ @Transactional
+ public InquiryRes getOneForMemberOrAdmin(Long inquiryId, Long requesterMemberId, boolean isAdmin) {
+ Inquiry inquiry = inquiryRepository.findById(inquiryId)
+ .orElseThrow(() -> new CustomApiException("문의를 찾을 수 없습니다."));
+
+ if (!isAdmin) {
+ Long ownerId = inquiry.getMember() != null ? inquiry.getMember().getId() : null;
+ if (ownerId == null || !ownerId.equals(requesterMemberId)) {
+ throw new CustomApiException("접근 권한이 없습니다.");
+ }
+ }
+
+ // Admin/owner 열람 시 NEW → READ 전환
+ if (isAdmin && inquiry.getStatus() == InquiryStatus.NEW) {
+ inquiry.markRead();
+ }
+ return InquiryRes.fromEntity(inquiry);
+ }
+
+ // ------- Admin helpers (Thymeleaf 페이지용) -------
+
+ @Transactional(readOnly = true)
+ public Page adminList(InquiryStatus status, Pageable pageable) {
+ if (status == null) {
+ return inquiryRepository.findAll(pageable);
+ }
+ return inquiryRepository.findAllByStatus(status, pageable);
+ }
+
+ @Transactional(readOnly = true)
+ public Inquiry adminGet(Long id) {
+ return inquiryRepository.findById(id)
+ .orElseThrow(() -> new CustomApiException("문의를 찾을 수 없습니다."));
+ }
+
+ @Transactional
+ public void adminUpdate(Long id, String statusStr, String adminMemo) {
+ Inquiry inquiry = inquiryRepository.findById(id)
+ .orElseThrow(() -> new CustomApiException("문의를 찾을 수 없습니다."));
+
+ if (statusStr != null && !statusStr.isBlank()) {
+ InquiryStatus status = InquiryStatus.fromString(statusStr)
+ .orElseThrow(() -> new CustomApiException("유효하지 않은 상태값입니다: " + statusStr));
+ inquiry.updateStatus(status);
+ }
+
+ inquiry.updateAdminMemo(adminMemo);
+ inquiryRepository.save(inquiry);
+ log.info("[INQUIRY][ADMIN] Updated id={}, status={}, memo_len={}",
+ id, inquiry.getStatus(), adminMemo == null ? 0 : adminMemo.length());
+ }
+}
diff --git a/src/main/java/com/application/tools/imagepipeline/ImagePipelineProperties.java b/src/main/java/com/application/tools/imagepipeline/ImagePipelineProperties.java
new file mode 100644
index 0000000..2a43fb8
--- /dev/null
+++ b/src/main/java/com/application/tools/imagepipeline/ImagePipelineProperties.java
@@ -0,0 +1,49 @@
+package com.application.tools.imagepipeline;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Bound to the {@code aws.s3.*} block in {@code application.yml}.
+ *
+ * Used by the one-shot image pipeline runner. Note that this is intentionally
+ * separate from the legacy {@link com.application.common.config.S3Config}
+ * (Spring Cloud AWS v1) — the image pipeline talks to S3 directly via AWS SDK v2.
+ *
+ *
If either {@link #accessKey} or {@link #secretKey} is blank, the runner forces
+ * dry-run mode (download only, write variants to local disk).
+ */
+@Configuration
+@ConfigurationProperties(prefix = "aws.s3")
+public class ImagePipelineProperties {
+
+ /** Region that hosts the bucket. Defaults to ap-northeast-2 (Seoul) in yml. */
+ private String region;
+
+ /** Bucket name (default: onz-cocktail-images). */
+ private String bucket;
+
+ /** AWS access key. Blank → dry-run forced. */
+ private String accessKey;
+
+ /** AWS secret key. Blank → dry-run forced. */
+ private String secretKey;
+
+ public String getRegion() { return region; }
+ public void setRegion(String region) { this.region = region; }
+
+ public String getBucket() { return bucket; }
+ public void setBucket(String bucket) { this.bucket = bucket; }
+
+ public String getAccessKey() { return accessKey; }
+ public void setAccessKey(String accessKey) { this.accessKey = accessKey; }
+
+ public String getSecretKey() { return secretKey; }
+ public void setSecretKey(String secretKey) { this.secretKey = secretKey; }
+
+ /** Returns true iff both access-key and secret-key are non-blank. */
+ public boolean hasCredentials() {
+ return accessKey != null && !accessKey.isBlank()
+ && secretKey != null && !secretKey.isBlank();
+ }
+}
diff --git a/src/main/java/com/application/tools/imagepipeline/ImagePipelineRunner.java b/src/main/java/com/application/tools/imagepipeline/ImagePipelineRunner.java
new file mode 100644
index 0000000..eb6bec5
--- /dev/null
+++ b/src/main/java/com/application/tools/imagepipeline/ImagePipelineRunner.java
@@ -0,0 +1,286 @@
+package com.application.tools.imagepipeline;
+
+import com.application.domain.cocktail.entity.Cocktail;
+import com.application.domain.cocktail.repository.CocktailRepository;
+import jakarta.persistence.EntityManager;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * One-shot CLI runner that converts every {@link Cocktail#getImageUrl()} and
+ * {@link Cocktail#getGlassImageUrl()} PNG into 2 WebP variants (thumb / detail).
+ *
+ *
Activation
+ * Only runs when {@code --image-pipeline} is on the command line. Otherwise the
+ * Spring web server starts normally and this runner is a no-op.
+ *
+ * Modes
+ *
+ * - dry-run — explicit {@code --dry-run} OR missing AWS creds.
+ * Saves variants to {@code /tmp/onz-image-out/{cocktails|glasses}/...} and
+ * skips the DB update.
+ * - full — uploads to S3 and updates DB columns
+ * (image_url_thumb / image_url_detail / glass_image_url_thumb /
+ * glass_image_url_detail).
+ *
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ImagePipelineRunner implements ApplicationRunner {
+
+ private static final String FLAG_PIPELINE = "image-pipeline";
+ private static final String FLAG_DRY_RUN = "dry-run";
+
+ private static final Path OUT_ROOT = Path.of("/tmp/onz-image-out");
+ private static final String S3_PREFIX_COCKTAILS = "cocktails";
+ private static final String S3_PREFIX_GLASSES = "glasses";
+
+ private final CocktailRepository cocktailRepository;
+ private final ImageVariantGenerator generator;
+ private final S3UploaderV2 uploader;
+ private final ImagePipelineProperties props;
+ private final EntityManager em;
+ private final ConfigurableApplicationContext appContext;
+
+ private final HttpClient http = HttpClient.newBuilder()
+ .connectTimeout(Duration.ofSeconds(15))
+ .followRedirects(HttpClient.Redirect.NORMAL)
+ .build();
+
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ if (!args.containsOption(FLAG_PIPELINE) && !args.getNonOptionArgs().contains("--" + FLAG_PIPELINE)) {
+ // Normal Spring Boot startup — do nothing.
+ return;
+ }
+
+ boolean explicitDryRun = args.containsOption(FLAG_DRY_RUN)
+ || args.getNonOptionArgs().contains("--" + FLAG_DRY_RUN);
+ boolean credsMissing = !props.hasCredentials();
+ boolean dryRun = explicitDryRun || credsMissing;
+
+ log.info("================================================================");
+ log.info(" ONZ Image Pipeline Runner");
+ log.info(" flag --image-pipeline = present");
+ log.info(" flag --dry-run = {}", explicitDryRun);
+ log.info(" AWS creds present = {}", !credsMissing);
+ log.info(" effective mode = {}", dryRun ? "DRY-RUN (no S3 upload, no DB update)" : "FULL (S3 + DB)");
+ if (credsMissing && !explicitDryRun) {
+ log.warn(" >> AWS credentials missing — forcing dry-run mode.");
+ }
+ log.info(" region={} bucket={}", props.getRegion(), props.getBucket());
+ log.info("================================================================");
+
+ if (dryRun) {
+ Files.createDirectories(OUT_ROOT.resolve(S3_PREFIX_COCKTAILS));
+ Files.createDirectories(OUT_ROOT.resolve(S3_PREFIX_GLASSES));
+ }
+
+ List all = cocktailRepository.findAll();
+ log.info("Loaded {} cocktails", all.size());
+
+ Stats stats = new Stats();
+ for (Cocktail c : all) {
+ processOne(c, dryRun, stats);
+ }
+
+ log.info("================================================================");
+ log.info(" Image pipeline complete.");
+ log.info(" cocktails seen : {}", stats.seen);
+ log.info(" image_url processed : {}", stats.cocktailProcessed);
+ log.info(" image_url skipped (null) : {}", stats.cocktailSkipped);
+ log.info(" image_url failed : {}", stats.cocktailFailed);
+ log.info(" glass_url processed : {}", stats.glassProcessed);
+ log.info(" glass_url skipped (null) : {}", stats.glassSkipped);
+ log.info(" glass_url failed : {}", stats.glassFailed);
+ log.info(" total bytes downloaded : {} ({} KB)", stats.bytesIn, stats.bytesIn / 1024);
+ log.info(" total bytes generated : {} ({} KB)", stats.bytesOut, stats.bytesOut / 1024);
+ log.info(" bytes saved (in - out) : {} ({} KB, {}% reduction)",
+ stats.bytesIn - stats.bytesOut,
+ (stats.bytesIn - stats.bytesOut) / 1024,
+ stats.bytesIn == 0 ? 0 : (100L * (stats.bytesIn - stats.bytesOut) / stats.bytesIn));
+ if (dryRun) {
+ log.info(" output dir : {}", OUT_ROOT.toAbsolutePath());
+ }
+ log.info("================================================================");
+
+ // One-shot tool: exit cleanly so the JVM doesn't linger as a web server.
+ // We close the context (instead of System.exit) so Spring runs all
+ // shutdown hooks (DB pool, etc.) gracefully.
+ log.info("Image pipeline finished. Closing Spring context and exiting.");
+ new Thread(() -> {
+ try { Thread.sleep(200); } catch (InterruptedException ignored) {}
+ int code = stats.cocktailFailed + stats.glassFailed > 0 ? 1 : 0;
+ appContext.close();
+ System.exit(code);
+ }, "image-pipeline-shutdown").start();
+ }
+
+ private void processOne(Cocktail c, boolean dryRun, Stats stats) {
+ stats.seen++;
+ String label = "[id=" + c.getId() + " " + c.getKorName() + "]";
+
+ String imgUrl = nullIfBlank(c.getImageUrl());
+ if (imgUrl == null) {
+ stats.cocktailSkipped++;
+ log.info("{} image_url is null — skipping cocktail variant", label);
+ } else {
+ try {
+ processVariant(label + " cocktail", imgUrl, c.getId(), S3_PREFIX_COCKTAILS, dryRun, stats, true);
+ stats.cocktailProcessed++;
+ } catch (Exception e) {
+ stats.cocktailFailed++;
+ log.error("{} cocktail FAILED: {}", label, e.toString());
+ }
+ }
+
+ String glassUrl = nullIfBlank(c.getGlassImageUrl());
+ if (glassUrl == null) {
+ stats.glassSkipped++;
+ log.info("{} glass_image_url is null — skipping glass variant", label);
+ } else {
+ try {
+ processVariant(label + " glass", glassUrl, c.getId(), S3_PREFIX_GLASSES, dryRun, stats, false);
+ stats.glassProcessed++;
+ } catch (Exception e) {
+ stats.glassFailed++;
+ log.error("{} glass FAILED: {}", label, e.toString());
+ }
+ }
+ }
+
+ /**
+ * Download original, generate thumb + detail, then upload (full mode) or
+ * write to /tmp (dry-run). Returns nothing — side effects only.
+ *
+ * @param isCocktail true → updates image_url_thumb/detail; false → glass_image_url_thumb/detail
+ */
+ private void processVariant(String label, String url, Long cocktailId, String s3Prefix,
+ boolean dryRun, Stats stats, boolean isCocktail) throws IOException, InterruptedException {
+ byte[] original = downloadBytes(url);
+ stats.bytesIn += original.length;
+
+ String basename = baseNameFromUrl(url);
+
+ byte[] thumbBytes = generator.generate(original, ImageVariantGenerator.Variant.THUMB);
+ byte[] detailBytes = generator.generate(original, ImageVariantGenerator.Variant.DETAIL);
+ stats.bytesOut += thumbBytes.length + detailBytes.length;
+
+ log.info("{} download: {}KB → thumb: {}KB / detail: {}KB",
+ label, original.length / 1024, thumbBytes.length / 1024, detailBytes.length / 1024);
+
+ String thumbKey = s3Prefix + "/" + basename + "_thumb.webp";
+ String detailKey = s3Prefix + "/" + basename + "_detail.webp";
+
+ if (dryRun) {
+ Path thumbPath = OUT_ROOT.resolve(thumbKey);
+ Path detailPath = OUT_ROOT.resolve(detailKey);
+ Files.createDirectories(thumbPath.getParent());
+ Files.write(thumbPath, thumbBytes);
+ Files.write(detailPath, detailBytes);
+ log.debug(" wrote {} ({} bytes)", thumbPath, thumbBytes.length);
+ log.debug(" wrote {} ({} bytes)", detailPath, detailBytes.length);
+ // Skip DB update intentionally; just log what would happen.
+ log.info(" (dry-run) would set {} url_thumb=s3://{}/{}",
+ isCocktail ? "image" : "glass_image", props.getBucket(), thumbKey);
+ log.info(" (dry-run) would set {} url_detail=s3://{}/{}",
+ isCocktail ? "image" : "glass_image", props.getBucket(), detailKey);
+ } else {
+ String thumbUrl = uploader.upload(thumbKey, thumbBytes, "image/webp");
+ String detailUrl = uploader.upload(detailKey, detailBytes, "image/webp");
+ log.info(" uploaded thumb={} detail={}", thumbUrl, detailUrl);
+ updateVariantUrls(cocktailId, isCocktail, thumbUrl, detailUrl);
+ }
+ }
+
+ /**
+ * Direct JPQL update (avoids loading & re-saving the full entity graph).
+ */
+ @Transactional
+ protected void updateVariantUrls(Long id, boolean isCocktail, String thumbUrl, String detailUrl) {
+ if (isCocktail) {
+ em.createQuery(
+ "UPDATE Cocktail c SET c.imageUrlThumb = :thumb, c.imageUrlDetail = :detail WHERE c.id = :id")
+ .setParameter("thumb", thumbUrl)
+ .setParameter("detail", detailUrl)
+ .setParameter("id", id)
+ .executeUpdate();
+ } else {
+ em.createQuery(
+ "UPDATE Cocktail c SET c.glassImageUrlThumb = :thumb, c.glassImageUrlDetail = :detail WHERE c.id = :id")
+ .setParameter("thumb", thumbUrl)
+ .setParameter("detail", detailUrl)
+ .setParameter("id", id)
+ .executeUpdate();
+ }
+ }
+
+ // ---------------------------------------------------------------- helpers
+
+ private byte[] downloadBytes(String url) throws IOException, InterruptedException {
+ HttpRequest req = HttpRequest.newBuilder(URI.create(url))
+ .timeout(Duration.ofSeconds(30))
+ .GET()
+ .build();
+ HttpResponse resp = http.send(req, HttpResponse.BodyHandlers.ofByteArray());
+ if (resp.statusCode() / 100 != 2) {
+ throw new IOException("Download failed status=" + resp.statusCode() + " url=" + url);
+ }
+ return resp.body();
+ }
+
+ /**
+ * Derive a deterministic, filesystem-safe basename from the source URL so the
+ * generated WebP key is stable across reruns.
+ *
+ * https://onz-cocktail-images.s3.ap-northeast-2.amazonaws.com/cocktails/long_island_iced_tea.png
+ * → long_island_iced_tea
+ *
+ */
+ static String baseNameFromUrl(String url) {
+ String tail = url;
+ int q = tail.indexOf('?');
+ if (q >= 0) tail = tail.substring(0, q);
+ int slash = tail.lastIndexOf('/');
+ if (slash >= 0) tail = tail.substring(slash + 1);
+ int dot = tail.lastIndexOf('.');
+ if (dot > 0) tail = tail.substring(0, dot);
+ // sanitize
+ tail = tail.toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9._-]+", "_");
+ if (tail.isBlank()) tail = "img";
+ return tail;
+ }
+
+ private static String nullIfBlank(String s) {
+ return (s == null || s.isBlank()) ? null : s;
+ }
+
+ private static class Stats {
+ int seen;
+ int cocktailProcessed;
+ int cocktailSkipped;
+ int cocktailFailed;
+ int glassProcessed;
+ int glassSkipped;
+ int glassFailed;
+ long bytesIn;
+ long bytesOut;
+ }
+}
diff --git a/src/main/java/com/application/tools/imagepipeline/ImageVariantGenerator.java b/src/main/java/com/application/tools/imagepipeline/ImageVariantGenerator.java
new file mode 100644
index 0000000..35dfa1a
--- /dev/null
+++ b/src/main/java/com/application/tools/imagepipeline/ImageVariantGenerator.java
@@ -0,0 +1,132 @@
+package com.application.tools.imagepipeline;
+
+import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import org.springframework.stereotype.Component;
+
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
+import javax.imageio.stream.MemoryCacheImageOutputStream;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+
+/**
+ * Pure utility: takes original image bytes (PNG/JPEG/...) and produces a WebP
+ * variant capped at a max dimension while preserving aspect ratio.
+ *
+ * Resizing uses Thumbnailator (pure-java). WebP encoding uses
+ * {@code org.sejda.imageio:webp-imageio} which auto-registers an ImageIO SPI.
+ */
+@Slf4j
+@Component
+public class ImageVariantGenerator {
+
+ public enum Variant {
+ THUMB(400, 0.80f),
+ DETAIL(1200, 0.80f);
+
+ public final int maxDim;
+ public final float quality;
+
+ Variant(int maxDim, float quality) {
+ this.maxDim = maxDim;
+ this.quality = quality;
+ }
+
+ public String suffix() {
+ return name().toLowerCase();
+ }
+ }
+
+ /**
+ * Resize the image so that the longer side is at most {@code variant.maxDim}
+ * (no upscaling) and encode to WebP at {@code variant.quality}.
+ *
+ * @return WebP-encoded byte array
+ */
+ public byte[] generate(byte[] originalBytes, Variant variant) throws IOException {
+ if (originalBytes == null || originalBytes.length == 0) {
+ throw new IOException("originalBytes is empty");
+ }
+
+ BufferedImage source = ImageIO.read(new ByteArrayInputStream(originalBytes));
+ if (source == null) {
+ throw new IOException("Could not decode source image (unknown format)");
+ }
+
+ int srcW = source.getWidth();
+ int srcH = source.getHeight();
+ int maxDim = variant.maxDim;
+
+ // Preserve aspect ratio, never upscale.
+ BufferedImage resized;
+ if (srcW <= maxDim && srcH <= maxDim) {
+ resized = ensureRgb(source);
+ } else {
+ BufferedImage scaled = Thumbnails.of(source)
+ .size(maxDim, maxDim) // bounding box
+ .keepAspectRatio(true)
+ .asBufferedImage();
+ resized = ensureRgb(scaled);
+ }
+
+ return encodeWebp(resized, variant.quality);
+ }
+
+ /**
+ * The sejda WebP encoder requires TYPE_INT_RGB (no alpha). PNGs commonly come
+ * in as TYPE_4BYTE_ABGR / TYPE_INT_ARGB which would otherwise blow up. We
+ * paint onto a white background to flatten any alpha channel.
+ */
+ private BufferedImage ensureRgb(BufferedImage src) {
+ if (src.getType() == BufferedImage.TYPE_INT_RGB) {
+ return src;
+ }
+ BufferedImage rgb = new BufferedImage(src.getWidth(), src.getHeight(),
+ BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = rgb.createGraphics();
+ try {
+ g.setColor(java.awt.Color.WHITE);
+ g.fillRect(0, 0, src.getWidth(), src.getHeight());
+ g.drawImage(src, 0, 0, null);
+ } finally {
+ g.dispose();
+ }
+ return rgb;
+ }
+
+ private byte[] encodeWebp(BufferedImage image, float quality) throws IOException {
+ Iterator writers = ImageIO.getImageWritersByMIMEType("image/webp");
+ if (!writers.hasNext()) {
+ throw new IOException("No WebP ImageWriter found on classpath. "
+ + "Make sure org.sejda.imageio:webp-imageio is on the runtime classpath.");
+ }
+ ImageWriter writer = writers.next();
+
+ ImageWriteParam params = writer.getDefaultWriteParam();
+ params.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+ // sejda's WebP writer exposes "Lossy" / "Lossless"
+ try {
+ params.setCompressionType("Lossy");
+ } catch (IllegalArgumentException ignore) {
+ // older versions only accept defaults — fall through
+ }
+ params.setCompressionQuality(quality);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try (ImageOutputStream ios = new MemoryCacheImageOutputStream(baos)) {
+ writer.setOutput(ios);
+ writer.write(null, new IIOImage(image, null, null), params);
+ } finally {
+ writer.dispose();
+ }
+ return baos.toByteArray();
+ }
+}
diff --git a/src/main/java/com/application/tools/imagepipeline/S3UploaderV2.java b/src/main/java/com/application/tools/imagepipeline/S3UploaderV2.java
new file mode 100644
index 0000000..aa498cc
--- /dev/null
+++ b/src/main/java/com/application/tools/imagepipeline/S3UploaderV2.java
@@ -0,0 +1,65 @@
+package com.application.tools.imagepipeline;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+/**
+ * Minimal AWS SDK v2 S3 wrapper for the image pipeline. Lazily constructs
+ * a single {@link S3Client} only when credentials are available — meaning
+ * dry-run mode never instantiates this client and never needs creds.
+ */
+@Slf4j
+@Component
+public class S3UploaderV2 {
+
+ private final ImagePipelineProperties props;
+ private S3Client client;
+
+ public S3UploaderV2(ImagePipelineProperties props) {
+ this.props = props;
+ }
+
+ private synchronized S3Client client() {
+ if (client == null) {
+ if (!props.hasCredentials()) {
+ throw new IllegalStateException(
+ "S3UploaderV2.client() called without AWS credentials configured");
+ }
+ this.client = S3Client.builder()
+ .region(Region.of(props.getRegion()))
+ .credentialsProvider(StaticCredentialsProvider.create(
+ AwsBasicCredentials.create(props.getAccessKey(), props.getSecretKey())))
+ .build();
+ log.info("[S3UploaderV2] initialized region={} bucket={}", props.getRegion(), props.getBucket());
+ }
+ return client;
+ }
+
+ /**
+ * Upload bytes to {@code s3://{bucket}/{key}} with the given content-type.
+ * Returns the public HTTPS URL using the virtual-hosted-style format.
+ */
+ public String upload(String key, byte[] body, String contentType) {
+ PutObjectRequest req = PutObjectRequest.builder()
+ .bucket(props.getBucket())
+ .key(key)
+ .contentType(contentType)
+ .contentLength((long) body.length)
+ .acl(ObjectCannedACL.PUBLIC_READ)
+ .build();
+ client().putObject(req, RequestBody.fromBytes(body));
+ return publicUrl(key);
+ }
+
+ public String publicUrl(String key) {
+ return String.format("https://%s.s3.%s.amazonaws.com/%s",
+ props.getBucket(), props.getRegion(), key);
+ }
+}
diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml
new file mode 100644
index 0000000..cd566ec
--- /dev/null
+++ b/src/main/resources/application-docker.yml
@@ -0,0 +1,19 @@
+## docker-compose 프로파일 (SPRING_PROFILES_ACTIVE=docker)
+##
+## - DB: docker compose 내부 db 서비스 (db:5432)
+## - 이미지 업로드: 컨테이너 내 /app/uploads (docker-compose 의 volume 마운트로 호스트와 공유)
+## - S3 자격증명 미주입 → 로컬 파일 모드 자동 활성
+
+spring:
+ datasource:
+ # docker-compose 가 SPRING_DATASOURCE_URL 환경변수로 직접 주입하므로 여기는 비워둠.
+ # 실수로 환경변수가 빠진 채 기동되면 빈값으로 명확히 실패하게 한다 (default 평문 패스워드 박지 않음).
+ url: ${SPRING_DATASOURCE_URL:}
+ username: ${SPRING_DATASOURCE_USERNAME:}
+ password: ${SPRING_DATASOURCE_PASSWORD:}
+
+image:
+ upload:
+ local-dir: /app/uploads
+ # 컨테이너 외부에서 접근하는 URL. nginx 앞단 없는 로컬 docker 환경 기준.
+ public-base-url: http://127.0.0.1/onz/uploads
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
new file mode 100644
index 0000000..d35a4d7
--- /dev/null
+++ b/src/main/resources/application-local.yml
@@ -0,0 +1,19 @@
+## 로컬 개발 프로파일 (SPRING_PROFILES_ACTIVE=local)
+##
+## - DB: 호스트 머신의 localhost:5433 docker postgres-cocktail 컨테이너
+## - 이미지 업로드: 로컬 파일시스템 (./uploads)
+## - S3 자격증명 미주입 → ImageStorageConfig 가 자동으로 LocalFileImageStorage 선택
+
+spring:
+ datasource:
+ # 환경변수 미주입 시 도커 compose 로컬 default 적용. 운영/공유 머신에선 .env 로 덮어쓸 것.
+ url: ${POSTGRE_url:jdbc:postgresql://localhost:5433/cocktail-postgres}
+ username: ${POSTGRE_USERNAME:root}
+ password: ${POSTGRE_PASSWORD:}
+
+# 이미지 업로드 (로컬 파일 모드용 설정)
+image:
+ upload:
+ local-dir: ./uploads
+ # 같은 머신에서 호출되는 admin/RN sim 기준. 실기기에서 띄울 땐 LAN IP 로 교체.
+ public-base-url: http://127.0.0.1/onz/uploads
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e967302..1b971fd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -97,3 +97,13 @@ custom:
team-id: ${APPLE_TEAM_ID} # Apple Developer Team ID
key-id: ${APPLE_KEY_ID}
private-key: ${APPLE_PRIVATE_KEY} # Key ID (P8 파일 발급 시 확인)
+
+# --- AWS S3 (image pipeline tool) ---
+# 이 블록은 ImagePipelineProperties (@ConfigurationProperties prefix=aws.s3) 와 연결됨.
+# access-key/secret-key 가 비어 있으면 ImagePipelineRunner 가 자동으로 dry-run 모드로 전환됨.
+aws:
+ s3:
+ region: ${AWS_S3_REGION:ap-northeast-2}
+ bucket: ${S3_BUCKET:onz-cocktail-images}
+ access-key: ${AWS_S3_ACCESS_KEY:}
+ secret-key: ${AWS_S3_SECRET_KEY:}
diff --git a/src/main/resources/templates/admin/cocktail/detail.html b/src/main/resources/templates/admin/cocktail/detail.html
index 1d2885a..161f6ac 100755
--- a/src/main/resources/templates/admin/cocktail/detail.html
+++ b/src/main/resources/templates/admin/cocktail/detail.html
@@ -139,7 +139,7 @@
formData.append("file", file);
try{
- const response = await api.post("/admin/cocktail/image/upload", formData, {
+ const response = await api.post("/onz/admin/cocktail/image/upload", formData, {
headers: { "Content-Type": "multipart/form-data" },
});
@@ -151,7 +151,7 @@
const oldImage = document.getElementById("oldImageUrl").value;
if(oldImage){
- await api.post("/admin/cocktail/image/delete", {url : oldImage});
+ await api.post("/onz/admin/cocktail/image/delete", {url : oldImage});
}
}catch(error){
console.log("이미지 업로드 실패:", error);
@@ -174,7 +174,7 @@
async function loadCocktailDetail(id) {
try {
- const response = await api.get("/admin/cocktail/info", { cocktailId: id });
+ const response = await api.get("/onz/admin/cocktail/info", { cocktailId: id });
if (response.code === 1) {
fillForm(response.data);
} else {
@@ -256,10 +256,10 @@
};
try {
- const url = cocktailId ? "/admin/cocktails/update" : "/admin/cocktails/save";
+ const url = cocktailId ? "/onz/admin/cocktails/update" : "/onz/admin/cocktails/save";
const response = await api.post(url, dto, {headers: {"Content-Type": "application/json"},});
if (response.code === 1) {
- showToast("✅ 저장되었습니다.", "/admin/cocktails?page=0&size=10");
+ showToast("✅ 저장되었습니다.", "/onz/admin/cocktails?page=0&size=10");
} else {
showToast("❌ 저장 실패");
}
@@ -275,9 +275,9 @@
}
if (!confirm("정말 삭제하시겠습니까?")) return;
try {
- const response = await api.get("/admin/cocktails/delete", { cocktailId: cocktailId });
+ const response = await api.get("/onz/admin/cocktails/delete", { cocktailId: cocktailId });
if (response.code === 1) {
- showToast("삭제되었습니다.", "/admin/cocktails?page=0&size=10");
+ showToast("삭제되었습니다.", "/onz/admin/cocktails?page=0&size=10");
} else {
showToast("삭제 실패");
}
@@ -287,13 +287,13 @@
}
function goBack() {
- window.location.href = "/admin/cocktails?page=0&size=10";
+ window.location.href = "/onz/admin/cocktails?page=0&size=10";
}
// 태그 목록 초기화
async function initTags() {
try {
- const response = await api.get("/admin/cocktail/tags");
+ const response = await api.get("/onz/admin/cocktail/tags");
if (response.code === 1) {
const allTags = response.data;
const container = document.getElementById("tagsContainer");
diff --git a/src/main/resources/templates/admin/cocktails.html b/src/main/resources/templates/admin/cocktails.html
index a4c9cda..bab6de8 100755
--- a/src/main/resources/templates/admin/cocktails.html
+++ b/src/main/resources/templates/admin/cocktails.html
@@ -104,7 +104,7 @@
* 이벤트 핸들러
*************************************/
document.getElementById("btnBack").addEventListener("click", () => {
- window.location.href = "/admin/dashboard";
+ window.location.href = "/onz/admin/dashboard";
});
document.getElementById("btnSearch").addEventListener("click", (e) => {
@@ -112,7 +112,7 @@
loadCocktails();
});
document.getElementById("btnReg").addEventListener("click", () => {
- window.location.href = "/admin/cocktail/detail";
+ window.location.href = "/onz/admin/cocktail/detail";
});
async function loadCocktails() {
@@ -129,7 +129,7 @@
const page = 0;
const size = 100;
const name = document.getElementById("searchKr").value;
- const res = await axios.get("/admin/search/cocktail", { params: { page, size, cocktailName: name } });
+ const res = await axios.get("/onz/admin/search/cocktail", { params: { page, size, cocktailName: name } });
const rows = (res.data && res.data.code === 1 && Array.isArray(res.data.data)) ? res.data.data : [];
// v31+ 방식
if (window.gridApi && typeof window.gridApi.setGridOption === 'function') {
@@ -145,13 +145,13 @@
}
function openDetail(id) {
- window.location.href = `/admin/cocktail/detail?cocktailId=${id}`;
+ window.location.href = `/onz/admin/cocktail/detail?cocktailId=${id}`;
}
async function deleteCocktail(id) {
if (!confirm("정말 삭제하시겠습니까?")) return;
try {
- const res = await axios.get(`/admin/cocktails/delete?cocktailId=${id}`);
+ const res = await axios.get(`/onz/admin/cocktails/delete?cocktailId=${id}`);
if (res.data.code === 1) {
alert("삭제되었습니다.");
loadCocktails();
diff --git a/src/main/resources/templates/admin/dashboard.html b/src/main/resources/templates/admin/dashboard.html
index e589be5..80ef490 100755
--- a/src/main/resources/templates/admin/dashboard.html
+++ b/src/main/resources/templates/admin/dashboard.html
@@ -45,8 +45,10 @@ 관리자 대시보드
관리 기능