Merge branch 'develop' into feature-#21

# Conflicts: # src/main/java/flab/quing/user/User.java # src/main/java/flab/quing/user/UserRepository.java
f-lab-edu · Nov 10, 2022 · e81ff83 · e81ff83
2 parents b46d7bc + 96467b0
commit e81ff83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/flab/quing/user/User.java b/src/main/java/flab/quing/user/User.java
@@ -24,5 +24,14 @@ public class User extends BaseEntity {
 
     private String phoneNumber;
 
+    public UserResponse toResponse() {
+        UserResponse userResponse = UserResponse.builder()
+                .userId(getId())
+                .name(name)
+                .phoneNumber(phoneNumber)
+                .build();
+        return userResponse;
+    }
+
 }
 
diff --git a/src/main/java/flab/quing/user/UserRepository.java b/src/main/java/flab/quing/user/UserRepository.java
@@ -6,6 +6,6 @@
 
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByName(String name);
-    Optional<User> findByPhoneNumber(String phone);
+    Optional<User> findByPhoneNumber(String phoneNumber);
 }