diff --git a/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java b/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java
index 4330a551..8286a38a 100644
--- a/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java
+++ b/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java
@@ -10,7 +10,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import picasso.server.api.exchange.model.request.PostCreatePaymentRequest;
 import picasso.server.api.exchange.service.PaymentService;
-import picasso.server.api.user.service.UserService;
+import picasso.server.api.mypage.service.MypageService;
 import picasso.server.domain.domains.user.entity.User;
 
 import java.util.Optional;
@@ -22,7 +22,7 @@
 public class PaymentController {
   
   private final PaymentService paymentService;
-  private final UserService userService;
+  private final MypageService userService;
   
   @GetMapping("/payment")
   public String paymentForm() {
diff --git a/Api/src/main/java/picasso/server/api/mypage/controller/MypageController.java b/Api/src/main/java/picasso/server/api/mypage/controller/MypageController.java
new file mode 100644
index 00000000..5c6d01bd
--- /dev/null
+++ b/Api/src/main/java/picasso/server/api/mypage/controller/MypageController.java
@@ -0,0 +1,78 @@
+package picasso.server.api.mypage.controller;
+
+import jakarta.servlet.http.HttpSession;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import picasso.server.api.mypage.service.MypageService;
+import picasso.server.domain.domains.user.entity.User;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+@Slf4j
+@Controller
+@RequestMapping("/user")
+@RequiredArgsConstructor
+public class MypageController {
+
+  private final MypageService mypageService;
+
+  // 마이페이지 수정 전
+  @GetMapping("/mypage")
+  public String getUserByEmail(HttpSession session, Model model) {
+    User loginUser = (User) session.getAttribute("loginUser");
+    if (loginUser == null) {
+      // TODO : 사용자 정보 없는 경우 Exception 처리 필요 (로그인을 하지 않은 상태이기 떄문)
+    }
+
+    Optional<User> optionalUser = mypageService.findUserById(loginUser.getId());
+    if (optionalUser.isEmpty()) {
+      // TODO : 로그인 사용자(세션)는 존재하더라도, DB에서 현재 사용자 정보가 존재하지 않는 경우이기 떄문에 Exception처리가 필요
+    }
+    model.addAttribute("user", optionalUser.get());
+    return "user/mypage";
+  }
+
+  // TODO: 테스트용 Controller 입니다. 추후 삭제 혹은 변경이 필요합니다.
+  @ResponseBody
+  @PostMapping("/session-info")
+  public Map<String, Long> paymentSessionInfoRtn(HttpSession session) {
+    User temp = (User)session.getAttribute("loginUser");
+    return new HashMap<String, Long>(){{
+      put("userId", 1L);
+    }};
+  }
+
+
+//  @GetMapping("/login-form")
+//  public String loginForm(@CookieValue(value = "user", required = false) String userJson, Model model) {
+//    if (userJson != null && !userJson.isEmpty()) {
+//      // 이미 로그인된 경우의 처리 로직
+//      // 예: return "redirect:/dashboard";
+//    }
+//    model.addAttribute("UserDTO", new UserDTO());
+//    return "user/login-form"; // Thymeleaf 템플릿 경로
+//  }
+//
+//  @PostMapping("/login")
+//  public ResponseEntity<String> login(@RequestBody UserDTO userDto, HttpServletResponse response) {
+//    Cookie loginCookie = null;
+//    try {
+//      loginCookie = muserService.login(userDto);
+//    } catch (JsonProcessingException e) {
+//      throw new RuntimeException(e);
+//    }
+//    if (loginCookie != null) {
+//      response.addCookie(loginCookie);
+//      return ResponseEntity.ok("로그인 성공");
+//    }
+//    return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("로그인 실패");
+//  }
+}
diff --git a/Api/src/main/java/picasso/server/api/user/service/AuthService.java b/Api/src/main/java/picasso/server/api/mypage/service/AuthService.java
similarity index 100%
rename from Api/src/main/java/picasso/server/api/user/service/AuthService.java
rename to Api/src/main/java/picasso/server/api/mypage/service/AuthService.java
diff --git a/Api/src/main/java/picasso/server/api/user/service/AuthServiceImpl.java b/Api/src/main/java/picasso/server/api/mypage/service/AuthServiceImpl.java
similarity index 100%
rename from Api/src/main/java/picasso/server/api/user/service/AuthServiceImpl.java
rename to Api/src/main/java/picasso/server/api/mypage/service/AuthServiceImpl.java
diff --git a/Api/src/main/java/picasso/server/api/mypage/service/MypageService.java b/Api/src/main/java/picasso/server/api/mypage/service/MypageService.java
new file mode 100644
index 00000000..522cb49c
--- /dev/null
+++ b/Api/src/main/java/picasso/server/api/mypage/service/MypageService.java
@@ -0,0 +1,31 @@
+package picasso.server.api.mypage.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import picasso.server.domain.domains.user.entity.User;
+import picasso.server.domain.domains.user.repository.MypageRepository;
+
+import java.util.Optional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class MypageService {
+
+  private final MypageRepository mypageRepository;
+  private final ObjectMapper objectMapper;
+  private HttpServletResponse response;
+
+
+  public void saveUser(User user) {
+    mypageRepository.save(user);
+  }
+
+  public Optional<User> findUserById(Long id) {
+    return mypageRepository.findById(id);
+  }
+}
+
diff --git a/Api/src/main/java/picasso/server/api/user/controller/LoginController.java b/Api/src/main/java/picasso/server/api/user/controller/LoginController.java
index 403dad8c..9a7d4f8f 100644
--- a/Api/src/main/java/picasso/server/api/user/controller/LoginController.java
+++ b/Api/src/main/java/picasso/server/api/user/controller/LoginController.java
@@ -1,56 +1,30 @@
-//package picasso.server.api.user.controller;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.web.bind.support.SessionStatus;
-//import picasso.server.api.user.service.UserService;
-//import picasso.server.domain.domains.dto.UserDTO;
-//import picasso.server.domain.domains.user.entity.User;
-//
-//@Controller
-//@RequestMapping("/user")
-//public class LoginController {
-//
-//  private final UserService userService;
-//
-//  @Autowired
-//  public LoginController(UserService userService) {
-//    this.userService = userService;
-//  }
-//
-//  @GetMapping("form")
-//  public String form(@CookieValue(required = false) String email, Model model) {
-//    model.addAttribute("UserDTO", new UserDTO());
-//    return "user/form";
-//  }
-//
-//  @PostMapping
-//  public String add(UserDTO dto){
-//    User user = new User();
-//    user.setEmail(dto.getEmail());
-//    user.setPassword(dto.getPassword());
-//    user.setNickName(dto.getEmail());
-//    return "redirect:/";
-//  }
-//
-//  @PostMapping("login")
-//  public ResponseEntity<?> login(@RequestBody UserDTO requestDto) {
-//    try {
-//      User authenticatedUser = userService.login(requestDto.getEmail(), requestDto.getPassword());
-//      return ResponseEntity.ok(authenticatedUser);
-//    } catch (Exception e) {
-//      return ResponseEntity.badRequest().body(e.getMessage());
-//    }
-//  }
-//
-//  @GetMapping("logout")
-//  public ResponseEntity<String> logout(SessionStatus sessionStatus) {
-//    sessionStatus.setComplete();
-//
-//    return ResponseEntity.ok("로그아웃");
-//  }
-//
-//}
+package picasso.server.api.user.controller;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import picasso.server.api.user.service.UserService;
+import picasso.server.domain.domains.dto.UserDTO;
+
+@Controller
+@RequestMapping("auth")
+@RequiredArgsConstructor
+public class LoginController {
+
+  private final UserService userService;
+
+  @GetMapping("login")
+  public String showLoginForm() {
+    return "auth/login";
+  }
+
+  @PostMapping("login")
+  public String handleLogin(@ModelAttribute UserDTO userDto) throws JsonProcessingException {
+    userService.login(userDto);
+    return "redirect:/";
+  }
+}
diff --git a/Api/src/main/java/picasso/server/api/user/controller/LoginController2.java b/Api/src/main/java/picasso/server/api/user/controller/LoginController2.java
new file mode 100644
index 00000000..403dad8c
--- /dev/null
+++ b/Api/src/main/java/picasso/server/api/user/controller/LoginController2.java
@@ -0,0 +1,56 @@
+//package picasso.server.api.user.controller;
+//
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.*;
+//import org.springframework.web.bind.support.SessionStatus;
+//import picasso.server.api.user.service.UserService;
+//import picasso.server.domain.domains.dto.UserDTO;
+//import picasso.server.domain.domains.user.entity.User;
+//
+//@Controller
+//@RequestMapping("/user")
+//public class LoginController {
+//
+//  private final UserService userService;
+//
+//  @Autowired
+//  public LoginController(UserService userService) {
+//    this.userService = userService;
+//  }
+//
+//  @GetMapping("form")
+//  public String form(@CookieValue(required = false) String email, Model model) {
+//    model.addAttribute("UserDTO", new UserDTO());
+//    return "user/form";
+//  }
+//
+//  @PostMapping
+//  public String add(UserDTO dto){
+//    User user = new User();
+//    user.setEmail(dto.getEmail());
+//    user.setPassword(dto.getPassword());
+//    user.setNickName(dto.getEmail());
+//    return "redirect:/";
+//  }
+//
+//  @PostMapping("login")
+//  public ResponseEntity<?> login(@RequestBody UserDTO requestDto) {
+//    try {
+//      User authenticatedUser = userService.login(requestDto.getEmail(), requestDto.getPassword());
+//      return ResponseEntity.ok(authenticatedUser);
+//    } catch (Exception e) {
+//      return ResponseEntity.badRequest().body(e.getMessage());
+//    }
+//  }
+//
+//  @GetMapping("logout")
+//  public ResponseEntity<String> logout(SessionStatus sessionStatus) {
+//    sessionStatus.setComplete();
+//
+//    return ResponseEntity.ok("로그아웃");
+//  }
+//
+//}
diff --git a/Api/src/main/java/picasso/server/api/user/controller/UserController.java b/Api/src/main/java/picasso/server/api/user/controller/UserController.java
index 985c6729..f90514cb 100644
--- a/Api/src/main/java/picasso/server/api/user/controller/UserController.java
+++ b/Api/src/main/java/picasso/server/api/user/controller/UserController.java
@@ -1,33 +1,54 @@
-package picasso.server.api.user.controller;
+package picasso.server.api.user.controller;//package picasso.server.api.user.controller;
+//
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.*;
+//import picasso.server.api.user.service.UserService;
+//import picasso.server.domain.domains.dto.UserDTO;
+//import picasso.server.domain.domains.user.entity.User;
+//
+//@Controller
+//@RequestMapping("/user")
+//public class UserController {
+//
+//  private final UserService userService;
+//  private final ObjectMapper objectMapper;
+//
+//  @Autowired
+//  public UserController(UserService userService) {
+//    this.userService = userService;
+//  }
+//
+//  @GetMapping("/form")
+//  public String form(@CookieValue(required = false) String email, Model model) {
+//    model.addAttribute("UserDTO", new UserDTO());
+//    return "user/form";
+//  }
+//
+//  @PostMapping("form")
+//  public ResponseEntity<User> signUp(@RequestBody UserDTO userDto) {
+//    User registeredUser = userService.signUp(userDto);
+//    return ResponseEntity.ok(registeredUser);
+//  }
+//
+//  @PostMapping("login")
+//  public ResponseEntity<User> login(@RequestBody UserDTO userDTO) {
+//    return ResponseEntity.ok();
+//  }
+//}
 
-import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import picasso.server.api.user.service.UserService;
 import picasso.server.domain.domains.dto.UserDTO;
-import picasso.server.domain.domains.user.dto.UserDto;
-import picasso.server.domain.domains.user.entity.User;
-import picasso.server.api.user.service.UserService;
-
-import java.util.HashMap;
-import java.util.Map;
 
-import java.util.Optional;
-
-@Slf4j
 @Controller
 @RequestMapping("/user")
 @RequiredArgsConstructor
@@ -35,58 +56,15 @@ public class UserController {
 
   private final UserService userService;
 
-  @GetMapping("/new")
-  public String createForm() {
-    return "user/UserForm";
-  }
-
-  @PostMapping
-  public String add(UserDto dto, Model model) {
-    userService.saveUser(UserDto.userEntity(dto));
-    return "redirect:/";
-  }
-
-  @GetMapping("/list")
-  public String listMembers(Model model) {
-    model.addAttribute("user", userService.findAllUsers());
-    return "user/list";
-  }
-
-  // 마이페이지 수정 전
-  @GetMapping("/mypage")
-  public String getUserByEmail(HttpSession session, Model model) {
-    User loginUser = (User) session.getAttribute("loginUser");
-    if (loginUser == null) {
-      // TODO : 사용자 정보 없는 경우 Exception 처리 필요 (로그인을 하지 않은 상태이기 떄문)
-    }
-
-    Optional<User> optionalUser = userService.findUserById(loginUser.getId());
-    if (optionalUser.isEmpty()) {
-      // TODO : 로그인 사용자(세션)는 존재하더라도, DB에서 현재 사용자 정보가 존재하지 않는 경우이기 떄문에 Exception처리가 필요
-    }
-    model.addAttribute("user", optionalUser.get());
-    return "user/mypage";
-  }
-
-  @GetMapping("/form")
-  public String form(@CookieValue(required = false) String email,Model model){
-    model.addAttribute("UserDTO",new UserDTO());
-    return"user/form";
+  @GetMapping("form")
+  public String showSignUpForm() {
+    return "user/form";
   }
 
   @PostMapping("form")
-  public ResponseEntity<User> signUp(@RequestBody UserDTO userDto){
-    User registeredUser=userService.signUp(userDto);
-    return ResponseEntity.ok(registeredUser);
-  }
-
-  // TODO: 테스트용 Controller 입니다. 추후 삭제 혹은 변경이 필요합니다.
-  @ResponseBody
-  @PostMapping("/session-info")
-  public Map<String, Long> paymentSessionInfoRtn(HttpSession session) {
-    User temp = (User)session.getAttribute("loginUser");
-    return new HashMap<String, Long>(){{
-      put("userId", 1L);
-    }};
+  public String handleSignUp(@RequestBody UserDTO userDto) {
+    userService.signUp(userDto);
+    return "redirect:/";
   }
 }
+
diff --git a/Api/src/main/java/picasso/server/api/user/service/UserService.java b/Api/src/main/java/picasso/server/api/user/service/UserService.java
index 93a1c7d9..ef5ac31b 100644
--- a/Api/src/main/java/picasso/server/api/user/service/UserService.java
+++ b/Api/src/main/java/picasso/server/api/user/service/UserService.java
@@ -1,47 +1,23 @@
 package picasso.server.api.user.service;
 
-import jakarta.transaction.Transactional;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import picasso.server.domain.domains.dto.UserDTO;
-import picasso.server.domain.domains.user.entity.User;
 import picasso.server.domain.domains.user.repository.UserRepository;
-
-import java.util.List;
-import java.util.Optional;
+import picasso.server.domain.domains.user.entity.User;
 
 @Service
-@Transactional
 @RequiredArgsConstructor
 public class UserService {
 
   private final UserRepository userRepository;
-
-  public void saveUser(User user) {
-    userRepository.save(user);
-  }
-
-  public List<User> findAllUsers() {
-    return userRepository.findAll();
-  }
-
-
-  public Optional<User> findUserById(Long id) {
-    return userRepository.findById(id);
-  }
-
-  public Optional<User> findUserByNickname(String nickname) {
-    return userRepository.findByNickName(nickname);
-  }
-
-
-  public List<User> findAllMembers() {
-    return userRepository.findAll();
-  }
-
-//  public User findByEmail(String email) {
-//    return userRepository.findByEmail();
-//  }
+  private final ObjectMapper objectMapper;
+  private HttpServletResponse response;
 
   public User signUp(UserDTO userDto) {
 
@@ -53,29 +29,39 @@ public User signUp(UserDTO userDto) {
     return userRepository.save(user);
   }
 
-//  public User login(UserDTO userDto) {
-//
-//    User user = new User();
-//    user.setEmail(userDto.getEmail());
-//    user.setPassword(userDto.getPassword());
-//
-//    return userRepository.save(user);
-//  }
+  public HttpServletResponse login(UserDTO userDto) throws JsonProcessingException {
 
-  public User save(User user) {
-    return userRepository.save(user);
-  }
+    User user = new User();
+    user.setEmail(userDto.getEmail());
+    user.setPassword(userDto.getPassword());
 
+    String userJson = objectMapper.writeValueAsString(user);
 
-  public Optional<User> findUserByEmail(String email) {
-    return userRepository.findByEmail(email);
-  }
+    Cookie userCookie = new Cookie("user", userJson);
+    response.addCookie(userCookie);
+
+//    if (response.equals(user.get))
+
+      return response;
 
-  public Optional<User> findUserByEmailAndPassword(String email, String password) {
-    return userRepository.findByEmailAndPassword(email, password);
   }
 
-  public void deleteUserById(Long id) {
-    userRepository.deleteById(id);
+  public boolean isUserValid(UserDTO userDto, HttpServletRequest request) throws JsonProcessingException {
+    // 1. 쿠키에서 "user" 데이터를 가져옵니다.
+    Cookie[] cookies = request.getCookies();
+    if (cookies != null) {
+      for (Cookie cookie : cookies) {
+        if ("user".equals(cookie.getName())) {
+          // 2. 가져온 데이터를 User 객체로 변환합니다.
+          User userFromCookie = objectMapper.readValue(cookie.getValue(), User.class);
+
+          // 3. 변환된 User 객체와 입력받은 UserDTO 데이터를 비교합니다.
+          if (userDto.getEmail().equals(userFromCookie.getEmail()) && userDto.getPassword().equals(userFromCookie.getPassword())) {
+            return true; // 쿠키의 데이터와 입력된 데이터가 일치합니다.
+          }
+        }
+      }
+    }
+    return false; // 일치하는 쿠키 데이터가 없거나, 데이터가 입력과 일치하지 않습니다.
   }
 }
diff --git a/Domain/src/main/java/picasso/server/domain/domains/user/dto/MyPageDTO.java b/Domain/src/main/java/picasso/server/domain/domains/user/dto/MyPageDTO.java
deleted file mode 100644
index bdc9e2b2..00000000
--- a/Domain/src/main/java/picasso/server/domain/domains/user/dto/MyPageDTO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package picasso.server.domain.domains.user.dto;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class MyPageDTO {
-
-  private String nickname;
-  private Long point;
-  private String profile;
-
-
-
-}
diff --git a/Domain/src/main/java/picasso/server/domain/domains/user/dto/UserDto.java b/Domain/src/main/java/picasso/server/domain/domains/user/dto/UserDto.java
deleted file mode 100644
index 5872ce91..00000000
--- a/Domain/src/main/java/picasso/server/domain/domains/user/dto/UserDto.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package picasso.server.domain.domains.user.dto;
-
-import lombok.Builder;
-import lombok.Data;
-import picasso.server.domain.domains.user.entity.User;
-import picasso.server.domain.domains.user.type.LoginType;
-import picasso.server.domain.domains.user.type.UserRole;
-import picasso.server.domain.domains.user.type.UserStatus;
-
-import java.time.LocalDateTime;
-
-@Data
-@Builder
-public class UserDto {
-
-  private Long id;
-  private String email;
-  private String nickname;
-  private String profile;
-  private Long point;
-  private LoginType loginType;
-  private UserStatus userstatus;
-  private UserRole role;
-  private LocalDateTime createdAt;
-  private LocalDateTime updatedAt;
-  private LocalDateTime loginAt;
-
-
-  public static User userEntity(UserDto requestUserDto) {
-    return User.builder()
-            .email(requestUserDto.getEmail())
-            .nickName(requestUserDto.getNickname())
-            .profile(requestUserDto.getProfile())
-            .point(requestUserDto.getPoint())
-            .loginType(requestUserDto.getLoginType())
-            .userStatus(requestUserDto.getUserstatus())
-            .userRole(requestUserDto.getRole())
-            .createdAt(requestUserDto.getCreatedAt())
-            .updatedAt(requestUserDto.getUpdatedAt())
-            .loginAt(requestUserDto.getLoginAt())
-            .build();
-  }
-}
diff --git a/Domain/src/main/java/picasso/server/domain/domains/user/repository/MypageRepository.java b/Domain/src/main/java/picasso/server/domain/domains/user/repository/MypageRepository.java
new file mode 100644
index 00000000..72707ff8
--- /dev/null
+++ b/Domain/src/main/java/picasso/server/domain/domains/user/repository/MypageRepository.java
@@ -0,0 +1,7 @@
+package picasso.server.domain.domains.user.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import picasso.server.domain.domains.user.entity.User;
+
+public interface MypageRepository extends JpaRepository <User, Long> {
+}
diff --git a/Domain/src/main/java/picasso/server/domain/domains/user/repository/UserRepository.java b/Domain/src/main/java/picasso/server/domain/domains/user/repository/UserRepository.java
index 63fb6055..04485b63 100644
--- a/Domain/src/main/java/picasso/server/domain/domains/user/repository/UserRepository.java
+++ b/Domain/src/main/java/picasso/server/domain/domains/user/repository/UserRepository.java
@@ -4,14 +4,12 @@
 import picasso.server.domain.domains.user.entity.User;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
-  List<User> findAll();
 
-  Optional<User> findByNickName(String nickname);
+  User findByEmail(String email);
+  List<User> findAll();
+  User findByEmailAndPassword(String email, String password);
 
-  Optional<User> findByEmail(String email);
 
-  Optional<User> findByEmailAndPassword(String email, String password);
 }
diff --git a/Domain/src/main/resources/data.sql b/Domain/src/main/resources/data.sql
index e2d6ff4a..9a9c2bae 100644
--- a/Domain/src/main/resources/data.sql
+++ b/Domain/src/main/resources/data.sql
@@ -23,9 +23,9 @@ values (5, 50, 5000, '2023-09-28', '2023-10-03', 'test5', 'local/paint/bf50117d-
 
 
 
-insert into tbl_member  (email, password, nick_name, profile, point, login_type, user_status, user_role, created_at, updated_at, login_at)
-values ('test1@test.com', '1111', '안뇽', 'profile1', 100, 'KAKAO', 'NOT_ACTIVE', 'USER', '2023-09-18 10:00:00', '2023-08-22 10:00:00', '2023-08-22 10:00:00');
-insert into tbl_member  (email, password, nick_name, profile, point, login_type, user_status, user_role, created_at, updated_at, login_at)
-values ('test2@test.com', '2222', '화요일', 'profile1', 100, 'NAVER', 'NOT_ACTIVE', 'USER', '2023-09-18 10:00:00', '2023-08-22 10:00:00', '2023-08-22 10:00:00');
-insert into tbl_member  (email, password, nick_name, profile, point, login_type, user_status, user_role, created_at, updated_at, login_at)
-values ('test3@test.com', '3333', '3번', 'profile3', 300, 'DEFAULT', 'SUSPENSION', 'USER', '2023-09-20 10:00:00', '2023-08-22 12:00:00', '2023-08-22 12:00:00');
+--insert into tbl_user  (email, password, nick_name, profile, point, login_type, user_status, user_role, created_at, updated_at, login_at)
+--values ('test1@test.com', '1111', '안뇽', 'profile1', 100, 'KAKAO', 'NOT_ACTIVE', 'USER', '2023-09-18 10:00:00', '2023-08-22 10:00:00', '2023-08-22 10:00:00');
+--insert into tbl_user  (email, password, nick_name, profile, point, login_type, user_status, user_role, created_at, updated_at, login_at)
+--values ('test2@test.com', '2222', '화요일', 'profile1', 100, 'NAVER', 'NOT_ACTIVE', 'USER', '2023-09-18 10:00:00', '2023-08-22 10:00:00', '2023-08-22 10:00:00');
+--insert into tbl_user  (email, password, nick_name, profile, point, login_type, user_status, user_role, created_at, updated_at, login_at)
+--values ('test3@test.com', '3333', '3번', 'profile3', 300, 'DEFAULT', 'SUSPENSION', 'USER', '2023-09-20 10:00:00', '2023-08-22 12:00:00', '2023-08-22 12:00:00');