From b36dca8d8e9e36ff0f54aab815bfaadbd47e18b9 Mon Sep 17 00:00:00 2001 From: abhibhaw <39991296+abhibhaw@users.noreply.github.com> Date: Sat, 22 Mar 2025 12:32:39 +0530 Subject: [PATCH 1/2] fix: let user delete the container reg if the ref app was deleted --- .../sql/repository/pipelineConfig/CiTemplateRepository.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/sql/repository/pipelineConfig/CiTemplateRepository.go b/internal/sql/repository/pipelineConfig/CiTemplateRepository.go index 3e3f113a61..04291afd9d 100644 --- a/internal/sql/repository/pipelineConfig/CiTemplateRepository.go +++ b/internal/sql/repository/pipelineConfig/CiTemplateRepository.go @@ -96,8 +96,10 @@ func (impl CiTemplateRepositoryImpl) FindByAppId(appId int) (ciTemplate *CiTempl func (impl CiTemplateRepositoryImpl) FindByDockerRegistryId(dockerRegistryId string) (ciTemplates []*CiTemplate, err error) { err = impl.dbConnection.Model(&ciTemplates). - Where("docker_registry_id =? ", dockerRegistryId). - Where("active = ?", true). + Join("JOIN app a ON ci_template.app_id = a.id"). + Where("docker_registry_id = ?", dockerRegistryId). + Where("ci_template.active = ?", true). + Where("a.active = ?", true). Select() return ciTemplates, err } From cc62da4ae2e2e5b76d78bf028b3c0563400d0be6 Mon Sep 17 00:00:00 2001 From: abhibhaw <39991296+abhibhaw@users.noreply.github.com> Date: Tue, 25 Mar 2025 12:17:10 +0530 Subject: [PATCH 2/2] chore: made where clause more explicit --- internal/sql/repository/pipelineConfig/CiTemplateRepository.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/sql/repository/pipelineConfig/CiTemplateRepository.go b/internal/sql/repository/pipelineConfig/CiTemplateRepository.go index 04291afd9d..dd8e975c9e 100644 --- a/internal/sql/repository/pipelineConfig/CiTemplateRepository.go +++ b/internal/sql/repository/pipelineConfig/CiTemplateRepository.go @@ -97,7 +97,7 @@ func (impl CiTemplateRepositoryImpl) FindByAppId(appId int) (ciTemplate *CiTempl func (impl CiTemplateRepositoryImpl) FindByDockerRegistryId(dockerRegistryId string) (ciTemplates []*CiTemplate, err error) { err = impl.dbConnection.Model(&ciTemplates). Join("JOIN app a ON ci_template.app_id = a.id"). - Where("docker_registry_id = ?", dockerRegistryId). + Where("ci_template.docker_registry_id = ?", dockerRegistryId). Where("ci_template.active = ?", true). Where("a.active = ?", true). Select()