From f21681d1cc62255e4e4141543e2c2368601b1f6a Mon Sep 17 00:00:00 2001 From: Yash Mehrotra Date: Thu, 18 Jan 2024 14:00:37 +0530 Subject: [PATCH] fix: filter components by agent when persisting them --- pkg/db/topology.go | 2 +- pkg/system_api.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/db/topology.go b/pkg/db/topology.go index 7a7ee66c4..c013d6ca9 100644 --- a/pkg/db/topology.go +++ b/pkg/db/topology.go @@ -227,7 +227,7 @@ func DeleteInlineCanariesForComponent(db *gorm.DB, componentID string) error { } func GetActiveComponentsIDsOfTopology(db *gorm.DB, topologyID string) (compIDs []uuid.UUID, err error) { - if err := db.Table("components").Where("deleted_at is NULL and topology_id = ?", topologyID).Select("id").Find(&compIDs).Error; err != nil { + if err := db.Table("components").Where("deleted_at is NULL AND topology_id = ?", topologyID).Select("id").Find(&compIDs).Error; err != nil { return nil, err } return diff --git a/pkg/system_api.go b/pkg/system_api.go index 3f4887d07..a6c2b610b 100644 --- a/pkg/system_api.go +++ b/pkg/system_api.go @@ -156,7 +156,7 @@ type Component struct { func (component *Component) FindExisting(db *gorm.DB) (*models.Component, error) { var existing models.Component - tx := db.Model(component).Select("id", "deleted_at") + tx := db.Model(component).Select("id", "deleted_at").Where("agent_id = ?", uuid.Nil) if component.ID == uuid.Nil { if component.ParentId == nil { tx = tx.Find(&existing, "name = ? AND type = ? and parent_id is NULL", component.Name, component.Type)