Merge branch 'develop' into feature/#13

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,11 @@
 ## 📋 Checklist
+
 - [ ] 🔀 PR 제목의 형식을 잘 작성했나요? (e.g. `feat: 유저 조회 기능 구현`)
 - [ ] 🏷️ 라벨, 프로젝트, 마일스톤은 등록했나요?
 - [ ] 🧹 코드 스멜은 해결했나요?
 
 ## 🧩 이슈 번호 <!-- 이슈 번호를 작성해주세요 ex) #11 -->
 
-- #이슈번호
+- close #이슈번호
 
 ## 👩‍💻 공유 포인트 및 논의 사항

src/main/java/com/moabam/api/application/BugService.java

@@ -0,0 +1,24 @@
+package com.moabam.api.application;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.moabam.api.domain.entity.Member;
+import com.moabam.api.dto.BugMapper;
+import com.moabam.api.dto.BugResponse;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class BugService {
+
+	private final MemberService memberService;
+
+	public BugResponse getBug(Long memberId) {
+		Member member = memberService.getById(memberId);
+
+		return BugMapper.toBugResponse(member.getBug());
+	}
+}

src/main/java/com/moabam/api/application/MemberService.java

@@ -0,0 +1,25 @@
+package com.moabam.api.application;
+
+import static com.moabam.global.error.model.ErrorMessage.*;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.moabam.api.domain.entity.Member;
+import com.moabam.api.domain.repository.MemberRepository;
+import com.moabam.global.error.exception.NotFoundException;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class MemberService {
+
+	private final MemberRepository memberRepository;
+
+	public Member getById(Long memberId) {
+		return memberRepository.findById(memberId)
+			.orElseThrow(() -> new NotFoundException(MEMBER_NOT_FOUND));
+	}
+}

src/main/java/com/moabam/api/domain/entity/Bug.java

@@ -0,0 +1,47 @@
+package com.moabam.api.domain.entity;
+
+import static com.moabam.global.error.model.ErrorMessage.*;
+
+import org.hibernate.annotations.ColumnDefault;
+
+import com.moabam.global.error.exception.BadRequestException;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Embeddable
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Bug {
+
+	@Column(name = "morning_bug", nullable = false)
+	@ColumnDefault("0")
+	private int morningBug;
+
+	@Column(name = "night_bug", nullable = false)
+	@ColumnDefault("0")
+	private int nightBug;
+
+	@Column(name = "golden_bug", nullable = false)
+	@ColumnDefault("0")
+	private int goldenBug;
+
+	@Builder
+	private Bug(int morningBug, int nightBug, int goldenBug) {
+		this.morningBug = validateBugCount(morningBug);
+		this.nightBug = validateBugCount(nightBug);
+		this.goldenBug = validateBugCount(goldenBug);
+	}
+
+	private int validateBugCount(int bug) {
+		if (bug < 0) {
+			throw new BadRequestException(INVALID_BUG_COUNT);
+		}
+
+		return bug;
+	}
+}

src/main/java/com/moabam/api/domain/entity/Member.java

@@ -13,6 +13,7 @@
 import com.moabam.global.common.util.BaseImageUrl;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -25,8 +26,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@Getter
 @Entity
+@Getter
 @Table(name = "member")
 @SQLDelete(sql = "UPDATE member SET deleted_at = CURRENT_TIMESTAMP where participant_id = ?")
 @Where(clause = "deleted_at IS NOT NULL")
@@ -66,17 +67,8 @@ public class Member extends BaseTimeEntity {
 	@ColumnDefault("0")
 	private int currentMorningCount;
 
-	@Column(name = "morning_bug", nullable = false)
-	@ColumnDefault("0")
-	private int morningBug;
-
-	@Column(name = "night_bug", nullable = false)
-	@ColumnDefault("0")
-	private int nightBug;
-
-	@Column(name = "golden_bug", nullable = false)
-	@ColumnDefault("0")
-	private int goldenBug;
+	@Embedded
+	private Bug bug;
 
 	@Enumerated(EnumType.STRING)
 	@Column(name = "role", nullable = false)
@@ -87,11 +79,12 @@ public class Member extends BaseTimeEntity {
 	private LocalDateTime deletedAt;
 
 	@Builder
-	private Member(Long id, String socialId, String nickname, String profileImage) {
+	private Member(Long id, String socialId, String nickname, String profileImage, Bug bug) {
 		this.id = id;
 		this.socialId = requireNonNull(socialId);
 		this.nickname = requireNonNull(nickname);
 		this.profileImage = requireNonNullElse(profileImage, BaseImageUrl.PROFILE_URL);
+		this.bug = requireNonNull(bug);
 		this.role = Role.USER;
 	}
 }

src/main/java/com/moabam/api/domain/repository/MemberRepository.java

@@ -0,0 +1,9 @@
+package com.moabam.api.domain.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.moabam.api.domain.entity.Member;
+
+public interface MemberRepository extends JpaRepository<Member, Long> {
+
+}

src/main/java/com/moabam/api/dto/BugMapper.java

@@ -0,0 +1,18 @@
+package com.moabam.api.dto;
+
+import com.moabam.api.domain.entity.Bug;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public final class BugMapper {
+
+	public static BugResponse toBugResponse(Bug bug) {
+		return BugResponse.builder()
+			.morningBug(bug.getMorningBug())
+			.nightBug(bug.getNightBug())
+			.goldenBug(bug.getGoldenBug())
+			.build();
+	}
+}

src/main/java/com/moabam/api/dto/BugResponse.java

@@ -0,0 +1,12 @@
+package com.moabam.api.dto;
+
+import lombok.Builder;
+
+@Builder
+public record BugResponse(
+	int morningBug,
+	int nightBug,
+	int goldenBug
+) {
+
+}

src/main/java/com/moabam/api/dto/OAuthMapper.java

@@ -1,6 +1,5 @@
 package com.moabam.api.dto;
 
-import com.moabam.api.dto.AuthorizationCodeRequest;
 import com.moabam.global.config.OAuthConfig;
 
 import lombok.AccessLevel;

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

@@ -0,0 +1,26 @@
+package com.moabam.api.presentation;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.moabam.api.application.BugService;
+import com.moabam.api.dto.BugResponse;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/bugs")
+@RequiredArgsConstructor
+public class BugController {
+
+	private final BugService bugService;
+
+	@GetMapping
+	@ResponseStatus(HttpStatus.OK)
+	public BugResponse getBug() {
+		return bugService.getBug(1L);
+	}
+}

src/main/java/com/moabam/global/error/model/ErrorMessage.java

@@ -15,6 +15,9 @@ public enum ErrorMessage {
 	LOGIN_FAILED("로그인에 실패했습니다."),
 	REQUEST_FAILD("네트우크 접근 실패입니다."),
 
+	MEMBER_NOT_FOUND("존재하지 않는 회원입니다."),
+
+	INVALID_BUG_COUNT("벌레 개수는 0 이상이어야 합니다."),
 	INVALID_PRICE("가격은 0 이상이어야 합니다."),
 	INVALID_QUANTITY("수량은 1 이상이어야 합니다.");
 

src/test/java/com/moabam/api/application/BugServiceTest.java

@@ -0,0 +1,44 @@
+package com.moabam.api.application;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.BDDMockito.*;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.moabam.api.domain.entity.Bug;
+import com.moabam.api.domain.entity.Member;
+import com.moabam.api.dto.BugResponse;
+import com.moabam.fixture.MemberFixture;
+
+@ExtendWith(MockitoExtension.class)
+class BugServiceTest {
+
+	@InjectMocks
+	BugService bugService;
+
+	@Mock
+	MemberService memberService;
+
+	@DisplayName("벌레를 조회한다.")
+	@Test
+	void get_bug_success() {
+		// given
+		Long memberId = 1L;
+		Member member = MemberFixture.member();
+		given(memberService.getById(memberId)).willReturn(member);
+
+		// when
+		BugResponse response = bugService.getBug(memberId);
+
+		// then
+		Bug bug = member.getBug();
+		assertThat(response.morningBug()).isEqualTo(bug.getMorningBug());
+		assertThat(response.nightBug()).isEqualTo(bug.getNightBug());
+		assertThat(response.goldenBug()).isEqualTo(bug.getGoldenBug());
+	}
+}

src/test/java/com/moabam/api/domain/entity/BugTest.java

@@ -0,0 +1,30 @@
+package com.moabam.api.domain.entity;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import com.moabam.global.error.exception.BadRequestException;
+
+class BugTest {
+
+	@DisplayName("벌레 개수가 음수이면 예외가 발생한다.")
+	@ParameterizedTest
+	@CsvSource({
+		"-10, 10, 10",
+		"10, -10, 10",
+		"10, 10, -10",
+	})
+	void validate_bug_count_exception(int morningBug, int nightBug, int goldenBug) {
+		Bug.BugBuilder bugBuilder = Bug.builder()
+			.morningBug(morningBug)
+			.nightBug(nightBug)
+			.goldenBug(goldenBug);
+
+		assertThatThrownBy(bugBuilder::build)
+			.isInstanceOf(BadRequestException.class)
+			.hasMessage("벌레 개수는 0 이상이어야 합니다.");
+	}
+}

src/test/java/com/moabam/api/domain/entity/MemberTest.java

@@ -23,6 +23,7 @@ void create_member_success() {
 			.socialId(socialId)
 			.nickname(nickname)
 			.profileImage(profileImage)
+			.bug(Bug.builder().build())
 			.build());
 	}
 
@@ -35,14 +36,15 @@ void create_member_noImage_success() {
 				.socialId(socialId)
 				.nickname(nickname)
 				.profileImage(null)
+				.bug(Bug.builder().build())
 				.build();
 
 			assertAll(
 				() -> assertThat(member.getProfileImage()).isEqualTo(BaseImageUrl.PROFILE_URL),
 				() -> assertThat(member.getRole()).isEqualTo(Role.USER),
-				() -> assertThat(member.getNightBug()).isZero(),
-				() -> assertThat(member.getGoldenBug()).isZero(),
-				() -> assertThat(member.getMorningBug()).isZero(),
+				() -> assertThat(member.getBug().getNightBug()).isZero(),
+				() -> assertThat(member.getBug().getGoldenBug()).isZero(),
+				() -> assertThat(member.getBug().getMorningBug()).isZero(),
 				() -> assertThat(member.getTotalCertifyCount()).isZero(),
 				() -> assertThat(member.getReportCount()).isZero(),
 				() -> assertThat(member.getCurrentMorningCount()).isZero(),