fix(archi): clean archi of the project (#89)

Author: MayuriXx

README.md

@@ -254,10 +254,10 @@ curl -X PUT "http://localhost:8080/random-users/1" \
          PostgreSQL
 ```
 
-### Domain Service Ports
+### Service Architecture
 
-- `LocalUserService`: local persistence operations (save, read, delete) backed by PostgreSQL.
-- `RemoteUserService`: external user source contract used by use cases.
+- `UserService`: domain port for local persistence operations (save, read, delete) backed by PostgreSQL. Implemented by `UserServiceImpl` in the data layer.
+- `RemoteUserService`: data-layer interface for external API adapters. Implemented by `DummyUserServiceImpl` and `RandomUserServiceImpl`.
 
 ### External Source Adapter
 

mvnw.cmd

@@ -31,7 +31,7 @@
 		<testcontainers.version>2.0.4</testcontainers.version>
 		<skipDocker>false</skipDocker>
 		<sonar.coverage.exclusions>**/*Application.java</sonar.coverage.exclusions>
-		<sonar.test.exclusions>**/feature/SpringIntegrationTest.java</sonar.test.exclusions>
+		<sonar.test.exclusions>**/features/SpringIntegrationTest.java</sonar.test.exclusions>
 		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 	</properties>
 

pom.xml

@@ -2,40 +2,40 @@
 
 import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResultDTO;
 import com.xpeho.spring_boot_java_random_user.data.models.api.randomuser.RandomUserResultDTO;
-import com.xpeho.spring_boot_java_random_user.data.models.database.User;
+import com.xpeho.spring_boot_java_random_user.data.models.database.UserDAO;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserEntity;
 import org.springframework.stereotype.Service;
 
 
 @Service
 public class UserConverter {
     // Domain -> DAO
-    public User toDao(UserEntity entity) {
-        User user = new User();
-        user.setId(entity.id());
-        user.setGender(entity.gender());
-        user.setFirstname(entity.firstname());
-        user.setLastname(entity.lastname());
-        user.setCivility(entity.civility());
-        user.setEmail(entity.email());
-        user.setPhone(entity.phone());
-        user.setPicture(entity.picture());
-        user.setNationality(entity.nat());
-        return user;
+    public UserDAO toDao(UserEntity entity) {
+        UserDAO userDAO = new UserDAO();
+        userDAO.setId(entity.id());
+        userDAO.setGender(entity.gender());
+        userDAO.setFirstname(entity.firstname());
+        userDAO.setLastname(entity.lastname());
+        userDAO.setCivility(entity.civility());
+        userDAO.setEmail(entity.email());
+        userDAO.setPhone(entity.phone());
+        userDAO.setPicture(entity.picture());
+        userDAO.setNationality(entity.nat());
+        return userDAO;
     }
 
     // DAO -> Domain
-    public UserEntity toDomain(User user) {
+    public UserEntity toDomain(UserDAO userDAO) {
         return new UserEntity(
-                user.getId(),
-                user.getGender(),
-                user.getFirstname(),
-                user.getLastname(),
-                user.getCivility(),
-                user.getEmail(),
-                user.getPhone(),
-                user.getPicture(),
-                user.getNationality()
+                userDAO.getId(),
+                userDAO.getGender(),
+                userDAO.getFirstname(),
+                userDAO.getLastname(),
+                userDAO.getCivility(),
+                userDAO.getEmail(),
+                userDAO.getPhone(),
+                userDAO.getPicture(),
+                userDAO.getNationality()
         );
     }
 

src/main/java/com/xpeho/spring_boot_java_random_user/data/converters/UserConverter.java

@@ -9,7 +9,7 @@
 
 @Entity
 @Table(name = "users")
-public class User {
+public class UserDAO {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
@@ -32,7 +32,7 @@ public class User {
     private String nationality;
 
     // Required by JPA
-    public User() {
+    public UserDAO() {
         // No initialization needed
     }
 

…ndom_user/data/models/database/User.java …m_user/data/models/database/UserDAO.javasrc/main/java/com/xpeho/spring_boot_java_random_user/data/models/database/User.java renamed to src/main/java/com/xpeho/spring_boot_java_random_user/data/models/database/UserDAO.java src/main/java/com/xpeho/spring_boot_java_random_user/data/models/database/User.java renamed to src/main/java/com/xpeho/spring_boot_java_random_user/data/models/database/UserDAO.java

@@ -1,33 +1,48 @@
 package com.xpeho.spring_boot_java_random_user.data.services;
 
 import com.xpeho.spring_boot_java_random_user.data.converters.UserConverter;
-import com.xpeho.spring_boot_java_random_user.data.models.database.User;
+import com.xpeho.spring_boot_java_random_user.data.models.database.UserDAO;
+import com.xpeho.spring_boot_java_random_user.data.sources.api.RemoteUserService;
 import com.xpeho.spring_boot_java_random_user.data.sources.database.UserRepository;
 import com.xpeho.spring_boot_java_random_user.data.sources.database.UserSpecifications;
+import com.xpeho.spring_boot_java_random_user.domain.entities.PaginatedUsers;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserEntity;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserFilter;
-import com.xpeho.spring_boot_java_random_user.domain.services.LocalUserService;
+import com.xpeho.spring_boot_java_random_user.domain.enums.UserSource;
+import com.xpeho.spring_boot_java_random_user.domain.services.UserService;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 @Service
-
-public class UserServiceImpl implements LocalUserService {
+public class UserServiceImpl implements UserService {
     private final UserRepository userRepository;
     private final UserConverter userConverter;
+    private final Map<UserSource, RemoteUserService> remoteUserServices;
 
-    public UserServiceImpl(UserRepository userRepository, UserConverter userConverter) {
+    public UserServiceImpl(
+            UserRepository userRepository,
+            UserConverter userConverter,
+            List<RemoteUserService> remoteUserServices
+    ) {
         this.userRepository = userRepository;
         this.userConverter = userConverter;
+        this.remoteUserServices = remoteUserServices.stream()
+                .collect(Collectors.toMap(RemoteUserService::getSource, Function.identity()));
     }
 
     @Override
     public List<UserEntity> saveAll(List<UserEntity> users) {
-        List<User> daoUsers = users.stream().map(userConverter::toDao).toList();
-        Iterable<User> saved = userRepository.saveAll(daoUsers);
+        List<UserDAO> userDAOs = users.stream().map(userConverter::toDao).toList();
+        Iterable<UserDAO> saved = userRepository.saveAll(userDAOs);
         return StreamSupport.stream(saved.spliterator(), false)
                 .map(userConverter::toDomain)
                 .toList();
@@ -41,8 +56,8 @@ public Optional<UserEntity> getById(long id) {
 
     @Override
     public UserEntity save(UserEntity user) {
-        User savedUser = userRepository.save(userConverter.toDao(user));
-        return userConverter.toDomain(savedUser);
+        UserDAO savedUserDAO = userRepository.save(userConverter.toDao(user));
+        return userConverter.toDomain(savedUserDAO);
     }
 
     @Override
@@ -51,9 +66,19 @@ public void deleteById(long id) {
     }
 
     @Override
-    public List<UserEntity> filterUsers(UserFilter filter) {
-        return userRepository.findAll(UserSpecifications.byFilter(filter)).stream()
-                .map(userConverter::toDomain)
-                .toList();
+    public Page<UserEntity> filterUsers(UserFilter filter, Pageable pageable) {
+        return userRepository.findAll(UserSpecifications.byFilter(filter), pageable)
+                .map(userConverter::toDomain);
+    }
+
+    @Override
+    public PaginatedUsers fetchAndSaveUsers(int page, int size, UserSource source) throws IOException {
+        RemoteUserService remoteService = remoteUserServices.get(source);
+        if (remoteService == null) {
+            throw new IllegalStateException("No remote service configured for source: " + source);
+        }
+        PaginatedUsers response = remoteService.fetchUsers(page, size);
+        saveAll(response.data());
+        return response;
     }
 }

src/main/java/com/xpeho/spring_boot_java_random_user/data/services/UserServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xpeho.spring_boot_java_random_user.domain.services;
+package com.xpeho.spring_boot_java_random_user.data.sources.api;
 
 import com.xpeho.spring_boot_java_random_user.domain.entities.PaginatedUsers;
 import com.xpeho.spring_boot_java_random_user.domain.enums.UserSource;

…r/domain/services/RemoteUserService.java …/data/sources/api/RemoteUserService.javasrc/main/java/com/xpeho/spring_boot_java_random_user/domain/services/RemoteUserService.java renamed to src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RemoteUserService.java src/main/java/com/xpeho/spring_boot_java_random_user/domain/services/RemoteUserService.java renamed to src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RemoteUserService.java

@@ -0,0 +1,67 @@
+package com.xpeho.spring_boot_java_random_user.data.sources.api;
+
+import com.xpeho.spring_boot_java_random_user.data.sources.api.dummy.DummyUserApi;
+import com.xpeho.spring_boot_java_random_user.data.sources.api.randomuser.RandomUserApi;
+import jakarta.annotation.PreDestroy;
+import okhttp3.OkHttpClient;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+@Configuration
+public class UserApiConfig {
+
+    private OkHttpClient okHttpClient;
+
+    /**
+     * Single shared OkHttpClient intentionally reused by both Retrofit instances (dummyUserRetrofit and randomUserRetrofit).
+     * Sharing a single client allows both APIs to benefit from a common connection pool, thread pool,
+     * and keep-alive settings, reducing resource consumption.
+     * If the two APIs ever require distinct timeouts or interceptors, separate clients should be created.
+     * The {@link jakarta.annotation.PreDestroy} hook ensures the client is shut down cleanly on application stop.
+     */
+    @Bean
+    public OkHttpClient okHttpClient() {
+        okHttpClient = new OkHttpClient.Builder().build();
+        return okHttpClient;
+    }
+
+    @Bean(name = "dummyUserRetrofit")
+    public Retrofit dummyUserRetrofit(OkHttpClient okHttpClient, Environment env) {
+        return new Retrofit.Builder()
+                .baseUrl(env.getRequiredProperty("dummy.api.base-url"))
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+    }
+
+    @Bean
+    public DummyUserApi dummyUserApi(@Qualifier("dummyUserRetrofit") Retrofit dummyUserRetrofit) {
+        return dummyUserRetrofit.create(DummyUserApi.class);
+    }
+
+    @Bean(name = "randomUserRetrofit")
+    public Retrofit randomUserRetrofit(OkHttpClient okHttpClient, Environment env) {
+        return new Retrofit.Builder()
+                .baseUrl(env.getRequiredProperty("randomuser.api.base-url"))
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+    }
+
+    @Bean
+    public RandomUserApi randomUserApi(@Qualifier("randomUserRetrofit") Retrofit randomUserRetrofit) {
+        return randomUserRetrofit.create(RandomUserApi.class);
+    }
+
+    @PreDestroy
+    public void destroy() {
+        if (okHttpClient != null) {
+            okHttpClient.dispatcher().executorService().shutdown();
+            okHttpClient.connectionPool().evictAll();
+        }
+    }
+}

src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/UserApiConfig.java

@@ -6,7 +6,7 @@
 import com.xpeho.spring_boot_java_random_user.domain.entities.PaginatedUsers;
 import com.xpeho.spring_boot_java_random_user.domain.enums.UserSource;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserEntity;
-import com.xpeho.spring_boot_java_random_user.domain.services.RemoteUserService;
+import com.xpeho.spring_boot_java_random_user.data.sources.api.RemoteUserService;
 import org.springframework.stereotype.Service;
 import retrofit2.Response;