[FEAT] Prod 서버 배포 CD 구축 및 1차 배포

[FEAT] Prod 서버 배포 CD 구축 및 1차 배포

Author: tjdtn0219

.github/workflows/cd-main.yml

@@ -3,8 +3,6 @@ name: Dockerizing to Amazon ECR for Prod
 on:
     push:
         branches: [ "main" ]
-    pull_request:
-        branches: [ "main" ]
 
 env:
   AWS_REGION: ap-northeast-2
@@ -80,4 +78,4 @@ jobs:
 #          # Use the Dockerfile.prod and build the image
 #          docker build -f Dockerfile.main --build-arg SPRING_PROFILES_ACTIVE=main -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
 #          # Push the image to ECR
-#          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+#          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: Java CI with Gradle
 
 on:
   pull_request:
-    branches: [ "release", "develop" ]
+    branches: [ "main", "develop" ]
 
 
 jobs:
@@ -71,4 +71,4 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-        run: ./gradlew clean build
+        run: ./gradlew clean build

src/main/java/swm/betterlife/antifragile/common/config/SecurityConfig.java

@@ -2,6 +2,7 @@
 
 import static org.springframework.http.HttpMethod.DELETE;
 import static org.springframework.http.HttpMethod.GET;
+import static org.springframework.http.HttpMethod.POST;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/swm/betterlife/antifragile/common/exception/PasswordSameException.java

@@ -0,0 +1,9 @@
+package swm.betterlife.antifragile.common.exception;
+
+import swm.betterlife.antifragile.common.exception.code.ErrorCode;
+
+public class PasswordSameException extends BaseException {
+    public PasswordSameException() {
+        super(ErrorCode.PASSWORD_SAME.getMessage());
+    }
+}

src/main/java/swm/betterlife/antifragile/common/exception/code/ErrorCode.java

@@ -14,6 +14,7 @@ public enum ErrorCode {
     // Member
     MEMBER_NOT_FOUND("멤버를 찾을 수 없습니다"),
     HUMAN_MEMBER_CANNOT_BE_ACCESSED("휴먼 계정의 아이디의 정보는 조회할 수 없습니다"),
+    PASSWORD_SAME("새로운 비밀번호는 기존 비밀번호와 달라야합니다."),
 
     // DiaryAnalysis
     DIARY_ANALYSIS_NOT_FOUND("해당 날짜에 사용자의 일기 분석을 찾을 수 없습니다"),

src/main/java/swm/betterlife/antifragile/domain/auth/controller/AuthController.java

@@ -50,6 +50,7 @@ public ResponseBody<Void> logout(
         return ResponseBody.ok();
     }
 
+
     @DeleteMapping()
     public ResponseBody<Void> delete(
         @AuthenticationPrincipal PrincipalDetails principalDetails

src/main/java/swm/betterlife/antifragile/domain/auth/dto/request/AuthSignUpRequest.java

@@ -7,6 +7,7 @@
 
 public record AuthSignUpRequest(
     String email,
+    String password,
     LoginType loginType,
     String nickname,
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd")

src/main/java/swm/betterlife/antifragile/domain/auth/dto/request/PasswordModifyRequest.java

@@ -0,0 +1,7 @@
+package swm.betterlife.antifragile.domain.auth.dto.request;
+
+public record PasswordModifyRequest(
+    String curPassword,
+    String newPassword
+) {
+}

src/main/java/swm/betterlife/antifragile/domain/auth/service/AuthService.java

@@ -81,7 +81,9 @@ public AuthSignUpResponse signUp(
             throw new RuntimeException("이미 존재하는 이메일입니다.");  //todo: Custom Ex
         }
 
-        String password = getPasswordByLoginType(authSignUpRequest.loginType());
+        String password = getPasswordByLoginType(
+                authSignUpRequest.loginType(), authSignUpRequest.password()
+            );
         String encodedPassword = passwordEncoder.encode(password);
 
         Member member = Member.builder()
@@ -141,8 +143,9 @@ private Authentication getAuthenticate(
         return authenticationManagerBuilder.getObject().authenticate(authenticationToken);
     }
 
-    private String getPasswordByLoginType(LoginType loginType) {
+    private String getPasswordByLoginType(LoginType loginType, String password) {
         return switch (loginType) {
+            case NORMAL -> password;
             case GOOGLE -> googlePassword;
             case KAKAO -> kakaoPassword;
             case NAVER -> naverPassword;

src/main/java/swm/betterlife/antifragile/domain/member/controller/MemberController.java

@@ -5,13 +5,15 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import swm.betterlife.antifragile.common.response.ResponseBody;
 import swm.betterlife.antifragile.common.security.PrincipalDetails;
+import swm.betterlife.antifragile.domain.auth.dto.request.PasswordModifyRequest;
 import swm.betterlife.antifragile.domain.member.dto.request.MemberProfileModifyRequest;
 import swm.betterlife.antifragile.domain.member.dto.response.MemberDetailInfoResponse;
 import swm.betterlife.antifragile.domain.member.dto.response.MemberInfoResponse;
@@ -82,4 +84,16 @@ public ResponseBody<MemberStatusResponse> checkMemberStatus(
             memberService.checkMemberStatus(email, loginType)
         );
     }
+
+    @PostMapping("/password")
+    public ResponseBody<Void> modifyPassword(
+        @AuthenticationPrincipal PrincipalDetails principalDetails,
+        @RequestBody PasswordModifyRequest passwordModifyRequest
+    ) {
+        memberService.modifyPassword(
+            principalDetails.email(), principalDetails.memberId(),
+            principalDetails.loginType(), passwordModifyRequest
+        );
+        return ResponseBody.ok();
+    }
 }

src/main/java/swm/betterlife/antifragile/domain/member/entity/LoginType.java

@@ -6,7 +6,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum LoginType {
-    GOOGLE("구글"), NAVER("네이버"), KAKAO("카카오");
+    NORMAL("일반"), GOOGLE("구글"), NAVER("네이버"), KAKAO("카카오");
 
     private final String toKorean;
 }

src/main/java/swm/betterlife/antifragile/domain/member/service/MemberService.java

@@ -13,12 +13,18 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import swm.betterlife.antifragile.common.exception.ExcessRecommendLimitException;
 import swm.betterlife.antifragile.common.exception.MemberNotFoundException;
+import swm.betterlife.antifragile.common.exception.PasswordSameException;
 import swm.betterlife.antifragile.common.util.S3ImageComponent;
+import swm.betterlife.antifragile.domain.auth.dto.request.PasswordModifyRequest;
 import swm.betterlife.antifragile.domain.member.controller.MemberNicknameDuplResponse;
 import swm.betterlife.antifragile.domain.member.dto.request.MemberProfileModifyRequest;
 import swm.betterlife.antifragile.domain.member.dto.response.MemberDetailInfoResponse;
@@ -40,6 +46,10 @@ public class MemberService {
     private final MemberPointService memberPointService;
     private final MemberDiaryService memberDiaryService;
     private final S3ImageComponent s3ImageComponent;
+    private final PasswordEncoder passwordEncoder;
+    private final AuthenticationManagerBuilder authenticationManagerBuilder;
+
+
 
     @Transactional(readOnly = true)
     public MemberInfoResponse findMemberById(String id) {
@@ -149,6 +159,30 @@ public MemberStatusResponse checkMemberStatus(
 
     }
 
+    @Transactional
+    public void modifyPassword(
+        String email, String memberId,
+        LoginType loginType, PasswordModifyRequest passwordModifyRequest
+    ) {
+        String curPassword = passwordModifyRequest.curPassword();
+        String newPassword = passwordModifyRequest.newPassword();
+        Authentication authentication
+            = getAuthenticate(email, curPassword, loginType);
+
+        if (curPassword.equals(newPassword)) {
+            throw new PasswordSameException();
+        }
+        String encodedPassword = passwordEncoder.encode(newPassword);
+        Query query = new Query(Criteria.where("id").is(memberId));
+        Update update = new Update().set("password", encodedPassword);
+
+        UpdateResult result = mongoTemplate.updateFirst(query, update, Member.class);
+
+        if (result.getMatchedCount() == 0) {
+            throw new MemberNotFoundException();
+        }
+    }
+
     @Scheduled(cron = "0 0 0 * * *")
     public void resetRemainRecommendNumber() {
         Query query = new Query();
@@ -157,4 +191,14 @@ public void resetRemainRecommendNumber() {
         mongoTemplate.updateMulti(query, update, Member.class);
     }
 
+    private Authentication getAuthenticate(
+        String email, String password,
+        LoginType loginType
+    ) {
+        String username = loginType.name() + ":" + email;
+        UsernamePasswordAuthenticationToken authenticationToken
+            = new UsernamePasswordAuthenticationToken(username, password);
+        return authenticationManagerBuilder.getObject().authenticate(authenticationToken);
+    }
+
 }