RHINENG-22023: move system delete endpoint to admin api

Author: Dugowitch

manager/controllers/system_delete.go

@@ -39,7 +39,6 @@ func InitAPI(api *gin.RouterGroup, config docs.EndpointsConfig) { // nolint: fun
 	systems.GET("/:inventory_id/packages", controllers.SystemPackagesHandler)
 	systems.GET("/:inventory_id/vmaas_json", controllers.SystemVmaasJSONHandler)
 	systems.GET("/:inventory_id/yum_updates", controllers.SystemYumUpdatesHandler)
-	systems.DELETE("/:inventory_id", controllers.SystemDeleteHandler)
 
 	userAuth.GET("/tags", controllers.SystemTagListHandler)
 
@@ -105,6 +104,7 @@ func InitAdmin(app *gin.Engine, enableTurnpikeAuth bool) {
 	api.PUT("/refresh-packages", admin.RefreshPackagesHandler)
 	api.PUT("/refresh-packages/:account", admin.RefreshPackagesAccountHandler)
 	api.GET("/repack/:table_name", admin.RepackHandler)
+	api.DELETE("/system/:inventory_id", admin.SystemDeleteHandler)
 
 	pprof := api.Group("/pprof")
 	pprof.GET("/evaluator_upload/:param", admin.GetEvaluatorUploadPprof)

manager/routes/routes.go

@@ -3,10 +3,12 @@ package controllers
 import (
 	"app/base/database"
 	"app/base/utils"
+	"app/manager/middlewares"
 	"app/tasks/caches"
 	"app/tasks/cleaning"
 	"app/tasks/repack"
 	sync "app/tasks/vmaas_sync"
+	"errors"
 	"net/http"
 	"regexp"
 	"strconv"
@@ -196,3 +198,67 @@ func CleanAADHandler(c *gin.Context) {
 
 	c.JSON(http.StatusOK, "cleaning advisory account data")
 }
+
+// @Summary Delete system by inventory id
+// @Description Delete system by inventory id
+// @ID deletesystem
+// @Security RhIdentity
+// @Accept   json
+// @Produce  json
+// @Param    inventory_id    path    string   true "Inventory ID"
+// @Success 200
+// @Failure 400 {object}	string
+// @Failure 404 {object}	string
+// @Failure 500 {object}	string
+// @Router /systems/{inventory_id} [delete]
+func SystemDeleteHandler(c *gin.Context) {
+	inventoryID := c.Param("inventory_id")
+	if inventoryID == "" {
+		c.JSON(http.StatusBadRequest, utils.ErrorResponse{Error: "inventory_id param not found"})
+		return
+	}
+
+	if !utils.IsValidUUID(inventoryID) {
+		utils.LogAndRespBadRequest(c, errors.New("bad request"), "incorrect inventory_id format")
+		return
+	}
+
+	var systemInventoryID []string
+	db := middlewares.DBFromContext(c)
+	tx := db.Begin()
+
+	defer tx.Rollback()
+
+	err := tx.Set("gorm:query_option", "FOR UPDATE OF system_platform").
+		Table("system_platform").
+		Where("inventory_id = ?::uuid", inventoryID).
+		Pluck("inventory_id", &systemInventoryID).Error
+
+	if err != nil {
+		utils.LogAndRespError(c, err, "could not query database for system")
+		return
+	}
+
+	if len(systemInventoryID) == 0 {
+		utils.LogAndRespNotFound(c, errors.New("no rows returned"), "system not found")
+		return
+	}
+
+	query := tx.Exec("select deleted_inventory_id from delete_system(?::uuid)", systemInventoryID[0])
+	if err := query.Error; err != nil {
+		utils.LogAndRespError(c, err, "Could not delete system")
+		return
+	}
+
+	if err := tx.Commit().Error; err != nil {
+		utils.LogAndRespError(c, err, "Could not delete system")
+		return
+	}
+
+	if query.RowsAffected > 0 {
+		c.Status(http.StatusOK)
+	} else {
+		utils.LogAndRespNotFound(c, errors.New("no rows returned"), "system not found")
+		return
+	}
+}

turnpike/controllers/admin.go

@@ -5,6 +5,7 @@ import (
 	"app/base/database"
 	"app/base/models"
 	"app/base/utils"
+	managerTestUtils "app/manager/controllers"
 	"net/http"
 	"testing"
 
@@ -27,28 +28,36 @@ func TestInitDelete(t *testing.T) {
 
 func TestSystemDelete(t *testing.T) {
 	core.SetupTest(t)
-	w := CreateRequestRouterWithParams("DELETE", "/:inventory_id", del, "", nil, "", SystemDeleteHandler, 1)
+	w := managerTestUtils.CreateRequestRouterWithParams(
+		"DELETE", "/systems/:inventory_id", del, "", nil, "", SystemDeleteHandler, 1,
+	)
 
 	assert.Equal(t, http.StatusOK, w.Code)
 }
 
 func TestSystemDeleteWrongAccount(t *testing.T) {
 	core.SetupTest(t)
-	w := CreateRequestRouterWithParams("DELETE", "/:inventory_id", del, "", nil, "", SystemDeleteHandler, 2)
+	w := managerTestUtils.CreateRequestRouterWithParams(
+		"DELETE", "/systems/:inventory_id", del, "", nil, "", SystemDeleteHandler, 2,
+	)
 
 	assert.Equal(t, http.StatusNotFound, w.Code)
 }
 
 func TestSystemDeleteNotFound(t *testing.T) {
 	core.SetupTest(t)
-	w := CreateRequestRouterWithParams("DELETE", "/:inventory_id", del, "", nil, "", SystemDeleteHandler, 1)
+	w := managerTestUtils.CreateRequestRouterWithParams(
+		"DELETE", "/systems/:inventory_id", del, "", nil, "", SystemDeleteHandler, 1,
+	)
 
 	assert.Equal(t, http.StatusNotFound, w.Code)
 }
 
 func TestSystemDeleteUnknown(t *testing.T) {
 	core.SetupTest(t)
-	w := CreateRequestRouterWithParams("DELETE", "/:inventory_id", "unknownsystem", "", nil, "", SystemDeleteHandler, 1)
+	w := managerTestUtils.CreateRequestRouterWithParams(
+		"DELETE", "/systems/:inventory_id", "unknownsystem", "", nil, "", SystemDeleteHandler, 1,
+	)
 
 	assert.Equal(t, http.StatusBadRequest, w.Code)
 }