Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

app/controllers/repositories_controller.rb

@@ -53,6 +53,8 @@ class RepositoriesController < ApplicationController
     @project_owner = @project.owner
     @hash_commit = Gitea::Repository::Commits::ListService.new(@project_owner.login, @project.identifier,
       sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+      Rails.logger.info("#####################_______hash_commit______############{@hash_commit}")
+      Rails.logger.info("#####################_______hash_commit_size______############{@hash_commit.size}")
   end
 
   def commit

app/models/project.rb

@@ -165,4 +165,8 @@ class Project < ApplicationRecord
     Project.find_by(id: self.forked_from_project_id)
   end
 
+  def self.members_projects(member_user_id)
+    joins(:members).where(members: { user_id: member_user_id})
+  end
+
 end

app/queries/projects/list_my_query.rb

@@ -17,16 +17,15 @@ class Projects::ListMyQuery < ApplicationQuery
       projects = Project.visible
     end
 
-    if params[:is_public].present? && params[:is_public] == "private"
-      projects = projects.is_private.joins(:members).where(members: { user_id: user.id })
-    else 
-      projects = projects.visible.joins(:members).where(members: { user_id: user.id })
+    if params[:is_public].present?
+      projects = projects.is_private.members_projects(user.id) if params[:is_public].to_s == "private"
+      projects = projects.visible.members_projects(user.id) if params[:is_public].to_s == "public"
     end
 
     if params[:category].blank?
-      projects = projects.joins(:members).where(members: { user_id: user.id })
+      projects = projects.members_projects(user.id)
     elsif params[:category].to_s == "join"
-      projects = projects.where.not(user_id: user.id).joins(:members).where(members: { user_id: user.id })
+      projects = projects.where.not(user_id: user.id).members_projects(user.id)
     elsif params[:category].to_s == "manage"
       projects = projects.where(user_id: user.id)
     elsif params[:category].to_s == "watched"  #我关注的