UserService 작성

bbaemin-api/src/main/java/org/bbaemin/user/controller/UserController.java

@@ -4,70 +4,64 @@
 import org.bbaemin.user.controller.request.JoinRequest;
 import org.bbaemin.user.controller.request.UpdateUserInfoRequest;
 import org.bbaemin.user.controller.response.UserResponse;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.bbaemin.user.service.UserService;
+import org.bbaemin.user.vo.User;
+import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RequestMapping("/api/v1/users")
 @RestController
 @RequiredArgsConstructor
 public class UserController {
 
+    private final UserService userService;
+
     // 회원 리스트
     @GetMapping
     public List<UserResponse> listUser() {
-        return Arrays.asList(
-                UserResponse.builder()
-                        .userId(1L)
-                        .email("[email protected]")
-                        .nickname("user1")
-                        .image(null)
-                        .phoneNumber("010-1234-5678")
-                        .build(),
-                UserResponse.builder()
-                        .userId(2L)
-                        .email("[email protected]")
-                        .nickname("user2")
-                        .image(null)
-                        .phoneNumber("010-1111-2222")
-                        .build()
-        );
+        return userService.getUserList().stream()
+                .map(UserResponse::new).collect(Collectors.toList());
     }
 
     // 회원 조회
     @GetMapping("/{userId}")
     public UserResponse getUser(@PathVariable Long userId) {
-        return UserResponse.builder()
-                .userId(userId)
-                .email("[email protected]")
-                .nickname("user1")
-                .image(null)
-                .phoneNumber("010-1234-5678")
-                .build();
+        User user = userService.getUser(userId);
+        return new UserResponse(user);
     }
 
     // 회원 등록
     @PostMapping
-    public Long join(JoinRequest joinRequest) {
-        return 1L;
+    public UserResponse join(@RequestBody JoinRequest joinRequest) {
+        User user = userService.join(
+                User.builder()
+                        .email(joinRequest.getEmail())
+                        .nickname(joinRequest.getNickname())
+                        .image(joinRequest.getImage())
+                        .password(joinRequest.getPassword())
+                        .phoneNumber(joinRequest.getPhoneNumber())
+                        .build());
+        return new UserResponse(user);
     }
 
     // 회원정보 수정
     @PutMapping("/{userId}")
-    public Long updateUserInfo(@PathVariable Long userId, UpdateUserInfoRequest updateUserInfoRequest) {
-        return userId;
+    public UserResponse updateUserInfo(@PathVariable Long userId, @RequestBody UpdateUserInfoRequest updateUserInfoRequest) {
+        User user = userService.updateUserInfo(
+                User.builder()
+                        .userId(userId)
+                        .nickname(updateUserInfoRequest.getNickname())
+                        .image(updateUserInfoRequest.getImage())
+                        .phoneNumber(updateUserInfoRequest.getPhoneNumber())
+                        .build());
+        return new UserResponse(user);
     }
 
     // 회원 탈퇴
     @PatchMapping("/{userId}")
-    public Long quit(@PathVariable Long userId) {
-        return userId;
+    public void quit(@PathVariable Long userId) {
+        userService.quit(userId);
     }
 }

bbaemin-api/src/main/java/org/bbaemin/user/controller/request/JoinRequest.java

@@ -1,13 +1,28 @@
 package org.bbaemin.user.controller.request;
 
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
 public class JoinRequest {
 
     private String email;
     private String nickname;
     private String image;
 
+    // TODO - validation check : password.equals(passwordConfirm)
     private String password;
     private String passwordConfirm;
 
     private String phoneNumber;
+
+    @Builder
+    private JoinRequest(String email, String nickname, String image, String password, String passwordConfirm, String phoneNumber) {
+        this.email = email;
+        this.nickname = nickname;
+        this.image = image;
+        this.password = password;
+        this.passwordConfirm = passwordConfirm;
+        this.phoneNumber = phoneNumber;
+    }
 }

bbaemin-api/src/main/java/org/bbaemin/user/controller/request/UpdateUserInfoRequest.java

@@ -1,8 +1,19 @@
 package org.bbaemin.user.controller.request;
 
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
 public class UpdateUserInfoRequest {
 
     private String nickname;
     private String image;
     private String phoneNumber;
+
+    @Builder
+    private UpdateUserInfoRequest(String nickname, String image, String phoneNumber) {
+        this.nickname = nickname;
+        this.image = image;
+        this.phoneNumber = phoneNumber;
+    }
 }

bbaemin-api/src/main/java/org/bbaemin/user/controller/response/UserResponse.java

@@ -1,6 +1,6 @@
 package org.bbaemin.user.controller.response;
 
-import lombok.Builder;
+import org.bbaemin.user.vo.User;
 
 public class UserResponse {
 
@@ -11,12 +11,11 @@ public class UserResponse {
 
     private String phoneNumber;
 
-    @Builder
-    private UserResponse(Long userId, String email, String nickname, String image, String phoneNumber) {
-        this.userId = userId;
-        this.email = email;
-        this.nickname = nickname;
-        this.image = image;
-        this.phoneNumber = phoneNumber;
+    public UserResponse(User user) {
+        this.userId = user.getUserId();
+        this.email = user.getEmail();
+        this.nickname = user.getNickname();
+        this.image = user.getImage();
+        this.phoneNumber = user.getPhoneNumber();
     }
 }

bbaemin-api/src/main/java/org/bbaemin/user/repository/UserRepository.java

@@ -0,0 +1,68 @@
+package org.bbaemin.user.repository;
+
+import org.bbaemin.user.vo.User;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+@Component
+public class UserRepository {
+
+    private static final Map<Long, User> map = new ConcurrentHashMap<>();
+    private static final AtomicLong id = new AtomicLong(0L);
+
+    public static AtomicLong getId() {
+        return id;
+    }
+
+    static {
+        map.put(getId().incrementAndGet(), User.builder()
+                .userId(getId().get())
+                .email("[email protected]")
+                .nickname("user1")
+                .image(null)
+                .phoneNumber("010-1234-5678")
+                .build());
+        map.put(getId().incrementAndGet(), User.builder()
+                .userId(getId().get())
+                .email("[email protected]")
+                .nickname("user2")
+                .image(null)
+                .phoneNumber("010-1111-2222")
+                .build());
+    }
+
+    public static void clear() {
+        map.clear();
+    }
+
+    public List<User> findAll() {
+        return new ArrayList<>(map.values());
+    }
+
+    public User findById(Long userId) {
+        return map.get(userId);
+    }
+
+    public User insert(User user) {
+        Long userId = getId().incrementAndGet();
+        user.setUserId(userId);
+        map.put(userId, user);
+        return user;
+    }
+
+    public User update(User user) {
+        map.put(user.getUserId(), user);
+        return user;
+    }
+
+    public void updateUserDeleted(Long userId) {
+        User user = map.get(userId);
+        user.setDeleted(true);
+        map.put(userId, user);
+    }
+}

bbaemin-api/src/main/java/org/bbaemin/user/service/UserService.java

@@ -0,0 +1,36 @@
+package org.bbaemin.user.service;
+
+import lombok.RequiredArgsConstructor;
+import org.bbaemin.user.repository.UserRepository;
+import org.bbaemin.user.vo.User;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class UserService {
+
+    private final UserRepository userRepository;
+
+    public List<User> getUserList() {
+        return userRepository.findAll();
+    }
+
+    public User getUser(Long userId) {
+        return userRepository.findById(userId);
+    }
+
+    public User join(User user) {
+        return userRepository.insert(user);
+    }
+
+    public User updateUserInfo(User user) {
+        return userRepository.update(user);
+    }
+
+    public void quit(Long userId) {
+        userRepository.updateUserDeleted(userId);
+    }
+
+}

bbaemin-api/src/main/java/org/bbaemin/user/vo/User.java

@@ -0,0 +1,35 @@
+package org.bbaemin.user.vo;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class User {
+
+    private Long userId;
+    private String email;
+    private String nickname;
+    private String image;
+    private String password;
+    private String phoneNumber;
+
+    private boolean deleted = false;
+
+    @Builder
+    private User(Long userId, String email, String nickname, String image, String password, String phoneNumber) {
+        this.userId = userId;
+        this.email = email;
+        this.nickname = nickname;
+        this.image = image;
+        this.password = password;
+        this.phoneNumber = phoneNumber;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+}

bbaemin-api/src/test/java/org/bbaemin/user/controller/response/UserResponseTest.java

@@ -0,0 +1,44 @@
+package org.bbaemin.user.controller.response;
+
+import org.bbaemin.user.vo.User;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.lang.reflect.Field;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class UserResponseTest {
+
+    @Test
+    public void test() {
+
+        User user = User.builder()
+                .userId(1L)
+                .email("[email protected]")
+                .nickname("user1")
+                .image(null)
+                .phoneNumber("010-1234-5678")
+                .build();
+        UserResponse response = new UserResponse(user);
+        Field[] userClassFields = User.class.getDeclaredFields();
+        Field[] fields = UserResponse.class.getDeclaredFields();
+        // TODO - 필드를 어떻게 빠짐없이 체크할까
+        // + 필드 이름이 다를 때는?
+        for (Field field : fields) {
+/*
+            field.setAccessible(true);
+            Field userClassField = Arrays.stream(userClassFields)
+                    .filter(f -> f.getName().equals(field.getName()))
+                    .findAny().orElseThrow(RuntimeException::new);
+            userClassField.setAccessible(true);
+            assertEquals(field.get(response), userClassField.get(user));*/
+
+            assertEquals(ReflectionTestUtils.getField(response, field.getName()),
+                    ReflectionTestUtils.getField(user, field.getName()));
+        }
+
+    }
+
+
+}