diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java index 9b8961f..1d6d804 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/example/nto/controller/EmployeeController.java @@ -1,8 +1,10 @@ package com.example.nto.controller; import com.example.nto.entity.Employee; +import com.example.nto.repository.EmployeeRepository; import com.example.nto.service.EmployeeService; import com.example.nto.service.impl.EmployeeServiceImpl; +import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -28,13 +30,14 @@ public class EmployeeController { this.employeeService = employeeService; } - @GetMapping("/{id}/auth") - public HttpStatus Isauth(@PathVariable long id){ - if(employeeService.isIdValid(id)){ + @GetMapping("/{code}/auth") + public HttpStatus Isauth(@PathVariable String code){ + if(employeeService.isCodeValid(code)){ return HttpStatus.OK; } else - return HttpStatus.NOT_FOUND; + return HttpStatus.UNAUTHORIZED; + } diff --git a/src/main/java/com/example/nto/entity/Employee.java b/src/main/java/com/example/nto/entity/Employee.java index 265e27d..387b6b8 100644 --- a/src/main/java/com/example/nto/entity/Employee.java +++ b/src/main/java/com/example/nto/entity/Employee.java @@ -35,9 +35,11 @@ public class Employee { @OneToMany(mappedBy = "employee", cascade = CascadeType.ALL, fetch = FetchType.LAZY) private List bookingList; - public Employee(long id, String name) { + public Employee(long id, String name, String code, String photoUrl) { this.id = id; this.name = name; + this.code = code; + this.photoUrl = photoUrl; } } diff --git a/src/main/java/com/example/nto/repository/EmployeeRepository.java b/src/main/java/com/example/nto/repository/EmployeeRepository.java index 7eee94f..e6ecbcb 100644 --- a/src/main/java/com/example/nto/repository/EmployeeRepository.java +++ b/src/main/java/com/example/nto/repository/EmployeeRepository.java @@ -16,7 +16,6 @@ import java.util.Optional; @Service @Repository -public interface EmployeeRepository extends JpaRepository { - Optional findById(Long id); - +public interface EmployeeRepository extends JpaRepository { + Optional findByCode(String code); } diff --git a/src/main/java/com/example/nto/service/EmployeeService.java b/src/main/java/com/example/nto/service/EmployeeService.java index 1565317..a949b95 100644 --- a/src/main/java/com/example/nto/service/EmployeeService.java +++ b/src/main/java/com/example/nto/service/EmployeeService.java @@ -14,7 +14,8 @@ import java.util.Optional; public interface EmployeeService { List getAll(); - Optional getById(long id); + Optional getByCode(String code); - boolean isIdValid(long id); + + boolean isCodeValid(String code); } diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java index e7488fa..66b2764 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -32,11 +32,11 @@ public class EmployeeServiceImpl implements EmployeeService { } @Override - public Optional getById(long id) { - return employeeRepository.findById(id); + public Optional getByCode(String code) { + return employeeRepository.findByCode(code); } - public boolean isIdValid(long id){ - return employeeRepository.findById(id).isPresent(); + public boolean isCodeValid(String code){ + return employeeRepository.findByCode(code).isPresent(); } }