feat(issues): apply issues

Author: Theo-lbg

.gitignore

@@ -1,3 +1,5 @@
+application-local.properties
+.env
 HELP.md
 target/
 .mvn/wrapper/maven-wrapper.jar

README.md

@@ -30,27 +30,55 @@ The interactive API documentation is available via **Swagger UI / OpenAPI**.
 
 ## ⚙️ Configuration
 
-The main configuration file is located at:
+
+The main configuration file is:
 
 ```
 src/main/resources/application.properties
 ```
 
-### Properties to configure
+But for credentials and local overrides, use:
+
+```
+src/main/resources/application-local.properties
+```
+
+### Example for application.properties
 
 ```properties
 spring.application.name=spring_boot_java_random_user
-
-# Swagger UI — available at /api
 springdoc.swagger-ui.path=/api
-
-# PostgreSQL datasource (add these if you use persistence)
 spring.datasource.url=jdbc:postgresql://localhost:5432/<database_name>
-spring.datasource.username=<username>
-spring.datasource.password=<password>
 spring.datasource.driver-class-name=org.postgresql.Driver
 ```
 
+### Local credentials & security
+
+To avoid exposing database credentials in source code, create a `.env` file at the project root (not versioned):
+
+```
+DB_USER=postgres
+DB_PASSWORD=postgres
+```
+
+Then, in `src/main/resources/application-local.properties`:
+
+```properties
+spring.datasource.username=${DB_USER}
+spring.datasource.password=${DB_PASSWORD}
+```
+
+Both `.env` and `application-local.properties` are in `.gitignore` (already set).
+
+To activate the local profile in IntelliJ or VS Code, add this environment variable to your run configuration:
+
+```
+SPRING_PROFILES_ACTIVE=local
+```
+
+This way, each developer can use their own credentials without risk of leaking them to GitHub.
+
+
 > ⚠️ **Common startup error**:
 > ```
 > Failed to configure a DataSource: 'url' attribute is not specified
@@ -218,7 +246,7 @@ This project consumes the public **Random User Generator** API:
 
 - [x] [Add Sonarqube in the project](https://github.com/XPEHO/spring_boot_java_random_user/issues/2)
 - [ ] [Add PostgreSQL database with docker](https://github.com/XPEHO/spring_boot_java_random_user/issues/6)
-- [X] [Add this endpoint get /user/random](https://github.com/XPEHO/spring_boot_java_random_user/issues/5)
+- [X] [Add this endpoint get /random-users](https://github.com/XPEHO/spring_boot_java_random_user/issues/5)
 - [ ] [Add this endpoint get /user/{id}](https://github.com/XPEHO/spring_boot_java_random_user/issues/8)
 - [ ] [Add this endpoint put /user/{id}](https://github.com/XPEHO/spring_boot_java_random_user/issues/9)
 - [ ] [Add this endpoint delete /user/{id}](https://github.com/XPEHO/spring_boot_java_random_user/issues/10)

pom.xml

@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.11.0</version>
         </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

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

@@ -1,21 +1,72 @@
 package com.xpeho.spring_boot_java_random_user.data.converters;
-
-import com.xpeho.spring_boot_java_random_user.data.models.RandomUserResultDAO;
+import com.xpeho.spring_boot_java_random_user.data.models.api.RandomUserResultDAO;
 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.springframework.stereotype.Service;
+import com.xpeho.spring_boot_java_random_user.presentation.dto.UserDTO;
+
 
 @Service
 public class UserConverter {
-    public UserEntity modelToEntity(RandomUserResultDAO model) {
-        UserEntity entity = new UserEntity();
-        entity.setGender(model.gender);
-        entity.setFirstname(model.name.first);
-        entity.setLastname(model.name.last);
-        entity.setCivility(model.name.title);
-        entity.setEmail(model.email);
-        entity.setPhone(model.phone);
-        entity.setPicture(model.picture.medium);
-        entity.setNat(model.nat);
-        return entity;
+    // Domain -> DAO
+    public User toDao(UserEntity entity) {
+        User user = new User();
+        user.setId(entity.id());
+        user.setFirstName(entity.firstname());
+        user.setLastName(entity.lastname());
+        user.setEmail(entity.email());
+        user.setPictureUrl(entity.picture());
+        return user;
+    }
+    // DAO -> Domain
+    public UserEntity toDomain(User user) {
+        return new UserEntity(
+            user.getId(),
+            // gender
+            null, 
+            user.getFirstName(),
+            user.getLastName(),
+            // civility
+            null, 
+            user.getEmail(),
+            // phone
+            null, 
+            user.getPictureUrl(),
+            // nat
+            null  
+        );
+    }
+    // API -> Domain
+    public UserEntity fromApiModel(RandomUserResultDAO model) {
+        String firstName = model.name != null ? model.name.first : null;
+        String lastName = model.name != null ? model.name.last : null;
+        String civility = model.name != null ? model.name.title : null;
+        String picture = model.picture != null ? model.picture.medium : null;
+        return new UserEntity(
+            null,
+            model.gender,
+            firstName,
+            lastName,
+            civility,
+            model.email,
+            model.phone,
+            picture,
+            model.nat
+        );
+    }
+
+    // Domain -> DTO
+    public UserDTO toDto(UserEntity entity) {
+        return new UserDTO(
+            entity.id(),
+            entity.gender(),
+            entity.firstname(),
+            entity.lastname(),
+            entity.civility(),
+            entity.email(),
+            entity.phone(),
+            entity.picture(),
+            entity.nat()
+        );
     }
 }

src/main/java/com/xpeho/spring_boot_java_random_user/data/models/RandomUserInfoDAO.java

@@ -1,4 +1,4 @@
-package com.xpeho.spring_boot_java_random_user.data.models;
+package com.xpeho.spring_boot_java_random_user.data.models.api;
 
 public class RandomUserNameDAO {
     public String title;

src/main/java/com/xpeho/spring_boot_java_random_user/data/models/RandomUserResponseDAO.java

@@ -0,0 +1,5 @@
+package com.xpeho.spring_boot_java_random_user.data.models.api;
+
+public class RandomUserPictureDAO {
+    public String medium;
+}

…_user/data/models/RandomUserNameDAO.java …r/data/models/api/RandomUserNameDAO.javasrc/main/java/com/xpeho/spring_boot_java_random_user/data/models/RandomUserNameDAO.java renamed to src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/RandomUserNameDAO.java src/main/java/com/xpeho/spring_boot_java_random_user/data/models/RandomUserNameDAO.java renamed to src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/RandomUserNameDAO.java

@@ -0,0 +1,5 @@
+package com.xpeho.spring_boot_java_random_user.data.models.api;
+
+public class RandomUserResponse {
+    public RandomUserResultDAO[] results;
+}

src/main/java/com/xpeho/spring_boot_java_random_user/data/models/api/RandomUserPictureDAO.java

@@ -1,4 +1,4 @@
-package com.xpeho.spring_boot_java_random_user.data.models;
+package com.xpeho.spring_boot_java_random_user.data.models.api;
 
 public class RandomUserResultDAO {
     public String gender;