diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/controller/PersonController.java b/server/src/main/java/com/usatiuk/tjv/y/server/controller/PersonController.java index 29cb838..186b994 100644 --- a/server/src/main/java/com/usatiuk/tjv/y/server/controller/PersonController.java +++ b/server/src/main/java/com/usatiuk/tjv/y/server/controller/PersonController.java @@ -1,6 +1,6 @@ package com.usatiuk.tjv.y.server.controller; -import com.usatiuk.tjv.y.server.dto.PersonSignupTo; +import com.usatiuk.tjv.y.server.dto.PersonCreateTo; import com.usatiuk.tjv.y.server.dto.PersonTo; import com.usatiuk.tjv.y.server.dto.converters.PersonMapper; import com.usatiuk.tjv.y.server.entity.Chat; @@ -38,7 +38,7 @@ public class PersonController { } @PostMapping - public PersonTo signup(@RequestBody PersonSignupTo signupRequest) throws UserAlreadyExistsException { + public PersonTo signup(@RequestBody PersonCreateTo signupRequest) throws UserAlreadyExistsException { Person toCreate = new Person(); toCreate.setUsername(signupRequest.username()) .setPassword(signupRequest.password()) @@ -78,11 +78,11 @@ public class PersonController { } @PatchMapping(path = "/self") - public PersonTo update(Authentication authentication, @RequestBody PersonSignupTo personSignupTo) { + public PersonTo update(Authentication authentication, @RequestBody PersonCreateTo personCreateTo) { var person = personService.readById(authentication.getName()).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); - person.setUsername(personSignupTo.username()) - .setFullName(personSignupTo.fullName()); - if (!personSignupTo.password().isEmpty()) person.setPassword(passwordEncoder.encode(personSignupTo.password())); + person.setUsername(personCreateTo.username()) + .setFullName(personCreateTo.fullName()); + if (!personCreateTo.password().isEmpty()) person.setPassword(passwordEncoder.encode(personCreateTo.password())); personService.update(person); return personMapper.makeDto(person); } diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/dto/PersonCreateTo.java b/server/src/main/java/com/usatiuk/tjv/y/server/dto/PersonCreateTo.java new file mode 100644 index 0000000..ab17c37 --- /dev/null +++ b/server/src/main/java/com/usatiuk/tjv/y/server/dto/PersonCreateTo.java @@ -0,0 +1,4 @@ +package com.usatiuk.tjv.y.server.dto; + +public record PersonCreateTo(String username, String fullName, String password) { +} diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/dto/PersonSignupTo.java b/server/src/main/java/com/usatiuk/tjv/y/server/dto/PersonSignupTo.java deleted file mode 100644 index 5b23bb2..0000000 --- a/server/src/main/java/com/usatiuk/tjv/y/server/dto/PersonSignupTo.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.usatiuk.tjv.y.server.dto; - -public record PersonSignupTo(String username, String fullName, String password) { -} diff --git a/server/src/test/java/com/usatiuk/tjv/y/server/controller/PersonControllerTest.java b/server/src/test/java/com/usatiuk/tjv/y/server/controller/PersonControllerTest.java index 9a13308..fab4659 100644 --- a/server/src/test/java/com/usatiuk/tjv/y/server/controller/PersonControllerTest.java +++ b/server/src/test/java/com/usatiuk/tjv/y/server/controller/PersonControllerTest.java @@ -1,6 +1,6 @@ package com.usatiuk.tjv.y.server.controller; -import com.usatiuk.tjv.y.server.dto.PersonSignupTo; +import com.usatiuk.tjv.y.server.dto.PersonCreateTo; import com.usatiuk.tjv.y.server.dto.PersonTo; import com.usatiuk.tjv.y.server.dto.converters.PersonMapper; import com.usatiuk.tjv.y.server.repository.PersonRepository; @@ -24,7 +24,7 @@ public class PersonControllerTest extends DemoDataDbTest { @Test void shouldSignUp() { var response = restTemplate.exchange(addr + "/person", HttpMethod.POST, - new HttpEntity<>(new PersonSignupTo("usernew", "full name", "pass")), + new HttpEntity<>(new PersonCreateTo("usernew", "full name", "pass")), PersonTo.class); Assertions.assertNotNull(response);