refactor: service 레이어 직관적으로 메소드명 통일 #238

bankidz · Sep 26, 2022 · 9f93bbd · 9f93bbd
1 parent c55f4a6
commit 9f93bbd
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/com/ceos/bankids/mapper/AppleMapper.java b/src/main/java/com/ceos/bankids/mapper/AppleMapper.java
@@ -1,10 +1,10 @@
 package com.ceos.bankids.mapper;
 
+import com.ceos.bankids.controller.request.AppleRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.oauth.AppleKeyListDTO;
 import com.ceos.bankids.dto.oauth.AppleSubjectDTO;
 import com.ceos.bankids.dto.oauth.AppleTokenDTO;
-import com.ceos.bankids.controller.request.AppleRequest;
 import com.ceos.bankids.service.AppleServiceImpl;
 import com.ceos.bankids.service.UserServiceImpl;
 import java.io.IOException;
@@ -34,7 +34,7 @@ public User postAppleLogin(MultiValueMap<String, String> formData) throws IOExce
             appleKeyListDTO);
         AppleTokenDTO appleTokenDTO = appleService.getAppleAccessToken(appleRequest, "login");
 
-        Optional<User> registeredUser = userService.readUserByAuthenticationCodeNullable(
+        Optional<User> registeredUser = userService.findUserByAuthenticationCodeNullable(
             appleSubjectDTO.getAuthenticationCode());
 
         User user;

diff --git a/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java b/src/main/java/com/ceos/bankids/mapper/KakaoMapper.java
@@ -1,9 +1,9 @@
 package com.ceos.bankids.mapper;
 
+import com.ceos.bankids.controller.request.KakaoRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.oauth.KakaoTokenDTO;
 import com.ceos.bankids.dto.oauth.KakaoUserDTO;
-import com.ceos.bankids.controller.request.KakaoRequest;
 import com.ceos.bankids.service.KakaoServiceImpl;
 import com.ceos.bankids.service.UserServiceImpl;
 import java.util.Optional;
@@ -28,7 +28,7 @@ public User postKakaoLogin(KakaoRequest kakaoRequest) {
         KakaoTokenDTO kakaoTokenDTO = kakaoService.getKakaoAccessToken(kakaoRequest);
         KakaoUserDTO kakaoUserDTO = kakaoService.getKakaoUserCode(kakaoTokenDTO);
 
-        Optional<User> registeredUser = userService.readUserByAuthenticationCodeNullable(
+        Optional<User> registeredUser = userService.findUserByAuthenticationCodeNullable(
             kakaoUserDTO.getAuthenticationCode());
 
         User user;

diff --git a/src/main/java/com/ceos/bankids/mapper/NoticeController.java b/src/main/java/com/ceos/bankids/mapper/NoticeController.java
@@ -2,12 +2,12 @@
 
 import com.ceos.bankids.config.CommonResponse;
 import com.ceos.bankids.constant.ErrorCode;
+import com.ceos.bankids.controller.request.NoticeRequest;
 import com.ceos.bankids.domain.User;
 import com.ceos.bankids.dto.AllSendNotificationDTO;
 import com.ceos.bankids.dto.NoticeDTO;
 import com.ceos.bankids.dto.NoticeListDTO;
 import com.ceos.bankids.exception.ForbiddenException;
-import com.ceos.bankids.controller.request.NoticeRequest;
 import com.ceos.bankids.service.ExpoNotificationServiceImpl;
 import com.ceos.bankids.service.NoticeServiceImpl;
 import com.ceos.bankids.service.UserServiceImpl;
@@ -52,7 +52,7 @@ public CommonResponse<NoticeDTO> postNotice(@AuthenticationPrincipal User authUs
         newMap.put("noticeId", noticeDTO.getId());
         AllSendNotificationDTO allSendNotificationDTO = new AllSendNotificationDTO(title, message,
             newMap);
-        List<User> userList = userService.readAllUserList();
+        List<User> userList = userService.getAllUserList();
         notificationService.createAllNotification(userList, title, message, allSendNotificationDTO);
 
         return CommonResponse.onSuccess(noticeDTO);

diff --git a/src/main/java/com/ceos/bankids/mapper/UserMapper.java b/src/main/java/com/ceos/bankids/mapper/UserMapper.java
@@ -86,9 +86,9 @@ public UserDTO updateUserType(User user, UserTypeRequest userTypeRequest) {
 
         UserDTO userDTO = userService.updateUserType(user, userTypeRequest);
         if (userDTO.getIsKid() == true) {
-            kidService.createNewKid(user);
+            kidService.createKid(user);
         } else {
-            parentService.createNewParent(user);
+            parentService.createParent(user);
         }
 
         return userDTO;

diff --git a/src/main/java/com/ceos/bankids/service/KidService.java b/src/main/java/com/ceos/bankids/service/KidService.java
@@ -8,7 +8,7 @@
 @Service
 public interface KidService {
 
-    public void createNewKid(User user);
+    public void createKid(User user);
 
     public void deleteKid(User user);
 

diff --git a/src/main/java/com/ceos/bankids/service/KidServiceImpl.java b/src/main/java/com/ceos/bankids/service/KidServiceImpl.java
@@ -26,7 +26,7 @@ public class KidServiceImpl implements KidService {
 
     @Override
     @Transactional
-    public void createNewKid(User user) {
+    public void createKid(User user) {
         Kid newKid = Kid.builder()
             .savings(0L)
             .achievedChallenge(0L)

diff --git a/src/main/java/com/ceos/bankids/service/ParentService.java b/src/main/java/com/ceos/bankids/service/ParentService.java
@@ -9,7 +9,7 @@
 @Service
 public interface ParentService {
 
-    public void createNewParent(User user);
+    public void createParent(User user);
 
     public void deleteParent(User user);
 

diff --git a/src/main/java/com/ceos/bankids/service/ParentServiceImpl.java b/src/main/java/com/ceos/bankids/service/ParentServiceImpl.java
@@ -19,7 +19,7 @@ public class ParentServiceImpl implements ParentService {
 
     @Override
     @Transactional
-    public void createNewParent(User user) {
+    public void createParent(User user) {
         Parent newParent = Parent.builder()
             .acceptedRequest(0L)
             .totalRequest(0L)

diff --git a/src/main/java/com/ceos/bankids/service/UserService.java b/src/main/java/com/ceos/bankids/service/UserService.java
@@ -12,7 +12,7 @@
 @Service
 public interface UserService {
 
-    public Optional<User> readUserByAuthenticationCodeNullable(String code);
+    public Optional<User> findUserByAuthenticationCodeNullable(String code);
 
     public User createNewUser(String username, String code, String provider);
 
@@ -30,6 +30,6 @@ public interface UserService {
 
     public OptInDTO updateServiceOptIn(User user);
 
-    public List<User> readAllUserList();
+    public List<User> getAllUserList();
 
 }
diff --git a/src/main/java/com/ceos/bankids/service/UserServiceImpl.java b/src/main/java/com/ceos/bankids/service/UserServiceImpl.java
@@ -20,7 +20,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(readOnly = true)
-    public Optional<User> readUserByAuthenticationCodeNullable(String code) {
+    public Optional<User> findUserByAuthenticationCodeNullable(String code) {
         return userRepository.findByAuthenticationCode(code);
     }
 
@@ -102,7 +102,7 @@ public OptInDTO updateServiceOptIn(User user) {
 
     @Override
     @Transactional(readOnly = true)
-    public List<User> readAllUserList() {
+    public List<User> getAllUserList() {
         return userRepository.findAll();
     }
 }