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

25
src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java
View File

@@ -4,6 +4,7 @@ import _11.asktpk.artisanconnectbackend.dto.AuthRequestDTO;
import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
import _11.asktpk.artisanconnectbackend.dto.ClientRegistrationDTO;
import _11.asktpk.artisanconnectbackend.entities.Client;
import _11.asktpk.artisanconnectbackend.entities.Role;
import _11.asktpk.artisanconnectbackend.repository.ClientRepository;
import _11.asktpk.artisanconnectbackend.repository.RolesRepository;
import jakarta.persistence.EntityNotFoundException;
@@ -25,13 +26,17 @@ public class ClientService {
}
private ClientDTO toDto(Client client) {
if(client == null) {
return null;
}
ClientDTO dto = new ClientDTO();
dto.setId(client.getId());
dto.setFirstName(client.getFirstName());
dto.setLastName(client.getLastName());
dto.setEmail(client.getEmail());
dto.setRole(client.getRole());
dto.setRole(client.getRole().getRole());
dto.setImage(client.getImage());
return dto;
@@ -39,12 +44,20 @@ public class ClientService {
private Client fromDto(ClientDTO dto) {
Client client = new Client();
Role rola;
if (clientRepository.findById(dto.getId()).isPresent()) {
rola = clientRepository.findById(dto.getId()).get().getRole();
} else {
rola = new Role();
rola.setRole("USER");
}
client.setId(dto.getId());
client.setFirstName(dto.getFirstName());
client.setLastName(dto.getLastName());
client.setEmail(dto.getEmail());
client.setRole(dto.getRole());
client.setRole(rola);
client.setImage(dto.getImage());
return client;
@@ -69,6 +82,10 @@ public class ClientService {
return clientRepository.findById(id).orElse(null);
}
public ClientDTO getClientByIdDTO(Long id) {
return toDto(clientRepository.findById(id).orElse(null));
}
public boolean clientExists(Long id) {
return clientRepository.existsById(id);
}
@@ -81,11 +98,13 @@ public class ClientService {
Client existingClient = clientRepository.findById(id)
.orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
Role newRole = rolesRepository.findRoleByRole(clientDTO.getRole());
existingClient.setEmail(clientDTO.getEmail());
existingClient.setFirstName(clientDTO.getFirstName());
existingClient.setLastName(clientDTO.getLastName());
existingClient.setImage(clientDTO.getImage());
existingClient.setRole(clientDTO.getRole());
existingClient.setRole(newRole);
return toDto(clientRepository.save(existingClient));
}