diff --git a/src/main/java/com/example/onomatopoeiaback/controller/EmployeeController.java b/src/main/java/com/example/onomatopoeiaback/controller/EmployeeController.java index be82008..79179e9 100644 --- a/src/main/java/com/example/onomatopoeiaback/controller/EmployeeController.java +++ b/src/main/java/com/example/onomatopoeiaback/controller/EmployeeController.java @@ -7,7 +7,6 @@ import com.example.onomatopoeiaback.domain.visit.Visit; import com.example.onomatopoeiaback.domain.visit.VisitDTO; import com.example.onomatopoeiaback.service.EmployeeService; import com.example.onomatopoeiaback.service.VisitService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java b/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java index 15cd61d..342d259 100644 --- a/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java +++ b/src/main/java/com/example/onomatopoeiaback/domain/employee/Employee.java @@ -1,11 +1,13 @@ package com.example.onomatopoeiaback.domain.employee; +import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; -import lombok.*; +import lombok.Getter; +import lombok.NonNull; +import lombok.Setter; import java.time.LocalDateTime; - @Entity @Table(name = "employee") @Getter @@ -19,6 +21,7 @@ public class Employee { @NonNull private String login; @NonNull + @JsonIgnore private String password; @NonNull @@ -26,7 +29,7 @@ public class Employee { @NonNull private String photo; @NonNull - private String position; + private PositionType position; private LocalDateTime lastVisit; } diff --git a/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java b/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java index d19f36f..15d1554 100644 --- a/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java +++ b/src/main/java/com/example/onomatopoeiaback/domain/employee/EmployeeDTO.java @@ -10,5 +10,5 @@ public class EmployeeDTO { private String password; private String name; private String photo; - private String position; + private PositionType position; } diff --git a/src/main/java/com/example/onomatopoeiaback/domain/employee/PositionType.java b/src/main/java/com/example/onomatopoeiaback/domain/employee/PositionType.java new file mode 100644 index 0000000..2a2b08a --- /dev/null +++ b/src/main/java/com/example/onomatopoeiaback/domain/employee/PositionType.java @@ -0,0 +1,9 @@ +package com.example.onomatopoeiaback.domain.employee; + +public enum PositionType { + DEVELOPER, + DESIGNER, + TESTER, + ANALYST, + ADMINISTRATOR +} diff --git a/src/main/java/com/example/onomatopoeiaback/repository/EmployeeRepository.java b/src/main/java/com/example/onomatopoeiaback/repository/EmployeeRepository.java index 34b49cf..7b6c512 100644 --- a/src/main/java/com/example/onomatopoeiaback/repository/EmployeeRepository.java +++ b/src/main/java/com/example/onomatopoeiaback/repository/EmployeeRepository.java @@ -1,6 +1,5 @@ package com.example.onomatopoeiaback.repository; -import com.example.onomatopoeiaback.domain.employee.Employee; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/onomatopoeiaback/service/VisitService.java b/src/main/java/com/example/onomatopoeiaback/service/VisitService.java index bc1de02..73987d8 100644 --- a/src/main/java/com/example/onomatopoeiaback/service/VisitService.java +++ b/src/main/java/com/example/onomatopoeiaback/service/VisitService.java @@ -1,7 +1,6 @@ package com.example.onomatopoeiaback.service; -import com.example.onomatopoeiaback.domain.employee.Employee; import com.example.onomatopoeiaback.domain.visit.Visit; import com.example.onomatopoeiaback.exceptions.BadRequestException; import com.example.onomatopoeiaback.exceptions.UnauthorizedException;