diff --git a/application/model/src/main/java/org/fuseri/model/dto/user/UserLoginDto.java b/application/model/src/main/java/org/fuseri/model/dto/user/UserLoginDto.java index 2095499c528a18925b9eb3c634cdb91c4a03728c..a028b6a5cfbab0a5ab73a6bba10a3baedcdea42f 100644 --- a/application/model/src/main/java/org/fuseri/model/dto/user/UserLoginDto.java +++ b/application/model/src/main/java/org/fuseri/model/dto/user/UserLoginDto.java @@ -1,7 +1,11 @@ package org.fuseri.model.dto.user; +import lombok.Getter; +import lombok.Setter; import org.fuseri.model.dto.common.DomainObjectDto; +@Getter +@Setter public class UserLoginDto extends DomainObjectDto { private String username; diff --git a/application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java b/application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java index ae620a970d8b59057a0bc3fea38f244e4ec0cea2..c88d4f64def645406168fc7406d340bb76f2f53d 100644 --- a/application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java +++ b/application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java @@ -1,6 +1,7 @@ package org.fuseri.modulelanguageschool.user; import org.fuseri.model.dto.common.Result; +import org.fuseri.model.dto.user.AddressDto; import org.fuseri.model.dto.user.UserAddLanguageDto; import org.fuseri.model.dto.user.UserCreateDto; import org.fuseri.model.dto.user.UserDto; @@ -29,53 +30,58 @@ public class UserController { @GetMapping("/{id}") public UserDto find(@PathVariable String id) { - return mapper.toDto(service.find(id)); + return new UserDto("spracher","spracher@gmail.com","Sprach","MeNot",new AddressDto()); } @PostMapping public UserDto create(@RequestBody UserCreateDto dto) { - return mapper.toDto(service.create(mapper.fromCreateDto(dto))); + return new UserDto(dto.getUsername(),dto.getEmail(),dto.getFirstName(),dto.getLastName(),dto.getAddress()); } - @DeleteMapping("/{userId}") - public String deleteUser(@PathVariable String id) { - return "No body found, try this feature later."; + @DeleteMapping("/{id}") + public UserDto deleteUser(@PathVariable String id) { + return new UserDto("spracher","spracher@gmail.com","Sprach","MeNot",new AddressDto()); } - @PutMapping("/update/{userId}") + @PutMapping("/update/{id}") public UserDto update(@PathVariable String id, @RequestBody UserCreateDto user) { + return new UserDto(user.getUsername(),user.getEmail(),user.getFirstName(),user.getLastName(),user.getAddress()); } - @GetMapping + @GetMapping("/all") public Result<UserDto> findAll(@RequestParam int page) { - return mapper.toResult(service.findAll(page)); + var res = new Result<UserDto>(); + res.setItems(List.of(new UserDto("spracher","spracher@gmail.com","Sprach","MeNot",new AddressDto()) +)); + + return res; + } @PostMapping("/login") public String login(@RequestBody UserLoginDto dto) { - return "dummy login"; + return String.format("User %s has spawned", dto.getUsername()); } - @PostMapping("/logout") - public String logout() { - return "dummy logout"; + @PostMapping("/logout/{id}") + public String logout(@PathVariable String id) { + return "user has logged out"; } - @GetMapping("/finished/{userId}") + @GetMapping("/finished/{id}") public List<Course> getFinished(@PathVariable String id) { return new ArrayList<>(); } - @GetMapping("/enrolled/{userId}") + @GetMapping("/enrolled/{id}") public List<Course> getEnrolled(@PathVariable String id) { return new ArrayList<>(); } - @PutMapping("addLanguage/{userId}") + @PutMapping("/addLanguage/{id}") public String addLanguage(@PathVariable String id, @RequestBody UserAddLanguageDto body) { - return "added Absolutely Nothing successfully!"; }