fix: 미션 인증 유효성 검사 추가

src/main/java/com/nexters/goalpanzi/application/auth/AuthService.java

@@ -4,6 +4,7 @@
 import com.nexters.goalpanzi.application.auth.dto.request.GoogleLoginCommand;
 import com.nexters.goalpanzi.application.auth.dto.response.LoginResponse;
 import com.nexters.goalpanzi.application.auth.dto.response.TokenResponse;
+import com.nexters.goalpanzi.application.auth.google.GoogleIdentityToken;
 import com.nexters.goalpanzi.common.jwt.Jwt;
 import com.nexters.goalpanzi.common.jwt.JwtProvider;
 import com.nexters.goalpanzi.domain.auth.repository.RefreshTokenRepository;
@@ -32,7 +33,8 @@ public LoginResponse appleOAuthLogin(final AppleLoginCommand command) {
     }
 
     public LoginResponse googleOAuthLogin(final GoogleLoginCommand command) {
-        SocialUserInfo socialUserInfo = new SocialUserInfo(command.identityToken(), command.email());
+        SocialUserInfo socialUserInfo = new SocialUserInfo(
+                GoogleIdentityToken.generate(command.email()), command.email());
 
         return socialLogin(socialUserInfo, SocialType.GOOGLE);
     }

src/main/java/com/nexters/goalpanzi/application/auth/dto/request/GoogleLoginCommand.java

@@ -3,7 +3,6 @@
 import jakarta.validation.constraints.NotEmpty;
 
 public record GoogleLoginCommand(
-        @NotEmpty String identityToken,
         @NotEmpty String email
 ) {
 }

src/main/java/com/nexters/goalpanzi/application/auth/google/GoogleIdentityToken.java

@@ -0,0 +1,28 @@
+package com.nexters.goalpanzi.application.auth.google;
+
+import com.nexters.goalpanzi.domain.member.SocialType;
+import com.nexters.goalpanzi.exception.BaseException;
+import com.nexters.goalpanzi.exception.ErrorCode;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+public class GoogleIdentityToken {
+
+    private static String SHA_256 = "SHA-256";
+
+    public static String generate(final String email) {
+        return generateHash(email + "__" + SocialType.GOOGLE);
+    }
+
+    private static String generateHash(final String input) {
+        try {
+            return Base64.getUrlEncoder().withoutPadding().encodeToString(
+                    MessageDigest.getInstance(SHA_256).digest(input.getBytes(StandardCharsets.UTF_8)));
+        } catch (NoSuchAlgorithmException e) {
+            throw new BaseException(ErrorCode.FAILED_TO_GENERATE_HASH);
+        }
+    }
+}

src/main/java/com/nexters/goalpanzi/application/mission/MissionVerificationService.java

@@ -1,28 +1,24 @@
 package com.nexters.goalpanzi.application.mission;
 
 import com.nexters.goalpanzi.application.mission.dto.request.CreateMissionVerificationCommand;
-import com.nexters.goalpanzi.application.mission.dto.request.MissionVerificationCommand;
+import com.nexters.goalpanzi.application.mission.dto.request.MissionVerificationQuery;
+import com.nexters.goalpanzi.application.mission.dto.request.MyMissionVerificationQuery;
 import com.nexters.goalpanzi.application.mission.dto.response.MissionVerificationResponse;
-import com.nexters.goalpanzi.application.mission.dto.response.MissionsResponse;
-import com.nexters.goalpanzi.application.mission.dto.request.MyMissionVerificationCommand;
+import com.nexters.goalpanzi.application.ncp.ObjectStorageClient;
 import com.nexters.goalpanzi.domain.member.Member;
 import com.nexters.goalpanzi.domain.member.repository.MemberRepository;
 import com.nexters.goalpanzi.domain.mission.Mission;
 import com.nexters.goalpanzi.domain.mission.MissionMember;
 import com.nexters.goalpanzi.domain.mission.MissionVerification;
 import com.nexters.goalpanzi.domain.mission.repository.MissionMemberRepository;
-import com.nexters.goalpanzi.domain.mission.repository.MissionRepository;
 import com.nexters.goalpanzi.domain.mission.repository.MissionVerificationRepository;
 import com.nexters.goalpanzi.exception.BadRequestException;
 import com.nexters.goalpanzi.exception.ErrorCode;
-import com.nexters.goalpanzi.exception.NotFoundException;
-import com.nexters.goalpanzi.infrastructure.ncp.ObjectStorageManager;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -33,82 +29,70 @@
 @Service
 public class MissionVerificationService {
 
-    private final MissionRepository missionRepository;
     private final MissionVerificationRepository missionVerificationRepository;
     private final MissionMemberRepository missionMemberRepository;
     private final MemberRepository memberRepository;
 
-    private final ObjectStorageManager objectStorageManager;
+    private final ObjectStorageClient objectStorageClient;
 
     @Transactional(readOnly = true)
-    public List<MissionVerificationResponse> getVerifications(final MissionVerificationCommand command) {
-        LocalDate date = command.date() != null ? command.date() : LocalDate.now();
-        Member member =
-                memberRepository.findById(command.memberId())
-                        .orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_MEMBER));
-        List<MissionMember> missionMembers = missionMemberRepository.findAllByMissionId(command.missionId());
-        List<MissionVerification> verifications = missionVerificationRepository.findAllByMissionIdAndDate(command.missionId(), date);
+    public List<MissionVerificationResponse> getVerifications(final MissionVerificationQuery query) {
+        LocalDate date = query.date() != null ? query.date() : LocalDate.now();
+        Member member = memberRepository.getMember(query.memberId());
+        List<MissionVerification> verifications = missionVerificationRepository.findAllByMissionIdAndDate(query.missionId(), date);
 
         Map<Long, MissionVerification> verificationMap = verifications.stream()
                 .collect(Collectors.toMap(v -> v.getMember().getId(), v -> v));
 
-        return missionMembers.stream()
-                .map(m -> {
-                    MissionVerification v = verificationMap.get(m.getMember().getId());
-                    return v != null
-                            ? MissionVerificationResponse.verified(m.getMember(), v)
-                            : MissionVerificationResponse.notVerified(m.getMember());
-                })
+        return missionMemberRepository.findAllByMissionId(query.missionId()).stream()
+                .map(m -> convertToVerificationResponse(m, verificationMap.get(m.getMember().getId())))
                 .sorted(Comparator.comparing((MissionVerificationResponse r) -> r.nickname().equals(member.getNickname())).reversed()
                         .thenComparing(MissionVerificationResponse::verifiedAt, Comparator.nullsLast(Comparator.reverseOrder())))
                 .collect(Collectors.toList());
     }
 
-    public MissionVerificationResponse getMyVerification(final MyMissionVerificationCommand command) {
-        Member member =
-                memberRepository.findById(command.memberId())
-                        .orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_MEMBER));
-        MissionVerification verification =
-                missionVerificationRepository.findByMemberIdAndMissionIdAndBoardNumber(command.memberId(), command.missionId(), command.number())
-                        .orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_VERIFICATION));
+    public MissionVerificationResponse getMyVerification(final MyMissionVerificationQuery query) {
+        MissionVerification verification = missionVerificationRepository.getMyVerification(query.memberId(), query.missionId(), query.number());
 
-        return MissionVerificationResponse.verified(member, verification);
+        return MissionVerificationResponse.verified(verification.getMember(), verification);
     }
 
     @Transactional
     public void createVerification(final CreateMissionVerificationCommand command) {
-        Member member =
-                memberRepository.findById(command.memberId())
-                        .orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_MEMBER));
-        Mission mission =
-                missionRepository.findById(command.missionId())
-                        .orElseThrow(() -> new NotFoundException("TODO"));
-        MissionMember missionMember =
-                missionMemberRepository.findByMemberIdAndMissionId(command.memberId(), command.missionId())
-                        .orElseThrow(() -> new NotFoundException("TODO"));
-
-        checkVerificationValidation(command.memberId(), command.missionId(), mission, missionMember);
-
-        String imageUrl = objectStorageManager.uploadFile(command.imageFile());
-        missionVerificationRepository.save(new MissionVerification(member, mission, imageUrl));
+        MissionMember missionMember = missionMemberRepository.getMissionMember(command.memberId(), command.missionId());
+        Mission mission = missionMember.getMission();
+
+        checkVerificationValidation(command.memberId(), mission, missionMember);
+
+        String imageUrl = objectStorageClient.uploadFile(command.imageFile());
         missionMember.verify();
+        missionVerificationRepository.save(new MissionVerification(missionMember.getMember(), mission, imageUrl, missionMember.getVerificationCount()));
     }
 
-    private void checkVerificationValidation(final Long memberId, final Long missionId, final Mission mission, final MissionMember missionMember) {
+    private MissionVerificationResponse convertToVerificationResponse(final MissionMember missionMember, final MissionVerification verification) {
+        return verification != null
+                ? MissionVerificationResponse.verified(missionMember.getMember(), verification)
+                : MissionVerificationResponse.notVerified(missionMember.getMember());
+    }
+
+    private void checkVerificationValidation(final Long memberId, final Mission mission, final MissionMember missionMember) {
         if (isCompletedMission(mission, missionMember)) {
             throw new BadRequestException(ErrorCode.ALREADY_COMPLETED_MISSION);
         }
-        if (isDuplicatedVerification(memberId, missionId)) {
+        LocalDate today = LocalDate.now();
+        if (isDuplicatedVerification(memberId, mission.getId(), today)) {
             throw new BadRequestException(ErrorCode.DUPLICATE_VERIFICATION);
         }
+        if (!mission.isMissionDay(today)) {
+            throw new BadRequestException(ErrorCode.NOT_VERIFICATION_DAY);
+        }
     }
 
     private boolean isCompletedMission(final Mission mission, final MissionMember missionMember) {
         return missionMember.getVerificationCount() >= mission.getBoardCount();
     }
 
-    private boolean isDuplicatedVerification(final Long memberId, final Long missionId) {
-        LocalDate today = LocalDateTime.now().toLocalDate();
+    private boolean isDuplicatedVerification(final Long memberId, final Long missionId, final LocalDate today) {
         return missionVerificationRepository.findByMemberIdAndMissionIdAndDate(memberId, missionId, today).isPresent();
     }
 }

src/main/java/com/nexters/goalpanzi/application/mission/dto/request/MissionVerificationCommand.java → src/main/java/com/nexters/goalpanzi/application/mission/dto/request/MissionVerificationQuery.java

@@ -2,7 +2,7 @@
 
 import java.time.LocalDate;
 
-public record MissionVerificationCommand(
+public record MissionVerificationQuery(
         Long memberId,
         Long missionId,
         LocalDate date

src/main/java/com/nexters/goalpanzi/application/mission/dto/request/MyMissionVerificationCommand.java → src/main/java/com/nexters/goalpanzi/application/mission/dto/request/MyMissionVerificationQuery.java

@@ -1,6 +1,6 @@
 package com.nexters.goalpanzi.application.mission.dto.request;
 
-public record MyMissionVerificationCommand(
+public record MyMissionVerificationQuery(
         Long memberId,
         Long missionId,
         Integer number

src/main/java/com/nexters/goalpanzi/application/mission/dto/response/MissionResponse.java

@@ -8,4 +8,4 @@ public record MissionResponse(
         @Schema(description = "목표 행동", requiredMode = Schema.RequiredMode.REQUIRED)
         String description
 ) {
-}
+}

src/main/java/com/nexters/goalpanzi/application/mission/dto/response/MissionVerificationResponse.java

@@ -1,5 +1,6 @@
 package com.nexters.goalpanzi.application.mission.dto.response;
 
+import com.nexters.goalpanzi.domain.member.CharacterType;
 import com.nexters.goalpanzi.domain.member.Member;
 import com.nexters.goalpanzi.domain.mission.MissionVerification;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,21 +11,19 @@
 public record MissionVerificationResponse(
         @Schema(description = "닉네임", requiredMode = Schema.RequiredMode.REQUIRED)
         @NotEmpty String nickname,
-
-        // TODO 캐릭터 이미지
-
+        @Schema(description = "장기말 타입", requiredMode = Schema.RequiredMode.REQUIRED)
+        CharacterType characterType,
         @Schema(description = "인증 이미지 URL", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
         String imageUrl,
-
         @Schema(description = "인증 시간", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
         LocalDateTime verifiedAt
 ) {
 
     public static MissionVerificationResponse verified(Member member, MissionVerification verification) {
-        return new MissionVerificationResponse(member.getNickname(), verification.getImageUrl(), verification.getCreatedAt());
+        return new MissionVerificationResponse(member.getNickname(), member.getCharacterType(), verification.getImageUrl(), verification.getCreatedAt());
     }
 
     public static MissionVerificationResponse notVerified(Member member) {
-        return new MissionVerificationResponse(member.getNickname(), "", null);
+        return new MissionVerificationResponse(member.getNickname(), member.getCharacterType(), "", null);
     }
 }

src/main/java/com/nexters/goalpanzi/application/mission/dto/response/MissionsResponse.java

@@ -3,7 +3,6 @@
 import com.nexters.goalpanzi.application.member.dto.response.ProfileResponse;
 import com.nexters.goalpanzi.domain.member.Member;
 import com.nexters.goalpanzi.domain.mission.MissionMember;
-import com.nexters.goalpanzi.domain.mission.MissionVerification;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.List;

src/main/java/com/nexters/goalpanzi/application/ncp/ObjectStorageClient.java

@@ -0,0 +1,12 @@
+package com.nexters.goalpanzi.application.ncp;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.web.multipart.MultipartFile;
+
+@Repository
+public interface ObjectStorageClient {
+
+    String uploadFile(final MultipartFile file);
+
+    void deleteFile(final String uploadedFileUrl);
+}

src/main/java/com/nexters/goalpanzi/config/NcpConfig.java

@@ -24,7 +24,7 @@ public class NcpConfig {
     private String endPoint;
 
     @Bean
-    public AmazonS3 s3Client() {
+    public AmazonS3 amazonS3() {
         BasicAWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
 
         return AmazonS3ClientBuilder

src/main/java/com/nexters/goalpanzi/domain/mission/DayOfWeek.java

@@ -7,6 +7,5 @@ public enum DayOfWeek {
     THURSDAY,
     FRIDAY,
     SATURDAY,
-    SUNDAY
-    ;
+    SUNDAY;
 }

src/main/java/com/nexters/goalpanzi/domain/mission/Mission.java

@@ -2,18 +2,12 @@
 
 import com.nexters.goalpanzi.common.jpa.DaysOfWeekConverter;
 import com.nexters.goalpanzi.domain.common.BaseEntity;
-import jakarta.persistence.Column;
-import jakarta.persistence.Convert;
-import jakarta.persistence.Embedded;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -111,4 +105,8 @@ private void validateMission() {
             throw new IllegalArgumentException("보드 칸 개수는 최소 1이어야 합니다.");
         }
     }
+
+    public boolean isMissionDay(final LocalDate date) {
+        return this.missionDays.contains(DayOfWeek.valueOf(date.getDayOfWeek().name()));
+    }
 }

src/main/java/com/nexters/goalpanzi/domain/mission/MissionVerification.java

@@ -32,9 +32,10 @@ public class MissionVerification extends BaseEntity {
     @Column(name = "board_number")
     private Integer boardNumber;
 
-    public MissionVerification(final Member member, final Mission mission, final String imageUrl) {
+    public MissionVerification(final Member member, final Mission mission, final String imageUrl, final Integer boardNumber) {
         this.member = member;
         this.mission = mission;
         this.imageUrl = imageUrl;
+        this.boardNumber = boardNumber;
     }
 }

src/main/java/com/nexters/goalpanzi/domain/mission/repository/MissionMemberRepository.java

@@ -1,6 +1,8 @@
 package com.nexters.goalpanzi.domain.mission.repository;
 
 import com.nexters.goalpanzi.domain.mission.MissionMember;
+import com.nexters.goalpanzi.exception.ErrorCode;
+import com.nexters.goalpanzi.exception.NotFoundException;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -14,4 +16,9 @@ public interface MissionMemberRepository extends JpaRepository<MissionMember, Lo
     List<MissionMember> findAllByMissionId(final Long MissionId);
 
     List<MissionMember> findAllByMemberId(final Long memberId);
+
+    default MissionMember getMissionMember(final Long memberId, final Long missionId) {
+        return findByMemberIdAndMissionId(memberId, missionId)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.NOT_JOINED_MISSION_MEMBER));
+    }
 }

src/main/java/com/nexters/goalpanzi/domain/mission/repository/MissionVerificationRepository.java

@@ -1,9 +1,11 @@
 package com.nexters.goalpanzi.domain.mission.repository;
 
-import com.nexters.goalpanzi.domain.mission.Mission;
 import com.nexters.goalpanzi.domain.mission.MissionVerification;
+import com.nexters.goalpanzi.exception.ErrorCode;
+import com.nexters.goalpanzi.exception.NotFoundException;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
@@ -17,9 +19,14 @@ public interface MissionVerificationRepository extends JpaRepository<MissionVeri
 
     Optional<MissionVerification> findByMemberIdAndMissionIdAndBoardNumber(final Long memberId, final Long missionId, final Integer boardNumber);
 
-    @Query(value = "SELECT * FROM mission_verification mv WHERE mv.mission_id = :missionId AND DATE(mv.created_at) = :date", nativeQuery = true)
-    List<MissionVerification> findAllByMissionIdAndDate(final Long missionId, final LocalDate date);
+    @Query("SELECT mv FROM MissionVerification mv WHERE mv.mission.id = :missionId AND Date(mv.createdAt) = :date")
+    List<MissionVerification> findAllByMissionIdAndDate(@Param("missionId") final Long missionId, @Param("date") final LocalDate date);
 
-    @Query(value = "SELECT * FROM mission_verification mv WHERE mv.member_id = :memberId AND mv.mission_id = :missionId AND DATE(mv.created_at) = :date", nativeQuery = true)
-    Optional<MissionVerification> findByMemberIdAndMissionIdAndDate(final Long memberId, final Long missionId, final LocalDate date);
+    @Query("SELECT mv FROM MissionVerification mv WHERE mv.member.id = :memberId AND mv.mission.id = :missionId AND Date(mv.createdAt) = :date")
+    Optional<MissionVerification> findByMemberIdAndMissionIdAndDate(@Param("memberId") Long memberId, @Param("missionId") Long missionId, @Param("date") LocalDate date);
+
+    default MissionVerification getMyVerification(final Long memberId, final Long missionId, final Integer boardNumber) {
+        return findByMemberIdAndMissionIdAndBoardNumber(memberId, missionId, boardNumber)
+                .orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_VERIFICATION));
+    }
 }