Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…

…to develop

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

@@ -20,12 +20,15 @@
 import com.moabam.api.dto.member.MemberInfo;
 import com.moabam.api.dto.member.MemberInfoResponse;
 import com.moabam.api.dto.member.MemberInfoSearchResponse;
+import com.moabam.api.dto.member.ModifyMemberRequest;
 import com.moabam.global.auth.model.AuthMember;
 import com.moabam.global.common.util.ClockHolder;
 import com.moabam.global.common.util.GlobalConstant;
 import com.moabam.global.error.exception.BadRequestException;
+import com.moabam.global.error.exception.ConflictException;
 import com.moabam.global.error.exception.NotFoundException;
 
+import io.micrometer.common.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -82,6 +85,26 @@ public MemberInfoResponse searchInfo(AuthMember authMember, Long memberId) {
 		return MemberMapper.toMemberInfoResponse(memberInfoSearchResponse, inventories);
 	}
 
+	@Transactional
+	public void modifyInfo(AuthMember authMember, ModifyMemberRequest modifyMemberRequest, String newProfileUri) {
+		validateNickname(modifyMemberRequest.nickname());
+
+		Member member = memberSearchRepository.findMember(authMember.id())
+			.orElseThrow(() -> new NotFoundException(MEMBER_NOT_FOUND));
+
+		member.changeNickName(modifyMemberRequest.nickname());
+		member.changeIntro(modifyMemberRequest.intro());
+		member.changeProfileUri(newProfileUri);
+
+		memberRepository.save(member);
+	}
+
+	private void validateNickname(String nickname) {
+		if (StringUtils.isEmpty(nickname) && memberRepository.existsByNickname(nickname)) {
+			throw new ConflictException(NICKNAME_CONFLICT);
+		}
+	}
+
 	private List<Inventory> getDefaultSkin(Long searchId) {
 		List<Inventory> inventories = inventorySearchRepository.findDefaultSkin(searchId);
 		if (inventories.size() != GlobalConstant.DEFAULT_SKIN_SIZE) {

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

@@ -84,6 +84,7 @@ private Member(Long id, String socialId, Bug bug) {
 		this.id = id;
 		this.socialId = requireNonNull(socialId);
 		this.nickname = createNickName();
+		this.intro = "";
 		this.profileImage = BaseImageUrl.MEMBER_PROFILE_URL;
 		this.bug = requireNonNull(bug);
 		this.role = Role.USER;
@@ -124,7 +125,15 @@ public void delete(LocalDateTime now) {
 	}
 
 	public void changeNickName(String nickname) {
-		this.nickname = nickname;
+		this.nickname = requireNonNullElse(nickname, this.nickname);
+	}
+
+	public void changeIntro(String intro) {
+		this.intro = requireNonNullElse(intro, this.intro);
+	}
+
+	public void changeProfileUri(String newProfileUri) {
+		this.profileImage = requireNonNullElse(newProfileUri, profileImage);
 	}
 
 	private String createNickName() {

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

@@ -9,4 +9,6 @@
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
 	Optional<Member> findBySocialId(String id);
+
+	boolean existsByNickname(String nickname);
 }

src/main/java/com/moabam/api/dto/member/ModifyMemberRequest.java

@@ -0,0 +1,8 @@
+package com.moabam.api.dto.member;
+
+public record ModifyMemberRequest(
+	String intro,
+	String nickname
+) {
+
+}

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

@@ -1,24 +1,32 @@
 package com.moabam.api.presentation;
 
+import java.util.List;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.moabam.api.application.auth.AuthorizationService;
+import com.moabam.api.application.image.ImageService;
 import com.moabam.api.application.member.MemberService;
+import com.moabam.api.domain.image.ImageType;
 import com.moabam.api.dto.auth.AuthorizationCodeResponse;
 import com.moabam.api.dto.auth.AuthorizationTokenInfoResponse;
 import com.moabam.api.dto.auth.AuthorizationTokenResponse;
 import com.moabam.api.dto.auth.LoginResponse;
 import com.moabam.api.dto.member.MemberInfoResponse;
+import com.moabam.api.dto.member.ModifyMemberRequest;
 import com.moabam.global.auth.annotation.Auth;
 import com.moabam.global.auth.model.AuthMember;
+import com.moabam.global.error.exception.BadRequestException;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -31,6 +39,7 @@ public class MemberController {
 
 	private final AuthorizationService authorizationService;
 	private final MemberService memberService;
+	private final ImageService imageService;
 
 	@GetMapping("/login/oauth")
 	public void socialLogin(HttpServletResponse httpServletResponse) {
@@ -65,4 +74,19 @@ public void deleteMember(@Auth AuthMember authMember) {
 	public MemberInfoResponse searchInfo(@Auth AuthMember authMember, @PathVariable(required = false) Long memberId) {
 		return memberService.searchInfo(authMember, memberId);
 	}
+
+	@PostMapping("/modify")
+	public void modifyMember(@Auth AuthMember authMember,
+		@RequestPart(required = false) ModifyMemberRequest modifyMemberRequest,
+		@RequestPart(name = "profileImage", required = false) MultipartFile newProfileImage) {
+		String newProfileUri = null;
+
+		try {
+			newProfileUri = imageService.uploadImages(List.of(newProfileImage), ImageType.PROFILE_IMAGE).get(0);
+		} catch (BadRequestException | NullPointerException e) {
+			// Do nothing
+		}
+
+		memberService.modifyInfo(authMember, modifyMemberRequest, newProfileUri);
+	}
 }

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

@@ -35,6 +35,7 @@ public enum ErrorMessage {
 	MEMBER_NOT_FOUND_BY_MANAGER_OR_NULL("방의 매니저거나 회원이 존재하지 않습니다."),
 	MEMBER_ROOM_EXCEED("참여할 수 있는 방의 개수가 모두 찼습니다."),
 	UNLINK_REQUEST_FAIL_ROLLBACK_SUCCESS("카카오 연결 요청 실패로 Rollback하였습니다."),
+	NICKNAME_CONFLICT("이미 존재하는 닉네임입니다."),
 
 	INVALID_DEFAULT_SKIN_SIZE("기본 스킨은 2개여야 합니다. 관리자에게 문의하세요"),
 

src/main/resources/static/docs/coupon.html

@@ -461,7 +461,7 @@ <h4 id="_요청" class="discrete">요청</h4>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /admins/coupons HTTP/1.1
 Content-Type: application/json;charset=UTF-8
-Content-Length: 175
+Content-Length: 183
 Host: localhost:8080
 
 {
@@ -540,7 +540,7 @@ <h4 id="_응답_3" class="discrete">응답</h4>
 Access-Control-Allow-Credentials: true
 Access-Control-Max-Age: 3600
 Content-Type: application/json
-Content-Length: 205
+Content-Length: 215
 
 {
   "id" : 22,
@@ -571,7 +571,7 @@ <h4 id="_요청_4">요청</h4>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /coupons/search HTTP/1.1
 Content-Type: application/json;charset=UTF-8
-Content-Length: 41
+Content-Length: 44
 Host: localhost:8080
 
 {
@@ -590,7 +590,7 @@ <h4 id="_응답_4" class="discrete">응답</h4>
 Access-Control-Allow-Credentials: true
 Access-Control-Max-Age: 3600
 Content-Type: application/json
-Content-Length: 206
+Content-Length: 216
 
 [ {
   "id" : 23,
@@ -637,7 +637,7 @@ <h4 id="_응답_5" class="discrete">응답</h4>
 Access-Control-Allow-Credentials: true
 Access-Control-Max-Age: 3600
 Content-Type: application/json
-Content-Length: 64
+Content-Length: 66
 
 {
   "message" : "쿠폰 발급 가능 기간이 아닙니다."
@@ -672,7 +672,7 @@ <h4 id="_응답_6" class="discrete">응답</h4>
 Access-Control-Allow-Credentials: true
 Access-Control-Max-Age: 3600
 Content-Type: application/json
-Content-Length: 507
+Content-Length: 537
 
 [ {
   "id" : 17,
@@ -724,7 +724,7 @@ <h3 id="_쿠폰_사용_진행_중">쿠폰 사용 (진행 중)</h3>
 <div id="footer">
 <div id="footer-text">
 Version 0.0.1-SNAPSHOT<br>
-Last updated 2023-11-26 14:13:28 +0900
+Last updated 2023-11-26 16:03:25 +0900
 </div>
 </div>
 </body>

src/main/resources/static/docs/index.html

@@ -616,7 +616,7 @@ <h4 id="_상태코드httpstatus"><a class="link" href="#_상태코드httpstatus"
 <div id="footer">
 <div id="footer-text">
 Version 0.0.1-SNAPSHOT<br>
-Last updated 2023-11-06 23:30:09 +0900
+Last updated 2023-11-26 16:03:25 +0900
 </div>
 </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.3/highlight.min.js"></script>

src/main/resources/static/docs/notification.html

@@ -513,7 +513,7 @@ <h4 id="_응답_2" class="discrete">응답</h4>
 <div id="footer">
 <div id="footer-text">
 Version 0.0.1-SNAPSHOT<br>
-Last updated 2023-11-21 17:10:26 +0900
+Last updated 2023-11-26 16:03:25 +0900
 </div>
 </div>
 </body>

src/test/java/com/moabam/api/application/member/MemberServiceTest.java

@@ -26,6 +26,7 @@
 import com.moabam.api.dto.auth.AuthorizationTokenInfoResponse;
 import com.moabam.api.dto.auth.LoginResponse;
 import com.moabam.api.dto.member.MemberInfoResponse;
+import com.moabam.api.dto.member.ModifyMemberRequest;
 import com.moabam.global.auth.model.AuthMember;
 import com.moabam.global.common.util.ClockHolder;
 import com.moabam.global.error.exception.BadRequestException;
@@ -37,6 +38,7 @@
 import com.moabam.support.fixture.ItemFixture;
 import com.moabam.support.fixture.MemberFixture;
 import com.moabam.support.fixture.MemberInfoSearchFixture;
+import com.moabam.support.fixture.ModifyImageFixture;
 
 @ExtendWith({MockitoExtension.class, FilterProcessExtension.class})
 class MemberServiceTest {
@@ -224,4 +226,24 @@ void failBy_overSize(@WithMember AuthMember authMember) {
 				.hasMessage(INVALID_DEFAULT_SKIN_SIZE.getMessage());
 		}
 	}
+
+	@DisplayName("사용자 정보 수정 성공")
+	@Test
+	void modify_success_test(@WithMember AuthMember authMember) {
+		// given
+		Member member = MemberFixture.member();
+		ModifyMemberRequest modifyMemberRequest = ModifyImageFixture.modifyMemberRequest();
+		given(memberSearchRepository.findMember(authMember.id())).willReturn(Optional.ofNullable(member));
+
+		// when
+		memberService.modifyInfo(authMember, modifyMemberRequest, "/main");
+
+		// Then
+		assertAll(
+			() -> assertThat(member.getNickname()).isEqualTo(modifyMemberRequest.nickname()),
+			() -> assertThat(member.getIntro()).isEqualTo(modifyMemberRequest.intro()),
+			() -> assertThat(member.getProfileImage()).isEqualTo("/main")
+		);
+	}
+
 }