Merge pull request #46 from DropThe8bit/feat/easterEggVoice

[refactor] easterEggVoice S3 업로드 연동 및 좌표 검증 로직 수정, JSON 매핑 로직 개선

Author: s2eojeong

src/main/java/everTale/everTale_be/domain/easterEgg/dto/easterEggVoice/request/EasterEggVoiceRequestDto.java

@@ -1,5 +1,6 @@
 package everTale.everTale_be.domain.easterEgg.dto.easterEggVoice.request;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -8,9 +9,11 @@
 @NoArgsConstructor
 public class EasterEggVoiceRequestDto {
 
+    @JsonProperty("xCoordinate")
     @Schema(description = "사용자가 클릭한 이미지의 X 좌표", example = "135.0")
     private float xCoordinate;
 
+    @JsonProperty("yCoordinate")
     @Schema(description = "사용자가 클릭한 이미지의 Y 좌표", example = "210.0")
     private float yCoordinate;
 }

src/main/java/everTale/everTale_be/domain/easterEgg/service/EasterEggVoiceService.java

@@ -34,8 +34,7 @@ public void createEasterEggVoice(Long sceneId, MultipartFile voiceFile, EasterEg
         validateParent();
         Scene scene = findScene(sceneId);
 
-//        String voiceUrl = s3Manager.uploadFile(voiceFile, "eastereggs/audios"); 추후에 이걸로 수정할 예정
-        String voiceUrl = voiceFile.getOriginalFilename();
+        String voiceUrl = s3Manager.uploadFile(voiceFile, "eastereggs/audios");
 
         EasterEggVoice voice = EasterEggVoice.builder()
                 .scene(scene)
@@ -56,7 +55,7 @@ public void deleteEasterEggVoice(Long sceneId){
                 .orElseThrow(()-> new NotFoundHandler(ErrorStatus.EASTER_EGG_VOICE_NOT_FOUND));
         Scene scene = voice.getScene();
         scene.setEasterEggVoice(null);
-//        s3Manager.deleteFile(voice.getVoiceFile()); 추후에 주석 해제 예정
+        s3Manager.deleteFile(voice.getVoiceFile());
         easterEggVoiceRepository.delete(voice);
         log.info("삭제 완료: audioId = {}", voice.getId());
     }
@@ -75,10 +74,10 @@ public String getVoiceUrl(Long sceneId, EasterEggVoiceRequestDto requestDto) {
     private boolean isInsideArea(EasterEggVoice voice, float clickX, float clickY) {
         float xLeft = voice.getXCoordinate() - voice.getWidth();
         float xRight = voice.getXCoordinate() + voice.getWidth();
-        float yTop = voice.getYCoordinate() - voice.getHeight();
-        float yBottom = voice.getYCoordinate() + voice.getHeight();
+        float yTop = voice.getYCoordinate() + voice.getHeight();
+        float yBottom = voice.getYCoordinate() - voice.getHeight();
 
-        return clickX >= xLeft && clickX <= xRight && clickY >= yTop && clickY <= yBottom;
+        return clickX >= xLeft && clickX <= xRight && clickY <= yTop && clickY >= yBottom;
     }
 
     @Transactional(readOnly = true)