feat: use unscoped delete for resource in manager (#2595)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Aug 3, 2023 · a966c04 · a966c04
1 parent a151be1
commit a966c04
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/manager/service/application.go b/manager/service/application.go
@@ -51,7 +51,7 @@ func (s *service) DestroyApplication(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if err := s.db.WithContext(ctx).Delete(&models.Application{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.Application{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/cluster.go b/manager/service/cluster.go
@@ -141,7 +141,7 @@ func (s *service) DestroyCluster(ctx context.Context, id uint) error {
 			return errors.New("seed peer cluster exists seed peer")
 		}
 
-		if err := tx.WithContext(ctx).Delete(&models.SeedPeerCluster{}, seedPeerCluster.ID).Error; err != nil {
+		if err := tx.WithContext(ctx).Unscoped().Delete(&models.SeedPeerCluster{}, seedPeerCluster.ID).Error; err != nil {
 			tx.Rollback()
 			return err
 		}
@@ -152,7 +152,7 @@ func (s *service) DestroyCluster(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if err := tx.WithContext(ctx).Delete(&models.SchedulerCluster{}, id).Error; err != nil {
+	if err := tx.WithContext(ctx).Unscoped().Delete(&models.SchedulerCluster{}, id).Error; err != nil {
 		tx.Rollback()
 		return err
 	}

diff --git a/manager/service/config.go b/manager/service/config.go
@@ -44,7 +44,7 @@ func (s *service) DestroyConfig(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.Config{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Unscoped().Delete(&models.Config{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/job.go b/manager/service/job.go
@@ -190,7 +190,7 @@ func (s *service) DestroyJob(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if err := s.db.WithContext(ctx).Delete(&models.Job{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.Job{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/oauth.go b/manager/service/oauth.go
@@ -45,7 +45,7 @@ func (s *service) DestroyOauth(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.Oauth{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Unscoped().Delete(&models.Oauth{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/personal_access_token.go b/manager/service/personal_access_token.go
@@ -55,7 +55,7 @@ func (s *service) DestroyPersonalAccessToken(ctx context.Context, id uint) error
 		return err
 	}
 
-	if err := s.db.WithContext(ctx).Delete(&models.PersonalAccessToken{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.PersonalAccessToken{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/scheduler.go b/manager/service/scheduler.go
@@ -52,7 +52,7 @@ func (s *service) DestroyScheduler(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.Scheduler{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Unscoped().Delete(&models.Scheduler{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/scheduler_cluster.go b/manager/service/scheduler_cluster.go
@@ -73,7 +73,7 @@ func (s *service) DestroySchedulerCluster(ctx context.Context, id uint) error {
 		return errors.New("scheduler cluster exists scheduler")
 	}
 
-	if err := s.db.WithContext(ctx).Delete(&models.SchedulerCluster{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.SchedulerCluster{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/seed_peer.go b/manager/service/seed_peer.go
@@ -49,7 +49,7 @@ func (s *service) DestroySeedPeer(ctx context.Context, id uint) error {
 		return err
 	}
 
-	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.SeedPeer{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Unscoped().Delete(&models.SeedPeer{}, id).Error; err != nil {
 		return err
 	}
 

diff --git a/manager/service/seed_peer_cluster.go b/manager/service/seed_peer_cluster.go
@@ -54,7 +54,7 @@ func (s *service) DestroySeedPeerCluster(ctx context.Context, id uint) error {
 		return errors.New("seedPeer cluster exists seedPeer")
 	}
 
-	if err := s.db.WithContext(ctx).Delete(&models.SeedPeerCluster{}, id).Error; err != nil {
+	if err := s.db.WithContext(ctx).Unscoped().Delete(&models.SeedPeerCluster{}, id).Error; err != nil {
 		return err
 	}