fix(architecture): clean architecture of the project

MayuriXx · MayuriXx · commit bb3a3fcfd564 · 2026-03-10T10:40:54.000+01:00
diff --git a/.env.template b/.env.template
@@ -2,3 +2,4 @@ POSTGRES_USER=your_postgres_user
 POSTGRES_PASSWORD=your_postgres_password
 POSTGRES_DB=your_postgres_db
 POSTGRES_PORT=5433
+DUMMY_API_BASE_URL=your_dummy_api_base_url
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/SpringBootJavaRandomUserApplication.java b/src/main/java/com/xpeho/spring_boot_java_random_user/SpringBootJavaRandomUserApplication.java
@@ -10,7 +10,7 @@ public class SpringBootJavaRandomUserApplication {
     private SpringBootJavaRandomUserApplication() {
     }
 
-    static void main(String[] args) {
+    public static void main(String[] args) {
         Dotenv.configure()
                 .ignoreIfMissing()
                 .load()
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/converters/UserConverter.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/converters/UserConverter.java
@@ -1,6 +1,6 @@
 package com.xpeho.spring_boot_java_random_user.data.converters;
 
-import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResultDAO;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResultDTO;
 import com.xpeho.spring_boot_java_random_user.data.models.db.User;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserEntity;
 import org.springframework.stereotype.Service;
@@ -39,7 +39,7 @@ public UserEntity toDomain(User user) {
     }
 
     // API -> Domain
-    public UserEntity fromApiModel(RandomUserResultDAO model) {
+    public UserEntity fromApiModel(DummyUserResultDTO model) {
         return new UserEntity(
                 null,
                 model.getGender(),
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/RandomUserResponse.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/RandomUserResponse.java
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserNameDTO.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserNameDTO.java
@@ -1,6 +1,6 @@
-package com.xpeho.spring_boot_java_random_user.data.models.api;
+package com.xpeho.spring_boot_java_random_user.data.models.api.dummy;
 
-public class RandomUserNameDAO {
+public class DummyUserNameDTO {
     private String title;
     private String first;
     private String last;
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserPictureDTO.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserPictureDTO.java
@@ -1,6 +1,6 @@
-package com.xpeho.spring_boot_java_random_user.data.models.api;
+package com.xpeho.spring_boot_java_random_user.data.models.api.dummy;
 
-public class RandomUserPictureDAO {
+public class DummyUserPictureDTO {
     private String medium;
 
     public String getMedium() {
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserResponse.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserResponse.java
@@ -0,0 +1,18 @@
+package com.xpeho.spring_boot_java_random_user.data.models.api.dummy;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class DummyUserResponse {
+    @SerializedName("users")
+    private List<DummyUserResultDTO> users;
+
+    public List<DummyUserResultDTO> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<DummyUserResultDTO> users) {
+        this.users = users;
+    }
+}
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserResultDTO.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/dummy/DummyUserResultDTO.java
@@ -1,6 +1,6 @@
-package com.xpeho.spring_boot_java_random_user.data.models.api;
+package com.xpeho.spring_boot_java_random_user.data.models.api.dummy;
 
-public class RandomUserResultDAO {
+public class DummyUserResultDTO {
     private String gender;
     private String firstName;
     private String lastName;
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserApi.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserApi.java
@@ -1,11 +1,11 @@
 package com.xpeho.spring_boot_java_random_user.data.sources.api;
 
-import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResponse;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResponse;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
 public interface RandomUserApi {
     @GET("/users")
-    Call<RandomUserResponse> getRandomUsers(@Query("limit") int limit);
+    Call<DummyUserResponse> getRandomUsers(@Query("limit") int limit);
 }
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserApiConfig.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserApiConfig.java
@@ -11,7 +11,7 @@
 public class RandomUserApiConfig {
     @Bean
     public Retrofit randomUserRetrofit(Environment env) {
-        String baseUrl = env.getProperty("randomuser.api.base-url", "https://dummyjson.com/");
+        String baseUrl = env.getRequiredProperty("dummy.api.base-url");
         OkHttpClient client = new OkHttpClient.Builder().build();
         return new Retrofit.Builder()
                 .baseUrl(baseUrl)
diff --git a/src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserProviderImpl.java b/src/main/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserProviderImpl.java
@@ -1,8 +1,8 @@
 package com.xpeho.spring_boot_java_random_user.data.sources.api;
 
 import com.xpeho.spring_boot_java_random_user.data.converters.UserConverter;
-import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResponse;
-import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResultDAO;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResponse;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResultDTO;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserEntity;
 import com.xpeho.spring_boot_java_random_user.domain.services.RandomUserProvider;
 import org.springframework.stereotype.Service;
@@ -23,11 +23,11 @@ public RandomUserProviderImpl(RandomUserApi randomUserApi, UserConverter userCon
 
     @Override
     public List<UserEntity> fetchRandomUsers(int count) throws IOException {
-        Response<RandomUserResponse> response = randomUserApi.getRandomUsers(count).execute();
+        Response<DummyUserResponse> response = randomUserApi.getRandomUsers(count).execute();
         if (!response.isSuccessful() || response.body() == null) {
             throw new IOException("Failed to fetch users: " + response.code());
         }
-        List<RandomUserResultDAO> users = response.body().getUsers();
+        List<DummyUserResultDTO> users = response.body().getUsers();
         if (users == null) {
             throw new IOException("Failed to parse users from response");
         }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -4,7 +4,7 @@ spring.application.name=spring_boot_java_random_user
 springdoc.swagger-ui.path=/api
 
 # URL for Random User API
-randomuser.api.base-url=https://dummyjson.com/
+dummy.api.base-url=${DUMMY_API_BASE_URL}
 
 # Database configuration
 spring.datasource.url=jdbc:postgresql://localhost:${POSTGRES_PORT}/${POSTGRES_DB}
diff --git a/src/test/java/com/xpeho/spring_boot_java_random_user/data/converters/UserConverterTest.java b/src/test/java/com/xpeho/spring_boot_java_random_user/data/converters/UserConverterTest.java
@@ -1,6 +1,6 @@
 package com.xpeho.spring_boot_java_random_user.data.converters;
 
-import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResultDAO;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResultDTO;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserEntity;
 import com.xpeho.spring_boot_java_random_user.data.models.db.User;
 import org.junit.jupiter.api.DisplayName;
@@ -14,7 +14,7 @@ class UserConverterTest {
     @Test
     @DisplayName("Should convert API model to domain entity with all fields")
     void shouldConvertApiModelToDomainWithAllFields() {
-        RandomUserResultDAO api = new RandomUserResultDAO();
+        DummyUserResultDTO api = new DummyUserResultDTO();
         api.setGender("male");
         api.setFirstName("John");
         api.setLastName("Doe");
@@ -34,7 +34,7 @@ void shouldConvertApiModelToDomainWithAllFields() {
     @Test
     @DisplayName("Should handle missing fields when converting API model")
     void shouldHandleMissingFieldsFromApiModel() {
-        RandomUserResultDAO api = new RandomUserResultDAO();
+        DummyUserResultDTO api = new DummyUserResultDTO();
         api.setGender("female");
         api.setEmail("jane@doe.com");
         api.setPhone("5678");
diff --git a/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserNameDTOTest.java b/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserNameDTOTest.java
@@ -1,14 +1,15 @@
 package com.xpeho.spring_boot_java_random_user.data.models.api;
 
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserNameDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
-class RandomUserNameDAOTest {
+class DummyUserNameDTOTest {
     @Test
     @DisplayName("Should store and return all name fields")
     void shouldStoreAndReturnAllNameFields() {
-        RandomUserNameDAO name = new RandomUserNameDAO();
+        DummyUserNameDTO name = new DummyUserNameDTO();
         name.setFirst("John");
         name.setLast("Doe");
         name.setTitle("Mr");
@@ -19,7 +20,7 @@ void shouldStoreAndReturnAllNameFields() {
     @Test
     @DisplayName("Should have null fields by default")
     void shouldHaveNullFieldsByDefault() {
-        RandomUserNameDAO name = new RandomUserNameDAO();
+        DummyUserNameDTO name = new DummyUserNameDTO();
         assertNull(name.getFirst());
         assertNull(name.getLast());
         assertNull(name.getTitle());
diff --git a/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserPictureDTOTest.java b/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserPictureDTOTest.java
@@ -1,21 +1,22 @@
 package com.xpeho.spring_boot_java_random_user.data.models.api;
 
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserPictureDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
-class RandomUserPictureDAOTest {
+class DummyUserPictureDTOTest {
     @Test
     @DisplayName("Should store and return medium picture URL")
     void shouldStoreAndReturnMediumPictureUrl() {
-        RandomUserPictureDAO picture = new RandomUserPictureDAO();
+        DummyUserPictureDTO picture = new DummyUserPictureDTO();
         picture.setMedium("pic.jpg");
         assertEquals("pic.jpg", picture.getMedium());
     }
     @Test
     @DisplayName("Should have null medium by default")
     void shouldHaveNullMediumByDefault() {
-        RandomUserPictureDAO picture = new RandomUserPictureDAO();
+        DummyUserPictureDTO picture = new DummyUserPictureDTO();
         assertNull(picture.getMedium());
     }
 }
diff --git a/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserResponseTest.java b/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserResponseTest.java
@@ -1,24 +1,26 @@
 package com.xpeho.spring_boot_java_random_user.data.models.api;
 
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResultDTO;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResponse;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import java.util.List;
 import static org.junit.jupiter.api.Assertions.*;
 
-class RandomUserResponseTest {
+class DummyUserResponseTest {
     @Test
     @DisplayName("Should store and return users list")
     void shouldStoreAndReturnUsersList() {
-        RandomUserResponse response = new RandomUserResponse();
-        List<RandomUserResultDAO> users = List.of(new RandomUserResultDAO(), new RandomUserResultDAO());
+        DummyUserResponse response = new DummyUserResponse();
+        List<DummyUserResultDTO> users = List.of(new DummyUserResultDTO(), new DummyUserResultDTO());
         response.setUsers(users);
         assertEquals(users, response.getUsers());
     }
 
     @Test
     @DisplayName("Should have null users list by default")
     void shouldHaveNullUsersListByDefault() {
-        RandomUserResponse response = new RandomUserResponse();
+        DummyUserResponse response = new DummyUserResponse();
         assertNull(response.getUsers());
     }
 }
diff --git a/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserResultDTOTest.java b/src/test/java/com/xpeho/spring_boot_java_random_user/data/models/api/DummyUserResultDTOTest.java
@@ -1,14 +1,15 @@
 package com.xpeho.spring_boot_java_random_user.data.models.api;
 
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResultDTO;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
-class RandomUserResultDAOTest {
+class DummyUserResultDTOTest {
     @Test
     @DisplayName("Should store and return all user fields")
     void shouldStoreAndReturnAllUserFields() {
-        RandomUserResultDAO result = new RandomUserResultDAO();
+        DummyUserResultDTO result = new DummyUserResultDTO();
         result.setGender("male");
         result.setFirstName("John");
         result.setLastName("Doe");
@@ -26,7 +27,7 @@ void shouldStoreAndReturnAllUserFields() {
     @Test
     @DisplayName("Should have null fields by default")
     void shouldHaveNullFieldsByDefault() {
-        RandomUserResultDAO result = new RandomUserResultDAO();
+        DummyUserResultDTO result = new DummyUserResultDTO();
         assertNull(result.getGender());
         assertNull(result.getFirstName());
         assertNull(result.getLastName());
diff --git a/src/test/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserProviderImplTest.java b/src/test/java/com/xpeho/spring_boot_java_random_user/data/sources/api/RandomUserProviderImplTest.java
@@ -1,8 +1,8 @@
 package com.xpeho.spring_boot_java_random_user.data.sources.api;
 
 import com.xpeho.spring_boot_java_random_user.data.converters.UserConverter;
-import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResponse;
-import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResultDAO;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResponse;
+import com.xpeho.spring_boot_java_random_user.data.models.api.dummy.DummyUserResultDTO;
 import com.xpeho.spring_boot_java_random_user.domain.entities.UserEntity;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -20,7 +20,7 @@ class RandomUserProviderImplTest {
     private RandomUserApi randomUserApi;
     private UserConverter userConverter;
     private RandomUserProviderImpl provider;
-    private Call<RandomUserResponse> call;
+    private Call<DummyUserResponse> call;
 
     @BeforeEach
     void setUp() {
@@ -34,9 +34,9 @@ void setUp() {
     @DisplayName("Should fetch and convert users successfully")
     void shouldFetchAndConvertUsersSuccessfully() throws IOException {
         int count = 2;
-        RandomUserResponse responseObj = new RandomUserResponse();
-        RandomUserResultDAO dao1 = new RandomUserResultDAO();
-        RandomUserResultDAO dao2 = new RandomUserResultDAO();
+        DummyUserResponse responseObj = new DummyUserResponse();
+        DummyUserResultDTO dao1 = new DummyUserResultDTO();
+        DummyUserResultDTO dao2 = new DummyUserResultDTO();
         responseObj.setUsers(List.of(dao1, dao2));
         UserEntity entity1 = new UserEntity(null, "a", "b", "c", "d", "e", "f", "g", "h");
         UserEntity entity2 = new UserEntity(null, "i", "j", "k", "l", "m", "n", "o", "p");
diff --git a/src/test/resources/application-test.properties.template b/src/test/resources/application-test.properties.template
@@ -3,4 +3,7 @@ POSTGRES_PASSWORD=your_postgres_password
 POSTGRES_DB=your_postgres_db
 POSTGRES_PORT=your_postgres_port
 
+# Dummy API
+dummy.api.base-url=your_dummy_api_base_url
+
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class SpringBootJavaRandomUserApplication {`
`10`	`10`	`private SpringBootJavaRandomUserApplication() {`
`11`	`11`	`}`
`12`	`12`
`13`		`- static void main(String[] args) {`
	`13`	`+ public static void main(String[] args) {`
`14`	`14`	`Dotenv.configure()`
`15`	`15`	`.ignoreIfMissing()`
`16`	`16`	`.load()`