Refactor collections controller to include owner filter

ecosyste-ms · Jun 13, 2024 · a0bd9a5 · a0bd9a5
1 parent ba7228b
commit a0bd9a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
@@ -21,7 +21,11 @@ def show
       scope = @collection.dependency_projects(params[:dependency])
     end
 
-    if params[:language].present? || params[:keyword].present? || params[:committer].present? || params[:dependency].present?
+    if params[:owner].present?
+      scope = @collection.owner_projects(params[:owner])
+    end
+
+    if params[:language].present? || params[:keyword].present? || params[:committer].present? || params[:dependency].present? || params[:owner].present?
       @pagy, @projects = pagy_array(scope)
     else  
       @pagy, @projects = pagy_countless(scope)

diff --git a/app/models/collection.rb b/app/models/collection.rb
@@ -65,6 +65,10 @@ def dependency_projects(dependency)
     projects.select{|p| p.dependency_packages.include?(dependency.split(':')) }
   end
 
+  def owner_projects(owner)
+    projects.select{|p| p.owner_name == owner }
+  end
+
   def owners
     projects.map(&:owner_name).flatten.group_by(&:itself).transform_values(&:count).sort_by{|k,v| v}.reverse
   end