HMS-10740: rename function and variable to reflect meaning

Author: MichaelMraka

manager/controllers/template_subscribed_systems_update.go

@@ -58,8 +58,8 @@ func TemplateSubscribedSystemsUpdateHandler(c *gin.Context) {
 
 	// re-evaluate systems added/removed from templates
 	if config.EnableTemplateChangeEval {
-		inventoryAIDs := kafka.InventoryIDs2InventoryAIDs(account, orgID, systemList)
-		kafka.RecalcSystems(inventoryAIDs)
+		evalDataList := kafka.InventoryIDs2EvalData(account, orgID, systemList)
+		kafka.RecalcSystems(evalDataList)
 	}
 	c.Status(http.StatusOK)
 }

manager/controllers/template_systems_delete.go

@@ -57,8 +57,8 @@ func TemplateSystemsDeleteHandler(c *gin.Context) {
 
 	// re-evaluate systems removed from templates
 	if config.EnableTemplateChangeEval {
-		inventoryAIDs := kafka.InventoryIDs2InventoryAIDs(account, orgID, req.Systems)
-		kafka.RecalcSystems(inventoryAIDs)
+		evalDataList := kafka.InventoryIDs2EvalData(account, orgID, req.Systems)
+		kafka.RecalcSystems(evalDataList)
 	}
 	c.Status(http.StatusOK)
 }

manager/controllers/template_systems_update.go

@@ -91,8 +91,8 @@ func TemplateSystemsUpdateHandler(c *gin.Context) {
 
 	// re-evaluate systems added/removed from templates
 	if config.EnableTemplateChangeEval {
-		inventoryAIDs := kafka.InventoryIDs2InventoryAIDs(account, orgID, req.Systems)
-		kafka.RecalcSystems(inventoryAIDs)
+		evalDataList := kafka.InventoryIDs2EvalData(account, orgID, req.Systems)
+		kafka.RecalcSystems(evalDataList)
 	}
 	c.Status(http.StatusOK)
 }

manager/kafka/kafka.go

@@ -29,12 +29,12 @@ func runRecalcLoop() {
 	}
 }
 
-func InventoryIDs2InventoryAIDs(accountID int, orgID string, inventoryIDs []string) []mqueue.EvalData {
-	inventoryAIDs := make([]mqueue.EvalData, 0, len(inventoryIDs))
+func InventoryIDs2EvalData(accountID int, orgID string, inventoryIDs []string) []mqueue.EvalData {
+	evalDataList := make([]mqueue.EvalData, 0, len(inventoryIDs))
 	for _, v := range inventoryIDs {
-		inventoryAIDs = append(inventoryAIDs, mqueue.EvalData{InventoryID: v, RhAccountID: accountID, OrgID: &orgID})
+		evalDataList = append(evalDataList, mqueue.EvalData{InventoryID: v, RhAccountID: accountID, OrgID: &orgID})
 	}
-	return inventoryAIDs
+	return evalDataList
 }
 
 func sendInventoryIDs(inventoryIDs mqueue.EvalDataSlice) {

manager/kafka/kafka_test.go

@@ -18,8 +18,8 @@ func testRecalcSystems(t *testing.T, accountID int, orgID string, inventoryIDs [
 
 	writerMock := mqueue.MockKafkaWriter{}
 	TryStartEvalQueue(mqueue.MockCreateKafkaWriter(&writerMock))
-	inventoryAIDs := InventoryIDs2InventoryAIDs(accountID, orgID, inventoryIDs)
-	RecalcSystems(inventoryAIDs)
+	evaldataList := InventoryIDs2EvalData(accountID, orgID, inventoryIDs)
+	RecalcSystems(evaldataList)
 	utils.AssertEqualWait(t, 1, func() (exp, act interface{}) {
 		return 1, len(writerMock.Messages)
 	})