fix: ingress and redirect rule haproxy operations bug resolved (#169)

Author: tanmoysrt

swiftwave_service/core/ingress_rule.operations.go

@@ -65,14 +65,18 @@ func (ingressRule *IngressRule) Update(ctx context.Context, db gorm.DB) error {
 func (ingressRule *IngressRule) Delete(ctx context.Context, db gorm.DB, force bool) error {
 	if !force {
 		// verify if ingress rule is not deleting
-		isDeleting := ingressRule.isDeleting()
-		if isDeleting {
+		if ingressRule.isDeleting() {
 			return errors.New("ingress rule is deleting")
 		}
+		// update status to deleting
+		tx := db.Model(&ingressRule).Update("status", IngressRuleStatusDeleting)
+		return tx.Error
+	} else {
+		// Delete ingress rule
+		tx := db.Delete(&ingressRule)
+		return tx.Error
 	}
-	// update status to deleting
-	tx := db.Model(&ingressRule).Update("status", IngressRuleStatusDeleting)
-	return tx.Error
+
 }
 
 func (ingressRule *IngressRule) isDeleting() bool {

swiftwave_service/core/redirect_rule.oprations.go

@@ -61,10 +61,14 @@ func (redirectRule *RedirectRule) Delete(ctx context.Context, db gorm.DB, force
 		if redirectRule.isDeleting() {
 			return errors.New("redirect rule is already deleting")
 		}
+		// update record
+		tx := db.Model(&redirectRule).Update("status", RedirectRuleStatusDeleting)
+		return tx.Error
+	} else {
+		// delete record
+		tx := db.Delete(&redirectRule)
+		return tx.Error
 	}
-	// update record
-	tx := db.Model(&redirectRule).Update("status", RedirectRuleStatusDeleting)
-	return tx.Error
 }
 
 func (redirectRule *RedirectRule) isDeleting() bool {