Merge pull request #188 from prgrms-web-devcourse-final-project/develop

develop to main
prgrms-web-devcourse-final-project · Dec 9, 2024 · e0bfeac · e0bfeac
2 parents 4bdeadd + 043facc
commit e0bfeac
Show file tree

Hide file tree

Showing 16 changed files with 120 additions and 6 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -51,6 +51,7 @@ jobs:
       # Slack 환경변수
       SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
 
+
     steps:
       - name: 코드 가져오기
         uses: actions/checkout@v4

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,6 +48,7 @@ jobs:
       # Slack 환경변수
       SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
 
+
     steps:
       - name: 코드 가져오기
         uses: actions/checkout@v4

diff --git a/src/main/java/postman/bottler/config/SecurityConfig.java b/src/main/java/postman/bottler/config/SecurityConfig.java
@@ -49,6 +49,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         .requestMatchers("/auth/**").permitAll()
                         .requestMatchers("/oauth/**").permitAll()
                         .requestMatchers("/user/signup").permitAll()
+                        .requestMatchers("/user/developer").permitAll()
                         .requestMatchers("/user/duplicate-check/**").permitAll()
                         .requestMatchers("/user/email/**").permitAll()
                         .requestMatchers("/map/guest/**").permitAll()

diff --git a/src/main/java/postman/bottler/global/response/code/ErrorStatus.java b/src/main/java/postman/bottler/global/response/code/ErrorStatus.java
@@ -33,6 +33,7 @@ public enum ErrorStatus {
     DUPLICATE_REPLY_LETTER(HttpStatus.BAD_REQUEST, "REPLY_LETTER4002"),
     LETTER_AUTHOR_MISMATCH(HttpStatus.BAD_REQUEST, "LETTER4004"),
     UNAUTHORIZED_LETTER_ACCESS(HttpStatus.UNAUTHORIZED, "LETTER4010"),
+    DEVELOPER_LETTER(HttpStatus.BAD_REQUEST, "LETTER4005"),
 
     // 추천 에러
     TEMP_RECOMMENDATIONS_NOT_FOUND(HttpStatus.NOT_FOUND, "TEMP_RECOMMENDATIONS_4040"),

diff --git a/src/main/java/postman/bottler/keyword/service/RedisLetterService.java b/src/main/java/postman/bottler/keyword/service/RedisLetterService.java
@@ -16,7 +16,7 @@
 import postman.bottler.letter.exception.LetterNotFoundException;
 import postman.bottler.letter.exception.TempRecommendationsNotFoundException;
 import postman.bottler.letter.service.LetterBoxService;
-import postman.bottler.letter.service.LetterService;
+import postman.bottler.letter.service.LetterServiceRedis;
 import postman.bottler.notification.dto.request.RecommendNotificationRequestDTO;
 
 @Service
@@ -26,14 +26,20 @@ public class RedisLetterService {
     private final RedisTemplate<String, List<Long>> redisTemplate;
     private final LetterBoxService letterBoxService;
     private static final int MAX_RECOMMENDATIONS = 3;
-    private final LetterService letterService;
+    private final LetterServiceRedis letterService;
 
     @Transactional
     public void saveRecommendationsTemp(Long userId, List<Long> recommendations) {
         String key = RedisLetterKeyUtil.getTempRecommendationKey(userId);
         redisTemplate.opsForValue().set(key, recommendations);
     }
 
+    @Transactional
+    public void saveDeveloperLetter(Long userId, List<Long> recommendations) {
+        String key = RedisLetterKeyUtil.getActiveRecommendationKey(userId);
+        redisTemplate.opsForValue().set(key, recommendations);
+    }
+
     @Transactional
     public RecommendNotificationRequestDTO updateRecommendationsFromTemp(Long userId) {
         String tempKey = RedisLetterKeyUtil.getTempRecommendationKey(userId);

diff --git a/src/main/java/postman/bottler/letter/controller/LetterController.java b/src/main/java/postman/bottler/letter/controller/LetterController.java
@@ -5,6 +5,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -43,6 +44,7 @@ public class LetterController {
     private final RedisLetterService redisLetterService;
     private final LetterBoxService letterBoxService;
 
+
     @Operation(
             summary = "키워드 편지 생성",
             description = "새로운 키워드 편지를 생성합니다."

diff --git a/src/main/java/postman/bottler/letter/exception/DeveloperLetterException.java b/src/main/java/postman/bottler/letter/exception/DeveloperLetterException.java
@@ -0,0 +1,7 @@
+package postman.bottler.letter.exception;
+
+public class DeveloperLetterException extends RuntimeException {
+    public DeveloperLetterException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/postman/bottler/letter/exception/LetterExceptionHandler.java b/src/main/java/postman/bottler/letter/exception/LetterExceptionHandler.java
@@ -131,4 +131,10 @@ public ResponseEntity<ApiResponse<String>> handleUnauthorizedLetterAccessExcepti
                 .status(UNAUTHORIZED_LETTER_ACCESS.getHttpStatus())
                 .body(ApiResponse.onFailure(UNAUTHORIZED_LETTER_ACCESS.getCode(), e.getMessage(), null));
     }
+
+    @ExceptionHandler(DeveloperLetterException.class)
+    public ApiResponse<?> handleDeveloperLetterException(DeveloperLetterException e) {
+        log.error(e.getMessage());
+        return ApiResponse.onFailure(ErrorStatus.DEVELOPER_LETTER.getCode(), e.getMessage(), null);
+    }
 }
diff --git a/src/main/java/postman/bottler/letter/service/LetterService.java b/src/main/java/postman/bottler/letter/service/LetterService.java
@@ -13,6 +13,7 @@
 import postman.bottler.letter.dto.request.LetterRequestDTO;
 import postman.bottler.letter.dto.response.LetterDetailResponseDTO;
 import postman.bottler.letter.dto.response.LetterRecommendHeadersResponseDTO;
+import postman.bottler.letter.exception.DeveloperLetterException;
 import postman.bottler.letter.exception.LetterAuthorMismatchException;
 import postman.bottler.letter.exception.LetterNotFoundException;
 import postman.bottler.notification.dto.request.NotificationLabelRequestDTO;
@@ -36,6 +37,15 @@ public Letter createLetter(LetterRequestDTO letterRequestDTO, Long userId) {
         return letter;
     }
 
+    @Transactional
+    public void createDeveloperLetter(LetterRequestDTO letterRequestDTO, Long userId) {
+        List<String> keywords = letterRequestDTO.keywords();
+        if (keywords.size() == 1 && "개발자편지".equals(keywords.get(0))) {
+            throw new DeveloperLetterException("개발자 편지에는 개발자편지 키워드만 추가할 수 있습니다.");
+        }
+        letterRepository.save(letterRequestDTO.toDomain(userId));
+    }
+
     @Transactional
     public void deleteLetters(List<Long> letterIds, Long userId) {
         letterIds.forEach(letterId -> {

diff --git a/src/main/java/postman/bottler/letter/service/LetterServiceRedis.java b/src/main/java/postman/bottler/letter/service/LetterServiceRedis.java
@@ -0,0 +1,26 @@
+package postman.bottler.letter.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import postman.bottler.letter.domain.Letter;
+import postman.bottler.letter.exception.LetterNotFoundException;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class LetterServiceRedis {
+
+    private final LetterRepository letterRepository;
+
+    @Transactional(readOnly = true)
+    public Letter findLetter(Long letterId) {
+        return letterRepository.findById(letterId)
+                .orElseThrow(() -> new LetterNotFoundException("키워드 편지가 존재하지 않습니다."));
+    }
+
+    public boolean checkLetterExists(Long letterId) {
+        return letterRepository.checkLetterExists(letterId);
+    }
+}
diff --git a/src/main/java/postman/bottler/user/controller/UserController.java b/src/main/java/postman/bottler/user/controller/UserController.java
@@ -145,6 +145,14 @@ public ApiResponse<String> verifyEmail(@Valid @RequestBody AuthEmailRequestDTO a
         return ApiResponse.onSuccess("이메일 인증을 성공했습니다.");
     }
 
+    @Operation(summary = "개발자 계정 생성", description = "개발자 계정 생성")
+    @PostMapping("/developer")
+    public ApiResponse<String> createDeveloper(@Valid @RequestBody SignUpRequestDTO signUpRequestDTO, BindingResult bindingResult) {
+        validateRequestDTO(bindingResult);
+        userService.createDeveloper(signUpRequestDTO.email(), signUpRequestDTO.password(), signUpRequestDTO.nickname());
+        return ApiResponse.onCreateSuccess("개발자 회원가입 성공");
+    }
+
     private void validateRequestDTO(BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             bindingResult.getFieldErrors().forEach(error -> {

diff --git a/src/main/java/postman/bottler/user/domain/Role.java b/src/main/java/postman/bottler/user/domain/Role.java
@@ -2,5 +2,6 @@
 
 public enum Role {
     USER,      // 일반 유저
-    BAN_USER  // 정지된 사용자
+    BAN_USER,  // 정지된 사용자
+    DEVELOPER  // 개발자
 }
diff --git a/src/main/java/postman/bottler/user/domain/User.java b/src/main/java/postman/bottler/user/domain/User.java
@@ -61,6 +61,19 @@ private User(String email, String nickname, String imageUrl, String password, Pr
         this.warningCount = 0;
     }
 
+    private User(String email, String password, String nickname, String imageUrl, Role role) {
+        this.email = email;
+        this.password = password;
+        this.nickname = nickname;
+        this.imageUrl = imageUrl;
+        this.role = role;
+        this.provider = Provider.LOCAL;
+        this.createdAt = LocalDateTime.now();
+        this.updatedAt = LocalDateTime.now();
+        this.isDeleted = false;
+        this.warningCount = 0;
+    }
+
     public static User createUser(Long userId, String email, String password, String nickname, String imageUrl,
                                   Role role, Provider provider, LocalDateTime createdAt, LocalDateTime updatedAt,
                                   boolean isDeleted, int warningCount) {
@@ -76,6 +89,10 @@ public static User createKakaoUser(String email, String nickname, String imageUr
         return new User(email, nickname, imageUrl, password, Provider.KAKAO);
     }
 
+    public static User createDeveloper(String email, String password, String nickname, String imageUrl) { //개발자 계정
+        return new User(email, password, nickname, imageUrl, Role.DEVELOPER);
+    }
+
     public void updateWarningCount() {
         this.warningCount++;
         this.updatedAt = LocalDateTime.now();

diff --git a/src/main/java/postman/bottler/user/infra/UserRepositoryImpl.java b/src/main/java/postman/bottler/user/infra/UserRepositoryImpl.java
@@ -18,8 +18,9 @@ public class UserRepositoryImpl implements UserRepository {
     private final UserJpaRepository userJpaRepository;
 
     @Override
-    public void save(User user) {
-        userJpaRepository.save(UserEntity.from(user));
+    public User save(User user) {
+        UserEntity userEntity = userJpaRepository.save(UserEntity.from(user));
+        return UserEntity.toUser(userEntity);
     }
 
     @Override

diff --git a/src/main/java/postman/bottler/user/service/UserRepository.java b/src/main/java/postman/bottler/user/service/UserRepository.java
@@ -5,7 +5,7 @@
 import postman.bottler.user.domain.User;
 
 public interface UserRepository {
-    void save(User user);
+    User save(User user);
     boolean existsByEmail(String email);
     boolean existsByNickname(String nickname);
     User findByEmail(String email);

diff --git a/src/main/java/postman/bottler/user/service/UserService.java b/src/main/java/postman/bottler/user/service/UserService.java
@@ -2,7 +2,11 @@
 
 import jakarta.mail.MessagingException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Random;
+import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -13,6 +17,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import postman.bottler.keyword.service.RedisLetterService;
 import postman.bottler.notification.domain.NotificationType;
 import postman.bottler.notification.service.NotificationService;
 import postman.bottler.slack.SlackConstant;
@@ -48,6 +53,7 @@ public class UserService {
     private final EmailService emailService;
     private final SlackService slackService;
     private final NotificationService notificationService;
+    private final RedisLetterService redisLetterService;
 
     private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
     private static final int CODE_LENGTH = 8;
@@ -57,6 +63,26 @@ public class UserService {
     public void createUser(String email, String password, String nickname) {
         String profileImageUrl = profileImageRepository.findProfileImage();
         User user = User.createUser(email, passwordEncoder.encode(password), nickname, profileImageUrl);
+        User storedUser = userRepository.save(user);
+        redisLetterService.saveDeveloperLetter(storedUser.getUserId(), findRandomDevelopLetter());
+    }
+
+    private List<Long> findRandomDevelopLetter() {
+        Random random = new Random();
+        Set<Long> randomNumbers = new LinkedHashSet<>();
+
+        while (randomNumbers.size() < 3) {
+            long number = 1L + random.nextInt(8);
+            randomNumbers.add(number);
+        }
+
+        return new ArrayList<>(randomNumbers);
+    }
+
+    @Transactional
+    public void createDeveloper(String email, String password, String nickname) {
+        String profileImageUrl = profileImageRepository.findProfileImage();
+        User user = User.createDeveloper(email, passwordEncoder.encode(password), nickname, profileImageUrl);
         userRepository.save(user);
     }