m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge

Browse Source
dev_forge
SylorHuang 5 years ago
parent 3a7df81d67 d5b5585168
commit 40ec620ead
18 changed files with 442 additions and 37 deletions
Show Stats Download Patch File Download Diff File

333
README.md
Unescape View File

@ -379,49 +379,342 @@ http://localhost:3000/api/projects/migrate | jq
```
---
#### 项目类别列表(用于项目列表左侧导航中的项目类别列表)
```
GET api/project_categories/group_list
```
*示例*
```
curl -X GET http://localhost:3000/api/project_categories/group_list | jq
```
*返回参数说明:*
|参数名|类型|说明|
-|-|-
|id |int |项目分类id |
|name |string|项目分类名称|
|projects_count |int |项目数量|
返回值
```
[
{
"id": 1,
"name": "大数据",
"projects_count": 30
},
{
"id": 2,
"name": "机器学习",
"projects_count": 1
},
{
"id": 3,
"name": "深度学习",
"projects_count": 1
}
]
```
---
#### 项目类型列表(用于项目列表左侧导航上方中的项目类型列表)
```
GET api/projects/group_type_list
```
*示例*
```
curl -X GET http://localhost:3000/api/projects/group_type_list | jq
```
*返回参数说明:*
|参数名|类型|说明|
-|-|-
|project_type |string|项目类型 |
|name |string|项目类型名称|
|projects_count |int |项目数量|
返回值
```
[
{
"project_type": "common",
"name": "开源托管项目",
"projects_count": 2106
},
{
"project_type": "mirror",
"name": "开源镜像项目",
"projects_count": 1
}
]
```
---
#### 项目列表
```
GET api/projects
```
*示例*
```
curl -X POST \
-d "user_id=36401" \
-d "clone_addr=https://gitea.com/CasperVector/slew.git" \
-d "name=ni项目" \
-d "description=my first project" \
-d "repository_name=mirror_demo" \
-d "project_category_id=1" \
-d "project_language_id=2" \
http://localhost:3000/api/projects/migrate | jq
curl -X GET \
-d "page=1" \
-d "limit=5" \
http://localhost:3000/api/projects | jq
```
*请求参数说明:*
|参数名|必选|类型|说明|
-|-|-|-
|user_id |是|int |用户id或者组织id |
|name |是|string |项目名称 |
|clone_addr |是|string |镜像项目clone地址 |
|description |否|string |项目描述 |
|repository_name |是|string |仓库名称, 只含有数字、字母、下划线不能以下划线开头和结尾，且唯一 |
|project_category_id|是|int |项目类别id |
|project_language_id|是|int |项目语言id |
|private |否|boolean|项目是否私有, true：为私有，false: 非私有，默认为公开 |
|page |否|string |页数，第几页 |
|limit |否|string |每页多少条数据，默认15条 |
|sort_by |否|string |排序类型, 取值：updated_on \| created_on \| forked_count \| praises_count, updated_on: 更新时间排序，created_on: 创建时间排序，forked_count: fork数据排序，praises_count: 点赞数量排序，默认为updated_on更新时间排序 |
|sort_direction|否|string |排序方式,取值为: desc \| asc; desc: 降序排序， asc: 升序排序， 默认为：desc |
|name |否|string |项目名称, 按照项目名称搜索 |
|category_id |否|int |项目类别id |
|language_id |否|int |项目语言id |
|project_type |否|string |项目类型， 取值为：common \| mirror; common:开源托管项目, mirror:开源镜像项目 |
*返回参数说明:*
|参数名|类型|说明|
-|-|-
|id |int |id |
|id |string |项目标识 |
|name |string|项目名称|
|description |string|项目简介|
|visits |int|流量数|
|forked_count |int|被fork的数量|
|is_public |boolean|是否公开， true:公开，false:未公开|
|mirror_url |string|镜像url|
|last_update_time |int|最后更新时间，为UNIX格式的时间戳|
|author |object|项目创建者|
|-- name |string|用户名，也是用户标识|
|category |object|项目类别|
|-- id |int|项目类型id|
|-- name |string|项目类型名称|
|language |object|项目语言|
|-- id |int|项目语言id|
|-- name |string|项目语言名称|
返回值
```
[
{
"id": "tongjj",
"name": "统计局",
"description": "my first project",
"visits": 0,
"forked_count": 0,
"is_public": true,
"mirror_url": null,
"last_update_time": 1577415173,
"author": {
"name": "18816895620"
},
"category": {
"id": 1,
"name": "大数据"
},
"language": {
"id": 2,
"name": "C"
}
},
{
"id": null,
"name": "开源同名",
"description": "my first project",
"visits": 0,
"forked_count": 0,
"is_public": false,
"mirror_url": "https://gitea.com/CasperVector/slew.git",
"last_update_time": 1577346228,
"author": {
"name": "18816895620"
},
"category": {
"id": 1,
"name": "大数据"
},
"language": {
"id": 2,
"name": "C"
}
},
{
"id": "mvp_demo",
"name": "开源支持",
"description": "my first project",
"visits": 0,
"forked_count": 0,
"is_public": true,
"mirror_url": null,
"last_update_time": 1577341572,
"author": {
"name": "18816895620"
},
"category": {
"id": 1,
"name": "大数据"
},
"language": {
"id": 2,
"name": "C"
}
},
{
"id": null,
"name": "ni项目1",
"description": "my first project",
"visits": 0,
"forked_count": 0,
"is_public": true,
"mirror_url": "https://gitea.com/CasperVector/slew.git",
"last_update_time": 1577092908,
"author": {
"name": "18816895620"
},
"category": {
"id": 1,
"name": "大数据"
},
"language": {
"id": 2,
"name": "C"
}
},
{
"id": "mirror_demo",
"name": "ni项目",
"description": "my first project",
"visits": 0,
"forked_count": 0,
"is_public": false,
"mirror_url": "https://gitea.com/CasperVector/slew.git",
"last_update_time": 1577085412,
"author": {
"name": "18816895620"
},
"category": {
"id": 1,
"name": "大数据"
},
"language": {
"id": 2,
"name": "C"
}
}
]
```
---
### 获取分支列表
```
GET /api/projects/:identifier/branches
```
*示例*
```
curl -X GET http://localhost:3000/api/projects/mirror_demo/branches | jq
```
*请求参数说明:*
|参数名|必选|类型|说明|
-|-|-|-
|identifier |是|string |项目标识 |
*返回参数说明:*
|参数名|类型|说明|
-|-|-
|name |string|分支名称|
返回值
```
[
{
"name": "develop"
},
{
"name": "master"
}
]
```
---
### 点赞
```
POST /api/praise_tread/like
```
*示例*
```
curl -X POST \
-d 'object_id=1' \
-d 'object_type=project' \
http://localhost:3000/api/praise_tread/like | jq
```
*请求参数说明:*
|参数名|必选|类型|说明|
-|-|-|-
|object_id |是 |int |项目id |
|object_type |否 |string | 点赞类型，默认为project|
*返回参数说明:*
|参数名|类型|说明|
-|-|-
|status |int|0:点赞成功，-1:操作失败，2:表示已经点过赞了|
返回值
```
{
"id": 3263,
"name": "ni项目"
"status": 0,
"message": "响应成功"
}
```
---
### 取消点赞
```
DELETE /api/praise_tread/unlike
```
*示例*
```
curl -X DELETE \
-d 'object_id=1' \
-d 'object_type=project' \
http://localhost:3000/api/praise_tread/unlike | jq
```
*请求参数说明:*
|参数名|必选|类型|说明|
-|-|-|-
|object_id |是 |string |点赞对象的唯一标识，如项目的identifier字段 |
|object_type |是 |string | 点赞类型，默认为project|
*返回参数说明:*
|参数名|类型|说明|
-|-|-
|status |int|0:点赞成功，-1:操作失败，2:表示还未点赞|
返回值
```
{
"status": 0,
"message": "响应成功"
}
```
---

6
app/controllers/project_categories_controller.rb
Unescape View File

@ -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

9
app/controllers/projects_controller.rb
Unescape View File

@ -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]

6
app/helpers/application_helper.rb
Unescape View File

@ -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

7
app/helpers/projects_helper.rb
Unescape View File

@ -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

13
app/models/concerns/matchable.rb
Unescape View File

@ -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

4
app/models/concerns/publicable.rb
Unescape View File

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

5
app/models/project.rb
Unescape View File

@ -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

2
app/models/repository.rb
Unescape View File

@ -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

21
app/queries/projects/list_query.rb
Unescape View File

@ -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

3
app/services/projects/migrate_service.rb
Unescape View File

@ -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

10
app/services/repositories/create_service.rb
Unescape View File

@ -25,12 +25,16 @@ class Repositories::CreateService < ApplicationService
private
def sync_project(repository, gitea_repository)
project.update_column('identifier', repository.identifier)
project.update_columns(gpid: gitea_repository["id"]) if gitea_repository
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

5
app/views/project_categories/group_list.json.jbuilder
Unescape View File

@ -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

8
app/views/projects/_project.json.jbuilder
Unescape View File

@ -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)

5
app/views/projects/group_type_list.json.jbuilder
Unescape View File

@ -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

23
app/views/projects/index.json.jbuilder
Unescape View File

@ -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

8
config/routes.rb
Unescape View File

@ -27,11 +27,9 @@ Rails.application.routes.draw do
put 'commons/unhidden', to: 'commons#unhidden'
delete 'commons/delete', to: 'commons#delete'
resources :issues, except: [:index, :new,:create, :update, :edit, :destroy] do
resources :journals, only: [:index, :create, :destroy]
resources :project_categories, only: [:index, :show] do
get :group_list, on: :collection
end
resources :project_categories, only: [:index, :show]
resources :project_languages, only: [:index, :show]
resources :ignores, only: [:index, :show]
resources :licenses, only: [:index, :show]
@ -54,6 +52,7 @@ Rails.application.routes.draw do
end
collection do
post :migrate
get :group_type_list
end
member do
get :branches
@ -130,6 +129,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'

11
db/migrate/20191227013202_change_forked_count_default_from_projects.rb
Unescape View File

@ -0,0 +1,11 @@
class ChangeForkedCountDefaultFromProjects < ActiveRecord::Migration[5.2]
def change
change_column_default :projects, :forked_count, { from: nil, to: 0 }
change_column_default :projects, :project_type, { from: nil, to: 0 }
Project.find_each do |project|
project.update_column('forked_count', 0) if project.forked_count.nil?
project.update_column('project_type', 0) if project.project_type.nil?
end
end
end
Write Preview
Loading…
Cancel
Save