Flat Message Layout

src/main/java/com/eactive/testmaster/client/controller/ApiRequestMgmtController.java

@@ -86,6 +86,7 @@ public class ApiRequestMgmtController {
 
         if (dto.getLayout() != null) {
             dto.getLayout().setApiRequestId(apiId);
+            dto.getLayout().setId(apiId);
             apiLayoutMgmtService.saveLayout(apiLayoutMapper.map(dto.getLayout()));
         }
         return ResponseEntity.ok(apiId);

src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java

@@ -1,6 +1,7 @@
 package com.eactive.testmaster.client.mapper;
 
 import com.eactive.testmaster.client.dto.ApiCollectionDTO;
+import com.eactive.testmaster.client.dto.ApiLayoutDTO;
 import com.eactive.testmaster.client.dto.ApiRequestDTO;
 import com.eactive.testmaster.client.entity.ApiCollection;
 import com.eactive.testmaster.client.entity.ApiLayout;
@@ -61,15 +62,17 @@ public abstract class ApiRequestMapper {
     public void handleTypeSpecificMapping(ApiRequestInfo entity, @MappingTarget ApiRequestDTO dto) {
         if ("TCP".equals(entity.getType())) {
             ApiLayout layout = apiLayoutRepository.findFirstByApiRequestInfo(entity);
-            if (layout!=null) {
+            if (layout != null) {
                 layout.getLayoutItems().sort(Comparator.comparingInt(ApiLayoutItem::getLoutItemSerno));
                 dto.setLayout(apiLayoutMapper.map(layout));
+            } else {
+                dto.setLayout(new ApiLayoutDTO());
             }
+
         }
     }
 
 
-
     public abstract List<ApiRequestInfo> mapApis(List<ApiRequestDTO> apis);
 
     public abstract List<ApiCollectionDTO> mapCollections(List<ApiCollection> apis);

src/main/java/com/eactive/testmaster/client/service/ApiLayoutMgmtService.java

@@ -6,6 +6,7 @@ import com.eactive.testmaster.client.entity.ApiRequestInfo;
 import com.eactive.testmaster.client.repository.ApiLayoutRepository;
 import com.eactive.testmaster.client.repository.ApiRequestRepository;
 import com.eactive.testmaster.common.exception.NotFoundException;
+import java.util.Optional;
 import java.util.UUID;
 import javax.transaction.Transactional;
 import org.springframework.stereotype.Service;
@@ -31,11 +32,9 @@ public class ApiLayoutMgmtService {
     }
 
     public ApiLayout saveLayout(ApiLayout layout) {
-        if (layout.getId() == null) {
-            return createLayout(layout);
-        } else {
-            return updateLayout(layout.getId(), layout);
-        }
+        ApiLayout apiLayout = apiLayoutRepository.findFirstByApiRequestInfo(layout.getApiRequestInfo());
+
+        return apiLayout == null ? createLayout(layout) : updateLayout(apiLayout.getId(), layout);
     }
 
     public ApiLayout createLayout(ApiLayout layout) {