shared-dg04-Won/smarketing-backend
2
0
Fork 0
mirror of https://github.com/won-ktds/smarketing-backend.git synced 2025-12-05 22:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from won-ktds/poster-content

Browse Source 
Poster content
This commit is contained in:
yuhalog 2025-06-19 09:54:36 +09:00 committed by GitHub
commit ed84fff47f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 440 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smarketing-java/ai-recommend/src/main/resources/application.yml
View File

@ -26,10 +26,10 @@ spring:
external:
store-service:
base-url: ${STORE_SERVICE_URL:http://localhost:8082}
base-url: ${STORE_SERVICE_URL:http://smarketing.20.249.184.228.nip.io}
timeout: ${STORE_SERVICE_TIMEOUT:5000}
python-ai-service:
base-url: ${PYTHON_AI_SERVICE_URL:http://localhost:5001}
base-url: ${PYTHON_AI_SERVICE_URL:http://20.249.113.247:5001}
api-key: ${PYTHON_AI_API_KEY:dummy-key}
timeout: ${PYTHON_AI_TIMEOUT:30000}

24
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/application/service/PosterContentService.java
View File

@ -6,20 +6,22 @@ import com.won.smarketing.content.domain.model.ContentStatus;
import com.won.smarketing.content.domain.model.ContentType;
import com.won.smarketing.content.domain.model.CreationConditions;
import com.won.smarketing.content.domain.model.Platform;
import com.won.smarketing.content.domain.model.store.StoreWithMenuData;
import com.won.smarketing.content.domain.repository.ContentRepository;
import com.won.smarketing.content.domain.service.AiPosterGenerator;
import com.won.smarketing.content.domain.service.BlobStorageService;
import com.won.smarketing.content.domain.service.StoreDataProvider;
import com.won.smarketing.content.presentation.dto.PosterContentCreateRequest;
import com.won.smarketing.content.presentation.dto.PosterContentCreateResponse;
import com.won.smarketing.content.presentation.dto.PosterContentSaveRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.List;
/**
@ -38,6 +40,7 @@ public class PosterContentService implements PosterContentUseCase {
private final ContentRepository contentRepository;
private final AiPosterGenerator aiPosterGenerator;
private final BlobStorageService blobStorageService;
private final StoreDataProvider storeDataProvider;
/**
* 포스터 콘텐츠 생성
@ -52,9 +55,13 @@ public class PosterContentService implements PosterContentUseCase {
// 1. 이미지 blob storage에 저장하고 request 저장
List<String> imageUrls = blobStorageService.uploadImage(images, posterImageContainer);
request.setImages(imageUrls);
// 매장 정보 호출
String userId = getCurrentUserId();
StoreWithMenuData storeWithMenuData = storeDataProvider.getStoreWithMenuData(userId);
// 2. AI 요청
String generatedPoster = aiPosterGenerator.generatePoster(request);
String generatedPoster = aiPosterGenerator.generatePoster(request, storeWithMenuData);
return PosterContentCreateResponse.builder()
.contentId(null) // 임시 생성이므로 ID 없음
@ -71,7 +78,7 @@ public class PosterContentService implements PosterContentUseCase {
* @param request 포스터 콘텐츠 저장 요청
*/
@Transactional
public Content savePosterContent(PosterContentSaveRequest request) {
public void savePosterContent(PosterContentSaveRequest request) {
// 생성 조건 구성
CreationConditions conditions = CreationConditions.builder()
.category(request.getCategory())
@ -87,7 +94,7 @@ public class PosterContentService implements PosterContentUseCase {
.contentType(ContentType.POSTER)
.platform(Platform.POSTER)
.title(request.getTitle())
// .content(request.gen)
.content(request.getContent())
.images(request.getImages())
.status(ContentStatus.PUBLISHED)
.creationConditions(conditions)
@ -95,6 +102,13 @@ public class PosterContentService implements PosterContentUseCase {
.build();
// 저장
return contentRepository.save(content);
contentRepository.save(content);
}
/**
* 현재 로그인된 사용자 ID 조회
*/
private String getCurrentUserId() {
return SecurityContextHolder.getContext().getAuthentication().getName();
}
}

2
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/application/usecase/PosterContentUseCase.java
View File

@ -26,5 +26,5 @@ public interface PosterContentUseCase {
* 포스터 콘텐츠 저장
* @param request 포스터 콘텐츠 저장 요청
*/
Content savePosterContent(PosterContentSaveRequest request);
void savePosterContent(PosterContentSaveRequest request);
}

21
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/domain/model/store/MenuData.java Normal file
View File

@ -0,0 +1,21 @@
package com.won.smarketing.content.domain.model.store;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
/**
* 메뉴 데이터 값 객체
*/
@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class MenuData {
private Long menuId;
private String menuName;
private String category;
private Integer price;
private String description;
}

22
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/domain/model/store/StoreData.java Normal file
View File

@ -0,0 +1,22 @@
package com.won.smarketing.content.domain.model.store;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
/**
* 매장 데이터 값 객체
*/
@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class StoreData {
private Long storeId;
private String storeName;
private String businessType;
private String location;
private String description;
private Integer seatCount;
}

13
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/domain/model/store/StoreWithMenuData.java Normal file
View File

@ -0,0 +1,13 @@
package com.won.smarketing.content.domain.model.store;
import lombok.Builder;
import lombok.Data;
import java.util.List;
@Data
@Builder
public class StoreWithMenuData {
private StoreData storeData;
private List<MenuData> menuDataList;
}

3
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/domain/service/AiPosterGenerator.java
View File

@ -1,5 +1,6 @@
package com.won.smarketing.content.domain.service;
import com.won.smarketing.content.domain.model.store.StoreWithMenuData;
import com.won.smarketing.content.presentation.dto.PosterContentCreateRequest;
import java.util.Map;
@ -16,5 +17,5 @@ public interface AiPosterGenerator {
* @param request 포스터 생성 요청
* @return 생성된 포스터 이미지 URL
*/
String generatePoster(PosterContentCreateRequest request);
String generatePoster(PosterContentCreateRequest request, StoreWithMenuData storeWithMenuData);
}

11
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/domain/service/StoreDataProvider.java Normal file
View File

@ -0,0 +1,11 @@
package com.won.smarketing.content.domain.service;
import com.won.smarketing.content.domain.model.store.StoreWithMenuData;
/**
* 매장 데이터 제공 도메인 서비스 인터페이스
*/
public interface StoreDataProvider {
StoreWithMenuData getStoreWithMenuData(String userId);
}

38
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/infrastructure/external/PythonAiPosterGenerator.java vendored
View File

@ -1,5 +1,8 @@
package com.won.smarketing.content.infrastructure.external;
import com.won.smarketing.content.domain.model.store.MenuData;
import com.won.smarketing.content.domain.model.store.StoreData;
import com.won.smarketing.content.domain.model.store.StoreWithMenuData;
import com.won.smarketing.content.domain.service.AiPosterGenerator; // 도메인 인터페이스 import
import com.won.smarketing.content.presentation.dto.PosterContentCreateRequest;
import lombok.RequiredArgsConstructor;
@ -11,7 +14,9 @@ import org.springframework.web.reactive.function.client.WebClient;
import java.time.Duration;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* Claude AI를 활용한 포스터 생성 구현체
@ -34,24 +39,24 @@ public class PythonAiPosterGenerator implements AiPosterGenerator {
* @return 생성된 포스터 이미지 URL
*/
@Override
public String generatePoster(PosterContentCreateRequest request) {
public String generatePoster(PosterContentCreateRequest request, StoreWithMenuData storeWithMenuData) {
try {
log.info("Python AI 포스터 서비스 호출: {}/api/ai/poster", aiServiceBaseUrl);
// 요청 데이터 구성
Map<String, Object> requestBody = buildRequestBody(request);
Map<String, Object> requestBody = buildRequestBody(request, storeWithMenuData);
log.debug("포스터 생성 요청 데이터: {}", requestBody);
// Python AI 서비스 호출
Map<String, Object> response = webClient
.post()
.uri("http://localhost:5001" + "/api/ai/poster")
.uri(aiServiceBaseUrl + "/api/ai/poster")
.header("Content-Type", "application/json")
.bodyValue(requestBody)
.retrieve()
.bodyToMono(Map.class)
.timeout(Duration.ofSeconds(90)) // 포스터 생성은 시간이 오래 걸릴 수 있음
.timeout(Duration.ofSeconds(90))
.block();
// 응답에서 content(이미지 URL) 추출
@ -75,9 +80,32 @@ public class PythonAiPosterGenerator implements AiPosterGenerator {
* Python 서비스의 PosterContentGetRequest 모델에 맞춤
* 카테고리,
*/
private Map<String, Object> buildRequestBody(PosterContentCreateRequest request) {
private Map<String, Object> buildRequestBody(PosterContentCreateRequest request, StoreWithMenuData storeWithMenuData) {
Map<String, Object> requestBody = new HashMap<>();
// TODO : 매장 정보 호출 후 request
// StoreData storeData = storeWithMenuData.getStoreData();
// List<MenuData> menuDataList = storeWithMenuData.getMenuDataList();
//
// List<Map<String, Object>> menuList = menuDataList.stream()
// .map(menu -> {
// Map<String, Object> menuMap = new HashMap<>();
// menuMap.put("menu_id", menu.getMenuId());
// menuMap.put("menu_name", menu.getMenuName());
// menuMap.put("category", menu.getCategory());
// menuMap.put("price", menu.getPrice());
// menuMap.put("description", menu.getDescription());
// return menuMap;
// })
// .collect(Collectors.toList());
//
// requestBody.put("store_name", storeData.getStoreName());
// requestBody.put("business_type", storeData.getBusinessType());
// requestBody.put("location", storeData.getLocation());
// requestBody.put("seat_count", storeData.getSeatCount());
// requestBody.put("menu_list", menuList);
// 기본 정보
requestBody.put("title", request.getTitle());
requestBody.put("category", request.getCategory());

310
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/infrastructure/external/StoreApiDataProvider.java vendored Normal file
View File

@ -0,0 +1,310 @@
package com.won.smarketing.content.infrastructure.external;
import com.won.smarketing.common.exception.BusinessException;
import com.won.smarketing.common.exception.ErrorCode;
import com.won.smarketing.content.domain.model.store.MenuData;
import com.won.smarketing.content.domain.model.store.StoreData;
import com.won.smarketing.content.domain.model.store.StoreWithMenuData;
import com.won.smarketing.content.domain.service.StoreDataProvider;
import jakarta.servlet.http.HttpServletRequest;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.reactive.function.client.WebClientException;
import org.springframework.web.reactive.function.client.WebClientResponseException;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* 매장 API 데이터 제공자 구현체
*/
@Slf4j
@Service // 추가된 어노테이션
@RequiredArgsConstructor
public class StoreApiDataProvider implements StoreDataProvider {
private final WebClient webClient;
@Value("${external.store-service.base-url}")
private String storeServiceBaseUrl;
@Value("${external.store-service.timeout}")
private int timeout;
private static final String AUTHORIZATION_HEADER = "Authorization";
private static final String BEARER_PREFIX = "Bearer ";
public StoreWithMenuData getStoreWithMenuData(String userId) {
log.info("매장 정보와 메뉴 정보 통합 조회 시작: userId={}", userId);
try {
// 매장 정보와 메뉴 정보를 병렬로 조회
StoreData storeData = getStoreDataByUserId(userId);
List<MenuData> menuDataList = getMenusByStoreId(storeData.getStoreId());
StoreWithMenuData result = StoreWithMenuData.builder()
.storeData(storeData)
.menuDataList(menuDataList)
.build();
log.info("매장 정보와 메뉴 정보 통합 조회 완료: storeId={}, storeName={}, menuCount={}",
storeData.getStoreId(), storeData.getStoreName(), menuDataList.size());
return result;
} catch (Exception e) {
log.error("매장 정보와 메뉴 정보 통합 조회 실패, Mock 데이터 반환: storeId={}", userId, e);
// 실패 시 Mock 데이터 반환
return StoreWithMenuData.builder()
.storeData(createMockStoreData(userId))
.menuDataList(createMockMenuData(6L))
.build();
}
}
public StoreData getStoreDataByUserId(String userId) {
try {
log.debug("매장 정보 실시간 조회: userId={}", userId);
return callStoreServiceByUserId(userId);
} catch (Exception e) {
log.error("매장 정보 조회 실패, Mock 데이터 반환: userId={}, error={}", userId, e.getMessage());
return createMockStoreData(userId);
}
}
public List<MenuData> getMenusByStoreId(Long storeId) {
log.info("매장 메뉴 조회 시작: storeId={}", storeId);
try {
return callMenuService(storeId);
} catch (Exception e) {
log.error("메뉴 조회 실패, Mock 데이터 반환: storeId={}", storeId, e);
return createMockMenuData(storeId);
}
}
private StoreData callStoreServiceByUserId(String userId) {
try {
StoreApiResponse response = webClient
.get()
.uri(storeServiceBaseUrl + "/api/store")
.header("Authorization", "Bearer " + getCurrentJwtToken()) // JWT 토큰 추가
.retrieve()
.bodyToMono(StoreApiResponse.class)
.timeout(Duration.ofMillis(timeout))
.block();
log.info("response : {}", response.getData().getStoreName());
log.info("response : {}", response.getData().getStoreId());
if (response != null && response.getData() != null) {
StoreApiResponse.StoreInfo storeInfo = response.getData();
return StoreData.builder()
.storeId(storeInfo.getStoreId())
.storeName(storeInfo.getStoreName())
.businessType(storeInfo.getBusinessType())
.location(storeInfo.getAddress())
.description(storeInfo.getDescription())
.seatCount(storeInfo.getSeatCount())
.build();
}
} catch (WebClientResponseException e) {
if (e.getStatusCode().value() == 404) {
throw new BusinessException(ErrorCode.STORE_NOT_FOUND);
}
log.error("매장 서비스 호출 실패: {}", e.getMessage());
}
return createMockStoreData(userId);
}
private String getCurrentJwtToken() {
try {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
log.warn("RequestAttributes를 찾을 수 없음 - HTTP 요청 컨텍스트 없음");
return null;
}
HttpServletRequest request = attributes.getRequest();
String bearerToken = request.getHeader(AUTHORIZATION_HEADER);
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(BEARER_PREFIX)) {
String token = bearerToken.substring(BEARER_PREFIX.length());
log.debug("JWT 토큰 추출 성공: {}...", token.substring(0, Math.min(10, token.length())));
return token;
} else {
log.warn("Authorization 헤더에서 Bearer 토큰을 찾을 수 없음: {}", bearerToken);
return null;
}
} catch (Exception e) {
log.error("JWT 토큰 추출 중 오류 발생: {}", e.getMessage());
return null;
}
}
private List<MenuData> callMenuService(Long storeId) {
try {
MenuApiResponse response = webClient
.get()
.uri(storeServiceBaseUrl + "/api/menu/store/" + storeId)
.retrieve()
.bodyToMono(MenuApiResponse.class)
.timeout(Duration.ofMillis(timeout))
.block();
if (response != null && response.getData() != null && !response.getData().isEmpty()) {
List<MenuData> menuDataList = response.getData().stream()
.map(this::toMenuData)
.collect(Collectors.toList());
log.info("매장 메뉴 조회 성공: storeId={}, menuCount={}", storeId, menuDataList.size());
return menuDataList;
}
} catch (WebClientResponseException e) {
if (e.getStatusCode().value() == 404) {
log.warn("매장의 메뉴 정보가 없습니다: storeId={}", storeId);
return Collections.emptyList();
}
log.error("메뉴 서비스 호출 실패: storeId={}, error={}", storeId, e.getMessage());
} catch (WebClientException e) {
log.error("메뉴 서비스 연결 실패: storeId={}, error={}", storeId, e.getMessage());
}
return createMockMenuData(storeId);
}
/**
* MenuResponse를 MenuData로 변환
*/
private MenuData toMenuData(MenuApiResponse.MenuInfo menuInfo) {
return MenuData.builder()
.menuId(menuInfo.getMenuId())
.menuName(menuInfo.getMenuName())
.category(menuInfo.getCategory())
.price(menuInfo.getPrice())
.description(menuInfo.getDescription())
.build();
}
private StoreData createMockStoreData(String userId) {
return StoreData.builder()
.storeName("테스트 카페 " + userId)
.businessType("카페")
.location("서울시 강남구")
.build();
}
private List<MenuData> createMockMenuData(Long storeId) {
log.info("Mock 메뉴 데이터 생성: storeId={}", storeId);
return List.of(
MenuData.builder()
.menuId(1L)
.menuName("아메리카노")
.category("음료")
.price(4000)
.description("깊고 진한 맛의 아메리카노")
.build(),
MenuData.builder()
.menuId(2L)
.menuName("카페라떼")
.category("음료")
.price(4500)
.description("부드러운 우유 거품이 올라간 카페라떼")
.build(),
MenuData.builder()
.menuId(3L)
.menuName("치즈케이크")
.category("디저트")
.price(6000)
.description("진한 치즈 맛의 수제 케이크")
.build()
);
}
@Getter
private static class StoreApiResponse {
private int status;
private String message;
private StoreInfo data;
public int getStatus() { return status; }
public void setStatus(int status) { this.status = status; }
public String getMessage() { return message; }
public void setMessage(String message) { this.message = message; }
public StoreInfo getData() { return data; }
public void setData(StoreInfo data) { this.data = data; }
@Getter
static class StoreInfo {
private Long storeId;
private String storeName;
private String businessType;
private String address;
private String description;
private Integer seatCount;
}
}
/**
* Menu API 응답 DTO (새로 추가)
*/
private static class MenuApiResponse {
private List<MenuInfo> data;
private String message;
private boolean success;
public List<MenuInfo> getData() { return data; }
public void setData(List<MenuInfo> data) { this.data = data; }
public String getMessage() { return message; }
public void setMessage(String message) { this.message = message; }
public boolean isSuccess() { return success; }
public void setSuccess(boolean success) { this.success = success; }
public static class MenuInfo {
private Long menuId;
private String menuName;
private String category;
private Integer price;
private String description;
private String image;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
public Long getMenuId() { return menuId; }
public void setMenuId(Long menuId) { this.menuId = menuId; }
public String getMenuName() { return menuName; }
public void setMenuName(String menuName) { this.menuName = menuName; }
public String getCategory() { return category; }
public void setCategory(String category) { this.category = category; }
public Integer getPrice() { return price; }
public void setPrice(Integer price) { this.price = price; }
public String getDescription() { return description; }
public void setDescription(String description) { this.description = description; }
public String getImage() { return image; }
public void setImage(String image) { this.image = image; }
public LocalDateTime getCreatedAt() { return createdAt; }
public void setCreatedAt(LocalDateTime createdAt) { this.createdAt = createdAt; }
public LocalDateTime getUpdatedAt() { return updatedAt; }
public void setUpdatedAt(LocalDateTime updatedAt) { this.updatedAt = updatedAt; }
}
}
}

3
smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/presentation/dto/PosterContentSaveRequest.java
View File

@ -29,9 +29,6 @@ public class PosterContentSaveRequest {
@Schema(description = "선택된 포스터 이미지 URL")
private List<String> images;
@Schema(description = "발행 상태", example = "PUBLISHED")
private String status;
@Schema(description = "콘텐츠 카테고리", example = "이벤트")
private String category;

4
smarketing-java/marketing-content/src/main/resources/application.yml
View File

@ -37,6 +37,10 @@ logging:
external:
ai-service:
base-url: ${AI_SERVICE_BASE_URL:http://20.249.113.247:5001}
store-service:
base-url: ${STORE_SERVICE_URL:http://smarketing.20.249.184.228.nip.io}
timeout: ${STORE_SERVICE_TIMEOUT:5000}
azure:
storage:
account-name: ${AZURE_STORAGE_ACCOUNT_NAME:stdigitalgarage02}

2
smarketing-java/member/src/main/resources/application.yml
View File

@ -55,4 +55,4 @@ info:
version: "1.0.0-MVP"
description: "AI 마케팅 서비스 MVP - member"
allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000}
allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000}

2
smarketing-java/store/src/main/java/com/won/smarketing/store/config/SecurityConfig.java
View File

@ -80,7 +80,7 @@ public class SecurityConfig
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
configuration.setAllowedHeaders(Arrays.asList("*"));
configuration.setAllowCredentials(true);
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", configuration);
return source;