refactor(api) reduce complexity of getGenericObjects()

API/controllers/entity.go

@@ -521,25 +521,35 @@ func getGenericObjects(w http.ResponseWriter, r *http.Request, user *models.Acco
 			return nil, false
 		}
 
+		nLimit, e := strconv.Atoi(filters.Limit)
+
 		// Save entity to help delete and respond
 		for _, obj := range entData {
 			obj["entity"] = entStr
 			if entStr == "device" && strings.Contains(complexFilterExp, "virtual_config.type=node") {
 				// add namespace prefix to device nodes
 				obj["id"] = "Physical." + obj["id"].(string)
 			}
-		}
 
-		if nLimit, e := strconv.Atoi(filters.Limit); e == nil && nLimit > 0 && req["id"] != nil {
-			// Get children until limit level (only for GET)
-			for _, obj := range entData {
+			if e == nil && nLimit > 0 && req["id"] != nil {
 				obj["children"], err = models.GetHierarchyByName(entStr, obj["id"].(string), nLimit, filters)
 				if err != nil {
 					u.ErrLog("Error while getting "+entStr, "GET "+entStr, err.Message, r)
 					u.RespondWithError(w, err)
 				}
 			}
 		}
+
+		// if nLimit, e := strconv.Atoi(filters.Limit); e == nil && nLimit > 0 && req["id"] != nil {
+		// 	// Get children until limit level (only for GET)
+		// 	for _, obj := range entData {
+		// 		obj["children"], err = models.GetHierarchyByName(entStr, obj["id"].(string), nLimit, filters)
+		// 		if err != nil {
+		// 			u.ErrLog("Error while getting "+entStr, "GET "+entStr, err.Message, r)
+		// 			u.RespondWithError(w, err)
+		// 		}
+		// 	}
+		// }
 		matchingObjects = append(matchingObjects, entData...)
 	}