✨ [STMT-199] 내 정보 조회 API 구현 및 당도 -> 레벨 변경으로 인한 스키마 구조 변경 (#88 #90)

.github/workflows/ci.yml

@@ -1,9 +1,10 @@
-name: CI triggered by CI trigger
+name: CI triggered by PR
 
 on:
-  workflow_run:
-    workflows: [CI trigger]
-    types: [completed]
+  pull_request:
+    branches:
+      - dev
+      - main
 
 jobs:
   ci:
@@ -35,4 +36,4 @@ jobs:
       - name: test
         run: |
           chmod +x gradlew 
-          ./gradlew test
+          ./gradlew test

src/docs/asciidoc/index.adoc

@@ -144,6 +144,18 @@ include::{snippets}/validate_nickname/fail/invalid/response-fields.adoc[]
 include::{snippets}/validate_nickname/fail/duplicate/response-body.adoc[]
 include::{snippets}/validate_nickname/fail/duplicate/response-fields.adoc[]
 
+=== 내 정보 조회
+
+==== GET /api/v1/members/me
+
+===== 요청
+include::{snippets}/get-my-profile/success/http-request.adoc[]
+include::{snippets}/get-my-profile/success/request-headers.adoc[]
+
+===== 응답 (200)
+include::{snippets}/get-my-profile/success/response-body.adoc[]
+include::{snippets}/get-my-profile/success/response-fields.adoc[]
+
 === 사용자 정보 수정
 
 ==== PATCH /api/v1/members/me

src/main/java/com/stumeet/server/member/adapter/in/web/MemberProfileApi.java

@@ -3,13 +3,15 @@
 import com.stumeet.server.common.annotation.WebAdapter;
 import com.stumeet.server.common.auth.model.LoginMember;
 import com.stumeet.server.common.model.ApiResponse;
+import com.stumeet.server.member.adapter.in.web.response.MemberProfileResponse;
 import com.stumeet.server.member.application.port.in.MemberProfileUseCase;
 import com.stumeet.server.member.application.port.in.command.MemberUpdateCommand;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -31,4 +33,15 @@ public ResponseEntity<ApiResponse<Void>> updateMyProfile(
                 HttpStatus.OK
         );
     }
+
+    @GetMapping("/me")
+    public ResponseEntity<ApiResponse<MemberProfileResponse>> getMyProfile(
+            @AuthenticationPrincipal LoginMember member
+    ) {
+        MemberProfileResponse response = memberProfileUseCase.getProfileById(member.getMember().getId());
+        return new ResponseEntity<>(
+                ApiResponse.success(HttpStatus.OK.value(), "내 프로필 조회에 성공했습니다.", response),
+                HttpStatus.OK
+        );
+    }
 }

src/main/java/com/stumeet/server/member/adapter/in/web/response/MemberProfileResponse.java

@@ -0,0 +1,15 @@
+package com.stumeet.server.member.adapter.in.web.response;
+
+import lombok.Builder;
+
+@Builder
+public record MemberProfileResponse(
+        Long id,
+        String image,
+        String nickname,
+        String region,
+        String profession,
+        String rank,
+        double experience
+) {
+}

src/main/java/com/stumeet/server/member/adapter/out/persistence/MemberJpaEntity.java

@@ -2,6 +2,7 @@
 
 import com.stumeet.server.common.model.BaseTimeEntity;
 import com.stumeet.server.member.domain.AuthType;
+import com.stumeet.server.member.domain.MemberRank;
 import com.stumeet.server.member.domain.UserRole;
 import com.stumeet.server.profession.adapter.out.persistence.ProfessionJpaEntity;
 import jakarta.persistence.*;
@@ -36,9 +37,14 @@ public class MemberJpaEntity extends BaseTimeEntity {
     @Comment("멤버 이미지 URL")
     private String image;
 
-    @Column(name = "sugar_contents", nullable = false)
-    @Comment("포도알 당도")
-    private Double sugarContents;
+    @Column(name = "rank", length = 50, nullable = false)
+    @Enumerated(EnumType.STRING)
+    @Comment("등급")
+    private MemberRank rank;
+
+    @Column(name = "experience", nullable = false)
+    @Comment("경험치")
+    private double experience;
 
     @Column(name = "region", length = 50)
     @Comment("지역")

src/main/java/com/stumeet/server/member/adapter/out/persistence/MemberPersistenceMapper.java

@@ -1,6 +1,7 @@
 package com.stumeet.server.member.adapter.out.persistence;
 
 import com.stumeet.server.member.domain.Member;
+import com.stumeet.server.member.domain.MemberLevel;
 import com.stumeet.server.profession.adapter.out.persistence.ProfessionPersistenceMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -16,7 +17,8 @@ public MemberJpaEntity toEntity(Member domain) {
                 .id(domain.getId())
                 .name(domain.getName())
                 .image(domain.getImage())
-                .sugarContents(domain.getSugarContents())
+                .rank(domain.getLevel().getRank())
+                .experience(domain.getLevel().getExperience())
                 .region(domain.getRegion())
                 .profession(professionPersistenceMapper.toEntity(domain.getProfession()))
                 .authType(domain.getAuthType())
@@ -25,11 +27,16 @@ public MemberJpaEntity toEntity(Member domain) {
     }
 
     public Member toDomain(MemberJpaEntity entity) {
+        MemberLevel level = MemberLevel.builder()
+                .rank(entity.getRank())
+                .experience(entity.getExperience())
+                .build();
+
         return Member.builder()
                 .id(entity.getId())
                 .name(entity.getName())
                 .image(entity.getImage())
-                .sugarContents(entity.getSugarContents())
+                .level(level)
                 .region(entity.getRegion())
                 .profession(professionPersistenceMapper.toDomain(entity.getProfession()))
                 .authType(entity.getAuthType())

src/main/java/com/stumeet/server/member/application/port/in/MemberProfileUseCase.java

@@ -1,5 +1,6 @@
 package com.stumeet.server.member.application.port.in;
 
+import com.stumeet.server.member.adapter.in.web.response.MemberProfileResponse;
 import com.stumeet.server.member.application.port.in.command.MemberSignupCommand;
 import com.stumeet.server.member.application.port.in.command.MemberUpdateCommand;
 import com.stumeet.server.member.domain.Member;
@@ -8,4 +9,6 @@ public interface MemberProfileUseCase {
     void signup(Member member, MemberSignupCommand request);
 
     void updateProfile(Member member, MemberUpdateCommand request);
+
+    MemberProfileResponse getProfileById(Long id);
 }

src/main/java/com/stumeet/server/member/application/port/in/mapper/MemberUseCaseMapper.java

@@ -0,0 +1,21 @@
+package com.stumeet.server.member.application.port.in.mapper;
+
+import com.stumeet.server.member.adapter.in.web.response.MemberProfileResponse;
+import com.stumeet.server.member.domain.Member;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MemberUseCaseMapper {
+
+    public MemberProfileResponse toProfileResponse(Member member) {
+        return MemberProfileResponse.builder()
+                .id(member.getId())
+                .image(member.getImage())
+                .nickname(member.getName())
+                .region(member.getRegion())
+                .profession(member.getProfession().getName())
+                .rank(member.getLevel().getRank().getName())
+                .experience(member.getLevel().getExperience())
+                .build();
+    }
+}

src/main/java/com/stumeet/server/member/application/service/MemberOAuthService.java

@@ -28,9 +28,13 @@ public Member getMemberOrCreate(OAuthUserProfileResponse response, String provid
         if (isRegisterUser) {
             member = memberQueryPort.getByOAuthProviderId(response.id(), oAuthProvider);
         } else {
+            MemberLevel initialLevel = MemberLevel.builder()
+                    .rank(MemberRank.SEED)
+                    .experience(0.0)
+                    .build();
             member = memberCommandPort.save(
                     Member.builder()
-                            .sugarContents(0.0)
+                            .level(initialLevel)
                             .authType(AuthType.OAUTH)
                             .role(UserRole.FIRST_LOGIN)
                             .build()

src/main/java/com/stumeet/server/member/application/service/MemberProfileService.java

@@ -2,11 +2,14 @@
 
 import com.stumeet.server.common.annotation.UseCase;
 import com.stumeet.server.file.application.port.in.FileUploadUseCase;
+import com.stumeet.server.member.adapter.in.web.response.MemberProfileResponse;
 import com.stumeet.server.member.application.port.in.MemberProfileUseCase;
 import com.stumeet.server.member.application.port.in.command.MemberProfileCommand;
 import com.stumeet.server.member.application.port.in.command.MemberSignupCommand;
 import com.stumeet.server.member.application.port.in.command.MemberUpdateCommand;
+import com.stumeet.server.member.application.port.in.mapper.MemberUseCaseMapper;
 import com.stumeet.server.member.application.port.out.MemberCommandPort;
+import com.stumeet.server.member.application.port.out.MemberQueryPort;
 import com.stumeet.server.member.domain.Member;
 import com.stumeet.server.profession.application.port.in.ProfessionQueryUseCase;
 import com.stumeet.server.profession.domain.Profession;
@@ -21,6 +24,9 @@ public class MemberProfileService implements MemberProfileUseCase {
     private final ProfessionQueryUseCase professionQueryUseCase;
     private final FileUploadUseCase fileUploadUseCase;
     private final MemberCommandPort memberCommandPort;
+    private final MemberQueryPort memberQueryPort;
+    private final MemberUseCaseMapper memberUseCaseMapper;
+
 
     @Override
     public void signup(Member member, MemberSignupCommand request) {
@@ -61,4 +67,10 @@ public void updateProfile(Member member, MemberUpdateCommand request) {
         memberCommandPort.update(member);
     }
 
+    @Override
+    public MemberProfileResponse getProfileById(Long id) {
+        Member member = memberQueryPort.getById(id);
+        return memberUseCaseMapper.toProfileResponse(member);
+    }
+
 }

src/main/java/com/stumeet/server/member/domain/Member.java

@@ -19,7 +19,7 @@ public class Member {
 
     private String image;
 
-    private Double sugarContents;
+    private MemberLevel level;
 
     private String region;
 

src/main/java/com/stumeet/server/member/domain/MemberLevel.java

@@ -0,0 +1,14 @@
+package com.stumeet.server.member.domain;
+
+import lombok.*;
+
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Builder
+public class MemberLevel {
+
+    private MemberRank rank;
+    private double experience;
+}

src/main/java/com/stumeet/server/member/domain/MemberRank.java

@@ -0,0 +1,19 @@
+package com.stumeet.server.member.domain;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum MemberRank {
+    SEED("씨앗"),
+    SPROUT("새싹"),
+    LEAF("잎"),
+    FLOWER("꽃"),
+    TREE("나무"),
+    FRUIT("열매");
+
+
+    private final String name;
+
+}

src/main/resources/db/migration/V1.2__modify_member_level.sql

@@ -0,0 +1,8 @@
+ALTER TABLE `member`
+    DROP COLUMN `sugar_contents`;
+
+ALTER TABLE `member`
+    ADD COLUMN `rank` VARCHAR(50) not null comment '등급' AFTER `image`;
+
+ALTER TABLE `member`
+    ADD COLUMN `experience` DOUBLE not null comment '경험치' AFTER `rank` ;

src/test/java/com/stumeet/server/common/auth/filter/LogoutFilterTest.java

@@ -29,7 +29,6 @@
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@Transactional
 public class LogoutFilterTest extends ApiTest {
 
     @Container
@@ -54,11 +53,10 @@ class Logout {
 
         @BeforeEach
         void setUp() {
-            MemberJpaEntity entity = jpaMemberRepository.save(MemberStub.getMemberEntity());
             redisTemplate.opsForValue()
                     .set(
                             JwtUtil.resolveToken(TokenStub.getMockAccessToken()),
-                            jwtTokenProvider.generateRefreshToken(entity.getId())
+                            jwtTokenProvider.generateRefreshToken(MemberStub.getMember().getId())
                     );
         }
 

src/test/java/com/stumeet/server/common/auth/filter/OAuthAuthenticationFilterTest.java

@@ -29,7 +29,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @WireMockTest(httpPort = 8089)
-@Transactional
 class OAuthAuthenticationFilterTest extends ApiTest {
 
     @Container

src/test/java/com/stumeet/server/member/adapter/in/web/MemberAuthApiTest.java

@@ -34,7 +34,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 
-@Transactional
 class MemberAuthApiTest extends ApiTest {
 
     @Container
@@ -61,8 +60,7 @@ class tokenRenew {
 
         @BeforeEach
         void setUp() {
-            MemberJpaEntity entity = jpaMemberRepository.save(MemberStub.getMemberEntity());
-            refreshToken = jwtTokenProvider.generateRefreshToken(entity.getId());
+            refreshToken = jwtTokenProvider.generateRefreshToken(MemberStub.getMember().getId());
             redisTemplate.opsForValue()
                     .set(TokenStub.getExpiredAccessToken(), refreshToken);
         }