feat: refactor template and application CURD logic (casibase#1459)

dark-Qy · hsluoyz · commit 1beb94cdcef4 · 2025-08-02T10:01:28.000+08:00
diff --git a/controllers/application.go b/controllers/application.go
@@ -23,14 +23,6 @@ import (
 	"github.com/casibase/casibase/util"
 )
 
-type ApplicationDeploymentRequest struct {
-	Owner       string `json:"owner"`
-	Name        string `json:"name"`
-	DisplayName string `json:"displayName"`
-	Template    string `json:"template"`
-	Parameters  string `json:"parameters"`
-}
-
 // GetApplications
 // @Title GetApplications
 // @Tag Application API
@@ -127,20 +119,20 @@ func (c *ApiController) UpdateApplication() {
 // @Success 200 {object} controllers.Response The Response object
 // @router /add-application [post]
 func (c *ApiController) AddApplication() {
-	var req ApplicationDeploymentRequest
-	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
+	var application object.Application
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &application)
 	if err != nil {
 		c.ResponseError(err.Error())
 		return
 	}
 
-	if req.Owner == "" || req.Name == "" || req.Template == "" {
+	if application.Template == "" {
 		c.ResponseError("Missing required parameters")
 		return
 	}
 
 	// Verify template exists
-	template, err := object.GetTemplate(req.Owner, req.Template)
+	template, err := object.GetTemplate(util.GetIdFromOwnerAndName(application.Owner, application.Template))
 	if err != nil {
 		c.ResponseError(err.Error())
 		return
@@ -151,17 +143,7 @@ func (c *ApiController) AddApplication() {
 		return
 	}
 
-	// Create new application
-	application := &object.Application{
-		Owner:       req.Owner,
-		Name:        req.Name,
-		DisplayName: req.DisplayName,
-		Template:    req.Template,
-		Parameters:  req.Parameters,
-		Status:      "Not Deployed",
-	}
-
-	success, err := object.AddApplication(application)
+	success, err := object.AddApplication(&application)
 	if err != nil {
 		c.ResponseError(err.Error())
 		return
@@ -198,7 +180,7 @@ func (c *ApiController) DeleteApplication() {
 // @Title DeployApplication
 // @Tag Application API
 // @Description deploy application synchronously
-// @Param body body ApplicationDeploymentRequest true "The deployment request details"
+// @Param body body object.Application true "The details of the application"
 // @Success 200 {object} controllers.Response The Response object
 // @router /deploy-application [post]
 func (c *ApiController) DeployApplication() {
@@ -246,7 +228,7 @@ func (c *ApiController) DeployApplication() {
 // @Title UndeployApplication
 // @Tag Application API
 // @Description undeploy application synchronously
-// @Param body body ApplicationDeploymentRequest true "The deployment request details"
+// @Param body body object.Application true "The details of the application"
 // @Success 200 {object} controllers.Response The Response object
 // @router /undeploy-application [post]
 func (c *ApiController) UndeployApplication() {
diff --git a/controllers/template.go b/controllers/template.go
@@ -74,7 +74,7 @@ func (c *ApiController) GetTemplates() {
 func (c *ApiController) GetTemplate() {
 	id := c.Input().Get("id")
 
-	res, err := object.GetTemplate(util.GetOwnerAndNameFromId(id))
+	res, err := object.GetTemplate(id)
 	if err != nil {
 		c.ResponseError(err.Error())
 		return
@@ -149,7 +149,7 @@ func (c *ApiController) DeleteTemplate() {
 		return
 	}
 
-	success, err := object.DeleteTemplate(template.Owner, template.Name)
+	success, err := object.DeleteTemplate(&template)
 	if err != nil {
 		c.ResponseError(err.Error())
 		return
diff --git a/object/application.go b/object/application.go
@@ -17,9 +17,9 @@ package object
 import (
 	"fmt"
 	"strings"
-	"xorm.io/core"
 
 	"github.com/casibase/casibase/util"
+	"xorm.io/core"
 )
 
 type Application struct {
@@ -82,16 +82,16 @@ func GetApplication(id string) (*Application, error) {
 
 func UpdateApplication(id string, application *Application) (bool, error) {
 	owner, name := util.GetOwnerAndNameFromId(id)
-
-	if application.Owner == "" {
-		application.Owner = owner
+	application.UpdatedTime = util.GetCurrentTime()
+	_, err := getApplication(owner, name)
+	if err != nil {
+		return false, err
 	}
-	if application.Name == "" {
-		application.Name = name
+	if application == nil {
+		return false, nil
 	}
-	application.UpdatedTime = util.GetCurrentTime()
 
-	affected, err := adapter.engine.ID(core.PK{owner, name}).Update(application)
+	affected, err := adapter.engine.ID(core.PK{owner, name}).AllCols().Update(application)
 	if err != nil {
 		return false, err
 	}
diff --git a/object/application_k8s.go b/object/application_k8s.go
@@ -145,7 +145,7 @@ func DeployApplication(application *Application) (bool, error) {
 	}
 
 	// Get the template
-	template, err := GetTemplate(application.Owner, application.Template)
+	template, err := getTemplate(application.Owner, application.Template)
 	if err != nil {
 		return false, fmt.Errorf("failed to get template: %v", err)
 	}
diff --git a/object/template.go b/object/template.go
@@ -57,7 +57,12 @@ func GetPaginationTemplates(owner string, offset, limit int, field, value, sortF
 	return templates, nil
 }
 
-func GetTemplate(owner, name string) (*Template, error) {
+func GetTemplate(id string) (*Template, error) {
+	owner, name := util.GetOwnerAndNameFromId(id)
+	return getTemplate(owner, name)
+}
+
+func getTemplate(owner, name string) (*Template, error) {
 	template := Template{Owner: owner, Name: name}
 	existed, err := adapter.engine.Get(&template)
 	if err != nil {
@@ -73,16 +78,16 @@ func GetTemplate(owner, name string) (*Template, error) {
 
 func UpdateTemplate(id string, template *Template) (bool, error) {
 	owner, name := util.GetOwnerAndNameFromId(id)
-
-	if template.Owner == "" {
-		template.Owner = owner
+	template.UpdatedTime = util.GetCurrentTime()
+	_, err := getTemplate(owner, name)
+	if err != nil {
+		return false, err
 	}
-	if template.Name == "" {
-		template.Name = name
+	if template == nil {
+		return false, nil
 	}
-	template.UpdatedTime = util.GetCurrentTime()
 
-	affected, err := adapter.engine.ID(core.PK{owner, name}).Update(template)
+	affected, err := adapter.engine.ID(core.PK{owner, name}).AllCols().Update(template)
 	if err != nil {
 		return false, err
 	}
@@ -106,8 +111,8 @@ func AddTemplate(template *Template) (bool, error) {
 	return affected != 0, nil
 }
 
-func DeleteTemplate(owner, name string) (bool, error) {
-	affected, err := adapter.engine.Delete(&Template{Owner: owner, Name: name})
+func DeleteTemplate(template *Template) (bool, error) {
+	affected, err := adapter.engine.ID(core.PK{template.Owner, template.Name}).Delete(&Template{})
 	if err != nil {
 		return false, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func DeployApplication(application *Application) (bool, error) {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`// Get the template`
`148`		`- template, err := GetTemplate(application.Owner, application.Template)`
	`148`	`+ template, err := getTemplate(application.Owner, application.Template)`
`149`	`149`	`if err != nil {`
`150`	`150`	`return false, fmt.Errorf("failed to get template: %v", err)`
`151`	`151`	`}`