commit

src/main/java/com/sparta/binplay/controller/UserController.java

@@ -1,9 +1,27 @@
 package com.sparta.binplay.controller;
 
+import com.sparta.binplay.service.UserService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/users")
+@RequestMapping("/api/auth")
 public class UserController {
+    private final UserService userService;
+
+    public UserController(UserService userService) {
+        this.userService = userService;
+    }
+
+   /* @PostMapping("/signup")
+    public UserResponseDto createUser(@RequestBody UserRequestDto requestDto) {
+        return userService.createUser(requestDto);
+    }
+
+    @PutMapping("/users/{id}")
+    public Long updateUser(@PathVariable Long id, @RequestBody UserRequestDto requestDto) {
+        return userService.updateUser(id, requestDto);
+    }*/
+
+
 }

src/main/java/com/sparta/binplay/dto/UserRequestDto.java

@@ -1,4 +1,30 @@
 package com.sparta.binplay.dto;
 
+import com.sparta.binplay.entity.Role;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+
+@Getter
 public class UserRequestDto {
+    @NotBlank(message = "이메일은 필수입니다.")
+    @Email(message = "유효하지않은 이메일입니다.")
+    private String email;
+
+    @NotBlank(message = "비밀번호는 필수입니다.")
+    @Size(min = 6, message = "비밀번호는 6자 이상이어야 합니다.")
+    private String password;
+
+    @NotBlank(message = "이름은 필수입니다.")
+    private String name;
+
+    @NotNull(message = "역할은 필수입니다.")
+    private Role role;
+
+    @NotNull(message = "등급은 필수입니다.")
+    private String grade;
+
+    private boolean isActive;
 }

src/main/java/com/sparta/binplay/dto/UserResponseDto.java

@@ -1,4 +1,27 @@
 package com.sparta.binplay.dto;
 
+import com.sparta.binplay.entity.Users;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
 public class UserResponseDto {
+    private Long userId;
+    private String email;
+    private String grade;
+    private String role;
+    private boolean isActive;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+
+    public UserResponseDto(Users user) {
+        this.userId = user.getUserId();
+        this.email = user.getEmail();
+        this.grade = user.getGrade();
+        this.role = user.getRole().name();
+        this.isActive = user.isActive();
+        this.createdAt = user.getCreatedAt();
+        this.updatedAt = user.getUpdatedAt();
+    }
 }

src/main/java/com/sparta/binplay/entity/Role.java

@@ -0,0 +1,6 @@
+package com.sparta.binplay.entity;
+
+public enum Role {
+    USER,
+    UPLOADER
+}

src/main/java/com/sparta/binplay/entity/Timestamped.java

@@ -14,11 +14,9 @@
 public abstract class Timestamped {
     @CreatedDate
     @Column(name="created_at", updatable = false) //업데이트를 막음
-    @Temporal(TemporalType.TIMESTAMP)
     private LocalDateTime createdAt;
 
     @LastModifiedDate
     @Column(name="updated_at")
-    @Temporal(TemporalType.TIMESTAMP)
     private LocalDateTime updatedAt;
 }

src/main/java/com/sparta/binplay/entity/Users.java

@@ -1,15 +1,12 @@
 package com.sparta.binplay.entity;
 
+import com.sparta.binplay.dto.UserRequestDto;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.List;
 
 @Entity
 @Getter
-@Setter
 @Table(name = "users")
 @NoArgsConstructor
 public class Users extends Timestamped{
@@ -18,27 +15,35 @@ public class Users extends Timestamped{
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long userId;
 
-    @Column(name = "email", nullable = false)
+    @Column(name="email", nullable = false, unique = true)
     private String email;
 
     @Column(name="password", nullable = false)
     private String password;
 
-    @Column(name="name", nullable = false)
-    private String name;
-
-    @Column(name = "grade", nullable = false)
+    @Column(name="grade")
     private String grade;
 
-    @Column(name = "is_active", nullable = false)
-    private Boolean isActive;
-
-    @OneToMany(mappedBy = "user")
-    private List<Videos> videos;
-
-    @OneToMany(mappedBy = "user")
-    private List<Streams> streams;
-
-    @OneToMany(mappedBy = "user")
-    private List<Payments> payments;
+    @Enumerated(EnumType.STRING)
+    @Column(name="role", nullable = false)
+    private Role role;
+
+    @Column(name="is_active", nullable = false)
+    private boolean isActive;
+
+    public Users(UserRequestDto requestDto) {
+        this.email = requestDto.getEmail();
+        this.password = requestDto.getPassword();
+        this.grade = requestDto.getGrade();
+        this.role = requestDto.getRole();
+        this.isActive = requestDto.isActive();
+    }
+
+    public void update(UserRequestDto requestDto) {
+        this.email = requestDto.getEmail();
+        this.password = requestDto.getPassword();
+        this.grade = requestDto.getGrade();
+        this.role = requestDto.getRole();
+        this.isActive = requestDto.isActive();
+    }
 }

src/main/java/com/sparta/binplay/repository/UserRepository.java

@@ -1,7 +1,15 @@
 package com.sparta.binplay.repository;
 
+import com.sparta.binplay.entity.Users;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class UserRepository {
+public interface UserRepository extends JpaRepository<Users, Long> {
+    /*Users findByEmail(String email);
+
+    Users findByUserId(Long userId);
+
+    boolean existsByEmail(String email);*/
+
 }