hamx/ArtisanConnectBackend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dto change to show good role

Browse Source
This commit is contained in:
Andrii Solianyk
2025-06-04 12:07:56 +02:00
parent ffbd8d220c
commit 5f548de73a
7 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/_11/asktpk/artisanconnectbackend/controller/AuthController.java
View File

@@ -53,7 +53,7 @@ public class AuthController {
String token = jwtUtil.generateToken(
savedClient.getEmail(),
savedClient.getRole().getRole(),
savedClient.getRole(),
savedClient.getId()
);
@@ -62,7 +62,7 @@ public class AuthController {
return ResponseEntity.status(HttpStatus.CREATED)
.body(new AuthResponseDTO(
savedClient.getId(),
savedClient.getRole().getRole(),
savedClient.getRole(),
token
));
}

12
src/main/java/_11/asktpk/artisanconnectbackend/controller/ClientController.java
View File

@@ -24,16 +24,16 @@ public class ClientController {
}
@GetMapping("/get/{id}")
public ResponseEntity getClientById(@PathVariable long id) {
public ResponseEntity<?> getClientById(@PathVariable long id) {
if(clientService.getClientById(id) != null) {
return new ResponseEntity(clientService.getClientById(id), HttpStatus.OK);
return new ResponseEntity<>(clientService.getClientByIdDTO(id), HttpStatus.OK);
} else {
return new ResponseEntity(HttpStatus.NOT_FOUND);
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
}
@PostMapping("/add")
public ResponseEntity addClient(@RequestBody ClientDTO clientDTO) {
public ResponseEntity<?> addClient(@RequestBody ClientDTO clientDTO) {
if(clientService.clientExists(clientDTO.getId())) {
return new ResponseEntity<>(HttpStatus.CONFLICT);
} else {
@@ -43,7 +43,7 @@ public class ClientController {
// TODO: do zrobienia walidacja danych
@PutMapping("/edit/{id}")
public ResponseEntity updateClient(@PathVariable("id") long id, @RequestBody ClientDTO clientDTO) {
public ResponseEntity<?> updateClient(@PathVariable("id") long id, @RequestBody ClientDTO clientDTO) {
if(clientService.clientExists(id)) {
return new ResponseEntity<>(clientService.updateClient(id, clientDTO),HttpStatus.OK);
} else {
@@ -52,7 +52,7 @@ public class ClientController {
}
@DeleteMapping("/delete/{id}")
public ResponseEntity deleteClient(@PathVariable("id") long id) {
public ResponseEntity<?> deleteClient(@PathVariable("id") long id) {
if(clientService.clientExists(id)) {
clientService.deleteClient(id);
return new ResponseEntity<>(HttpStatus.OK);