feat: 방 인증, 입장 동시성 처리

.github/workflows/ci.yml

@@ -38,6 +38,10 @@ jobs:
       - name: Gradle Grant 권한 부여
         run: chmod +x gradlew
 
+      - name: 테스트용 MySQL 도커 컨테이너 실행
+        run: |
+          sudo docker run -d -p 3305:3306 --env MYSQL_DATABASE=moabam --env MYSQL_ROOT_PASSWORD=1234 mysql:8.0.33
+
       - name: SonarCloud 캐싱
         uses: actions/cache@v3
         with:

src/main/java/com/moabam/api/application/room/CertificationService.java

@@ -29,6 +29,7 @@
 import com.moabam.api.domain.room.repository.DailyRoomCertificationRepository;
 import com.moabam.api.domain.room.repository.ParticipantSearchRepository;
 import com.moabam.api.domain.room.repository.RoutineRepository;
+import com.moabam.api.dto.room.CertifiedMemberInfo;
 import com.moabam.global.common.util.ClockHolder;
 import com.moabam.global.common.util.UrlSubstringParser;
 import com.moabam.global.error.exception.BadRequestException;
@@ -53,7 +54,7 @@ public class CertificationService {
 	private final ClockHolder clockHolder;
 
 	@Transactional
-	public void certifyRoom(Long memberId, Long roomId, List<String> imageUrls) {
+	public CertifiedMemberInfo getCertifiedMemberInfo(Long memberId, Long roomId, List<String> imageUrls) {
 		LocalDate today = clockHolder.date();
 		Participant participant = participantSearchRepository.findOne(memberId, roomId)
 			.orElseThrow(() -> new NotFoundException(PARTICIPANT_NOT_FOUND));
@@ -63,22 +64,31 @@ public void certifyRoom(Long memberId, Long roomId, List<String> imageUrls) {
 			case MORNING -> BugType.MORNING;
 			case NIGHT -> BugType.NIGHT;
 		};
-		int roomLevel = room.getLevel();
 
 		validateCertifyTime(clockHolder.times(), room.getCertifyTime());
 		validateAlreadyCertified(memberId, roomId, today);
 
 		certifyMember(memberId, roomId, participant, member, imageUrls);
 
+		return CertificationsMapper.toCertifiedMemberInfo(today, bugType, room, member);
+	}
+
+	@Transactional
+	public void certifyRoom(CertifiedMemberInfo certifyInfo) {
+		LocalDate date = certifyInfo.date();
+		BugType bugType = certifyInfo.bugType();
+		Room room = certifyInfo.room();
+		Member member = certifyInfo.member();
+
 		Optional<DailyRoomCertification> dailyRoomCertification =
-			certificationsSearchRepository.findDailyRoomCertification(roomId, today);
+			certificationsSearchRepository.findDailyRoomCertification(room.getId(), date);
 
 		if (dailyRoomCertification.isEmpty()) {
-			certifyRoomIfAvailable(roomId, today, room, bugType, roomLevel);
+			certifyRoomIfAvailable(room.getId(), date, room, bugType, room.getLevel());
 			return;
 		}
 
-		member.getBug().increase(bugType, roomLevel);
+		member.getBug().increase(bugType, room.getLevel());
 	}
 
 	public boolean existsMemberCertification(Long memberId, Long roomId, LocalDate date) {

src/main/java/com/moabam/api/application/room/RoomService.java

@@ -1,14 +1,7 @@
 package com.moabam.api.application.room;
 
-import static com.moabam.api.domain.room.RoomType.MORNING;
-import static com.moabam.api.domain.room.RoomType.NIGHT;
-import static com.moabam.global.error.model.ErrorMessage.MEMBER_ROOM_EXCEED;
-import static com.moabam.global.error.model.ErrorMessage.PARTICIPANT_NOT_FOUND;
-import static com.moabam.global.error.model.ErrorMessage.ROOM_EXIT_MANAGER_FAIL;
-import static com.moabam.global.error.model.ErrorMessage.ROOM_MAX_USER_REACHED;
-import static com.moabam.global.error.model.ErrorMessage.ROOM_MODIFY_UNAUTHORIZED_REQUEST;
-import static com.moabam.global.error.model.ErrorMessage.ROOM_NOT_FOUND;
-import static com.moabam.global.error.model.ErrorMessage.WRONG_ROOM_PASSWORD;
+import static com.moabam.api.domain.room.RoomType.*;
+import static com.moabam.global.error.model.ErrorMessage.*;
 
 import java.util.List;
 
@@ -37,9 +30,11 @@
 import com.moabam.global.error.exception.NotFoundException;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 @Transactional(readOnly = true)
 public class RoomService {
 
@@ -90,7 +85,8 @@ public void modifyRoom(Long memberId, Long roomId, ModifyRoomRequest modifyRoomR
 
 	@Transactional
 	public void enterRoom(Long memberId, Long roomId, EnterRoomRequest enterRoomRequest) {
-		Room room = roomRepository.findById(roomId).orElseThrow(() -> new NotFoundException(ROOM_NOT_FOUND));
+		Room room = roomRepository.findWithPessimisticLockById(roomId).orElseThrow(
+			() -> new NotFoundException(ROOM_NOT_FOUND));
 		validateRoomEnter(memberId, enterRoomRequest.password(), room);
 
 		Member member = memberService.getById(memberId);

src/main/java/com/moabam/api/application/room/mapper/CertificationsMapper.java

@@ -3,14 +3,17 @@
 import java.time.LocalDate;
 import java.util.List;
 
+import com.moabam.api.domain.bug.BugType;
 import com.moabam.api.domain.member.Member;
 import com.moabam.api.domain.room.Certification;
 import com.moabam.api.domain.room.DailyMemberCertification;
 import com.moabam.api.domain.room.DailyRoomCertification;
 import com.moabam.api.domain.room.Participant;
+import com.moabam.api.domain.room.Room;
 import com.moabam.api.domain.room.Routine;
 import com.moabam.api.dto.room.CertificationImageResponse;
 import com.moabam.api.dto.room.CertificationImagesResponse;
+import com.moabam.api.dto.room.CertifiedMemberInfo;
 import com.moabam.api.dto.room.TodayCertificateRankResponse;
 
 import lombok.AccessLevel;
@@ -72,4 +75,13 @@ public static Certification toCertification(Routine routine, Long memberId, Stri
 			.image(image)
 			.build();
 	}
+
+	public static CertifiedMemberInfo toCertifiedMemberInfo(LocalDate date, BugType bugType, Room room, Member member) {
+		return CertifiedMemberInfo.builder()
+			.date(date)
+			.bugType(bugType)
+			.room(room)
+			.member(member)
+			.build();
+	}
 }

src/main/java/com/moabam/api/domain/image/ImageName.java

@@ -17,15 +17,19 @@ public class ImageName {
 
 	private static final String CERTIFICATION_PATH = "certifications" + DELIMITER + LocalDate.now() + DELIMITER;
 	private static final String PROFILE_IMAGE = "members/profile" + DELIMITER;
+	private static final String BIRD_SKIN = "moabam/skins" + DELIMITER;
 	private static final String DEFAULT = "moabam/default" + DELIMITER;
 
 	private final String fileName;
 
 	public static ImageName of(MultipartFile file, ImageType imageType) {
 		return switch (imageType) {
-			case CERTIFICATION -> new ImageName(CERTIFICATION_PATH + file.getName() + "_" + UUID.randomUUID());
-			case PROFILE_IMAGE -> new ImageName(PROFILE_IMAGE + file.getName() + "_" + UUID.randomUUID());
-			case DEFAULT -> new ImageName(DEFAULT + file.getName());
+			case CERTIFICATION ->
+				new ImageName(CERTIFICATION_PATH + file.getName() + "_" + UUID.randomUUID() + IMAGE_EXTENSION);
+			case PROFILE_IMAGE ->
+				new ImageName(PROFILE_IMAGE + file.getName() + "_" + UUID.randomUUID() + IMAGE_EXTENSION);
+			case BIRD_SKIN -> new ImageName(BIRD_SKIN + file.getName() + IMAGE_EXTENSION);
+			case DEFAULT -> new ImageName(DEFAULT + file.getName() + IMAGE_EXTENSION);
 		};
 	}
 }

src/main/java/com/moabam/api/domain/image/ImageResizer.java

@@ -61,6 +61,7 @@ public void resizeImageToFixedSize(ImageType imageType) {
 		ImageSize imageSize = switch (imageType) {
 			case PROFILE_IMAGE -> ImageSize.PROFILE_IMAGE;
 			case CERTIFICATION -> ImageSize.CERTIFICATION_IMAGE;
+			case BIRD_SKIN -> ImageSize.BIRD_SKIN;
 			case DEFAULT -> ImageSize.CAGE;
 		};
 

src/main/java/com/moabam/api/domain/image/ImageType.java

@@ -4,5 +4,6 @@ public enum ImageType {
 
 	PROFILE_IMAGE,
 	CERTIFICATION,
+	BIRD_SKIN,
 	DEFAULT
 }

src/main/java/com/moabam/api/domain/room/Room.java

@@ -128,10 +128,6 @@ public void changeMaxCount(int maxUserCount) {
 
 	public void increaseCurrentUserCount() {
 		this.currentUserCount += 1;
-
-		if (this.currentUserCount > this.maxUserCount) {
-			throw new BadRequestException(ROOM_MAX_USER_REACHED);
-		}
 	}
 
 	public void decreaseCurrentUserCount() {

src/main/java/com/moabam/api/domain/room/repository/CertificationsSearchRepository.java

@@ -17,6 +17,7 @@
 import com.moabam.api.domain.room.DailyRoomCertification;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
+import jakarta.persistence.LockModeType;
 import lombok.RequiredArgsConstructor;
 
 @Repository
@@ -67,6 +68,7 @@ public Optional<DailyRoomCertification> findDailyRoomCertification(Long roomId,
 				dailyRoomCertification.roomId.eq(roomId),
 				dailyRoomCertification.certifiedAt.eq(date)
 			)
+			.setLockMode(LockModeType.PESSIMISTIC_WRITE)
 			.fetchOne());
 	}
 

src/main/java/com/moabam/api/domain/room/repository/RoomRepository.java

@@ -1,15 +1,22 @@
 package com.moabam.api.domain.room.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import com.moabam.api.domain.room.Room;
 
+import jakarta.persistence.LockModeType;
+
 public interface RoomRepository extends JpaRepository<Room, Long> {
 
+	@Lock(LockModeType.PESSIMISTIC_WRITE)
+	Optional<Room> findWithPessimisticLockById(Long id);
+
 	@Query(value = "select distinct rm.* from room rm left join routine rt on rm.id = rt.room_id "
 		+ "where rm.title like %:keyword% "
 		+ "or rm.manager_nickname like %:keyword% "

src/main/java/com/moabam/api/dto/room/CertifiedMemberInfo.java

@@ -0,0 +1,19 @@
+package com.moabam.api.dto.room;
+
+import java.time.LocalDate;
+
+import com.moabam.api.domain.bug.BugType;
+import com.moabam.api.domain.member.Member;
+import com.moabam.api.domain.room.Room;
+
+import lombok.Builder;
+
+@Builder
+public record CertifiedMemberInfo(
+	LocalDate date,
+	BugType bugType,
+	Room room,
+	Member member
+) {
+
+}

src/main/java/com/moabam/api/presentation/RoomController.java

@@ -23,6 +23,7 @@
 import com.moabam.api.application.room.SearchService;
 import com.moabam.api.domain.image.ImageType;
 import com.moabam.api.domain.room.RoomType;
+import com.moabam.api.dto.room.CertifiedMemberInfo;
 import com.moabam.api.dto.room.CreateRoomRequest;
 import com.moabam.api.dto.room.EnterRoomRequest;
 import com.moabam.api.dto.room.GetAllRoomsResponse;
@@ -98,7 +99,8 @@ public RoomDetailsResponse getRoomDetails(@Auth AuthMember authMember, @PathVari
 	public void certifyRoom(@Auth AuthMember authMember, @PathVariable("roomId") Long roomId,
 		@RequestPart List<MultipartFile> multipartFiles) {
 		List<String> imageUrls = imageService.uploadImages(multipartFiles, ImageType.CERTIFICATION);
-		certificationService.certifyRoom(authMember.id(), roomId, imageUrls);
+		CertifiedMemberInfo info = certificationService.getCertifiedMemberInfo(authMember.id(), roomId, imageUrls);
+		certificationService.certifyRoom(info);
 	}
 
 	@PutMapping("/{roomId}/members/{memberId}/mandate")

src/main/java/com/moabam/global/common/util/GlobalConstant.java

@@ -19,4 +19,5 @@ public class GlobalConstant {
 	public static final int ROOM_FIXED_SEARCH_SIZE = 10;
 	public static final int LEVEL_DIVISOR = 10;
 	public static final int DEFAULT_SKIN_SIZE = 2;
+	public static final String IMAGE_EXTENSION = ".png";
 }

src/test/java/com/moabam/api/application/ImageServiceTest.java → src/test/java/com/moabam/api/application/image/ImageServiceTest.java

@@ -1,4 +1,4 @@
-package com.moabam.api.application;
+package com.moabam.api.application.image;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.BDDMockito.*;
@@ -15,7 +15,6 @@
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.moabam.api.application.image.ImageService;
 import com.moabam.api.domain.image.ImageType;
 import com.moabam.api.domain.image.ResizedImage;
 import com.moabam.api.infrastructure.s3.S3Manager;