#80 [REFACTOR] 표정 인식 API 리팩토링 및 미션 수행 API 통합

src/main/java/com/wakeUpTogetUp/togetUp/api/alarm/AlarmService.java

@@ -5,8 +5,8 @@
 import com.wakeUpTogetUp.togetUp.api.alarm.dto.response.AlarmSimpleRes;
 import com.wakeUpTogetUp.togetUp.api.alarm.dto.response.AlarmTimeLineRes;
 import com.wakeUpTogetUp.togetUp.api.alarm.model.Alarm;
-import com.wakeUpTogetUp.togetUp.api.mission.MissionObjectRepository;
-import com.wakeUpTogetUp.togetUp.api.mission.MissionRepository;
+import com.wakeUpTogetUp.togetUp.api.mission.repository.MissionObjectRepository;
+import com.wakeUpTogetUp.togetUp.api.mission.repository.MissionRepository;
 import com.wakeUpTogetUp.togetUp.api.mission.model.Mission;
 import com.wakeUpTogetUp.togetUp.api.mission.model.MissionObject;
 import com.wakeUpTogetUp.togetUp.api.users.UserRepository;
@@ -47,7 +47,7 @@ public Alarm createAlarmDeprecated(Integer userId, PostAlarmReq postAlarmReq) {
 
             if (postAlarmReq.getMissionObjectId() != null) {
                 missionObject = missionObjectRepository.findById(postAlarmReq.getMissionObjectId())
-                        .orElseThrow(() -> new BaseException(Status.OBJECT_NOT_FOUND));
+                        .orElseThrow(() -> new BaseException(Status.MISSION_OBJECT_NOT_FOUND));
 
                 if (missionObject.getMission().getId() != mission.getId()) {
                     throw new BaseException(Status.MISSION_ID_NOT_MATCH);

src/main/java/com/wakeUpTogetUp/togetUp/api/mission/MissionController.java

@@ -1,19 +1,16 @@
 package com.wakeUpTogetUp.togetUp.api.mission;
 
-import com.google.cloud.vision.v1.FaceAnnotation;
 import com.wakeUpTogetUp.togetUp.api.auth.AuthUser;
-import com.wakeUpTogetUp.togetUp.api.mission.model.CustomAnalysisEntity;
-import com.wakeUpTogetUp.togetUp.infra.aws.s3.FileService;
 import com.wakeUpTogetUp.togetUp.api.mission.dto.request.MissionCompleteReq;
 import com.wakeUpTogetUp.togetUp.api.mission.dto.response.GetMissionLogRes;
 import com.wakeUpTogetUp.togetUp.api.mission.dto.response.GetMissionWithObjectListRes;
 import com.wakeUpTogetUp.togetUp.api.mission.dto.response.MissionCompleteRes;
 import com.wakeUpTogetUp.togetUp.api.mission.dto.response.MissionPerfomRes;
-import com.wakeUpTogetUp.togetUp.api.mission.service.MissionImageService;
+import com.wakeUpTogetUp.togetUp.api.mission.service.MissionProvider;
+import com.wakeUpTogetUp.togetUp.api.mission.service.MissionService;
 import com.wakeUpTogetUp.togetUp.common.Status;
 import com.wakeUpTogetUp.togetUp.common.annotation.validator.ImageFile;
 import com.wakeUpTogetUp.togetUp.common.dto.BaseResponse;
-import com.wakeUpTogetUp.togetUp.infra.aws.s3.model.CustomFile;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -32,6 +29,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
@@ -44,10 +42,9 @@
 @RequestMapping("/app/mission")
 public class MissionController {
 
+    private final MissionFacade missionFacade;
     private final MissionProvider missionProvider;
     private final MissionService missionService;
-    private final MissionImageService missionImageService;
-    private final FileService fileService;
 
     @Operation(summary = "미션 목록 가져오기")
     @GetMapping("/{missionId}")
@@ -63,10 +60,11 @@ BaseResponse<GetMissionWithObjectListRes> getObjectDetectionMissions(
         return new BaseResponse<>(Status.SUCCESS, missionProvider.getMission(missionId));
     }
 
-    // TODO: 객체 탐지, 표정 인식 통합
-    // TODO: 객체 이름이 아닌 알람 ID를 요청값으로 받게 리팩토링하기 + 그냥 리팩토링
-    @Operation(summary = "객체 탐지 미션")
-    @PostMapping(value = "/object-detection/{object}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(summary = "미션 수행 결과 불러오기",
+            description = "미션 이름을 기반으로 미션을 수행합니다.\n"
+                    + "- 사용 가능 미션 이름: `direct-registration`/`object-detection`/`expression-recognition`\n"
+                    + "- 직접 촬영 미션(direct-registration)의 경우 object 필드가 필수적이지 않습니다.")
+    @PostMapping(value = "/{missionName}/result", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(HttpStatus.CREATED)
     @ApiResponses(value = {
             @ApiResponse(
@@ -79,37 +77,11 @@ BaseResponse<GetMissionWithObjectListRes> getObjectDetectionMissions(
     public BaseResponse<MissionPerfomRes> recognizeObject(
             @Parameter(hidden = true) @AuthUser Integer userId,
             @Parameter(required = true, description = "미션 수행 사진") @RequestPart @ImageFile MultipartFile missionImage,
-            @Parameter(required = true, description = "탐지할 객체") @PathVariable String object
-    ) throws Exception {
-        List<CustomAnalysisEntity> detectedObjects = missionService.getDetectionResult(object, missionImage);
-        CustomFile file = missionImageService.processODResultImage(missionImage, detectedObjects);
-        String imageUrl = fileService.uploadFile(file, "mission");
-
-        return new BaseResponse<>(Status.MISSION_SUCCESS, new MissionPerfomRes(imageUrl));
-    }
-
-    @Operation(summary = "표정 인식 미션")
-    @PostMapping(value = "/face-recognition/{object}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseStatus(HttpStatus.CREATED)
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = "201",
-                    description = "미션을 성공하였습니다.",
-                    content = @Content(schema = @Schema(implementation = MissionPerfomRes.class))),
-            @ApiResponse(responseCode = "200", description = "탐지된 객체가 없습니다."),
-            @ApiResponse(responseCode = "200", description = "미션을 성공하지 못했습니다."),
-            @ApiResponse(responseCode = "500", description = "예상치 못한 서버 에러입니다. 제보 부탁드립니다.")
-    })
-    public BaseResponse<MissionPerfomRes> recognizeFaceExpression(
-            @Parameter(hidden = true) @AuthUser Integer userId,
-            @Parameter(required = true, description = "미션 수행 사진") @RequestPart @ImageFile MultipartFile missionImage,
-            @Parameter(required = true, description = "탐지할 표정(`joy`/`sorrow`/`anger`/`surprise`)") @PathVariable String object
-    ) throws Exception {
-        List<FaceAnnotation> faceAnnotations = missionService.getFaceRecognitionResult(object, missionImage);
-        CustomFile file = missionImageService.processFRResultImage(missionImage, faceAnnotations, object);
-        String imageUrl = fileService.uploadFile(file, "mission");
-
-        return new BaseResponse<>(Status.MISSION_SUCCESS, new MissionPerfomRes(imageUrl));
+            @Parameter(description = "미션 이름") @PathVariable String missionName,
+            @Parameter(description = "탐지할 미션 객체") @RequestParam(required = false) String object
+    ) {
+        MissionPerfomRes response = missionFacade.performMission(missionImage, missionName, object);
+        return new BaseResponse<>(Status.MISSION_SUCCESS, response);
     }
 
     @Operation(summary = "미션 완료 - 수행 기록 생성 및 경험치, 레벨 정산 및 경우에 따라 아바타 해금")

src/main/java/com/wakeUpTogetUp/togetUp/api/mission/MissionFacade.java

@@ -0,0 +1,30 @@
+package com.wakeUpTogetUp.togetUp.api.mission;
+
+import com.wakeUpTogetUp.togetUp.api.mission.dto.response.MissionPerfomRes;
+import com.wakeUpTogetUp.togetUp.api.mission.strategy.MissionImageStrategyFactory;
+import com.wakeUpTogetUp.togetUp.api.mission.model.MissionType;
+import com.wakeUpTogetUp.togetUp.infra.aws.s3.FileService;
+import com.wakeUpTogetUp.togetUp.infra.aws.s3.model.CustomFile;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+@Component
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public class MissionFacade {
+
+    private final MissionImageStrategyFactory missionImageStrategyFactory;
+    private final FileService fileService;
+
+    public MissionPerfomRes performMission(MultipartFile missionImage, String missionName, String object) {
+        MissionType type = MissionType.getByName(missionName);
+
+        CustomFile file = missionImageStrategyFactory
+                .getStrategy(type)
+                .execute(missionImage, type, object);
+        String imageUrl = fileService.uploadFile(file, "mission");
+
+        return new MissionPerfomRes(imageUrl);
+    }
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/mission/domain/CustomAnalysisEntity.java

@@ -0,0 +1,19 @@
+package com.wakeUpTogetUp.togetUp.api.mission.domain;
+
+import com.wakeUpTogetUp.togetUp.api.mission.model.BoundingBox;
+import lombok.Getter;
+
+@Getter
+public abstract class CustomAnalysisEntity {
+
+    private final double confidence;
+
+    private final BoundingBox box;
+
+    protected CustomAnalysisEntity(double confidence, BoundingBox box) {
+        this.confidence = confidence;
+        this.box = box;
+    }
+
+    protected abstract boolean isMatchEntity(Object target);
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/mission/domain/CustomDetectedFaceAnnotation.java

@@ -0,0 +1,47 @@
+package com.wakeUpTogetUp.togetUp.api.mission.domain;
+
+import com.wakeUpTogetUp.togetUp.api.mission.model.BoundingBox;
+import com.wakeUpTogetUp.togetUp.api.mission.model.Expression;
+import com.wakeUpTogetUp.togetUp.common.Status;
+import com.wakeUpTogetUp.togetUp.exception.BaseException;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class CustomDetectedFaceAnnotation extends CustomAnalysisEntity {
+
+    private final int joyLikelihood;
+    private final int sorrowLikelihood;
+    private final int angerLikelihood;
+    private final int surpriseLikelihood;
+
+    @Builder
+    private CustomDetectedFaceAnnotation(double confidence, BoundingBox box, int joyLikelihood,
+            int sorrowLikelihood, int angerLikelihood, int surpriseLikelihood) {
+        super(confidence, box);
+        this.joyLikelihood = joyLikelihood;
+        this.sorrowLikelihood = sorrowLikelihood;
+        this.angerLikelihood = angerLikelihood;
+        this.surpriseLikelihood = surpriseLikelihood;
+    }
+
+    @Override
+    protected boolean isMatchEntity(Object target) {
+        return getLikelihood((Expression) target) >= 3;
+    }
+
+    private int getLikelihood(Expression expression) {
+        switch (expression) {
+            case JOY:
+                return joyLikelihood;
+            case SORROW:
+                return sorrowLikelihood;
+            case ANGER:
+                return angerLikelihood;
+            case SURPRISE:
+                return surpriseLikelihood;
+            default:
+                throw new BaseException(Status.INVALID_OBJECT_NAME);
+        }
+    }
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/mission/domain/CustomDetectedObject.java

@@ -0,0 +1,29 @@
+package com.wakeUpTogetUp.togetUp.api.mission.domain;
+
+import com.wakeUpTogetUp.togetUp.api.mission.model.BoundingBox;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class CustomDetectedObject extends CustomAnalysisEntity {
+
+    private final String name;
+    private final String parent;
+
+    @Builder
+    private CustomDetectedObject(String name, String parent, double confidence, BoundingBox box) {
+        super(confidence, box);
+        this.name = name;
+        this.parent = parent;
+    }
+
+    @Override
+    public boolean isMatchEntity(Object target) {
+        return concatObjectAndParent()
+                .contains(target.toString().toLowerCase());
+    }
+
+    public String concatObjectAndParent() {
+        return (name + parent).toLowerCase();
+    }
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/mission/domain/CustomDetectedTag.java

@@ -0,0 +1,22 @@
+package com.wakeUpTogetUp.togetUp.api.mission.domain;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class CustomDetectedTag extends CustomAnalysisEntity {
+
+    private final String name;
+
+    @Builder
+    public CustomDetectedTag(String name, double confidence) {
+        super(confidence, null);
+        this.name = name;
+    }
+
+    @Override
+    protected boolean isMatchEntity(Object target) {
+        return name.toLowerCase()
+                .contains(target.toString().toLowerCase());
+    }
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/mission/domain/FaceAnnotationRecognitionResult.java

@@ -0,0 +1,56 @@
+package com.wakeUpTogetUp.togetUp.api.mission.domain;
+
+import com.wakeUpTogetUp.togetUp.api.mission.model.Expression;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.Builder;
+
+public class FaceAnnotationRecognitionResult extends VisionAnalysisResult {
+
+    private final Expression expression;
+    private final List<CustomDetectedFaceAnnotation> faceAnnotations;
+
+    @Builder
+    public FaceAnnotationRecognitionResult(String target, List<CustomDetectedFaceAnnotation> faceAnnotations) {
+        super(target);
+        this.expression = Expression.fromName(targetName);
+        this.faceAnnotations = faceAnnotations;
+    }
+
+    @Override
+    public boolean isFail() {
+        return faceAnnotations.stream()
+                .noneMatch(faceAnnotation -> faceAnnotation.isMatchEntity(this.expression));
+    }
+
+    @Override
+    public List<CustomAnalysisEntity> getEntities() {
+        return faceAnnotations.stream()
+                .map(CustomAnalysisEntity.class::cast)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<CustomAnalysisEntity> getMatches(int size) {
+        return faceAnnotations.stream()
+                .filter(faceAnnotation -> faceAnnotation.isMatchEntity(this.expression))
+                .sorted(Comparator.comparing(CustomDetectedFaceAnnotation::getConfidence).reversed())
+                .limit(size)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public void print() {
+        System.out.println("\n[FACE ANNOTATION]");
+        System.out.println("emotions.size() = " + faceAnnotations.size());
+
+        faceAnnotations.forEach(faceAnnotation -> {
+            System.out.println("JOY = " + faceAnnotation.getJoyLikelihood());
+            System.out.println("SORROW = " + faceAnnotation.getSorrowLikelihood());
+            System.out.println("ANGER = " + faceAnnotation.getAngerLikelihood());
+            System.out.println("SURPRISE = " + faceAnnotation.getSurpriseLikelihood());
+            System.out.println();
+        });
+    }
+}