fix： 支持模型间存在多条关联场景 --bug=150307140 【CMDB】模型间多条关系查询问题

Author: elizabevil

src/scene_server/topo_server/logics/inst/inst.go

@@ -87,14 +87,16 @@ func NewInstOperation(client apimachinery.ClientSetInterface, lang language.CCLa
 
 // ObjectWithInsts a struct include object msg and insts array
 type ObjectWithInsts struct {
+	AssoID int64
+	instID int64
 	Object metadata.Object
-	Insts  []mapstr.MapStr
+	Inst   mapstr.MapStr
 }
 
 // ObjectAssoPair a struct include object msg and association
 type ObjectAssoPair struct {
-	Object    metadata.Object
-	AssocName string
+	Object     metadata.Object
+	AssocNames []string
 }
 
 // ConditionItem subcondition
@@ -1048,7 +1050,7 @@ func (c *commonInst) findInstTopo(kit *rest.Kit, objID string, instID int64, nee
 
 	tmpResults := map[string]*metadata.CommonInstTopo{}
 
-	topoInsts, relation, err := c.getAssociatedObjectWithInsts(kit, objID, instID, needChild)
+	topoInsts, err := c.getAssociatedObjectWithInsts(kit, objID, instID, needChild)
 	if err != nil {
 		return 0, nil, err
 	}
@@ -1066,32 +1068,31 @@ func (c *commonInst) findInstTopo(kit *rest.Kit, objID string, instID int64, nee
 			tmpResults[object.ObjectID] = commonInst
 		}
 
-		commonInst.Count = commonInst.Count + len(topoInst.Insts)
+		commonInst.Count = commonInst.Count + len(topoInst.Inst)
 
-		for _, inst := range topoInst.Insts {
+		inst := topoInst.Inst
 
-			id, err := inst.Int64(metadata.GetInstIDFieldByObjID(object.ObjectID))
-			if err != nil {
-				return 0, nil, err
-			}
-
-			name, err := inst.String(metadata.GetInstNameFieldName(object.ObjectID))
-			if err != nil {
-				return 0, nil, err
-			}
+		id, err := inst.Int64(metadata.GetInstIDFieldByObjID(object.ObjectID))
+		if err != nil {
+			return 0, nil, err
+		}
 
-			instAsst := metadata.InstNameAsst{
-				ID:         strconv.Itoa(int(id)),
-				InstID:     id,
-				InstName:   name,
-				ObjectName: object.ObjectName,
-				ObjIcon:    object.ObjIcon,
-				ObjID:      object.ObjectID,
-				AssoID:     relation[id],
-			}
+		name, err := inst.String(metadata.GetInstNameFieldName(object.ObjectID))
+		if err != nil {
+			return 0, nil, err
+		}
 
-			tmpResults[object.ObjectID].Children = append(tmpResults[object.ObjectID].Children, instAsst)
+		instAsst := metadata.InstNameAsst{
+			ID:         strconv.Itoa(int(id)),
+			InstID:     id,
+			InstName:   name,
+			ObjectName: object.ObjectName,
+			ObjIcon:    object.ObjIcon,
+			ObjID:      object.ObjectID,
+			AssoID:     topoInst.AssoID,
 		}
+
+		tmpResults[object.ObjectID].Children = append(tmpResults[object.ObjectID].Children, instAsst)
 	}
 
 	results := make([]*metadata.CommonInstTopo, 0)
@@ -1443,7 +1444,7 @@ func (c *commonInst) innerHasHost(kit *rest.Kit, moduleIDs []int64) (bool, error
 // getAssociatedObjectWithInsts TODO
 // GetObjectWithInsts get object with insts, get parent or child depends on needChild
 func (c *commonInst) getAssociatedObjectWithInsts(kit *rest.Kit, objID string, instID int64, needChild bool) (
-	[]*ObjectWithInsts, map[int64]int64, error) {
+	[]*ObjectWithInsts, error) {
 
 	cond := mapstr.New()
 	if needChild {
@@ -1455,16 +1456,15 @@ func (c *commonInst) getAssociatedObjectWithInsts(kit *rest.Kit, objID string, i
 	objPairs, err := c.searchAssoObjects(kit, needChild, cond)
 	if err != nil {
 		blog.Errorf("failed to get the object(%s)'s parent, err: %v, rid: %s", objID, err, kit.Rid)
-		return nil, nil, err
+		return nil, err
 	}
 
-	relation := make(map[int64]int64)
 	result := make([]*ObjectWithInsts, 0)
 	for _, objPair := range objPairs {
 
 		queryCond := &metadata.InstAsstQueryCondition{
 			Cond: metadata.QueryCondition{Condition: mapstr.MapStr{
-				common.AssociationObjAsstIDField: objPair.AssocName,
+				common.AssociationObjAsstIDField: mapstr.MapStr{common.BKDBIN: objPair.AssocNames},
 			}},
 			ObjID: objPair.Object.ObjectID,
 		}
@@ -1482,7 +1482,7 @@ func (c *commonInst) getAssociatedObjectWithInsts(kit *rest.Kit, objID string, i
 		rsp, err := c.clientSet.CoreService().Association().ReadInstAssociation(kit.Ctx, kit.Header, queryCond)
 		if err != nil {
 			blog.Errorf("search inst association failed , err: %v, rid: %s", err, kit.Rid)
-			return nil, nil, err
+			return nil, err
 		}
 
 		// found no noe inst association with this object and association info.
@@ -1499,9 +1499,17 @@ func (c *commonInst) getAssociatedObjectWithInsts(kit *rest.Kit, objID string, i
 			} else {
 				instID = item.InstID
 			}
-			relation[instID] = item.ID
 			instIDs = append(instIDs, instID)
+
+			inst := ObjectWithInsts{
+				AssoID: item.ID,
+				instID: instID,
+				Object: objPair.Object,
+				Inst:   nil,
+			}
+			result = append(result, &inst)
 		}
+		instIDs = util.IntArrayUnique(instIDs)
 
 		innerCond := &metadata.QueryCondition{
 			Condition: mapstr.MapStr{objPair.Object.GetInstIDFieldName(): mapstr.MapStr{common.BKDBIN: instIDs}},
@@ -1511,18 +1519,31 @@ func (c *commonInst) getAssociatedObjectWithInsts(kit *rest.Kit, objID string, i
 		if objPair.Object.IsCommon() {
 			innerCond.Condition[common.BKObjIDField] = objPair.Object.ObjectID
 		}
-
 		rspItems, err := c.FindInst(kit, objPair.Object.ObjectID, innerCond)
 		if err != nil {
-			blog.Errorf("failed to search the insts by the condition(%#v), err: %v, rid: %s", innerCond, err, kit.Rid)
-			return result, nil, err
+			blog.Errorf("failed to search the inst by the condition(%#v), err: %v, rid: %s", innerCond, err, kit.Rid)
+			return nil, err
 		}
 
-		rstObj := &ObjectWithInsts{Object: objPair.Object, Insts: rspItems.Info}
-		result = append(result, rstObj)
+		tempMap := make(map[int64]mapstr.MapStr)
+		for _, info := range rspItems.Info {
+			id, err := info.Int64(common.GetInstIDField(objPair.Object.ObjectID))
+			if err != nil {
+				return nil, err
+			}
+			tempMap[id] = info
+		}
+
+		for i, inst := range result {
+			if value, ok := tempMap[inst.instID]; ok {
+				result[i].Inst = value
+				continue
+			}
+			return nil, fmt.Errorf("failed to find the inst (%v) by the condition(%#v)", inst, queryCond)
+		}
 	}
 
-	return result, relation, nil
+	return result, nil
 }
 
 func (c *commonInst) searchAssoObjects(kit *rest.Kit, needChild bool, cond mapstr.MapStr) ([]ObjectAssoPair,
@@ -1544,18 +1565,27 @@ func (c *commonInst) searchAssoObjects(kit *rest.Kit, needChild bool, cond mapst
 		return make([]ObjectAssoPair, 0), nil
 	}
 
-	objAssoMap := make(map[string]metadata.Association, 0)
+	objAssoMap := make(map[string][]string, len(rsp.Info))
 	var objIDArray []string
 	for _, asst := range rsp.Info {
 		if needChild {
 			objIDArray = append(objIDArray, asst.AsstObjID)
-			objAssoMap[asst.AsstObjID] = asst
+			if len(objAssoMap[asst.AsstObjID]) == 0 {
+				objAssoMap[asst.AsstObjID] = []string{asst.AssociationName}
+				continue
+			}
+			objAssoMap[asst.AsstObjID] = append(objAssoMap[asst.AsstObjID], asst.AssociationName)
 		} else {
 			objIDArray = append(objIDArray, asst.ObjectID)
-			objAssoMap[asst.ObjectID] = asst
+			if len(objAssoMap[asst.ObjectID]) == 0 {
+				objAssoMap[asst.ObjectID] = []string{asst.AssociationName}
+				continue
+			}
+			objAssoMap[asst.ObjectID] = append(objAssoMap[asst.ObjectID], asst.AssociationName)
 		}
 	}
 
+	objIDArray = util.StrArrayUnique(objIDArray)
 	queryCond := &metadata.QueryCondition{
 		Condition:      mapstr.MapStr{metadata.ModelFieldObjectID: mapstr.MapStr{common.BKDBIN: objIDArray}},
 		Fields:         []string{common.BKObjNameField, common.BKObjIDField, common.BKObjIconField},
@@ -1574,8 +1604,8 @@ func (c *commonInst) searchAssoObjects(kit *rest.Kit, needChild bool, cond mapst
 	pair := make([]ObjectAssoPair, 0)
 	for _, object := range rspRst.Info {
 		pair = append(pair, ObjectAssoPair{
-			Object:    object,
-			AssocName: objAssoMap[object.ObjectID].AssociationName,
+			Object:     object,
+			AssocNames: objAssoMap[object.ObjectID],
 		})
 	}