Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.controller;

import jakarta.validation.Valid;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.data;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.data;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.data;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.data;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.data;

import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.dto.request;

import java.util.List;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

Expand All @@ -18,6 +22,10 @@
@Schema(description = "동물 미션 테스트 결과 제출 요청")
public class AnimalMissionSubmitRequest {

@NotBlank(message = "사용자 코드는 필수입니다.")
@Schema(description = "사용자 코드 (3자리)", example = "123")
private String userCode;

@NotNull @Size(min = 2, max = 2, message = "문양은 2개를 선택해야 합니다.")
@Schema(description = "문양 선택 (2개)", example = "[\"TIGER\", \"CRANE\"]")
private List<AnimalType> patternAnimals;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.dto.response;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.dto.response;

import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.entity;

import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.exception;

import org.springframework.http.HttpStatus;

import com.pbl.insaroad.global.exception.model.BaseErrorCode;

import lombok.AllArgsConstructor;
Expand All @@ -10,6 +14,8 @@
@AllArgsConstructor
public enum AnimalMissionErrorCode implements BaseErrorCode {
DUPLICATE_PATTERN_ANIMALS("ANIMAL_4001", "patternAnimals에 중복된 동물이 있습니다.", HttpStatus.BAD_REQUEST),
USER_NOT_FOUND("ANIMAL_4002", "사용자를 찾을 수 없습니다.", HttpStatus.NOT_FOUND),
USER_NOT_STAGE_3("ANIMAL_4003", "사용자의 스테이지가 3이 아닙니다.", HttpStatus.BAD_REQUEST),
;

private final String code;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
/*
* Copyright (c) SKU PBL Team4
*/
package com.pbl.insaroad.domain.animalmission.service;

import java.util.*;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.pbl.insaroad.domain.animalmission.data.Crane;
import com.pbl.insaroad.domain.animalmission.data.Haetae;
Expand All @@ -13,14 +17,21 @@
import com.pbl.insaroad.domain.animalmission.dto.response.AnimalResultResponse;
import com.pbl.insaroad.domain.animalmission.entity.AnimalType;
import com.pbl.insaroad.domain.animalmission.exception.AnimalMissionErrorCode;
import com.pbl.insaroad.domain.user.entity.User;
import com.pbl.insaroad.domain.user.repository.UserRepository;
import com.pbl.insaroad.global.exception.CustomException;

import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
public class AnimalMissionService {

// 동물 타입별 결과 응답을 저장하는 Map
private static final Map<AnimalType, AnimalResultResponse> ANIMAL_RESULTS = new HashMap<>();

private final UserRepository userRepository;

static {
ANIMAL_RESULTS.put(AnimalType.TIGER, Tiger.CONTENT);
ANIMAL_RESULTS.put(AnimalType.MAGPIE, Magpie.CONTENT);
Expand All @@ -30,10 +41,22 @@ public class AnimalMissionService {
}

// 동물 미션 제출 처리 메서드
@Transactional
public AnimalResultResponse submitAnimalMission(AnimalMissionSubmitRequest request) {
// 0. patternAnimals 중복 검증
validateNoDuplicatePatternAnimals(request.getPatternAnimals());

// 사용자 조회
User user =
userRepository
.findByCode(request.getUserCode())
.orElseThrow(() -> new CustomException(AnimalMissionErrorCode.USER_NOT_FOUND));

// 사용자 스테이지 검증
if (user.getStage() != 3) {
throw new CustomException(AnimalMissionErrorCode.USER_NOT_STAGE_3);
}

// 1. 동물별 점수 집계
Map<AnimalType, Integer> scoreMap = calculateScores(request);

Expand All @@ -57,6 +80,10 @@ public AnimalResultResponse submitAnimalMission(AnimalMissionSubmitRequest reque
.orElse(request.getPaintingAnimal());
}

// 스테이지가 3이면 미션 완료 처리
user.completeMission();
userRepository.save(user);

return ANIMAL_RESULTS.get(resultAnimal);
}

Expand Down