Merge branch 'mark-catalog-resource-as-draft' into 'master'

Return catalog resource to `draft`

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130555

Merged-by: Avielle Wolfe <[email protected]>
Approved-by: Avielle Wolfe <[email protected]>
Approved-by: Kasia Misirli <[email protected]>
Co-authored-by: Laura Montemayor <[email protected]>

Author: Avielle Wolfe

app/services/releases/destroy_service.rb

@@ -7,6 +7,8 @@ def execute
       return error(_('Access Denied'), 403) unless allowed?
 
       if release.destroy
+        update_catalog_resource!
+
         success(tag: existing_tag, release: release)
       else
         error(release.errors.messages || '400 Bad request', 400)
@@ -15,6 +17,14 @@ def execute
 
     private
 
+    def update_catalog_resource!
+      return unless project.catalog_resource
+
+      return unless project.catalog_resource.versions.none?
+
+      project.catalog_resource.update!(state: 'draft')
+    end
+
     def allowed?
       Ability.allowed?(current_user, :destroy_release, release)
     end

spec/services/releases/destroy_service_spec.rb

@@ -28,6 +28,26 @@
       it 'returns the destroyed object' do
         is_expected.to include(status: :success, release: release)
       end
+
+      context 'when the release is for a catalog resource' do
+        let!(:catalog_resource) { create(:catalog_resource, project: project, state: 'published') }
+        let!(:version) { create(:catalog_resource_version, catalog_resource: catalog_resource, release: release) }
+
+        it 'does not update the catalog resources if there are still releases' do
+          second_release = create(:release, project: project, tag: 'v1.2.0')
+          create(:catalog_resource_version, catalog_resource: catalog_resource, release: second_release)
+
+          subject
+
+          expect(catalog_resource.reload.state).to eq('published')
+        end
+
+        it 'updates the catalog resource if there are no more releases' do
+          subject
+
+          expect(catalog_resource.reload.state).to eq('draft')
+        end
+      end
     end
 
     context 'when tag does not exist in the repository' do