Prevent reviews that are assigned to package to be counted twice

openSUSE · Nov 16, 2018 · 3ac25f8 · 3ac25f8
1 parent 0d1c3a0
commit 3ac25f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/api/app/models/staging/staging_project.rb b/src/api/app/models/staging/staging_project.rb
@@ -33,7 +33,7 @@ def missing_reviews
       return @missing_reviews if @missing_reviews
 
       @missing_reviews = []
-      attribs = [:by_group, :by_user, :by_project, :by_package]
+      attribs = [:by_group, :by_user, :by_package, :by_project]
 
       staged_requests.includes(:reviews).find_each do |request|
         request.reviews.where.not(state: :accepted).find_each do |review|
@@ -48,9 +48,11 @@ def missing_reviews
           # who = review.by_group || review.by_user || review.by_project || review.by_package
           attribs.each do |att|
             who = review.send(att)
-            if who
-              @missing_reviews << { id: review.id, request: request.number, state: review.state.to_s, package: request.first_target_package, by: who }
-            end
+            next unless who
+
+            @missing_reviews << { id: review.id, request: request.number, state: review.state.to_s, package: request.first_target_package, by: who }
+            # No need to duplicate reviews
+            break
           end
         end
       end

diff --git a/src/api/spec/models/staging/staging_project_spec.rb b/src/api/spec/models/staging/staging_project_spec.rb
@@ -49,7 +49,6 @@
         { id: review_1.id, request: submit_request.number, state: 'new', package: target_package.name, by: other_user.login },
         { id: review_2.id, request: submit_request.number, state: 'new', package: target_package.name, by: group.title },
         { id: review_3.id, request: submit_request.number, state: 'new', package: target_package.name, by: other_package.project.name },
-        { id: review_4.id, request: submit_request.number, state: 'new', package: target_package.name, by: other_package.project.name },
         { id: review_4.id, request: submit_request.number, state: 'new', package: target_package.name, by: other_package.name }
       )
       # rubocop:enable Style/BracesAroundHashParameters