diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java index 086c52b..ff67c53 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/example/nto/controller/EmployeeController.java @@ -47,7 +47,7 @@ public class EmployeeController { @PatchMapping("/{login}/open") public ResponseEntity openEmployee(@PathVariable String login, @RequestBody CodeDto value) { - Long code = value.getValue(); + String code = value.getValue(); return ResponseEntity.ok(employeeService.enterEmployee(login, code)); } diff --git a/src/main/java/com/example/nto/dto/CodeDto.java b/src/main/java/com/example/nto/dto/CodeDto.java index ae2cf8f..0618084 100644 --- a/src/main/java/com/example/nto/dto/CodeDto.java +++ b/src/main/java/com/example/nto/dto/CodeDto.java @@ -5,5 +5,5 @@ import lombok.Data; @Data public class CodeDto { - private Long value; + private String value; } diff --git a/src/main/java/com/example/nto/entity/Code.java b/src/main/java/com/example/nto/entity/Code.java index eb74e42..113c4c3 100644 --- a/src/main/java/com/example/nto/entity/Code.java +++ b/src/main/java/com/example/nto/entity/Code.java @@ -13,7 +13,7 @@ public class Code { private Long id; @Column(name="value") - private Long value; + private String value; @Column(name ="name") private String name; diff --git a/src/main/java/com/example/nto/repository/CodeRepository.java b/src/main/java/com/example/nto/repository/CodeRepository.java index 22d1219..083e084 100644 --- a/src/main/java/com/example/nto/repository/CodeRepository.java +++ b/src/main/java/com/example/nto/repository/CodeRepository.java @@ -7,5 +7,5 @@ import org.springframework.data.jpa.repository.Query; import java.util.Optional; public interface CodeRepository extends JpaRepository { - Optional findByValue(long value); + Optional findByValue(String value); } diff --git a/src/main/java/com/example/nto/service/EmployeeService.java b/src/main/java/com/example/nto/service/EmployeeService.java index 2bcbd35..93bdbfc 100644 --- a/src/main/java/com/example/nto/service/EmployeeService.java +++ b/src/main/java/com/example/nto/service/EmployeeService.java @@ -9,5 +9,5 @@ public interface EmployeeService { EmployeeDto getByLogin(String login); String blockEmployee(String login); String unblockEmployee(String login); - Boolean enterEmployee(String login, Long value); + Boolean enterEmployee(String login, String value); } \ No newline at end of file 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 3cb4662..39852ab 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -61,7 +61,7 @@ public class EmployeeServiceImpl implements EmployeeService { } @Override - public Boolean enterEmployee(String login, Long value) { + public Boolean enterEmployee(String login, String value) { Employee employee = EmployeeMapper.convertFromDto(getByLogin(login)); if (employee != null) { Optional codeOp = codeRepository.findByValue(value); diff --git a/src/main/resources/db.changelog/1.0/2025-01-30--0001-code.xml b/src/main/resources/db.changelog/1.0/2025-01-30--0001-code.xml index b58a5dd..1148be3 100644 --- a/src/main/resources/db.changelog/1.0/2025-01-30--0001-code.xml +++ b/src/main/resources/db.changelog/1.0/2025-01-30--0001-code.xml @@ -18,7 +18,7 @@ - +