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

app/assets/javascripts/version_releases.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/stylesheets/version_releases.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the version_releases controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/application_controller.rb

@@ -328,7 +328,7 @@ class ApplicationController < ActionController::Base
 
 	def current_user
 		# User.current
-		User.find_by_id 36401
+		User.find_by_id 1
 	end
 
 	## 默认输出json

app/controllers/issues_controller.rb

@@ -49,7 +49,7 @@ class IssuesController < ApplicationController
     order_name = params[:order_name] || "created_on"   #或者"updated_on"
 
     @page = params[:page]
-    @limit = params[:limit] || "15"
+    @limit = params[:limit] || 15
     @issues = issues.order("#{order_name} #{order_type}")
     @issues_size = issues.size
     @issues = issues.order("#{order_name} #{order_type}").page(@page).per(@limit)
@@ -175,6 +175,7 @@ class IssuesController < ApplicationController
                          parent_container_id: @project.id, parent_container_type: "Project",
                          tiding_type: 'issue', status: 0)
         end
+        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
         normal_status(0, "创建成功")
       else
         normal_status(-1, "创建失败")
@@ -300,6 +301,7 @@ class IssuesController < ApplicationController
     end
     if @issue.update_attribute(:status_id, type)
       if type == 5
+        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "close")
         @issue.issue_times.update_all(end_time: Time.now)
       end
       @issue.create_journal_detail(false, [], [])

app/controllers/journals_controller.rb

@@ -35,6 +35,8 @@ class JournalsController < ApplicationController
             end
           end
         end
+        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal")
+
         normal_status(0, "评论成功")
       else
         normal_status(-1, "评论失败")

app/controllers/project_trends_controller.rb

@@ -0,0 +1,49 @@
+class ProjectTrendsController < ApplicationController
+  before_action :set_project
+  before_action :check_project_public
+
+  def index
+    @project_issues_count = @project.get_issues_count(nil)
+    @project_open_issues_count = @project.get_issues_count([1,2,3,4,6])
+    @project_close_issues_count = @project.get_issues_count(5)
+
+    project_trends = @project.project_trends.includes(:user, trend: :user)
+    check_time = params[:time]  #时间的筛选
+    check_type = params[:type]   #动态类型的筛选，目前已知的有 Issue, PullRequest, Version
+    check_status = params[:status]   #类型的选择 "create", "close", "journal",
+
+    if check_time.present?
+      check_time = check_time.to_i
+      project_trends = project_trends.where("created_at between ? and ?",(Time.now.beginning_of_day - check_time.days), Time.now.end_of_day)
+    end
+
+    if check_type.present?
+      project_trends = project_trends.where(trend_type: check_type.to_s.titleize)
+    end
+
+    if check_status.present?
+      project_trends = project_trends.where(action_type: check_status.to_s)
+    end
+    project_trends = project_trends.order("created_at desc")
+
+    @page = params[:page]
+    @limit = params[:limit] || 15
+    @project_trends_size = project_trends.size
+    @project_trends = project_trends.page(@page).per(@limit)
+  end
+
+  private
+
+  def set_project
+    @project = Project.find_by_id(params[:project_id])
+    unless @project.present?
+      normal_status(-1, "项目不存在")
+    end
+  end
+
+  def check_project_public
+    unless @project.is_public || @project.member?(current_user) || current_user.admin?
+      normal_status(-1, "您没有权限")
+    end
+  end
+end

app/controllers/version_releases_controller.rb

@@ -0,0 +1,146 @@
+class VersionReleasesController < ApplicationController
+  before_action :set_user_and_project
+  before_action :require_login, except: [:index]
+  before_action :find_version , only: [:edit, :update, :destroy]
+
+  def index
+    version_releases = @repository.version_releases.includes(:user)
+    version_releases = version_releases.where(draft: false) unless current_user.present? && (current_user == @user || current_user.admin?)
+
+    @version_releases_size = version_releases.size
+    page = params[:page]
+    @limit = params[:limit] || 15
+    @version_releases = version_releases.order("created_at desc").page(page).limit(@limit)
+  end
+
+  def new
+    #获取所有的分支
+    @all_branches = []
+    get_all_branches = Gitea::Repository::BranchesService.new(@user, @repository.try(:identifier)).call
+    if get_all_branches && get_all_branches.size > 0
+      get_all_branches.each do |b|
+        @all_branches.push(b["name"])
+      end
+    end
+
+  end
+
+  def create
+    if params[:name].nil?
+      normal_status(-1, "名称不能为空")
+    elsif params[:tag_name].blank?
+      normal_status(-1, "标签名称不能为空")
+    else
+      ActiveRecord::Base.transaction do
+        begin
+          version_params = {
+            body:	params[:body],
+            draft: params[:draft] || false,
+            name: params[:name],
+            prerelease: params[:prerelease],
+            tag_name: params[:tag_name],
+            target_commitish: params[:target_commitish] || "master"  #分支
+          }
+          version_release = VersionRelease.new(version_params.merge(user_id: current_user.id, repository_id: @repository.id))
+          if version_release.save!
+            git_version_release = Gitea::Versions::CreateService.new(@user.gitea_token, @repository.try(:login), @repository.try(:identifier), version_params).call
+
+            if git_version_release
+              update_params = {
+                tarball_url: git_version_release["tarball_url"],
+                zipball_url: git_version_release["zipball_url"],
+                url: git_version_release["url"],
+                version_gid: git_version_release["id"],
+              }
+              version_release.update_attributes!(update_params)
+              normal_status(0, "发布成功")
+            else
+              normal_status(-1, "发布失败")
+            end
+          else
+            normal_status(-1, "发布失败")
+          end
+        rescue => e
+          puts "create version release error: #{e.message}"
+          raise Error, e.message
+        end
+      end
+    end
+  end
+
+  def edit
+
+  end
+
+  def update
+    if params[:name].nil?
+      normal_status(-1, "名称不能为空")
+    elsif params[:tag_name].blank?
+      normal_status(-1, "标签名称不能为空")
+    else
+      ActiveRecord::Base.transaction do
+        begin
+          version_params = {
+            body:	params[:body],
+            draft: params[:draft] || false,
+            name: params[:name],
+            prerelease: params[:prerelease],
+            tag_name: params[:tag_name],
+            target_commitish: params[:target_commitish] || "master"  #分支
+          }
+          if @version.update_attributes!(version_params)
+            git_version_release = Gitea::Versions::UpdateService.new(@user.gitea_token, @repository.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
+            unless git_version_release
+              raise Error, "更新失败"
+            end
+            normal_status(0, "更新成功")
+          else
+            normal_status(-1, "更新失败")
+          end
+        rescue => e
+          puts "update version release error: #{e.message}"
+          raise Error, e.message
+        end
+      end
+    end
+  end
+
+  def destroy
+    ActiveRecord::Base.transaction do
+      begin
+        if @version.destroy
+          git_version_release = Gitea::Versions::UpdateService.new(@user.gitea_token, @repository.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
+          unless git_version_release
+            raise Error, "删除失败"
+          end
+          normal_status(0, "删除成功")
+        else
+          normal_status(-1, "删除失败")
+        end
+      rescue => e
+        puts "destroy version release error: #{e.message}"
+        raise Error, e.message
+      end
+    end
+  end
+
+
+  private
+
+  def set_user_and_project
+    @project = Project.find_by_id(params[:project_id])
+    @repository = @project.repository  #项目的仓库
+    @user = @project.owner
+    unless @user.present? && @project.present? && @repository.present?
+      normal_status(-1, "仓库不存在")
+    end
+  end
+
+  def find_version
+    @version = VersionRelease.find_by_id(params[:id])
+    unless @version.present?
+      normal_status(-1, "版本不存在")
+    end
+  end
+
+end

app/helpers/version_releases_helper.rb

@@ -0,0 +1,2 @@
+module VersionReleasesHelper
+end

app/models/issue.rb

@@ -2,6 +2,7 @@ class Issue < ApplicationRecord
   #issue_type 1为普通，2为悬赏
   belongs_to :project
   belongs_to :tracker
+  has_many :project_trends, as: :trend, dependent: :destroy
   # belongs_to :issue_tag,optional: true
   belongs_to :priority, :class_name => 'IssuePriority', foreign_key: :priority_id,optional: true  #
   belongs_to :version, foreign_key: :fixed_version_id,optional: true
@@ -17,6 +18,7 @@ class Issue < ApplicationRecord
   has_many :issue_times, dependent: :destroy
   has_many :issue_depends, dependent: :destroy
   scope :issue_includes, ->{includes(:user)}
+  scope :issue_many_includes, ->{includes(journals: :user)}
 
 
   def get_assign_user
@@ -78,4 +80,8 @@ class Issue < ApplicationRecord
     end
   end
 
+  def only_reply_journals
+    journals.where.not(notes: [nil, ""]).journal_includes.limit(2)
+  end
+
 end

app/models/project.rb

@@ -10,6 +10,7 @@ class Project < ApplicationRecord
   belongs_to :owner, class_name: 'User', foreign_key: :user_id
   belongs_to :project_category , :counter_cache => true
   belongs_to :project_language , :counter_cache => true
+  has_many :project_trends, dependent: :destroy
 
   has_many :commits
 
@@ -52,4 +53,13 @@ class Project < ApplicationRecord
     self.identifier.parameterize
   end
 
+  def get_issues_count(status_id)
+    if status_id.present?
+      self&.issues.select(:id, :status_id).where(status_id: status_id)&.pluck(:id).size
+    else
+      self&.issues.select(:id)&.pluck(:id).size
+    end
+
+  end
+
 end

app/models/project_trend.rb

@@ -0,0 +1,5 @@
+class ProjectTrend < ApplicationRecord
+  belongs_to :project
+  belongs_to :trend, polymorphic: true, optional: true
+  belongs_to :user
+end

app/models/repository.rb

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

app/models/user.rb

@@ -166,6 +166,8 @@ class User < ApplicationRecord
   has_many :composes, dependent: :destroy
   has_many :compose_users, dependent: :destroy
 
+  has_many :project_trends, dependent: :destroy
+
   # Groups and active users
   scope :active, lambda { where(status: STATUS_ACTIVE) }
 

app/models/version_release.rb

@@ -0,0 +1,4 @@
+class VersionRelease < ApplicationRecord
+  belongs_to :repository
+  belongs_to :user
+end

app/services/gitea/client_service.rb

@@ -50,6 +50,18 @@ class Gitea::ClientService < ApplicationService
     render_status(response)
   end
 
+  def update(url, params={})
+    puts "[gitea] request params: #{params}"
+    request_url = [api_url, url].join('').freeze
+    auth_token = authen_params(params[:token])
+
+    response = conn(auth_token).put do |req|
+      req.url "#{request_url}"
+      req.body = params[:data].to_json
+    end
+    render_status(response)
+  end
+
   private
   def conn(auth={})
     username = auth[:username] || access_key_id

app/services/gitea/versions/create_service.rb

@@ -0,0 +1,34 @@
+class Gitea::Versions::CreateService < Gitea::ClientService
+  attr_reader :token, :user_name, :repo, :params
+
+  # params EX:
+  # {
+  #   "body": "sylor",  #user_name
+  #   "draft": false,
+  #   "name": "string",
+  #   "prerelease": true,
+  #   "tag_name": "string",
+  #   "target_commitish": "string"
+  # }
+  def initialize(token, user_name, repo, params)
+    @token = token
+    @params = params
+    @user_name = user_name
+    @repo = repo
+  end
+
+  def call
+    post(url, request_params)
+  end
+
+  private
+
+  def request_params
+    Hash.new.merge(token: token, data: params)
+  end
+
+  def url
+    "/repos/#{@user}/#{@repo}/releases".freeze
+  end
+
+end

app/services/gitea/versions/delete_service.rb

@@ -0,0 +1,24 @@
+class Gitea::Versions::DeleteService < Gitea::ClientService
+  attr_reader :token, :user_name, :repo,:version_gid
+
+  def initialize(token, user_name, repo,version_gid)
+    @token = token
+    @user_name = user_name
+    @repo = repo
+    @version_gid = version_gid
+  end
+
+  def call
+    delete(url, params)
+  end
+
+  private
+
+  def params
+    Hash.new.merge(token: @token)
+  end
+
+  def url
+    "/repos/#{@user}/#{@repo}/releases/#{@version_gid}".freeze
+  end
+end

app/services/gitea/versions/update_service.rb

@@ -0,0 +1,35 @@
+class Gitea::Versions::UpdateService < Gitea::ClientService
+  attr_reader :token, :user_name, :repo, :params, :version_gid
+
+  # params EX:
+  # {
+  #   "body": "sylor",  #user_name
+  #   "draft": false,
+  #   "name": "string",
+  #   "prerelease": true,
+  #   "tag_name": "string",
+  #   "target_commitish": "string"
+  # }
+  def initialize(token, user_name, repo, params,version_gid)
+    @token = token
+    @params = params
+    @user_name = user_name
+    @repo = repo
+    @version_gid = version_gid
+  end
+
+  def call
+    update(url, request_params)
+  end
+
+  private
+
+  def request_params
+    Hash.new.merge(token: token, data: params)
+  end
+
+  def url
+    "/repos/#{@user}/#{@repo}/releases/#{@version_gid}".freeze
+  end
+
+end

app/views/issues/_simple_issue_item.json.jbuilder

@@ -0,0 +1,18 @@
+json.name issue.subject
+json.created_at format_time(issue.created_on)
+json.updated_at format_time(issue.updated_on)
+json.assign_user_name issue.get_assign_user.try(:show_real_name)
+json.assign_user_login issue.get_assign_user.try(:login)
+json.issue_journal_size issue.get_journals_size
+journals = issue.only_reply_journals
+
+json.issue_journals do
+  json.array! journals.to_a.each do |j|
+    json.user_name j.user.try(:show_real_name)
+    json.user_login j.user.try(:login)
+    json.user_picture url_to_avatar(j.user)
+    json.content j.try(:notes)
+    json.created_at time_from_now(j.created_on)
+  end
+end
+

app/views/project_trends/index.json.jbuilder

@@ -0,0 +1,24 @@
+json.partial! "commons/success"
+json.issues_count @project_issues_count
+json.open_issues_count @project_open_issues_count
+json.close_issues_count @project_close_issues_count
+json.limit @limit
+json.project_trends_size @project_trends_size
+json.project_trends do
+  json.array! @project_trends.to_a.each do |trend|
+    json.id trend.id
+    json.trend_type trend.trend_type
+    json.action_type l("trend.#{trend.action_type}") + l("trend.#{trend.trend_type}")
+    json.trend_id trend.trend_id
+    json.user_login trend.user.login
+    json.user_avatar url_to_avatar(trend.user)
+
+    if trend.trend_type == "Issue"
+      json.partial! "issues/simple_issue_item", locals: {issue: trend.trend}
+    end
+
+    #后续需要天际pullrequest 和 版本的内容
+
+  end
+end
+

app/views/version_releases/edit.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @version, :id, :name, :body, :tag_name, :target_commitish, :draft, :prerelease,:version_gid

app/views/version_releases/index.json.jbuilder

@@ -0,0 +1,21 @@
+json.partial! "commons/success"
+json.all_count @version_releases_size
+json.limit @limit
+json.version_releases do
+  json.array! @version_releases.to_a.each do |re|
+    json.id re.id
+    json.version_gid re.version_gid
+    json.name re.name
+    json.body re.body
+    json.tag_name re.tag_name
+    json.target_commitish re.target_commitish
+    json.release_type re.draft ? "草稿" : (re.prerelease ? "预发行" : "稳定")
+    json.tarball_url re.tarball_url
+    json.zipball_url re.zipball_url
+    json.url re.zipball_url
+    json.user_login re.user.try(:login)
+    json.user_avatar url_to_avatar(re.user)
+    json.created_at format_time(re.created_at)
+    json.format_created time_from_now(re.created_at)
+  end
+end

app/views/version_releases/new.json.jbuilder

@@ -0,0 +1,2 @@
+json.partial! "commons/success"
+json.branches @all_branches

config/locales/zh-CN.yml

@@ -14,6 +14,18 @@ zh-CN:
       'processed': '已审批'
       'refused': '已拒绝'
       'agreed': '已同意'
+  trend:
+    Issue: 工单
+    PullRequest: 合并请求
+    Version: 版本发布
+    create: 创建了
+    journal: 回复了
+    close: 关闭了
+    merge: 合并了
+    push: 发布了
+
+  version:
+    draft: 草稿
 
   journal_detail:
     issue_tags_value: 标签

config/routes.rb

@@ -46,6 +46,8 @@ Rails.application.routes.draw do
     resources :licenses, only: [:index, :show]
 
     resources :projects, only: [:index, :create, :show] do
+      resources :version_releases, only: [:index,:new, :create, :edit, :update, :destroy]
+      resources :project_trends, only: [:index, :create]
       resources :issues do
         collection do
           get :commit_issues

db/migrate/20200106022157_create_project_trends.rb

@@ -0,0 +1,12 @@
+class CreateProjectTrends < ActiveRecord::Migration[5.2]
+  def change
+    create_table :project_trends do |t|
+      t.integer :user_id
+      t.integer :project_id
+      t.references :trend, polymorphic: true, index: true
+      t.string :action_type
+      t.timestamps
+    end
+    add_index :project_trends, [:user_id, :project_id]
+  end
+end

db/migrate/20200106082806_create_version_releases.rb

@@ -0,0 +1,18 @@
+class CreateVersionReleases < ActiveRecord::Migration[5.2]
+  def change
+    create_table :version_releases do |t|
+      t.integer :user_id
+      t.string :name
+      t.text :body
+      t.string :tag_name
+      t.string :target_commitish
+      t.boolean :draft, default: false
+      t.boolean :prerelease, default: false
+      t.string :tarball_url
+      t.string :zipball_url
+      t.string :url
+      t.string :version_gid
+      t.timestamps
+    end
+  end
+end

db/migrate/20200106093141_add_project_id_to_version_release.rb

@@ -0,0 +1,6 @@
+class AddProjectIdToVersionRelease < ActiveRecord::Migration[5.2]
+  def change
+    add_column :version_releases, :repository_id, :integer
+    add_index :version_releases, [:repository_id]
+  end
+end

public/react/src/forge/Branch/CloneAddress.js

@@ -0,0 +1,32 @@
+import React , { Component } from 'react';
+import { Dropdown , Icon , Menu } from 'antd';
+
+import "./branch.css"
+
+// 点击按钮复制功能
+function jsCopy(){
+  var e = document.getElementById("copy_rep_content");
+  e.select();
+  document.execCommand("Copy");
+}
+class CloneAddress extends Component{
+
+  render(){
+    const { http_url , downloadUrl } = this.props;
+    return(
+      <div className="gitAddressClone">
+        <span className={"addressType active"} onClick={()=>this.changeAddress("http")}>HTTP</span>
+        {/* <span className={address ==="ssh" ? "addressType active":"addressType"} onClick={()=>this.changeAddress("ssh")}>SSH</span> */}
+        <input type="text" id="copy_rep_content" value={ http_url }/>
+        <span onClick={()=>jsCopy()}><i className="iconfont icon-fuzhi"></i></span>
+        <span>
+        <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
+          <a className="ant-dropdown-link">
+            <Icon type="cloud-download" className="font-18 fl"/>
+          </a>
+        </Dropdown></span>
+      </div>
+    )
+  }
+}
+export default CloneAddress;

public/react/src/forge/Branch/SelectBranch.js

@@ -1,6 +1,8 @@
 import React , { Component } from 'react';
 import { Dropdown , Icon , Menu } from 'antd';
 
+import "./branch.css"
+
 class SelectBranch extends Component{
 
   render(){

public/react/src/forge/Branch/branch.css

@@ -0,0 +1,9 @@
+.branchDropdown{
+  border:1px solid #eee;
+  border-radius: 4px;
+  display: flex;
+  justify-content: center;
+  padding:0px 10px;
+  height: 35px;
+  line-height: 35px;
+}

public/react/src/forge/Main/CoderRootDirectory.js

@@ -6,13 +6,9 @@ import { getImageUrl } from 'educoder';
 import axios from 'axios';
 
 import SelectBranch from '../Branch/SelectBranch'
+import CloneAddress from '../Branch/CloneAddress'
+
 
-// 点击按钮复制功能
-function jsCopy(){
-  var e = document.getElementById("copy_rep_content");
-  e.select();
-  document.execCommand("Copy");
-}
 class CoderRootDirectory extends Component{
   constructor(props){
     super(props);
@@ -163,18 +159,7 @@ class CoderRootDirectory extends Component{
 
         <div className="f-wrap-between mt20">
           <SelectBranch branch={branch} branchs={branchs} changeBranch={this.changeBranch}></SelectBranch>
-          <div className="gitAddressClone">
+          <CloneAddress http_url={http_url} downloadUrl={downloadUrl}></CloneAddress>
-            <span className={"addressType active"} onClick={()=>this.changeAddress("http")}>HTTP</span>
-            {/* <span className={address ==="ssh" ? "addressType active":"addressType"} onClick={()=>this.changeAddress("ssh")}>SSH</span> */}
-            <input type="text" id="copy_rep_content" value={ http_url }/>
-            <span onClick={()=>jsCopy()}><i className="iconfont icon-fuzhi"></i></span>
-            <span>
-            <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
-              <a className="ant-dropdown-link">
-                <Icon type="cloud-download" className="font-18 fl"/>
-              </a>
-            </Dropdown></span>
-          </div>
         </div>
         <Table
           className="mt20 wrap-commit-table"

public/react/src/forge/Main/list.css

@@ -203,15 +203,7 @@ body,#root{
 .branch-wrapper span:hover{
   color: #4CACFF;
 }
-.branchDropdown{
+
-  border:1px solid #eee;
-  border-radius: 4px;
-  display: flex;
-  justify-content: center;
-  padding:0px 10px;
-  height: 35px;
-  line-height: 35px;
-}
 
 .gitAddressClone{
   display: flex;

spec/controllers/version_releases_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe VersionReleasesController, type: :controller do
+
+end

spec/helpers/version_releases_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the VersionReleasesHelper. For example:
+#
+# describe VersionReleasesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe VersionReleasesHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/project_trend_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ProjectTrend, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/version_release_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe VersionRelease, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end