Merge pull request #108 from tukcomCD2024/bug#107/solve-third-present…

…ation

Bug#107/solve third presentation

AI/roop/d_id/did_reqeust.py

@@ -49,7 +49,8 @@ def upload_scene(self, s3_image_url, text, voice_id):
             },
             "config": {
                 "fluent": "false",
-                "pad_audio": "0.0"
+                "pad_audio": "0.0",
+                "stitch": True
             },
             "source_url": s3_image_url  # 소스 이미지
         }

AI/roop/shotstack/shot_stack.py

@@ -31,7 +31,8 @@ def send_timeline_data(self, timeline_data):
     # timeline에 영상을 붙임
     def add_track(self, clips, asset_type, asset_src, start, length):
         # 새로운 track을 생성하고 clips를 추가
-        new_track = {"clips": [{"asset": {"type": asset_type, "src": asset_src}, "start": start, "length": length}]}
+        new_track = {"clips": [
+            {"asset": {"type": asset_type, "src": asset_src}, "start": start, "length": length, "fit": "contain"}]}
         clips.append(new_track)
 
     # 결과 불러오기

AI/roop/tasks.py

@@ -1,4 +1,5 @@
 import hashlib
+import math
 import subprocess
 import time
 from urllib.parse import urlparse
@@ -67,14 +68,15 @@ def generate_meme(data):
         },
         "output": {
             "format": "mp4",
-            "resolution": "sd"
+            "resolution": "hd",
+            "aspectRatio": "9:16"
         },
         "callback": CALLBACK_URL + member_id
     }
     start_time = 0
     while result_url_queue:
         item = result_url_queue.pop(0)
-        duration = int(item[1])
+        duration = int(math.ceil(item[1]))
         print("duration : " + str(duration))
         shotstack.add_track(timeline_data["timeline"]["tracks"], "video", item[0], start_time, duration)
         start_time = start_time + duration

backend/memetory/src/main/java/com/example/memetory/domain/meme/controller/MemeApi.java

@@ -1,10 +1,10 @@
 package com.example.memetory.domain.meme.controller;
 
 import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import com.example.memetory.domain.meme.dto.GenerateMemeListRequest;
+import com.example.memetory.domain.meme.dto.MemeResponse;
 import com.example.memetory.domain.meme.dto.ShotStackCallBackRequest;
 import com.example.memetory.global.response.ResultResponse;
 
@@ -29,7 +29,7 @@ public interface MemeApi {
 			description = "콜백 성공!"
 		)
 	})
-	ResponseEntity<HttpStatus> callBackMeme(
+	ResponseEntity<MemeResponse> callBackMeme(
 		@Parameter(in = ParameterIn.PATH, description = "멤버 아이디", required = true) Long memberId,
 		ShotStackCallBackRequest shotStackCallBackRequest
 	);

backend/memetory/src/main/java/com/example/memetory/domain/meme/controller/MemeController.java

@@ -31,13 +31,13 @@ public class MemeController implements MemeApi {
 
 	@PostMapping("/create/{memberId}")
 	@Override
-	public ResponseEntity<HttpStatus> callBackMeme(@PathVariable Long memberId,
+	public ResponseEntity<MemeResponse> callBackMeme(@PathVariable Long memberId,
 		@RequestBody ShotStackCallBackRequest shotStackCallBackRequest) {
 		MemeServiceDto memeServiceDto = shotStackCallBackRequest.toServiceDtoFromMemberId(memberId);
 
-		memeService.registerMeme(memeServiceDto);
+		MemeResponse response = memeService.registerMeme(memeServiceDto);
 
-		return ResponseEntity.status(HttpStatus.OK).build();
+		return ResponseEntity.status(HttpStatus.OK).body(response);
 	}
 
 	@PostMapping

backend/memetory/src/main/java/com/example/memetory/domain/memes/controller/comment/MemesCommentApi.java

@@ -1,6 +1,8 @@
 package com.example.memetory.domain.memes.controller.comment;
 
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 
 import com.example.memetory.domain.comment.dto.request.CommentRequest;
 import com.example.memetory.global.response.ResultResponse;
@@ -48,4 +50,14 @@ ResponseEntity<ResultResponse> deleteComment(
 		@Parameter(hidden = true) String email,
 		@Parameter(in = ParameterIn.PATH, description = "댓글 아이디", required = true) Long commentId
 	);
+
+	@Operation(
+		summary = "전체 밈스 댓글 조회",
+		description = "전체 밈스 댓글을 조회한다.",
+		security = {@SecurityRequirement(name = "access_token")}
+	)
+	@GetMapping()
+	ResponseEntity<ResultResponse> findCommentInfoSlice(
+		@Parameter(in = ParameterIn.PATH, description = "댓글 아이디", required = true) Long memesId,
+		Pageable pageable);
 }

backend/memetory/src/main/java/com/example/memetory/domain/memes/controller/comment/MemesCommentController.java

@@ -50,6 +50,7 @@ public ResponseEntity<ResultResponse> deleteComment(@LoginMemberEmail String ema
 	}
 
 	@GetMapping()
+	@Override
 	public ResponseEntity<ResultResponse> findCommentInfoSlice(@PathVariable Long memesId, Pageable pageable) {
 		CommentInfoSlice response = commentService.findCommentFromMemesId(memesId, pageable);