[Feature][jsonspilt]fix ProcessInstanceMapperTest (#4989)

* Modify Project and ProjectUser Mapper

* Modify Project and ProjectUser Mapper

* project_code is bigint(20)

* modify ERROR name

* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation

* modify import/export processdefinition, add genProcessData

* fix ut and bug

* code style

* repalce project_id with code

* conflicts solve

* conflicts solve

* conflicts solve

* bugfix

* modify listResources mothod and remove getResourceIds mothod

* 1

* conflicts solve

* modify listResources mothod and remove getResourceIds mothod

* modify listResources mothod and remove getResourceIds mothod

* replace processDefinitionVersion with processDefinitionLog

* codestyle

* codestyle

* add mapper module ut

* codestyle

* fix ProcessInstanceMapperTest

* codestyle

* conflicts solve

* conflicts solve

* conflicts solve

* conflicts solve

* conflicts solve

* fix ProcessInstanceMapperTest

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java

@@ -1,3 +1,4 @@
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -149,7 +150,7 @@ public interface ProcessInstanceService {
     Map<String, Object> viewGantt(Integer processInstanceId) throws Exception;
 
     /**
-     * query process instance by processDefinitionId and stateArray
+     * query process instance by processDefinitionCode and stateArray
      *
      * @param processDefinitionCode processDefinitionCode
      * @param states states array
@@ -166,4 +167,4 @@ public interface ProcessInstanceService {
      */
     List<ProcessInstance> queryByProcessDefineCode(Long processDefinitionCode,int size);
 
-}
+}

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java

@@ -1762,4 +1762,4 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
         return result;
 
     }
-}
+}

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java

@@ -130,11 +130,24 @@ public class ProcessInstanceServiceTest {
                 "192.168.xx.xx", 1, 10);
         Assert.assertEquals(Status.PROJECT_NOT_FOUNT, proejctAuthFailRes.get(Constants.STATUS));
 
+        Date start = DateUtils.getScheduleDate("2020-01-01 00:00:00");
+        Date end = DateUtils.getScheduleDate("2020-01-02 00:00:00");
+        ProcessInstance processInstance = getProcessInstance();
+        List<ProcessInstance> processInstanceList = new ArrayList<>();
+        Page<ProcessInstance> pageReturn = new Page<>(1, 10);
+        processInstanceList.add(processInstance);
+        pageReturn.setRecords(processInstanceList);
+
         // data parameter check
         putMsg(result, Status.SUCCESS, projectName);
         Project project = getProject(projectName);
         when(projectMapper.queryByName(projectName)).thenReturn(project);
         when(projectService.checkProjectAndAuth(loginUser, project, projectName)).thenReturn(result);
+        when(processDefineMapper.selectById(Mockito.anyInt())).thenReturn(getProcessDefinition());
+        when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class)
+                , Mockito.any(), Mockito.any(), Mockito.any(),Mockito.any(), Mockito.any(),
+                eq("192.168.xx.xx"),  Mockito.any(),  Mockito.any())).thenReturn(pageReturn);
+
         Map<String, Object> dataParameterRes = processInstanceService.queryProcessInstanceList(loginUser, projectName, 1, "20200101 00:00:00",
                 "20200102 00:00:00", "", loginUser.getUserName(), ExecutionStatus.SUBMITTED_SUCCESS,
                 "192.168.xx.xx", 1, 10);
@@ -142,13 +155,7 @@ public class ProcessInstanceServiceTest {
 
         //project auth success
         putMsg(result, Status.SUCCESS, projectName);
-        Date start = DateUtils.getScheduleDate("2020-01-01 00:00:00");
-        Date end = DateUtils.getScheduleDate("2020-01-02 00:00:00");
-        ProcessInstance processInstance = getProcessInstance();
-        List<ProcessInstance> processInstanceList = new ArrayList<>();
-        Page<ProcessInstance> pageReturn = new Page<>(1, 10);
-        processInstanceList.add(processInstance);
-        pageReturn.setRecords(processInstanceList);
+
         when(projectMapper.queryByName(projectName)).thenReturn(project);
         when(projectService.checkProjectAndAuth(loginUser, project, projectName)).thenReturn(result);
         when(usersService.queryUser(loginUser.getId())).thenReturn(loginUser);
@@ -532,6 +539,7 @@ public class ProcessInstanceServiceTest {
      */
     private Project getProject(String projectName) {
         Project project = new Project();
+        project.setCode(1L);
         project.setId(1);
         project.setName(projectName);
         project.setUserId(1);

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java

@@ -52,6 +52,7 @@ public class ProcessInstance {
      * process definition id
      * TODO delete
      */
+    @TableField(exist = false)
     private int processDefinitionId;
 
     /**
@@ -160,6 +161,7 @@ public class ProcessInstance {
      * process instance json
      * TODO delete
      */
+    @TableField(exist = false)
     private String processInstanceJson;
 
     /**
@@ -193,11 +195,13 @@ public class ProcessInstance {
     /**
      * task locations for web
      */
+    @TableField(exist = false)
     private String locations;
 
     /**
      * task connects for web
      */
+    @TableField(exist = false)
     private String connects;
 
     /**
@@ -208,6 +212,7 @@ public class ProcessInstance {
     /**
      * depend processes schedule time
      */
+    @TableField(exist = false)
     private String dependenceScheduleTimes;
 
     /**

dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml

@@ -21,8 +21,8 @@
     <sql id="baseSql">
         id, name, process_definition_version, process_definition_code, state, recovery, start_time, end_time, run_times,host,
         command_type, command_param, task_depend_type, max_try_times, failure_strategy, warning_type,
-        warning_group_id, schedule_time, command_start_time, global_params, flag, update_time, is_sub_process, executor_id,
-        locations, connects, history_cmd, dependence_schedule_times,
+        warning_group_id, schedule_time, command_start_time, global_params, flag,
+        update_time, is_sub_process, executor_id, history_cmd,
         process_instance_priority, worker_group, timeout, tenant_id, var_pool
     </sql>
     <select id="queryDetailById" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
@@ -223,4 +223,4 @@
         set global_params = #{globalParams}
         where id = #{id}
     </update>
-</mapper>
+</mapper>

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java

@@ -73,6 +73,7 @@ public class ErrorCommandMapperTest {
         ErrorCommand errorCommand = insertOne();
 
         ProcessDefinition processDefinition = new ProcessDefinition();
+        processDefinition.setCode(1L);
         processDefinition.setName("def 1");
         processDefinition.setProjectCode(1010L);
         processDefinition.setUserId(101);

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionLogMapperTest.java

@@ -98,7 +98,7 @@ public class ProcessDefinitionLogMapperTest {
         processDefinitionLogMapper.insert(processDefinitionLog);
         return processDefinitionLog;
     }
-    
+
     @Test
     public void testInsert() {
         ProcessDefinitionLog processDefinitionLog = insertOne();

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java

@@ -64,6 +64,7 @@ public class ProcessInstanceMapperTest {
         ProcessInstance processInstance = new ProcessInstance();
         Date start = startTime;
         Date end = endTime;
+        processInstance.setProcessDefinitionCode(1L);
         processInstance.setStartTime(start);
         processInstance.setEndTime(end);
         processInstance.setState(ExecutionStatus.SUCCESS);
@@ -82,6 +83,7 @@ public class ProcessInstanceMapperTest {
         ProcessInstance processInstance = new ProcessInstance();
         Date start = new Date(2019 - 1900, 1 - 1, 1, 0, 10, 0);
         Date end = new Date(2019 - 1900, 1 - 1, 1, 1, 0, 0);
+        processInstance.setProcessDefinitionCode(1L);
         processInstance.setStartTime(start);
         processInstance.setEndTime(end);
         processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
@@ -170,12 +172,16 @@ public class ProcessInstanceMapperTest {
                 ExecutionStatus.SUCCESS.ordinal()};
 
         ProcessDefinition processDefinition = new ProcessDefinition();
+        processDefinition.setCode(1L);
         processDefinition.setProjectId(1010);
+        processDefinition.setProjectCode(1L);
         processDefinition.setReleaseState(ReleaseState.ONLINE);
+        processDefinition.setUpdateTime(new Date());
+        processDefinition.setCreateTime(new Date());
         processDefinitionMapper.insert(processDefinition);
 
         ProcessInstance processInstance = insertOne();
-        processInstance.setProcessDefinitionId(processDefinition.getId());
+        processInstance.setProcessDefinitionCode(processDefinition.getCode());
         processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
         processInstance.setIsSubProcess(Flag.NO);
         processInstance.setStartTime(new Date());
@@ -254,10 +260,18 @@ public class ProcessInstanceMapperTest {
 
         Project project = new Project();
         project.setName("testProject");
+        project.setCode(1L);
+        project.setCreateTime(new Date());
+        project.setUpdateTime(new Date());
         projectMapper.insert(project);
 
         ProcessDefinition processDefinition = new ProcessDefinition();
-        processDefinition.setProjectId(project.getId());
+        processDefinition.setCode(1L);
+        processDefinition.setProjectId(1010);
+        processDefinition.setProjectCode(1L);
+        processDefinition.setReleaseState(ReleaseState.ONLINE);
+        processDefinition.setUpdateTime(new Date());
+        processDefinition.setCreateTime(new Date());
 
         processDefinitionMapper.insert(processDefinition);
         ProcessInstance processInstance = insertOne();
@@ -338,11 +352,13 @@ public class ProcessInstanceMapperTest {
 
         Date start = new Date(2019 - 1900, 1 - 1, 01, 0, 0, 0);
         Date end = new Date(2019 - 1900, 1 - 1, 01, 5, 0, 0);
-        ProcessInstance processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end);
+        ProcessInstance processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end
+        );
         Assert.assertEquals(processInstance1.getId(), processInstance.getId());
 
         start = new Date(2019 - 1900, 1 - 1, 01, 1, 0, 0);
-        processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end);
+        processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end
+        );
         Assert.assertNull(processInstance1);
 
         processInstanceMapper.deleteById(processInstance.getId());

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java

@@ -2459,4 +2459,4 @@ public class ProcessService {
         });
         return new ArrayList<>(taskNodeMap.values());
     }
-}
+}