feat: save case merge interfaces

arex-web-api/src/main/java/com/arextest/web/api/service/beans/auto/SystemConfigAutoConfiguration.java

@@ -0,0 +1,13 @@
+package com.arextest.web.api.service.beans.auto;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author wildeslam.
+ * @create 2024/6/27 20:20
+ */
+@Configuration
+public class SystemConfigAutoConfiguration {
+
+
+}

arex-web-api/src/main/java/com/arextest/web/api/service/controller/FileSystemController.java

@@ -352,8 +352,10 @@ public Response validInvitation(@Valid @RequestBody ValidInvitationRequestType r
   @PostMapping("/addItemsByAppNameAndInterfaceName")
   @ResponseBody
   public Response addItemsByAppAndInterface(
+      @RequestHeader(name = Constants.ACCESS_TOKEN) String token,
       @Valid @RequestBody FSAddItemsByAppAndInterfaceRequestType request) {
-    List<String> path = fileSystemService.addItemsByAppAndInterface(request);
+    String userName = jwtService.getUserName(token);
+    List<String> path = fileSystemService.addItemsByAppAndInterface(request, userName);
     FSAddItemsByAppAndInterfaceResponseType response = new FSAddItemsByAppAndInterfaceResponseType();
     if (CollectionUtils.isEmpty(path)) {
       response.setSuccess(false);

arex-web-core/src/main/java/com/arextest/web/core/business/filesystem/FileSystemService.java

@@ -2,7 +2,6 @@
 
 import com.arextest.common.exceptions.ArexException;
 import com.arextest.common.jwt.JWTService;
-import com.arextest.config.model.dto.record.ServiceCollectConfiguration;
 import com.arextest.config.repository.ConfigRepositoryProvider;
 import com.arextest.web.common.LoadResource;
 import com.arextest.web.common.LogUtils;
@@ -23,7 +22,6 @@
 import com.arextest.web.core.repository.ReportPlanStatisticRepository;
 import com.arextest.web.core.repository.UserRepository;
 import com.arextest.web.core.repository.UserWorkspaceRepository;
-import com.arextest.web.core.repository.mongo.ScheduleConfigurationRepositoryImpl;
 import com.arextest.web.model.contract.contracts.config.replay.ScheduleConfiguration;
 import com.arextest.web.model.contract.contracts.filesystem.BatchGetInterfaceCaseRequestType;
 import com.arextest.web.model.contract.contracts.filesystem.BatchGetInterfaceCaseResponseType;
@@ -98,6 +96,7 @@
 import com.arextest.web.model.mapper.FSFolderMapper;
 import com.arextest.web.model.mapper.FSInterfaceMapper;
 import com.arextest.web.model.mapper.FSNodeMapper;
+import com.arextest.web.model.mapper.FSRequestMapper;
 import com.arextest.web.model.mapper.FSTreeMapper;
 import com.arextest.web.model.mapper.UserWorkspaceMapper;
 import com.arextest.web.model.mapper.WorkspaceMapper;
@@ -805,7 +804,8 @@ public FSQueryCaseResponseType queryDebuggingCase(String planId, String recordId
     return response;
   }
 
-  public List<String> addItemsByAppAndInterface(FSAddItemsByAppAndInterfaceRequestType request) {
+  public List<String> addItemsByAppAndInterface(FSAddItemsByAppAndInterfaceRequestType request,
+      String userName) {
     List<String> path = new ArrayList<>();
     if (CollectionUtils.isNotEmpty(request.getParentPath())) {
       path.addAll(request.getParentPath());
@@ -815,7 +815,8 @@ public List<String> addItemsByAppAndInterface(FSAddItemsByAppAndInterfaceRequest
         LogUtils.error(LOGGER, "Workspace not found, workspaceId: {}", request.getWorkspaceId());
         return null;
       }
-      String[] defaultPath = new String[2];
+      String[] defaultPath = new String[3];
+      // add folder
       FSNodeDto appIdNode = fileSystemUtils.findByNodeName(treeDto.getRoots(),
           request.getAppName());
       if (appIdNode == null) {
@@ -836,6 +837,7 @@ public List<String> addItemsByAppAndInterface(FSAddItemsByAppAndInterfaceRequest
       } else {
         defaultPath[0] = appIdNode.getInfoId();
       }
+      // add interface
       FSNodeDto interfaceNode = fileSystemUtils.findByNodeName(appIdNode.getChildren(),
           request.getInterfaceName());
       if (interfaceNode == null) {
@@ -851,13 +853,50 @@ public List<String> addItemsByAppAndInterface(FSAddItemsByAppAndInterfaceRequest
               request.getInterfaceName());
           return null;
         }
+        interfaceNode = fileSystemUtils.deepFindByInfoId(addInterface.getRight().getRoots(),
+            addInterface.getLeft());
         defaultPath[1] = addInterface.getLeft();
       } else {
         defaultPath[1] = interfaceNode.getInfoId();
       }
+
+      // add case
+      FSAddItemRequestType addCaseRequest = new FSAddItemRequestType();
+      addCaseRequest.setId(treeDto.getId());
+      addCaseRequest.setNodeName(request.getNodeName());
+      addCaseRequest.setNodeType(FSInfoItem.CASE);
+      addCaseRequest.setParentPath(Arrays.asList(defaultPath[0], defaultPath[1]));
+      MutablePair<String, FSTreeDto> addCase = addItem(addCaseRequest);
+      if (addCase == null) {
+        LogUtils.error(LOGGER, "Add case failed, workspaceId: {}, nodeName: {}",
+            request.getWorkspaceId(),
+            request.getNodeName());
+        return null;
+      }
+      defaultPath[2] = addCase.getLeft();
+
       path.addAll(Arrays.asList(defaultPath));
+
+      // save interface
+      FSSaveInterfaceRequestType saveInterfaceRequest = FSRequestMapper.INSTANCE.buildSaveInterfaceRequest(
+          request);
+      saveInterfaceRequest.setId(defaultPath[1]);
+      saveInterface(saveInterfaceRequest, userName);
+
+      //save case
+      FSSaveCaseRequestType saveCaseRequest = FSRequestMapper.INSTANCE.buildSaveCaseRequest(
+          request);
+      saveCaseRequest.setId(defaultPath[2]);
+      saveCase(saveCaseRequest, userName);
+
+      //pin case
+      FSPinMockRequestType pinMockRequest = FSRequestMapper.INSTANCE.buildPinMockRequest(request);
+      pinMockRequest.setInfoId(defaultPath[2]);
+      pinMockRequest.setNodeType(FSInfoItem.CASE);
+      pinMock(pinMockRequest);
     }
 
+
     // add the related information about the replay interface to the manual interface
     this.addReplayInfoToManual(request.getOperationId(), path);
     return path;

arex-web-model-contract/src/main/java/com/arextest/web/model/contract/contracts/filesystem/FSAddItemsByAppAndInterfaceRequestType.java

@@ -1,6 +1,10 @@
 package com.arextest.web.model.contract.contracts.filesystem;
 
+import com.arextest.web.model.contract.contracts.common.KeyValuePairType;
+import com.arextest.web.model.contract.contracts.common.ScriptBlockType;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import javax.validation.constraints.NotBlank;
 import lombok.Data;
 
@@ -17,4 +21,18 @@ public class FSAddItemsByAppAndInterfaceRequestType {
   private String interfaceName;
   @NotBlank(message = "operationId cannot be empty")
   private String operationId;
+  private String nodeName;
+
+  // for Case & Interface
+  private AddressType address;
+  private List<ScriptBlockType> preRequestScripts;
+  private List<ScriptBlockType> testScripts;
+  private BodyType body;
+  private List<KeyValuePairType> headers;
+  private List<KeyValuePairType> params;
+  private AuthType auth;
+  private AddressType testAddress;
+  private Set<String> labelIds;
+  private String description;
+
 }

arex-web-model/src/main/java/com/arextest/web/model/mapper/FSRequestMapper.java

@@ -0,0 +1,28 @@
+package com.arextest.web.model.mapper;
+
+import com.arextest.web.model.contract.contracts.filesystem.FSAddItemsByAppAndInterfaceRequestType;
+import com.arextest.web.model.contract.contracts.filesystem.FSPinMockRequestType;
+import com.arextest.web.model.contract.contracts.filesystem.FSSaveCaseRequestType;
+import com.arextest.web.model.contract.contracts.filesystem.FSSaveInterfaceRequestType;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author wildeslam.
+ * @create 2024/6/28 11:36
+ */
+@Mapper
+public interface FSRequestMapper {
+
+  FSRequestMapper INSTANCE = Mappers.getMapper(FSRequestMapper.class);
+
+  FSSaveInterfaceRequestType buildSaveInterfaceRequest(
+      FSAddItemsByAppAndInterfaceRequestType request);
+
+  FSSaveCaseRequestType buildSaveCaseRequest(FSAddItemsByAppAndInterfaceRequestType request);
+
+  @Mapping(target = "recordId", source = "nodeName")
+  FSPinMockRequestType buildPinMockRequest(FSAddItemsByAppAndInterfaceRequestType request);
+
+}