diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java index f4e6aae..b78a823 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -1,6 +1,6 @@ package org.cmh.backend.authentication.controller; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.authentication.model.UserHS; import org.cmh.backend.authentication.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -16,8 +16,8 @@ public class UserController { private UserService userService; @GetMapping("/{username}") - public ResponseEntity getUser(@PathVariable String username) { - User user = userService.getUserByUsername(username); + public ResponseEntity getUser(@PathVariable String username) { + UserHS user = userService.getUserByUsername(username); return ResponseEntity.ok(user); } } diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java deleted file mode 100644 index ba9aa53..0000000 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.cmh.backend.authentication.model; - -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; - -@Entity -public class User { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - private String username; - private String password; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } -} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/model/UserHS.java b/src/main/java/org/cmh/backend/authentication/model/UserHS.java new file mode 100644 index 0000000..995186d --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/model/UserHS.java @@ -0,0 +1,28 @@ +package org.cmh.backend.authentication.model; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Setter +@Getter +@Entity +public class UserHS { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String username; + private String password; + private String nickname; + private String gender; + private String phoneNumber; + private String email; + private String department; + private String role; + private LocalDateTime createdAt; +} diff --git a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java index 2c5116e..c313cb8 100644 --- a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java +++ b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java @@ -1,8 +1,8 @@ package org.cmh.backend.authentication.repository; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.authentication.model.UserHS; import org.springframework.data.jpa.repository.JpaRepository; -public interface UserRepository extends JpaRepository { - User findByUsername(String username); +public interface UserRepository extends JpaRepository { + UserHS findByUsername(String username); } diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java index 30e5134..1351b1f 100644 --- a/src/main/java/org/cmh/backend/authentication/service/UserService.java +++ b/src/main/java/org/cmh/backend/authentication/service/UserService.java @@ -1,6 +1,6 @@ package org.cmh.backend.authentication.service; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.authentication.model.UserHS; import org.cmh.backend.authentication.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,7 +10,7 @@ public class UserService { @Autowired private UserRepository userRepository; - public User getUserByUsername(String username) { + public UserHS getUserByUsername(String username) { return userRepository.findByUsername(username); } }