Merge branch 'main' of https://github.com/won-ktds/smarketing-backend into poster-content

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

@@ -84,7 +84,7 @@ public class PosterContentService implements PosterContentUseCase {
         // 콘텐츠 엔티티 생성
         Content content = Content.builder()
                 .contentType(ContentType.POSTER)
-                .platform(Platform.GENERAL)
+                .platform(Platform.POSTER)
                 .title(request.getTitle())
                 .content(request.getContent())
                 .images(request.getImages())

smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/application/service/SnsContentService.java

@@ -14,6 +14,7 @@ import com.won.smarketing.content.presentation.dto.SnsContentCreateRequest;
 import com.won.smarketing.content.presentation.dto.SnsContentCreateResponse;
 import com.won.smarketing.content.presentation.dto.SnsContentSaveRequest;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -34,6 +35,9 @@ public class SnsContentService implements SnsContentUseCase {
     private final AiContentGenerator aiContentGenerator;
     private final BlobStorageService blobStorageService;
 
+    @Value("${azure.storage.container.poster-images:content-images}")
+    private String contentImageContainer;
+
     /**
      * SNS 콘텐츠 생성
      *
@@ -44,8 +48,10 @@ public class SnsContentService implements SnsContentUseCase {
     @Transactional
     public SnsContentCreateResponse generateSnsContent(SnsContentCreateRequest request, List<MultipartFile> files) {
         //파일들 주소 가져옴
-        List<String> urls = blobStorageService.uploadImage(files, "containerName");
-        request.setImages(urls);
+        if(files != null) {
+            List<String> urls = blobStorageService.uploadImage(files, contentImageContainer);
+            request.setImages(urls);
+        }
 
         // AI를 사용하여 SNS 콘텐츠 생성
         String content = aiContentGenerator.generateSnsContent(request);
@@ -67,8 +73,6 @@ public class SnsContentService implements SnsContentUseCase {
         CreationConditions conditions = CreationConditions.builder()
                 .category(request.getCategory())
                 .requirement(request.getRequirement())
-                //.toneAndManner(request.getToneAndManner())
-                //.emotionIntensity(request.getEmotionIntensity())
                 .eventName(request.getEventName())
                 .startDate(request.getStartDate())
                 .endDate(request.getEndDate())
@@ -76,7 +80,6 @@ public class SnsContentService implements SnsContentUseCase {
 
         // 콘텐츠 엔티티 생성 및 저장
         Content content = Content.builder()
-//                .contentType(ContentType.SNS_POST)
                 .platform(Platform.fromString(request.getPlatform()))
                 .title(request.getTitle())
                 .content(request.getContent())

smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/domain/model/Platform.java

@@ -17,7 +17,7 @@ public enum Platform {
     FACEBOOK("페이스북"),
     KAKAO_STORY("카카오스토리"),
     YOUTUBE("유튜브"),
-    GENERAL("일반");
+    POSTER("포스터");
 
     private final String displayName;
 

smarketing-java/marketing-content/src/main/java/com/won/smarketing/content/presentation/controller/ContentController.java

@@ -46,7 +46,7 @@ public class ContentController {
     @Operation(summary = "SNS 게시물 생성", description = "AI를 활용하여 SNS 게시물을 생성합니다.")
     @PostMapping(path = "/sns/generate", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<ApiResponse<SnsContentCreateResponse>> generateSnsContent(@Valid @RequestPart("request") String requestJson,
-                                                                                    @Valid @RequestPart("files") List<MultipartFile> images) throws JsonProcessingException {
+                                                                                    @Valid @RequestPart(name = "files", required = false) List<MultipartFile> images) throws JsonProcessingException {
         SnsContentCreateRequest request = objectMapper.readValue(requestJson, SnsContentCreateRequest.class);
         SnsContentCreateResponse response = snsContentUseCase.generateSnsContent(request, images);
         return ResponseEntity.ok(ApiResponse.success(response, "SNS 콘텐츠가 성공적으로 생성되었습니다."));