Merge pull request #43 from Halbes-Byte/feature/modules

Change dataflow to ensure consistency between payloads

Author: Daenges

server/src/main/java/com/studybuddies/server/services/user/UserService.java

@@ -86,10 +86,9 @@ public boolean existsByUUID(UUID uuid) {
   }
 
   @Transactional
-  public void updateModules(ModuleUpdateRequest moduleUpdateRequest, String uuid) {
-    List<String> modules = moduleUpdateRequest.getName();
-
-    var foundModules = modules.stream()
+  public void updateModules(List<ModuleUpdateRequest> moduleUpdateRequest, String uuid) {
+    var foundModules = moduleUpdateRequest.stream()
+        .map(ModuleUpdateRequest::getName)
         .filter(moduleValidationService::exists)
         .map(String::toUpperCase)
         .collect(Collectors.toCollection(ArrayList::new));

server/src/main/java/com/studybuddies/server/web/UserController.java

@@ -41,7 +41,7 @@ public ResponseEntity<?> delete(HttpServletRequest request,
   }
 
   @PutMapping
-  public ResponseEntity<?> put(HttpServletRequest request, @RequestBody ModuleUpdateRequest updateRequest) {
+  public ResponseEntity<?> put(HttpServletRequest request, @RequestBody List<ModuleUpdateRequest> updateRequest) {
     String userUUID = request.getUserPrincipal().getName();
     userService.updateModules(updateRequest, userUUID);
     return new ResponseEntity<>(userUUID, HttpStatus.OK);

server/src/main/java/com/studybuddies/server/web/dto/module/ModuleResponse.java

@@ -1,9 +1,11 @@
 package com.studybuddies.server.web.dto.module;
 
 import com.studybuddies.server.web.dto.interfaces.Responses;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
+@AllArgsConstructor
 public class ModuleResponse implements Responses {
   public String name;
 }

server/src/main/java/com/studybuddies/server/web/dto/user/ModuleUpdateRequest.java

@@ -1,9 +1,8 @@
 package com.studybuddies.server.web.dto.user;
 
-import java.util.List;
 import lombok.Getter;
 
 @Getter
 public class ModuleUpdateRequest {
-  public List<String> name;
+  public String name;
 }

server/src/main/java/com/studybuddies/server/web/dto/user/UserResponse.java

@@ -1,6 +1,7 @@
 package com.studybuddies.server.web.dto.user;
 
 import com.studybuddies.server.web.dto.interfaces.Responses;
+import com.studybuddies.server.web.dto.module.ModuleResponse;
 import java.util.List;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -13,5 +14,5 @@ public class UserResponse implements Responses {
 
   String uuid;
   String username;
-  List<String> modules;
+  List<ModuleResponse> modules;
 }

server/src/main/java/com/studybuddies/server/web/mapper/UserMapper.java

@@ -6,14 +6,14 @@
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-@Mapper(componentModel = "spring")
+@Mapper(componentModel = "spring", uses = {UserMapperUtils.class})
 public interface UserMapper {
 
   @Mapping(source = "username", target = "username")
   UserEntity of(UserAccountSetupRequest userAccountSetupRequest);
 
   @Mapping(source = "uuid", target = "uuid")
   @Mapping(source = "username", target = "username")
-  @Mapping(source = "modules", target = "modules")
+  @Mapping(source = "modules", target = "modules", qualifiedByName = "stringListToRespList")
   UserResponse of(UserEntity userEntity);
 }

server/src/main/java/com/studybuddies/server/web/mapper/UserMapperUtils.java

@@ -0,0 +1,20 @@
+package com.studybuddies.server.web.mapper;
+
+import com.studybuddies.server.web.dto.module.ModuleResponse;
+import java.util.ArrayList;
+import java.util.List;
+import org.mapstruct.Named;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserMapperUtils {
+
+  @Named("stringListToRespList")
+  public List<ModuleResponse> stringListToRespList(List<String> stringList) {
+    List<ModuleResponse> respList = new ArrayList<>();
+    for (String s : stringList) {
+      respList.add(new ModuleResponse(s));
+    }
+    return respList;
+  }
+}