FIX api

app/controllers/project_categories_controller.rb

@@ -2,4 +2,10 @@ class ProjectCategoriesController < ApplicationController
   def index
     @project_categories = ProjectCategory.search(params[:name]).without_content
   end
+
+  def group_list
+    @category_group_list =
+      Project.visible.joins(:project_category).group(:project_category_id)
+        .select("project_category_id, count(*) AS projects_count, project_categories.name")
+  end
 end

app/controllers/projects_controller.rb

@@ -1,9 +1,10 @@
 class ProjectsController < ApplicationController
-  before_action :require_login
+  before_action :require_login, except: %i[index branches group_type_list]
   before_action :find_project, only: %i[branches]
 
   def index
-
+    scope = Projects::ListQuery.call(params)
+    @projects = paginate(scope)
   end
 
   def create
@@ -30,6 +31,10 @@ class ProjectsController < ApplicationController
     @branches = Gitea::Repository::BranchesService.new(current_user, @project.identifier).call
   end
 
+  def group_type_list
+    @project_group_list = Project.visible.group(:project_type).select('project_type, count(*) AS projects_count')
+  end
+
   private
   def find_project
     @project = Project.find_by_identifier! params[:id]

app/helpers/application_helper.rb

@@ -422,6 +422,8 @@ module ApplicationHelper
     when 3 then 'text-secondary'
     end
   end
-end
-
 
+  def render_unix_time(date)
+    date.to_time.to_i
+  end
+end

app/helpers/projects_helper.rb

@@ -1,2 +1,9 @@
 module ProjectsHelper
+
+  def render_zh_project_type(project_type)
+    case project_type
+    when 'common' then "开源托管项目"
+    when 'mirror' then "开源镜像项目"
+    end
+  end
 end

app/models/concerns/matchable.rb

@@ -0,0 +1,13 @@
+module Matchable
+  extend ActiveSupport::Concern
+
+  included do
+    scope :like, lambda { |keywords|
+      where("name LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
+    }
+    scope :with_project_category, ->(category_id) { where(project_category_id: category_id) unless category_id.blank? }
+    scope :with_project_language, ->(language_id) { where(project_language_id: language_id) unless language_id.blank? }
+    scope :with_project_type,     ->(project_type) { where(project_type: project_type) if Project.project_types.include?(project_type) }
+  end
+
+end

app/models/concerns/publicable.rb

@@ -2,8 +2,6 @@ module Publicable
   extend ActiveSupport::Concern
 
   included do
-    alias_attribute :public, :is_public
+    scope :visible, -> { where(is_public: true) }
-    enum public: { publiced: 1, hidden: 0 }
   end
-
 end

app/models/project.rb

@@ -1,4 +1,9 @@
 class Project < ApplicationRecord
+  include Matchable
+  include Publicable
+
+  enum project_type: { mirror: 1, common: 0 } # common:开源托管项目, mirror:开源镜像项目
+
   belongs_to :ignore, optional: true
   belongs_to :license, optional: true
   belongs_to :owner, class_name: 'User', foreign_key: :user_id

app/models/repository.rb

@@ -1,6 +1,6 @@
 class Repository < ApplicationRecord
   self.inheritance_column = nil # FIX  The single-table inheritance mechanism failed
-  belongs_to :project
+  belongs_to :project, :touch => true
   belongs_to :user
 
   validates :identifier, presence: true, uniqueness: true

app/queries/projects/list_query.rb

@@ -0,0 +1,21 @@
+class Projects::ListQuery < ApplicationQuery
+  include CustomSortable
+
+  attr_reader :params
+
+  sort_columns :updated_on, :created_on, :forked_count, :praises_count, default_by: :updated_on, default_direction: :desc
+
+  def initialize(params)
+    @params = params
+  end
+
+  def call
+    scope = Project.like(params[:search])
+      .with_project_type(params[:project_type])
+      .with_project_category(params[:category_id])
+      .with_project_language(params[:language_id])
+      .includes(:project_category, :project_language, :repository, :owner)
+
+    custom_sort(scope, params[:sort_by], params[:sort_direction])
+  end
+end

app/services/projects/migrate_service.rb

@@ -30,7 +30,8 @@ class Projects::MigrateService < ApplicationService
       description: params[:description],
       project_category_id: params[:project_category_id],
       project_language_id: params[:project_language_id],
-      is_public: get_is_public
+      is_public: get_is_public,
+      project_type: Project.project_types[:mirror]
     }
   end
 

app/services/repositories/create_service.rb

@@ -25,12 +25,16 @@ class Repositories::CreateService < ApplicationService
   private
 
   def sync_project(repository, gitea_repository)
-    project.update_column('identifier', repository.identifier)
+    if gitea_repository
-    project.update_columns(gpid: gitea_repository["id"]) if gitea_repository
+      project.update_columns(
+        gpid: gitea_repository["id"],
+        identifier: repository.identifier,
+        forked_count: gitea_repository["forks_count"])
+    end
   end
 
   def sync_repository(repository, gitea_repository)
-    repository.update_columns(url: remote_repository_url) if gitea_repository
+    repository.update_columns(url: remote_repository_url,) if gitea_repository
   end
 
   def remote_repository_url

app/views/project_categories/group_list.json.jbuilder

@@ -0,0 +1,5 @@
+json.array! @category_group_list do |category|
+  json.id category.project_category_id
+  json.name category.name
+  json.projects_count category.projects_count
+end

app/views/projects/_project.json.jbuilder

@@ -0,0 +1,8 @@
+json.id project.identifier
+json.name project.name
+json.description project.description
+json.visits project.visits
+json.forked_count project.forked_count
+json.is_public project.is_public
+json.mirror_url project.repository&.mirror_url
+json.last_update_time render_unix_time(project.updated_on)

app/views/projects/group_type_list.json.jbuilder

@@ -0,0 +1,5 @@
+json.array! @project_group_list do |group|
+  json.project_type group.project_type
+  json.name render_zh_project_type(group.project_type)
+  json.projects_count group.projects_count
+end

app/views/projects/index.json.jbuilder

@@ -1 +1,22 @@
-json.projects []
+json.array! @projects do |project|
+  json.partial! 'project', project: project
+  json.author do
+    json.name project.owner.login
+  end
+  json.category do
+    if project.project_category.blank?
+      json.nil!
+    else
+      json.id project.project_category.id
+      json.name project.project_category.name
+    end
+  end
+  json.language do
+    if project.project_language.blank?
+      json.nil!
+    else
+      json.id project.project_language.id
+      json.name project.project_language.name
+    end
+  end
+end

config/routes.rb

@@ -27,7 +27,9 @@ Rails.application.routes.draw do
     put    'commons/unhidden',    to: 'commons#unhidden'
     delete 'commons/delete',      to: 'commons#delete'
 
-    resources :project_categories, only: [:index, :show]
+    resources :project_categories, only: [:index, :show] do
+      get :group_list, on: :collection
+    end
     resources :project_languages, only: [:index, :show]
     resources :ignores, only: [:index, :show]
     resources :licenses, only: [:index, :show]
@@ -42,6 +44,7 @@ Rails.application.routes.draw do
       end
       collection do
         post :migrate
+        get :group_type_list
       end
       member do
         get :branches
@@ -118,6 +121,7 @@ Rails.application.routes.draw do
       member do
         get :homepage_info
       end
+      get 'me', on: :collection
 
       get :question_banks, on: :collection, to: 'users/question_banks#index'