Diagramas

angular/RestClient/src/mocks/users.ts

+import { Client, User } from '../app/core/models';
+
+export const users: Client[] = [
+  {
+    id: 1,
+    name: 'John Doe',
+    email: 'jon@com',
+    rol: 'CLIENT',
+    status: 'NO_BOOKINGS',
+  },
+  {
+    id: 2,
+    name: 'Angela Doe',
+    email: 'angle@com',
+    rol: 'CLIENT',
+    status: 'NO_BOOKINGS',
+  },
+];

java/services/users/src/main/java/com/uva/api/users/services/ClientService.java

@@ -3,7 +3,6 @@ package com.uva.api.users.services;
 import java.time.LocalDate;
 import java.util.List;
 
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -42,9 +41,7 @@ public class ClientService {
     return client;
   }
 
-  public Client save(User request) {
-    Client client = new Client();
-    BeanUtils.copyProperties(request, client);
+  public Client save(Client client) {
     // Default rol
     client.setRol(UserRol.CLIENT);
     return clientRepository.save(client);

java/services/users/src/main/java/com/uva/api/users/services/ManagerService.java

@@ -2,12 +2,10 @@ package com.uva.api.users.services;
 
 import java.util.List;
 
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.uva.api.users.api.HotelApi;
 import com.uva.api.users.models.Manager;
-import com.uva.api.users.models.User;
 import com.uva.api.users.repositories.ManagerRepository;
 import com.uva.api.users.utils.Utils;
 
@@ -20,10 +18,8 @@ public class ManagerService {
   @Autowired
   private ManagerRepository managerRepository;
 
-  public Manager save(User request) {
-    Manager hm = new Manager();
-    BeanUtils.copyProperties(request, hm);
-    return managerRepository.save(hm);
+  public Manager save(Manager manager) {
+    return managerRepository.save(manager);
   }
 
   public List<Manager> findAll() {

java/services/users/src/main/java/com/uva/api/users/services/UserService.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 
 import com.uva.api.users.models.AuthDTO;
+import com.uva.api.users.models.Client;
+import com.uva.api.users.models.Manager;
 import com.uva.api.users.models.User;
 import com.uva.api.users.models.UserRol;
 import com.uva.api.users.repositories.UserRepository;
@@ -67,12 +69,16 @@ public class UserService {
         break;
 
       case HOTEL_ADMIN:
-        user = managerService.save(user);
+        Manager manager = new Manager();
+        BeanUtils.copyProperties(request, manager);
+        user = managerService.save(manager);
         break;
 
       case CLIENT: // By default
       default:
-        user = clientService.save(user);
+        Client client = new Client();
+        BeanUtils.copyProperties(request, client);
+        user = clientService.save(client);
         break;
     }
     return ResponseEntity.ok(user);