update User-related file

Author: Stelle83

src/main/java/demo/codeexample/config/DataInitializer.java

@@ -1,6 +1,7 @@
 package demo.codeexample.config;
 
-import demo.codeexample.user.CreateUserRequestDTO;
+import demo.codeexample.user.CreateUserDto;
+import demo.codeexample.user.CreateUserDto;
 import demo.codeexample.shared.Role;
 import demo.codeexample.user.UserLookup;
 import org.springframework.boot.CommandLineRunner;
@@ -24,7 +25,7 @@ public void run(String... arg) {
             return; // admin already exists — do nothing
         }
 
-        CreateUserRequestDTO adminRequest = new CreateUserRequestDTO();
+        CreateUserDto adminRequest = new CreateUserDto();
         adminRequest.setFirstName("Admin");
         adminRequest.setLastName("System");
         adminRequest.setEmail("admin@filmstudio.com");

src/main/java/demo/codeexample/project/application/out/UserPort.java

@@ -15,9 +15,9 @@ public interface UserPort {
 
     boolean validateEmployees(Set<Long> employeesId);
 
-    List<UserInfo> findAll();
+//    List<UserInfo> findAll();
 
-//    List<UserDto> findAll();
+    List<UserDto> findAll();
 
     record UserInfo(Long id, String firstname, String lastname, Role role){}
 }

src/main/java/demo/codeexample/project/infrastructure/adapters/out/external/CustomerAdapter.java

@@ -34,9 +34,19 @@ public List<UserInfo> findByRole(Role role) {
                 .toList();
     }
 
+//    @Override
+//    public boolean validateEmployees(Set<Long> employeesId) {
+//        return userLookup.validateUniqueRoles(employeesId);
+//    }
+
     @Override
     public boolean validateEmployees(Set<Long> employeesId) {
-        return userLookup.validateUniqueRoles(employeesId);
+        try {
+            userLookup.validateUniqueRoles(employeesId);
+            return true;    // no exception = all roles valid ✅
+        } catch (Exception e) {
+            return false;   // TeamValidationException = invalid ✅
+        }
     }
 
 

src/main/java/demo/codeexample/user/UserLookup.java

@@ -30,7 +30,7 @@ public interface UserLookup {
     // WRITE OPERATIONS
     // ─────────────────────────────────────────
 
-    UserDto createUser(CreateUserRequestDTO request);
+    UserDto createUser(CreateUserDto request);
     UserDto updateRole(Long id, Role newRole);
     void deactivateUser(Long id);
 

src/main/java/demo/codeexample/user/application/UserService.java

@@ -1,6 +1,7 @@
 package demo.codeexample.user.application;
 
 import demo.codeexample.exceptions.EmailAlreadyExistsException;
+import demo.codeexample.exceptions.TeamValidationException;
 import demo.codeexample.exceptions.UserNotFoundException;
 import demo.codeexample.shared.Role;
 import demo.codeexample.user.*;
@@ -70,16 +71,30 @@ public Optional<UserDto> findByFullName(String firstname, String lastName) {
      * @return true if each user has unique role
      */
 
+//    @Override
+//    public void validateUniqueRoles(Set<Long> employeesId) {
+//        List<Role> foundRoles = employeesId.stream()
+//                .map(id -> findById(id).orElseThrow(() -> new UserNotFoundException(id)))
+//                .map(UserDto::getRole)
+//                .toList();
+//
+//        List<Role> requiredRoles = List.of(Role.PRODUCER, Role.DIRECTOR, Role.EDITOR, Role.RECRUITER);
+//        if(!foundRoles.containsAll(requiredRoles))
+//            throw new TeamValidationException();
+//    }
+
     @Override
-    public void validateUniqueRoles(Set<Long> employeesId) {
+    public boolean validateUniqueRoles(Set<Long> employeesId) {
         List<Role> foundRoles = employeesId.stream()
-                .map(id -> findById(id).orElseThrow(() -> new UserNotFoundException(id)))
+                .map(id -> findById(id)
+                        .orElseThrow(() -> new UserNotFoundException(id)))
                 .map(UserDto::getRole)
                 .toList();
 
-        List<Role> requiredRoles = List.of(Role.PRODUCER, Role.DIRECTOR, Role.EDITOR, Role.RECRUITER);
-        if(!foundRoles.containsAll(requiredRoles))
-            throw new TeamValidationException();
+        List<Role> requiredRoles = List.of(
+                Role.PRODUCER, Role.DIRECTOR, Role.EDITOR, Role.RECRUITER
+        );
+        return foundRoles.containsAll(requiredRoles);  // ← return boolean instead of throw
     }
 
     @Override
@@ -94,7 +109,7 @@ public boolean validateUserRole(Long id, Role role) {
     // ─────────────────────────────────────────
 
     @Override
-    public UserDto createUser(CreateUserRequestDTO request) {
+    public UserDto createUser(CreateUserDto request) {
 
         // Check email is not already taken
         if (repository.existsByEmail(request.getEmail())) {

src/main/java/demo/codeexample/user/web/UserController.java

@@ -1,7 +1,7 @@
 package demo.codeexample.user.web;
 
 import demo.codeexample.exceptions.UserNotFoundException;
-import demo.codeexample.user.CreateUserRequestDTO;
+import demo.codeexample.user.CreateUserDto;
 import demo.codeexample.user.UserDto;
 import demo.codeexample.user.application.UserService;
 import demo.codeexample.shared.Role;
@@ -26,7 +26,7 @@ public UserController(UserService userService) {
     @PostMapping
     @PreAuthorize("hasRole('ADMIN')")
     public ResponseEntity<UserDto> createUser(
-            @Valid @RequestBody CreateUserRequestDTO request) {
+            @Valid @RequestBody CreateUserDto request) {
         UserDto created = userService.createUser(request);
         return ResponseEntity.status(HttpStatus.CREATED).body(created);
     }

src/main/resources/application.properties

@@ -49,3 +49,10 @@ app.security.enabled=false
 
 # Production default ? always secure
 cookie.secure=true
+
+# application-local.properties ? add these:
+S3_ACCESS_KEY=dummy-key-for-local
+S3_SECRET_KEY=dummy-secret-for-local
+S3_BUCKET_NAME=dummy-bucket
+S3_REGION=eu-north-1
+S3_ENDPOINT=http://localhost:9000