remove repo after sync

app/models/product.rb

@@ -153,7 +153,7 @@ def self.recommended_extensions(root_product_ids)
     joins(:product_extensions_associations).where(products_extensions: { recommended: true, root_product_id: root_product_ids })
   end
 
-  def create_service!
+  def find_or_create_service!
     service = Service.find_by(product_id: id)
     return service if service
 

app/services/repository_service.rb

@@ -3,7 +3,7 @@ class RepositoryService
   class RepositoryNotFound < RuntimeError
   end
 
-  def create_repository!(product, url, attributes, custom: false)
+  def update_or_create_repository!(product, url, attributes, custom: false)
     repository = if custom
                    Repository.find_or_initialize_by(external_url: url)
                  else

lib/rmt/cli/repos_custom.rb

@@ -35,7 +35,7 @@ def add(url, name)
       raise RMT::CLI::Error.new(_("Couldn't add custom repository."))
     end
 
-    repository_service.create_repository!(nil, url, {
+    repository_service.update_or_create_repository!(nil, url, {
       name: name.strip,
       mirroring_enabled: true,
       autorefresh: true,

lib/rmt/scc.rb

@@ -23,13 +23,30 @@ def sync
     data.each { |item| create_product(item) }
     data.each { |item| migration_paths(item) }
 
+    # Update repositories with details (eg. access token) from API
     update_repositories(scc_api_client.list_repositories)
 
     Repository.remove_suse_repos_without_tokens!
+    remove_obsolete_repositories(scc_api_client.list_repositories)
 
     update_subscriptions(scc_api_client.list_subscriptions)
   end
 
+  def remove_obsolete_repositories(repos_data)
+    @logger.info _('Removing obsolete repositories')
+    scc_repo_ids = repos_data.pluck(:id)
+
+
+    # Find repositories in RMT that no longer exist in SCC
+    # Only consider repositories that have a non-null scc_id
+    repos_to_remove = Repository.where.not(scc_id: nil)
+                                .where.not(scc_id: scc_repo_ids)
+    if repos_to_remove.any?
+      repos_to_remove.delete_all
+      @logger.info("Successfully removed #{repos_to_remove.count} obsolete repositories")
+    end
+  end
+
   def export(path)
     credentials_set? || (raise CredentialsError, 'SCC credentials not set.')
 
@@ -185,9 +202,9 @@ def create_product(item, root_product_id = nil, base_product = nil, recommended
   end
 
   def create_service(item, product)
-    product.create_service!
+    product.find_or_create_service!
     item[:repositories].each do |repo_item|
-      repository_service.create_repository!(product, repo_item[:url], repo_item)
+      repository_service.update_or_create_repository!(product, repo_item[:url], repo_item)
     end
   end
 

package/obs/rmt-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 03 13:06:20 UTC 2025 - Parag Jain <parag.jain@suse.com>
+
+- Version 2.21
+  * Fix: Remove obsolete repositories from rmt during SCC sync (bsc#1232808)
+
 -------------------------------------------------------------------
 Mon Dec 23 08:03:56 UTC 2024 - Parag Jain <parag.jain@suse.com>
 

spec/factories/products.rb

@@ -117,7 +117,7 @@
 
     trait :with_service do
       after :create do |product, _evaluator|
-        product.create_service!
+        product.find_or_create_service!
       end
     end
 

spec/models/product_spec.rb

@@ -218,13 +218,13 @@
     end
   end
 
-  describe '#create_service!' do
+  describe '#find_or_create_service!' do
     context 'when service already exists' do
       let!(:product) { create :product }
       let!(:service) { create :service, product_id: product.id }
 
       it 'returns the existing service' do
-        expect(product.create_service!).to eq(service)
+        expect(product.find_or_create_service!).to eq(service)
       end
     end
 
@@ -234,15 +234,15 @@
       let!(:other_service) { create :service, id: product.id, product_id: other_product.id }
 
       it 'creates a service with a random ID' do
-        expect(product.create_service!.id).not_to eq(other_service.id)
+        expect(product.find_or_create_service!.id).not_to eq(other_service.id)
       end
     end
 
     context 'when the matching service ID is free' do
       let!(:product) { create :product }
 
       it 'creates a service with a matching ID' do
-        expect(product.create_service!.id).to eq(product.id)
+        expect(product.find_or_create_service!.id).to eq(product.id)
       end
     end
   end

spec/services/repository_service_spec.rb

@@ -6,7 +6,7 @@
   let(:product) { create :product, :with_service }
 
   describe '#create_repository' do
-    subject(:repository) { service.create_repository!(product, url, attributes, custom: custom).reload }
+    subject(:repository) { service.update_or_create_repository!(product, url, attributes, custom: custom).reload }
 
     let(:attributes) do
       {
@@ -38,10 +38,10 @@
 
     context 'URLs of SCC repositories changes' do
       subject(:repository) do
-        service.create_repository!(product, old_url, attributes, custom: custom)
+        service.update_or_create_repository!(product, old_url, attributes, custom: custom)
         expect(Repository.find_by(external_url: old_url)).not_to eq(nil)
 
-        service.create_repository!(product, url, attributes, custom: custom).reload
+        service.update_or_create_repository!(product, url, attributes, custom: custom).reload
       end
 
       let(:old_url) { 'https://foo.bar.com/bar/foo' }
@@ -53,10 +53,10 @@
 
     context 'self heals SCC repos' do
       subject(:repository) do
-        service.create_repository!(product, url, attributes, custom: custom).update(scc_id: old_scc_id)
+        service.update_or_create_repository!(product, url, attributes, custom: custom).update(scc_id: old_scc_id)
         expect(Repository.find_by(scc_id: old_scc_id)).not_to eq(nil)
 
-        service.create_repository!(product, url, attributes, custom: custom).reload
+        service.update_or_create_repository!(product, url, attributes, custom: custom).reload
       end
 
       let(:old_scc_id) { 666 }
@@ -68,8 +68,8 @@
 
     context 'custom repo with same url' do
       subject(:repository) do
-        service.create_repository!(product, url, attributes, custom: custom).update(scc_id: nil)
-        service.create_repository!(product, url, attributes, custom: custom).reload
+        service.update_or_create_repository!(product, url, attributes, custom: custom).update(scc_id: nil)
+        service.update_or_create_repository!(product, url, attributes, custom: custom).reload
       end
 
       it_behaves_like 'scc repositories'
@@ -90,9 +90,9 @@
 
       context 'already existing repositories with changing URL', :skip_sqlite do
         subject(:repository) do
-          service.create_repository!(product, url, attributes, custom: custom).reload
+          service.update_or_create_repository!(product, url, attributes, custom: custom).reload
           url = 'https://foo.bar.com/bar/foo'
-          service.create_repository!(product, url, attributes, custom: custom).reload
+          service.update_or_create_repository!(product, url, attributes, custom: custom).reload
         end
 
         it('raises error when the id is the same') { expect { repository }.to raise_error(/Duplicate entry/) }