fix: conflict clause

flanksource · May 1, 2024 · a3c872c · a3c872c
1 parent 8422166
commit a3c872c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/pkg/db/canary.go b/pkg/db/canary.go
@@ -373,18 +373,7 @@ func CreateCheck(ctx context.Context, canary pkg.Canary, check *pkg.Check) error
 func PersistCanaryModel(ctx context.Context, model pkg.Canary) (*pkg.Canary, error) {
 	db := ctx.DB()
 	err := db.Clauses(
-		clause.OnConflict{
-			Columns: []clause.Column{{Name: "agent_id"}, {Name: "name"}, {Name: "namespace"}, {Name: "source"}},
-			TargetWhere: clause.Where{
-				Exprs: []clause.Expression{
-					clause.Or(
-						clause.Eq{Column: "deleted_at", Value: gorm.Expr("NULL")},
-						clause.Not(clause.Eq{Column: "agent_id", Value: uuid.Nil.String()}),
-					),
-				},
-			},
-			DoUpdates: clause.AssignmentColumns([]string{"labels", "spec"}),
-		},
+		models.Canary{}.ConflictClause(),
 		clause.Returning{},
 	).Create(&model).Error
 

diff --git a/pkg/db/topology.go b/pkg/db/topology.go
@@ -41,18 +41,7 @@ func PersistV1Topology(ctx context.Context, t *v1.Topology) (pkg.Topology, bool,
 
 func PersistTopology(ctx context.Context, model *pkg.Topology) (bool, error) {
 	tx := ctx.DB().
-		Clauses(clause.OnConflict{
-			Columns: []clause.Column{{Name: "agent_id"}, {Name: "name"}, {Name: "namespace"}},
-			TargetWhere: clause.Where{
-				Exprs: []clause.Expression{
-					clause.Or(
-						clause.Eq{Column: "deleted_at", Value: gorm.Expr("NULL")},
-						clause.Not(clause.Eq{Column: "agent_id", Value: uuid.Nil.String()}),
-					),
-				},
-			},
-			DoUpdates: clause.AssignmentColumns([]string{"labels", "spec"}),
-		}).
+		Clauses(models.Topology{}.OnConflictClause()).
 		Create(model)
 	if tx.Error != nil {
 		return false, tx.Error