diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java index 6eb6670..9e601e0 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/example/nto/controller/EmployeeController.java @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.*; import java.net.http.HttpResponse; import java.util.List; +import java.util.Map; +import java.util.Optional; /** * TODO: ДОРАБОТАТЬ в рамках задания @@ -31,20 +33,30 @@ public class EmployeeController { } @GetMapping("/{code}/auth") - public ResponseEntity Isauth(@PathVariable String code) { + public HttpStatus Isauth(@PathVariable String code) { if (employeeService.isCodeValid(code)) { - return ResponseEntity - .status(HttpStatus.OK) - .body("данный код существует - можно пользоваться приложением"); + return HttpStatus.OK; + } else if (code == null) { - return ResponseEntity - .status(HttpStatus.BAD_REQUEST) - .body("что-то пошло не так"); + return + HttpStatus.BAD_REQUEST; + } else { - return ResponseEntity - .status(HttpStatus.UNAUTHORIZED) - .body("кода не существует"); + return + HttpStatus.UNAUTHORIZED; } } + @GetMapping("/{code}/info") + public ResponseEntity getInfo(@PathVariable String code){ + + Optional employee = employeeService.getByCode(code); + + if (employee.isPresent()) { + return ResponseEntity.ok(employee.get()); + } else { + return ResponseEntity.notFound().build(); + } + + } } diff --git a/src/main/java/com/example/nto/entity/Booking.java b/src/main/java/com/example/nto/entity/Booking.java index d15b740..d7b56c0 100644 --- a/src/main/java/com/example/nto/entity/Booking.java +++ b/src/main/java/com/example/nto/entity/Booking.java @@ -22,6 +22,7 @@ import java.time.LocalDate; @Entity public class Booking { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private long id; private LocalDate date; diff --git a/src/main/java/com/example/nto/entity/Place.java b/src/main/java/com/example/nto/entity/Place.java index 1bbd9bb..8e58ba8 100644 --- a/src/main/java/com/example/nto/entity/Place.java +++ b/src/main/java/com/example/nto/entity/Place.java @@ -19,7 +19,6 @@ import lombok.NoArgsConstructor; @Data @Builder @NoArgsConstructor -@AllArgsConstructor @Entity public class Place { @@ -28,4 +27,9 @@ public class Place { private long id; private String place; + + public Place(long id, String place){ + this.id = id; + this.place = place; + } }