fix: add unit test

Author: littlejiancc

modules/dop/dao/testplan_v2_step.go

@@ -197,7 +197,7 @@ func (client *DBClient) MoveTestPlanV2Step(req *apistructs.TestPlanV2StepMoveReq
 		oldGroupID = step.GroupID
 
 		// the order of the linked list has not changed
-		if req.PreID == step.PreID || req.PreID == step.ID {
+		if req.PreID == step.PreID || req.PreID == lastStepIDInGroup {
 			if req.IsGroup {
 				return nil
 			}
@@ -258,7 +258,7 @@ func (client *DBClient) MoveTestPlanV2Step(req *apistructs.TestPlanV2StepMoveReq
 	})
 }
 
-// updateStepGroup update step group, set min SetID in the group as groupID
+// updateStepGroup update step group, set min setID in the group as groupID
 func updateStepGroup(tx *gorm.DB, groupIDs ...uint64) error {
 	for _, v := range groupIDs {
 		if v == 0 {

modules/openapi/component-protocol/scenarios/auto-test-plan-detail/components/stages/stages.go

@@ -187,7 +187,7 @@ func (i *ComponentStageForm) RenderGroupMoveStagesForm() (err error) {
 	if len(stepDragGroup) <= 0 {
 		return errors.New("the dragGroupKey is not exists")
 	}
-	firstStepDrag, lastStepDrag := findFirstLastStepIDInGroup(stepDragGroup)
+	firstStepDrag, lastStepDrag := findFirstLastStepInGroup(stepDragGroup)
 	req.StepID = firstStepDrag.ID
 	req.LastStepID = lastStepDrag.ID
 
@@ -202,9 +202,10 @@ func (i *ComponentStageForm) RenderGroupMoveStagesForm() (err error) {
 		if len(stepDropGroup) <= 0 {
 			return errors.New("the dropGroupKey is not exists")
 		}
-		firstStepDrop, _ := findFirstLastStepIDInGroup(stepDropGroup)
+		firstStepDrop, _ := findFirstLastStepInGroup(stepDropGroup)
 		req.PreID = firstStepDrop.PreID
 		req.TargetStepID = firstStepDrop.ID
+		// the order of the linked list has not changed
 		if req.PreID == req.LastStepID {
 			return nil
 		}
@@ -216,10 +217,11 @@ func (i *ComponentStageForm) RenderGroupMoveStagesForm() (err error) {
 		if len(stepDropGroup) <= 0 {
 			return errors.New("the dropGroupKey is not exists")
 		}
-		_, lastStepDrop := findFirstLastStepIDInGroup(stepDropGroup)
+		_, lastStepDrop := findFirstLastStepInGroup(stepDropGroup)
 		req.PreID = lastStepDrop.ID
 		req.TargetStepID = lastStepDrop.ID
-		if req.PreID == req.StepID {
+		// the order of the linked list has not changed
+		if req.PreID == firstStepDrag.PreID {
 			return nil
 		}
 	default:
@@ -228,7 +230,7 @@ func (i *ComponentStageForm) RenderGroupMoveStagesForm() (err error) {
 	return i.ctxBdl.Bdl.MoveTestPlansV2Step(req)
 }
 
-func findFirstLastStepIDInGroup(steps []*apistructs.TestPlanV2Step) (firstStep, lastStep *apistructs.TestPlanV2Step) {
+func findFirstLastStepInGroup(steps []*apistructs.TestPlanV2Step) (firstStep, lastStep *apistructs.TestPlanV2Step) {
 	stepIDMap := make(map[uint64]*apistructs.TestPlanV2Step, len(steps))
 	preIDMap := make(map[uint64]*apistructs.TestPlanV2Step, len(steps))
 	for _, v := range steps {
@@ -256,12 +258,15 @@ func (i *ComponentStageForm) RenderItemMoveStagesForm() (err error) {
 		req      apistructs.TestPlanV2StepMoveRequest
 		testPlan *apistructs.TestPlanV2GetResponse
 	)
+	dragGroupKey := uint64(i.State.DragParams.DragGroupKey)
+	dropGroupKey := uint64(i.State.DragParams.DropGroupKey)
+
 	req.UserID = i.ctxBdl.Identity.UserID
 	req.TestPlanID = i.State.TestPlanId
 	req.StepID = uint64(i.State.DragParams.DragKey)
 	req.LastStepID = uint64(i.State.DragParams.DragKey)
 	req.IsGroup = false
-	if i.State.DragParams.DropKey == -1 {
+	if i.State.DragParams.DropKey == -1 { // move to the end and be independent group
 		req.TargetStepID = 0
 	} else {
 		req.TargetStepID = uint64(i.State.DragParams.DropKey)
@@ -284,12 +289,21 @@ func (i *ComponentStageForm) RenderItemMoveStagesForm() (err error) {
 				return
 			}
 			req.PreID = uint64(i.State.DragParams.DropKey)
+			// the order of the linked list has not changed in the same group
+			if req.PreID == step.PreID && dragGroupKey == dropGroupKey {
+				return nil
+			}
+
 		case -1: // in front of the target
 			step, err = i.ctxBdl.Bdl.GetTestPlanV2Step(uint64(i.State.DragParams.DropKey))
 			if err != nil {
 				return
 			}
 			req.PreID = step.PreID
+			// the order of the linked list has not changed in the same group
+			if req.PreID == req.LastStepID && dragGroupKey == dropGroupKey {
+				return nil
+			}
 		default:
 			return errors.New("unknown position")
 		}
@@ -319,7 +333,10 @@ func (i *ComponentStageForm) RenderSplitStagesForm(opsData interface{}) (err err
 	if len(stepGroup) <= 0 {
 		return errors.New("the groupID is not exists")
 	}
-	_, lastStep := findFirstLastStepIDInGroup(stepGroup)
+	if len(stepGroup) == 1 {
+		return nil
+	}
+	_, lastStep := findFirstLastStepInGroup(stepGroup)
 	req.PreID = lastStep.ID
 	return i.ctxBdl.Bdl.MoveTestPlansV2Step(req)
 }

modules/openapi/component-protocol/scenarios/auto-test-plan-detail/components/stages/stages_test.go

@@ -0,0 +1,64 @@
+// Copyright (c) 2021 Terminus, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package stages
+
+import (
+	"testing"
+
+	"github.com/erda-project/erda/apistructs"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFindFirstLastStepInGroup(t *testing.T) {
+	tt := []struct {
+		steps     []*apistructs.TestPlanV2Step
+		wantFirst uint64
+		wantLast  uint64
+	}{
+		{
+			steps: []*apistructs.TestPlanV2Step{
+				{ID: 2, PreID: 1},
+				{ID: 3, PreID: 2},
+				{ID: 4, PreID: 3},
+				{ID: 5, PreID: 4},
+			},
+			wantFirst: 2,
+			wantLast:  5,
+		},
+		{
+			steps: []*apistructs.TestPlanV2Step{
+				{ID: 4, PreID: 0},
+				{ID: 2, PreID: 4},
+				{ID: 3, PreID: 5},
+				{ID: 5, PreID: 2},
+			},
+			wantFirst: 4,
+			wantLast:  3,
+		},
+		{
+			steps: []*apistructs.TestPlanV2Step{
+				{ID: 1, PreID: 0},
+			},
+			wantFirst: 1,
+			wantLast:  1,
+		},
+	}
+	for _, v := range tt {
+		firstStep, lastStep := findFirstLastStepInGroup(v.steps)
+		firstStepID, lastStepID := firstStep.ID, lastStep.ID
+		assert.Equal(t, v.wantFirst, firstStepID)
+		assert.Equal(t, v.wantLast, lastStepID)
+	}
+}