release: v2.1.0

backend/src/docs/asciidoc/member.adoc

@@ -67,6 +67,12 @@ include::{snippets}/member/myinfo/put/http-request.adoc[]
 ==== Response
 include::{snippets}/member/myinfo/put/http-response.adoc[]
 
+=== 비밀번호 변경
+==== Request
+include::{snippets}/member/password/put/http-request.adoc[]
+==== Response
+include::{snippets}/member/password/put/http-response.adoc[]
+
 === 회원 탈퇴
 ==== Request
 include::{snippets}/member/myinfo/delete/http-request.adoc[]

backend/src/main/java/com/woowacourse/zzimkkong/controller/MemberController.java

@@ -2,6 +2,7 @@
 
 import com.woowacourse.zzimkkong.config.logaspect.LogMethodExecutionTime;
 import com.woowacourse.zzimkkong.domain.LoginEmail;
+import com.woowacourse.zzimkkong.dto.member.ChangePasswordRequest;
 import com.woowacourse.zzimkkong.dto.member.*;
 import com.woowacourse.zzimkkong.dto.member.oauth.OauthMemberSaveRequest;
 import com.woowacourse.zzimkkong.service.MemberService;
@@ -76,4 +77,10 @@ public ResponseEntity<ProfileEmojisResponse> getEmojis() {
         ProfileEmojisResponse profileEmojis = memberService.getProfileEmojis();
         return ResponseEntity.ok().body(profileEmojis);
     }
+
+    @PutMapping("/me/password")
+    public ResponseEntity<Void> changePassword(@LoginEmail final LoginUserEmail loginUserEmail, @RequestBody @Valid final ChangePasswordRequest changePasswordRequest) {
+        memberService.changePassword(loginUserEmail, changePasswordRequest);
+        return ResponseEntity.ok().build();
+    }
 }

backend/src/main/java/com/woowacourse/zzimkkong/domain/Member.java

@@ -78,4 +78,8 @@ public void update(final MemberUpdateRequest memberUpdateRequest) {
     public boolean hasEmail(String email) {
         return this.email.equals(email);
     }
+
+    public void updatePassword(String password) {
+        this.password = password;
+    }
 }

backend/src/main/java/com/woowacourse/zzimkkong/dto/member/ChangePasswordRequest.java

@@ -0,0 +1,31 @@
+package com.woowacourse.zzimkkong.dto.member;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import static com.woowacourse.zzimkkong.dto.ValidatorMessage.*;
+
+@Getter
+@NoArgsConstructor
+public class ChangePasswordRequest {
+    @NotBlank(message = EMPTY_MESSAGE)
+    private String oldPassword;
+
+    @NotNull(message = EMPTY_MESSAGE)
+    @Pattern(regexp = MEMBER_PW_FORMAT, message = MEMBER_PW_MESSAGE)
+    private String newPassword;
+
+    @NotNull(message = EMPTY_MESSAGE)
+    @Pattern(regexp = MEMBER_PW_FORMAT, message = MEMBER_PW_MESSAGE)
+    private String newPasswordConfirm;
+
+    public ChangePasswordRequest(String oldPassword, String newPassword, String newPasswordConfirm) {
+        this.oldPassword = oldPassword;
+        this.newPassword = newPassword;
+        this.newPasswordConfirm = newPasswordConfirm;
+    }
+}

backend/src/main/java/com/woowacourse/zzimkkong/dto/member/ProfileEmojiResponse.java

@@ -1,11 +1,15 @@
 package com.woowacourse.zzimkkong.dto.member;
 
 import com.woowacourse.zzimkkong.domain.ProfileEmoji;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ProfileEmojiResponse {
     private ProfileEmoji name;
     private String code;

backend/src/main/java/com/woowacourse/zzimkkong/dto/reservation/ReservationInfiniteScrollResponse.java

@@ -1,14 +1,18 @@
 package com.woowacourse.zzimkkong.dto.reservation;
 
 import com.woowacourse.zzimkkong.domain.Reservation;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Getter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ReservationInfiniteScrollResponse {
     private List<ReservationOwnerResponse> data;
     private Boolean hasNext;

backend/src/main/java/com/woowacourse/zzimkkong/dto/reservation/ReservationOwnerResponse.java

@@ -2,11 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.woowacourse.zzimkkong.domain.Map;
-import com.woowacourse.zzimkkong.domain.Member;
 import com.woowacourse.zzimkkong.domain.Reservation;
 import com.woowacourse.zzimkkong.domain.Space;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.time.ZonedDateTime;
 
@@ -15,6 +16,8 @@
 
 @Getter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ReservationOwnerResponse {
     private Long id;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DATETIME_FORMAT)

backend/src/main/java/com/woowacourse/zzimkkong/dto/space/SpaceFindAllAvailabilityResponse.java

@@ -1,8 +1,10 @@
 package com.woowacourse.zzimkkong.dto.space;
 
 import com.woowacourse.zzimkkong.domain.Space;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.util.Collection;
 import java.util.List;
@@ -11,6 +13,8 @@
 
 @Builder
 @Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SpaceFindAllAvailabilityResponse {
     private Long mapId;
     private List<SpaceFindAvailabilityResponse> spaces;

backend/src/main/java/com/woowacourse/zzimkkong/dto/space/SpaceFindAvailabilityResponse.java

@@ -1,15 +1,17 @@
 package com.woowacourse.zzimkkong.dto.space;
 
 import com.woowacourse.zzimkkong.domain.Space;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.util.Collection;
-import java.util.Set;
 
-
-@Builder
 @Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SpaceFindAvailabilityResponse {
     private Long spaceId;
     private Boolean isAvailable;
@@ -21,3 +23,4 @@ public static SpaceFindAvailabilityResponse of(final Space space, final Collecti
                 .build();
     }
 }
+

backend/src/main/java/com/woowacourse/zzimkkong/exception/member/ConfirmationNewPasswordMismatchException.java

@@ -0,0 +1,12 @@
+package com.woowacourse.zzimkkong.exception.member;
+
+import com.woowacourse.zzimkkong.exception.ZzimkkongException;
+import org.springframework.http.HttpStatus;
+
+public class ConfirmationNewPasswordMismatchException extends ZzimkkongException {
+    private static final String MESSAGE = "새 비밀번호가 확인란과 일치하지 않습니다.";
+
+    public ConfirmationNewPasswordMismatchException() {
+        super(MESSAGE, HttpStatus.BAD_REQUEST);
+    }
+}

backend/src/main/java/com/woowacourse/zzimkkong/exception/member/PasswordMismatchException.java

@@ -0,0 +1,12 @@
+package com.woowacourse.zzimkkong.exception.member;
+
+import com.woowacourse.zzimkkong.exception.InputFieldException;
+import org.springframework.http.HttpStatus;
+
+public class PasswordMismatchException extends InputFieldException {
+    private static final String MESSAGE = "기존 비밀번호가 일치하지 않습니다.";
+
+    public PasswordMismatchException() {
+        super(MESSAGE, HttpStatus.BAD_REQUEST, PASSWORD);
+    }
+}

backend/src/main/java/com/woowacourse/zzimkkong/repository/ReservationRepository.java

@@ -42,7 +42,7 @@ Slice<Reservation> findAllByMemberAndReservationTimeDateLessThanEqualAndReservat
             final LocalDateTime dateTime,
             final Pageable pageable);
 
-    Slice<Reservation> findAllByUserNameAndReservationTimeDateGreaterThanEqualAndReservationTimeStartTimeGreaterThanEqualAndMemberIsNull(
+    Slice<Reservation> findAllByUserNameAndReservationTimeDateGreaterThanEqualAndReservationTimeEndTimeGreaterThanEqualAndMemberIsNull(
             final String userName,
             final LocalDate date,
             final LocalDateTime dateTime,

backend/src/main/java/com/woowacourse/zzimkkong/service/MemberService.java

@@ -5,21 +5,15 @@
 import com.woowacourse.zzimkkong.domain.ProfileEmoji;
 import com.woowacourse.zzimkkong.dto.member.*;
 import com.woowacourse.zzimkkong.dto.member.oauth.OauthMemberSaveRequest;
-import com.woowacourse.zzimkkong.exception.member.DuplicateEmailException;
-import com.woowacourse.zzimkkong.exception.member.DuplicateUserNameException;
-import com.woowacourse.zzimkkong.exception.member.NoSuchMemberException;
-import com.woowacourse.zzimkkong.exception.member.ReservationExistsOnMemberException;
+import com.woowacourse.zzimkkong.exception.member.*;
 import com.woowacourse.zzimkkong.repository.MemberRepository;
 import com.woowacourse.zzimkkong.repository.ReservationRepository;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -93,7 +87,9 @@ public void updateMember(final LoginUserEmail loginUserEmail, final MemberUpdate
         Member member = members.findByEmail(loginUserEmail.getEmail())
                 .orElseThrow(NoSuchMemberException::new);
 
-        validateDuplicateUserName(memberUpdateRequest.getUserName());
+        if (!member.getUserName().equals(memberUpdateRequest.getUserName())) {
+            validateDuplicateUserName(memberUpdateRequest.getUserName());
+        }
 
         member.update(memberUpdateRequest);
     }
@@ -113,4 +109,26 @@ public void deleteMember(final LoginUserEmail loginUserEmail) {
     public ProfileEmojisResponse getProfileEmojis() {
         return ProfileEmojisResponse.from(List.of(ProfileEmoji.values()));
     }
+
+    public void changePassword(final LoginUserEmail loginUserEmail, final ChangePasswordRequest changePasswordRequest) {
+        Member member = members.findByEmail(loginUserEmail.getEmail())
+                .orElseThrow(NoSuchMemberException::new);
+        validateOldPassword(member, changePasswordRequest);
+        validateConfirmationPassword(changePasswordRequest);
+
+        String newPassword = passwordEncoder.encode(changePasswordRequest.getNewPassword());
+        member.updatePassword(newPassword);
+    }
+
+    private void validateOldPassword(final Member member, final ChangePasswordRequest changePasswordRequest) {
+        if (!passwordEncoder.matches(changePasswordRequest.getOldPassword(), member.getPassword())) {
+            throw new PasswordMismatchException();
+        }
+    }
+
+    private void validateConfirmationPassword(final ChangePasswordRequest changePasswordRequest) {
+        if (!changePasswordRequest.getNewPassword().equals(changePasswordRequest.getNewPasswordConfirm())) {
+            throw new ConfirmationNewPasswordMismatchException();
+        }
+    }
 }

backend/src/main/java/com/woowacourse/zzimkkong/service/ReservationService.java

@@ -179,7 +179,7 @@ public ReservationInfiniteScrollResponse findUpcomingNonLoginReservations(
             final String userName,
             final LocalDateTime searchStartTime,
             final Pageable pageable) {
-        Slice<Reservation> reservationSlice = reservations.findAllByUserNameAndReservationTimeDateGreaterThanEqualAndReservationTimeStartTimeGreaterThanEqualAndMemberIsNull(
+        Slice<Reservation> reservationSlice = reservations.findAllByUserNameAndReservationTimeDateGreaterThanEqualAndReservationTimeEndTimeGreaterThanEqualAndMemberIsNull(
                 userName,
                 TimeZoneUtils.convertTo(searchStartTime, ServiceZone.KOREA).toLocalDate(),
                 searchStartTime,

backend/src/test/java/com/woowacourse/zzimkkong/controller/MemberControllerTest.java

@@ -153,6 +153,24 @@ void findEmojis() {
         assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
     }
 
+    @Test
+    @DisplayName("비밀번호를 변경할 수 있다.")
+    void changePassword() {
+        //given
+        String newPassword = "newPassword1234";
+        ChangePasswordRequest changePasswordRequest = new ChangePasswordRequest(PW, newPassword, newPassword);
+
+        //when
+        ExtractableResponse<Response> response = changePassword(changePasswordRequest);
+
+        //then
+        assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value());
+
+        LoginRequest loginRequest = new LoginRequest(EMAIL, newPassword);
+        ExtractableResponse<Response> loginResponse = login(loginRequest);
+        assertThat(loginResponse.statusCode()).isEqualTo(HttpStatus.OK.value());
+    }
+
     static ExtractableResponse<Response> saveMember(final MemberSaveRequest memberSaveRequest) {
         return RestAssured
                 .given(getRequestSpecification()).log().all()
@@ -240,4 +258,27 @@ private ExtractableResponse<Response> findProfileEmojis() {
                 .when().get("/api/members/emojis")
                 .then().log().all().extract();
     }
+
+    private ExtractableResponse<Response> changePassword(ChangePasswordRequest changePasswordRequest) {
+        return RestAssured
+                .given(getRequestSpecification()).log().all()
+                .accept("application/json")
+                .header("Authorization", AuthorizationExtractor.AUTHENTICATION_TYPE + " " + accessToken)
+                .filter(document("member/password/put", getRequestPreprocessor(), getResponsePreprocessor()))
+                .contentType(MediaType.APPLICATION_JSON_VALUE)
+                .body(changePasswordRequest)
+                .when().put("/api/members/me/password")
+                .then().log().all().extract();
+    }
+
+    private ExtractableResponse<Response> login(final LoginRequest loginRequest) {
+        return RestAssured
+                .given(getRequestSpecification()).log().all()
+                .accept("application/json")
+                .filter(document("member/login", getRequestPreprocessor(), getResponsePreprocessor()))
+                .contentType(MediaType.APPLICATION_JSON_VALUE)
+                .body(loginRequest)
+                .when().post("/api/members/login/token")
+                .then().log().all().extract();
+    }
 }