Merge pull request #70 from PepperStones/develop

[FIX] 구성원 추가 시, 유효성 검사 추가

Author: pipi-shortstocking

src/main/java/pepperstone/backend/common/repository/UserRepository.java

@@ -31,4 +31,5 @@ Slice<UserEntity> findAllWithFilters(@Param("search") String search,
 
     List<UserEntity> findByJobGroup_CenterGroup_CenterNameAndJobGroup_JobName(String centerGroup, String jobGroup);
     List<UserEntity> findByJobGroupId(Long jobGroupId);
+    Boolean existsByUserId(String userId);
 }

src/main/java/pepperstone/backend/member/controller/MemberController.java

@@ -127,6 +127,12 @@ public ResponseEntity<Map<String, Object>> updateMember(@PathVariable("userId")
     @PostMapping("/add")
     public ResponseEntity<Map<String, Object>> addMember(@RequestBody MemberAddRequestDTO dto) {
         try {
+            if(memberService.duplicateUserId(dto.getUserId()))
+                throw new IllegalArgumentException("중복된 아이디입니다.");
+
+            if(!memberService.checkCompanyNum(dto.getCompanyNum()))
+                throw new IllegalArgumentException("사번이 잘못되었습니다.");
+
             memberService.addMemberAndJobGroup(dto);
 
             return ResponseEntity.ok().body(Map.of("code", 200, "data", true));

src/main/java/pepperstone/backend/member/service/MemberService.java

@@ -131,6 +131,18 @@ public void addMemberAndJobGroup(MemberAddRequestDTO dto) {
         }
     }
 
+    public Boolean duplicateUserId(final String userId) {
+        return userRepo.existsByUserId(userId);
+    }
+
+    public Boolean checkCompanyNum(final String companyNum) {
+        // 10자리인지 확인 && 숫자만 있는지 확인
+        if (companyNum.length() != 10 || !companyNum.matches("\\d+"))
+            return false;
+
+        return true;
+    }
+
     // ============== private method ================
 
     private boolean isNotBlank(String value) {