RHINENG-15506: fix test for candlepin API

Author: MichaelMraka

base/database/testing.go

@@ -540,9 +540,7 @@ func CheckTemplateSystems(t *testing.T, account int, templateUUID string, invent
 	assert.Nil(t, err)
 
 	assert.Equal(t, len(inventoryIDs), len(dbInventoryIDs))
-	if len(inventoryIDs) == 0 {
-		assert.Equal(t, 0, len(dbInventoryIDs))
-	} else {
+	if len(inventoryIDs) == len(dbInventoryIDs) {
 		for index, inventoryID := range inventoryIDs {
 			assert.Equal(t, inventoryID, dbInventoryIDs[index])
 		}

manager/controllers/template_subscribed_systems_update_test.go

@@ -15,6 +15,7 @@ import (
 var subscriptionUUID = "cccccccc-0000-0000-0001-000000000004"
 var templateSystemUUID = "00000000-0000-0000-0000-000000000004"
 var subscriptionInvalidUUID = "99999999-9999-8888-8888-888888888888"
+var orgID = "org_1"
 
 func TestSubscribedSystemID(t *testing.T) {
 	core.SetupTest(t)
@@ -49,7 +50,8 @@ func TestUpdateTemplateSubscribedSystems(t *testing.T) {
 
 	w := CreateRequestRouterWithParams("PATCH", "/:template_id/subscribed-systems", templateUUID, "", nil, "",
 		TemplateSubscribedSystemsUpdateHandler, templateAccount,
-		core.ContextKV{Key: utils.KeySystem, Value: subscriptionUUID})
+		core.ContextKV{Key: utils.KeySystem, Value: subscriptionUUID},
+		core.ContextKV{Key: utils.KeyOrgID, Value: orgID})
 
 	assert.Equal(t, http.StatusOK, w.Code)
 	database.CheckTemplateSystems(t, templateAccount, templateUUID, []string{templateSystemUUID})

manager/controllers/template_systems_update.go

@@ -253,6 +253,9 @@ func assignCandlepinEnvironment(c *gin.Context, db *gorm.DB, accountID int, env
 	resp, err := callCandlepin(base.Context, c.GetString(utils.KeyOrgID), &updateReq)
 	// check response
 	if err != nil {
+		if resp == nil {
+			resp = &candlepin.ConsumersUpdateResponse{Message: "call to candlepin failed"}
+		}
 		LogAndRespBadRequest(c, err, resp.Message)
 		return err
 	}

manager/controllers/template_systems_update_test.go

@@ -226,22 +226,22 @@ func TestUpdateTemplateSystemsCandlepin404(t *testing.T) {
 	})
 	defer database.DeleteTemplate(t, templateAccount, templateUUID)
 	w := CreateRequestRouterWithParams("PUT", templatePath, templateUUID, "", bytes.NewBufferString(data), "",
-		TemplateSystemsUpdateHandler, templateAccount)
+		TemplateSystemsUpdateHandler, templateAccount, core.ContextKV{Key: utils.KeyOrgID, Value: orgID})
 
-	assert.Equal(t, http.StatusFailedDependency, w.Code)
+	assert.Equal(t, http.StatusBadRequest, w.Code)
 	database.CheckTemplateSystems(t, templateAccount, templateUUID, []string{"00000000-0000-0000-0000-000000000007"})
 
-	// Expect HTTP 200 status code when only 1 system causes candlepin call error
+	// Expect HTTP 400 status code even when only 1 system causes candlepin call error
 	data = `{
 		"systems": [
 			"00000000-0000-0000-0000-000000000004",
 			"00000000-0000-0000-0000-000000000018"
 		]
 	}`
 	w = CreateRequestRouterWithParams("PUT", templatePath, templateUUID, "", bytes.NewBufferString(data), "",
-		TemplateSystemsUpdateHandler, templateAccount)
+		TemplateSystemsUpdateHandler, templateAccount, core.ContextKV{Key: utils.KeyOrgID, Value: orgID})
 
-	assert.Equal(t, http.StatusOK, w.Code)
+	assert.Equal(t, http.StatusBadRequest, w.Code)
 	database.CheckTemplateSystems(t, templateAccount, templateUUID,
-		[]string{"00000000-0000-0000-0000-000000000004", "00000000-0000-0000-0000-000000000007"})
+		[]string{"00000000-0000-0000-0000-000000000007"})
 }

platform/candlepin.go

@@ -3,35 +3,15 @@ package platform
 import (
 	"app/base/candlepin"
 	"app/base/utils"
-	"fmt"
+	"encoding/json"
 	"io"
 	"net/http"
+	"slices"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 )
 
-func candlepinEnvHandler(c *gin.Context) {
-	envID := c.Param("envid")
-	/*
-		jsonData, _ := io.ReadAll(c.Request.Body)
-		json.Unmarshal(jsonData, &body) // nolint:errcheck
-		if body.ReturnStatus > 200 {
-			c.AbortWithStatus(body.ReturnStatus)
-			return
-		}
-	*/
-	data := fmt.Sprintf(`{
-        "environment": "%s"
-    }`, envID)
-	utils.LogInfo(data)
-	if envID == "return_404" {
-		c.Data(http.StatusNotFound, gin.MIMEJSON, []byte{})
-		return
-	}
-	c.Data(http.StatusOK, gin.MIMEJSON, []byte(data))
-}
-
 func candlepinConsumersPutHandler(c *gin.Context) {
 	consumer := c.Param("consumer")
 	jsonData, _ := io.ReadAll(c.Request.Body)
@@ -56,8 +36,26 @@ func candlepinConsumersGetHandler(c *gin.Context) {
 	c.JSON(http.StatusOK, response)
 }
 
+func candlepinConsumersEnvironmentsHandler(c *gin.Context) {
+	owner := c.Param("owner")
+	jsonData, _ := io.ReadAll(c.Request.Body)
+	utils.LogInfo("owner", owner, "body", string(jsonData))
+	var req candlepin.ConsumersEnvironmentsRequest
+	err := json.Unmarshal(jsonData, &req)
+	if err != nil {
+		c.Data(http.StatusInternalServerError, gin.MIMEJSON, []byte{})
+		return
+	}
+	utils.LogInfo("ConsumerUuids", req.ConsumerUuids)
+	if slices.Contains(req.ConsumerUuids, "return_404") {
+		c.Data(http.StatusNotFound, gin.MIMEJSON, []byte{})
+		return
+	}
+	c.Data(http.StatusOK, gin.MIMEJSON, []byte{})
+}
+
 func initCandlepin(app *gin.Engine) {
-	app.POST("/candlepin/environments/:envid/consumers", candlepinEnvHandler)
 	app.PUT("/candlepin/consumers/:consumer", candlepinConsumersPutHandler)
 	app.GET("/candlepin/consumers/:consumer", candlepinConsumersGetHandler)
+	app.PUT("/candlepin/owner/:owner/consumers/environments", candlepinConsumersEnvironmentsHandler)
 }