fix: fix bug when init plan and pricing and record (#2934)

* fix: fix potential bugs in init data * fix: improve code format * fix: fix bug when init plan and pricing and record
casdoor · May 7, 2024 · c302dc7 · c302dc7
1 parent d24ddd4
commit c302dc7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/object/init_data.go b/object/init_data.go
@@ -666,7 +666,7 @@ func initDefinedPlan(plan *Plan) {
 			panic(err)
 		}
 		if !affected {
-			panic("Fail to delete enforcer")
+			panic("Fail to delete plan")
 		}
 	}
 	plan.CreatedTime = util.GetCurrentTime()
@@ -677,7 +677,7 @@ func initDefinedPlan(plan *Plan) {
 }
 
 func initDefinedPricing(pricing *Pricing) {
-	existed, err := getPlan(pricing.Owner, pricing.Name)
+	existed, err := getPricing(pricing.Owner, pricing.Name)
 	if err != nil {
 		panic(err)
 	}
@@ -719,6 +719,7 @@ func initDefinedInvitation(invitation *Invitation) {
 }
 
 func initDefinedRecord(record *casvisorsdk.Record) {
+	record.Id = 0
 	record.CreatedTime = util.GetCurrentTime()
 	_ = AddRecord(record)
 }

diff --git a/object/plan.go b/object/plan.go
@@ -133,7 +133,7 @@ func AddPlan(plan *Plan) (bool, error) {
 }
 
 func DeletePlan(plan *Plan) (bool, error) {
-	affected, err := ormer.Engine.ID(core.PK{plan.Owner, plan.Name}).Delete(plan)
+	affected, err := ormer.Engine.ID(core.PK{plan.Owner, plan.Name}).Delete(Plan{})
 	if err != nil {
 		return false, err
 	}

diff --git a/object/pricing.go b/object/pricing.go
@@ -140,7 +140,7 @@ func AddPricing(pricing *Pricing) (bool, error) {
 }
 
 func DeletePricing(pricing *Pricing) (bool, error) {
-	affected, err := ormer.Engine.ID(core.PK{pricing.Owner, pricing.Name}).Delete(pricing)
+	affected, err := ormer.Engine.ID(core.PK{pricing.Owner, pricing.Name}).Delete(Pricing{})
 	if err != nil {
 		return false, err
 	}