From 587facfb3d98fc68dfeb9320f7b5200fe63d3834 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Feb 2023 17:12:43 +0800 Subject: [PATCH 001/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BA=BA=E5=92=8C=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/base_controller.rb | 9 +++++++++ app/controllers/api/v1/issues/authors_controller.rb | 9 +++++++++ app/controllers/api/v1/issues/statues_controller.rb | 10 ++++++++++ .../{projects => }/issues/_simple_detail.json.jbuilder | 0 app/views/api/v1/issues/authors/index.json.jbuilder | 4 ++++ app/views/api/v1/issues/statues/index.json.jbuilder | 4 ++++ config/routes/api.rb | 8 +++++++- 7 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 app/controllers/api/v1/issues/authors_controller.rb create mode 100644 app/controllers/api/v1/issues/statues_controller.rb rename app/views/api/v1/{projects => }/issues/_simple_detail.json.jbuilder (100%) create mode 100644 app/views/api/v1/issues/authors/index.json.jbuilder create mode 100644 app/views/api/v1/issues/statues/index.json.jbuilder diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index b937d798e..771adcc05 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -20,10 +20,19 @@ class Api::V1::BaseController < ApplicationController # User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token # end # end + + def kaminary_select_paginate(relation) + limit = params[:limit] || params[:per_page] + limit = (limit.to_i.zero? || limit.to_i > 100) ? 100 : limit.to_i + page = params[:page].to_i.zero? ? 1 : params[:page].to_i + + relation.page(page).per(limit) + end def limit params.fetch(:limit, 15) end + def page params.fetch(:page, 1) end diff --git a/app/controllers/api/v1/issues/authors_controller.rb b/app/controllers/api/v1/issues/authors_controller.rb new file mode 100644 index 000000000..8c7a4f7e6 --- /dev/null +++ b/app/controllers/api/v1/issues/authors_controller.rb @@ -0,0 +1,9 @@ +class Api::V1::Issues::AuthorsController < Api::V1::BaseController + before_action :require_public_and_member_above, only: [:index] + + # 发布人列表 + def index + @authors = User.joins(issues: :project).where(projects: {id: @project&.id}) + @authors = kaminary_select_paginate(@authors) + end +end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/statues_controller.rb b/app/controllers/api/v1/issues/statues_controller.rb new file mode 100644 index 000000000..0e9eff43f --- /dev/null +++ b/app/controllers/api/v1/issues/statues_controller.rb @@ -0,0 +1,10 @@ +class Api::V1::Issues::StatuesController < Api::V1::BaseController + + before_action :require_public_and_member_above, only: [:index] + + # 状态列表 + def index + @statues = IssueStatus.order("position asc") + @statues = kaminary_select_paginate(@statues) + end +end \ No newline at end of file diff --git a/app/views/api/v1/projects/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder similarity index 100% rename from app/views/api/v1/projects/issues/_simple_detail.json.jbuilder rename to app/views/api/v1/issues/_simple_detail.json.jbuilder diff --git a/app/views/api/v1/issues/authors/index.json.jbuilder b/app/views/api/v1/issues/authors/index.json.jbuilder new file mode 100644 index 000000000..dd1a4174a --- /dev/null +++ b/app/views/api/v1/issues/authors/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @authors.total_count +json.authors @authors.each do |author| + json.partial! 'api/v1/users/simple_user', locals: { user: author} +end \ No newline at end of file diff --git a/app/views/api/v1/issues/statues/index.json.jbuilder b/app/views/api/v1/issues/statues/index.json.jbuilder new file mode 100644 index 000000000..2cc91fb52 --- /dev/null +++ b/app/views/api/v1/issues/statues/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @statues.total_count +json.statues @statues.each do |status| + json.(status, :id, :name) +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index 19531526e..fac227d73 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -28,6 +28,13 @@ defaults format: :json do # projects文件夹下的 scope module: :projects do resources :issues + scope module: :issues do + resources :milestones, except: [:new, :edit] + resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues' + resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors' + resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners' + end + resources :pulls, module: 'pulls' do resources :versions, only: [:index] do member do @@ -38,7 +45,6 @@ defaults format: :json do resources :reviews, only: [:index, :create] end - resources :versions resources :release_versions resources :webhooks do member do From 241bbc06ca3a231224105245618e8274237c01d6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Feb 2023 17:47:28 +0800 Subject: [PATCH 002/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=8F=98=E6=9B=B4=E4=B8=BA=E4=B8=80?= =?UTF-8?q?=E5=AF=B9=E5=A4=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/assigners_controller.rb | 10 ++++++++++ app/models/issue.rb | 3 +++ app/models/issue_assigner.rb | 20 +++++++++++++++++++ app/models/user.rb | 2 ++ .../v1/issues/assigners/index.json.jbuilder | 4 ++++ .../20230207091507_create_issue_assigners.rb | 10 ++++++++++ 6 files changed, 49 insertions(+) create mode 100644 app/controllers/api/v1/issues/assigners_controller.rb create mode 100644 app/models/issue_assigner.rb create mode 100644 app/views/api/v1/issues/assigners/index.json.jbuilder create mode 100644 db/migrate/20230207091507_create_issue_assigners.rb diff --git a/app/controllers/api/v1/issues/assigners_controller.rb b/app/controllers/api/v1/issues/assigners_controller.rb new file mode 100644 index 000000000..421ae2eda --- /dev/null +++ b/app/controllers/api/v1/issues/assigners_controller.rb @@ -0,0 +1,10 @@ +class Api::V1::Issues::AssignersController < Api::V1::BaseController + + before_action :require_public_and_member_above, only: [:index] + + # 负责人列表 + def index + @assigners = User.joins(assigned_issues: :project).where(projects: {id: @project&.id}) + @assigners = kaminary_select_paginate(@assigners) + end +end \ No newline at end of file diff --git a/app/models/issue.rb b/app/models/issue.rb index 2a3b95958..069fae40a 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -68,6 +68,9 @@ class Issue < ApplicationRecord has_many :issue_tags, through: :issue_tags_relates has_many :issue_times, dependent: :destroy has_many :issue_depends, dependent: :destroy + has_many :issue_assigners + has_many :assigners, through: :issue_assigners + scope :issue_includes, ->{includes(:user)} scope :issue_many_includes, ->{includes(journals: :user)} scope :issue_issue, ->{where(issue_classify: [nil,"issue"])} diff --git a/app/models/issue_assigner.rb b/app/models/issue_assigner.rb new file mode 100644 index 000000000..a0836f214 --- /dev/null +++ b/app/models/issue_assigner.rb @@ -0,0 +1,20 @@ +# == Schema Information +# +# Table name: issue_assigners +# +# id :integer not null, primary key +# issue_id :integer +# assigner_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_issue_assigners_on_assigner_id (assigner_id) +# index_issue_assigners_on_issue_id (issue_id) +# + +class IssueAssigner < ApplicationRecord + belongs_to :issue + belongs_to :assigner, class_name: "User" +end diff --git a/app/models/user.rb b/app/models/user.rb index 4288c4d4c..9162702fc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -175,6 +175,8 @@ class User < Owner has_many :system_notifications, through: :system_notification_histories has_one :trace_user, dependent: :destroy has_many :feedbacks, dependent: :destroy + has_many :issue_assigners, foreign_key: :assigner_id + has_many :assigned_issues, through: :issue_assigners, source: :issue # Groups and active users scope :active, lambda { where(status: STATUS_ACTIVE) } scope :like, lambda { |keywords| diff --git a/app/views/api/v1/issues/assigners/index.json.jbuilder b/app/views/api/v1/issues/assigners/index.json.jbuilder new file mode 100644 index 000000000..fbcf469a6 --- /dev/null +++ b/app/views/api/v1/issues/assigners/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @assigners.total_count +json.assigners @assigners.each do |assigner| + json.partial! 'api/v1/users/simple_user', locals: { user: assigner} +end \ No newline at end of file diff --git a/db/migrate/20230207091507_create_issue_assigners.rb b/db/migrate/20230207091507_create_issue_assigners.rb new file mode 100644 index 000000000..1a25db213 --- /dev/null +++ b/db/migrate/20230207091507_create_issue_assigners.rb @@ -0,0 +1,10 @@ +class CreateIssueAssigners < ActiveRecord::Migration[5.2] + def change + create_table :issue_assigners do |t| + t.references :issue + t.references :assigner, references: :user + + t.timestamps + end + end +end From af67d984b4839aa7badbd2b50ce00420031ad49d Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Feb 2023 09:49:02 +0800 Subject: [PATCH 003/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=87=8C?= =?UTF-8?q?=E7=A8=8B=E7=A2=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/milestones_controller.rb | 31 +++++++++++++++++++ .../milestones/_simple_detail.json.jbuilder | 1 + .../v1/issues/milestones/index.json.jbuilder | 6 ++++ 3 files changed, 38 insertions(+) create mode 100644 app/controllers/api/v1/issues/milestones_controller.rb create mode 100644 app/views/api/v1/issues/milestones/_simple_detail.json.jbuilder create mode 100644 app/views/api/v1/issues/milestones/index.json.jbuilder diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb new file mode 100644 index 000000000..f25ec498c --- /dev/null +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -0,0 +1,31 @@ +class Api::V1::Issues::MilestonesController < Api::V1::BaseController + before_action :require_public_and_member_above, only: [:index] + + # 里程碑列表 + def index + if params[:only_name] + @milestones = @project.versions + else + @milestones = @project.versions.includes(:issues) + end + @milestones = kaminary_select_paginate(@milestones) + end + + # 里程碑详情 + def show + end + + def create + end + + def update + end + + def destroy + end + + + private + + +end \ No newline at end of file diff --git a/app/views/api/v1/issues/milestones/_simple_detail.json.jbuilder b/app/views/api/v1/issues/milestones/_simple_detail.json.jbuilder new file mode 100644 index 000000000..667f7b6a7 --- /dev/null +++ b/app/views/api/v1/issues/milestones/_simple_detail.json.jbuilder @@ -0,0 +1 @@ +json.(milestone, :id, :name) \ No newline at end of file diff --git a/app/views/api/v1/issues/milestones/index.json.jbuilder b/app/views/api/v1/issues/milestones/index.json.jbuilder new file mode 100644 index 000000000..012549bd3 --- /dev/null +++ b/app/views/api/v1/issues/milestones/index.json.jbuilder @@ -0,0 +1,6 @@ +json.total_count @milestones.total_count +json.milestones @milestones.each do |milestone| + if params[:only_name] + json.partial! "simple_detail", locals: {milestone: milestone} + end +end \ No newline at end of file From fe972f1141015845469bfd7feafb0c5fde588d22 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Feb 2023 10:15:29 +0800 Subject: [PATCH 004/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E8=AE=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/issue_tags_controller.rb | 27 +++++++++++++++++++ .../issue_tags/_simple_detail.json.jbuilder | 1 + .../v1/issues/issue_tags/index.json.jbuilder | 6 +++++ config/routes/api.rb | 1 + 4 files changed, 35 insertions(+) create mode 100644 app/controllers/api/v1/issues/issue_tags_controller.rb create mode 100644 app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder create mode 100644 app/views/api/v1/issues/issue_tags/index.json.jbuilder diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb new file mode 100644 index 000000000..2b03c94fe --- /dev/null +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -0,0 +1,27 @@ +class Api::V1::Issues::IssueTagsController < Api::V1::BaseController + + before_action :require_public_and_member_above, only: [:index] + + def index + @issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}") + if params[:only_name] + @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name)) + else + @issue_tags = kaminari_paginate(@issue_tags) + end + end + + + private + def order_by + order_by = params.fetch(:order_by, "created_at") + order_by = IssueTag.column_names.include?(order_by) ? order_by : "created_at" + order_by + end + + def order_direction + order_direction = params.fetch(:order_direction, "desc").downcase + order_direction = %w(desc asc).include?(order_direction) ? order_direction : "desc" + order_direction + end +end \ No newline at end of file diff --git a/app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder b/app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder new file mode 100644 index 000000000..f0826fab7 --- /dev/null +++ b/app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder @@ -0,0 +1 @@ +json.(tag, :id, :name) \ No newline at end of file diff --git a/app/views/api/v1/issues/issue_tags/index.json.jbuilder b/app/views/api/v1/issues/issue_tags/index.json.jbuilder new file mode 100644 index 000000000..548cd1b40 --- /dev/null +++ b/app/views/api/v1/issues/issue_tags/index.json.jbuilder @@ -0,0 +1,6 @@ +json.total_count @issue_tags.total_count +json.issue_tags @issue_tags.each do |tag| + if params[:only_name] + json.partial! "simple_detail", locals: {tag: tag} + end +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index fac227d73..6c262ddd0 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -29,6 +29,7 @@ defaults format: :json do scope module: :projects do resources :issues scope module: :issues do + resources :issue_tags, only: [:index] resources :milestones, except: [:new, :edit] resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues' resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors' From ade03c5e2facf3e164c043630b2106fac881378a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Feb 2023 16:55:20 +0800 Subject: [PATCH 005/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 3 +++ app/models/issue_participant.rb | 9 +++++++++ app/models/user.rb | 2 ++ .../20230208023811_create_issue_participants.rb | 11 +++++++++++ 4 files changed, 25 insertions(+) create mode 100644 app/models/issue_participant.rb create mode 100644 db/migrate/20230208023811_create_issue_participants.rb diff --git a/app/models/issue.rb b/app/models/issue.rb index 069fae40a..11375f4b9 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -70,6 +70,8 @@ class Issue < ApplicationRecord has_many :issue_depends, dependent: :destroy has_many :issue_assigners has_many :assigners, through: :issue_assigners + has_many :issue_participants + has_many :participants, through: :issue_participants scope :issue_includes, ->{includes(:user)} scope :issue_many_includes, ->{includes(journals: :user)} @@ -77,6 +79,7 @@ class Issue < ApplicationRecord scope :issue_pull_request, ->{where(issue_classify: "pull_request")} scope :issue_index_includes, ->{includes(:tracker, :priority, :version, :issue_status, :journals,:issue_tags,user: :user_extension)} scope :closed, ->{where(status_id: 5)} + scope :opened, ->{where.not(status_id: 5)} after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic after_save :change_versions_count, :send_update_message_to_notice_system after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic diff --git a/app/models/issue_participant.rb b/app/models/issue_participant.rb new file mode 100644 index 000000000..fa7be6980 --- /dev/null +++ b/app/models/issue_participant.rb @@ -0,0 +1,9 @@ +class IssueParticipant < ApplicationRecord + + belongs_to :issue + belongs_to :participant, class_name: "User" + + enum participant_type: {"authored": 0, "assigned": 1, "commented": 2, "edited": 3, "atme": 4} + + +end diff --git a/app/models/user.rb b/app/models/user.rb index 9162702fc..cb39e42e7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -177,6 +177,8 @@ class User < Owner has_many :feedbacks, dependent: :destroy has_many :issue_assigners, foreign_key: :assigner_id has_many :assigned_issues, through: :issue_assigners, source: :issue + has_many :issue_participants, foreign_key: :participant_id + has_many :participant_issues, through: :issue_participants, source: :issue # Groups and active users scope :active, lambda { where(status: STATUS_ACTIVE) } scope :like, lambda { |keywords| diff --git a/db/migrate/20230208023811_create_issue_participants.rb b/db/migrate/20230208023811_create_issue_participants.rb new file mode 100644 index 000000000..834061053 --- /dev/null +++ b/db/migrate/20230208023811_create_issue_participants.rb @@ -0,0 +1,11 @@ +class CreateIssueParticipants < ActiveRecord::Migration[5.2] + def change + create_table :issue_participants do |t| + t.references :issue + t.references :participant, references: :user + t.integer :participant_type, default: 0 + + t.timestamps + end + end +end From 4085da7837870e96b1a377d58889d573be3063f8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Feb 2023 16:56:01 +0800 Subject: [PATCH 006/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue?= =?UTF-8?q?=E5=92=8C=E9=87=8C=E7=A8=8B=E7=A2=91=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 23 +++++ app/services/api/v1/issues/list_service.rb | 87 +++++++++++++++++++ .../v1/issues/_simple_detail.json.jbuilder | 20 +++++ app/views/api/v1/issues/index.json.jbuilder | 4 + .../issue_tags/_simple_detail.json.jbuilder | 2 +- 5 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 app/controllers/api/v1/issues_controller.rb create mode 100644 app/services/api/v1/issues/list_service.rb create mode 100644 app/views/api/v1/issues/index.json.jbuilder diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb new file mode 100644 index 000000000..1decf3421 --- /dev/null +++ b/app/controllers/api/v1/issues_controller.rb @@ -0,0 +1,23 @@ +class Api::V1::IssuesController < Api::V1::BaseController + + before_action :require_public_and_member_above, only: [:index] + + def index + @object_results = Api::V1::Issues::ListService.call(@project, query_params, current_user) + @issues = kaminari_paginate(@object_results) + end + + private + + def query_params + params.permit( + :category, + :participant_category, + :keyword, :author_id, + :milestone_id, :assigner_id, + :status_id, + :sort_by, :sort_direction, + :issue_tag_ids => []) + end + +end \ No newline at end of file diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb new file mode 100644 index 000000000..1a7378598 --- /dev/null +++ b/app/services/api/v1/issues/list_service.rb @@ -0,0 +1,87 @@ +class Api::V1::Issues::ListService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :category, :participant_category, :keyword, :author_id, :issue_tag_ids + attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user + attr_accessor :queried_issues + + validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} + validates :sort_by, inclusion: {in: Issue.column_names, message: '请输入正确的SortBy'}, allow_blank: true + validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true + + def initialize(project, params, current_user=nil) + puts params + @project = project + @category = params[:category] || 'all' + @participant_category = params[:participant_category] + @keyword = params[:keyword] + @author_id = params[:author_id] + @issue_tag_ids = params[:issue_tag_ids] + @milestone_id = params[:milestone_id] + @assigner_id = params[:assigner_id] + @status_id = params[:status_id] + @sort_by = params[:sort_by].present? ? params[:sort_by] : 'updated_on' + @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + begin + issue_query_data + + queried_issues + rescue + raise Error, "服务器错误，请联系系统管理员！" + end + end + + private + def issue_query_data + issues = @project.issues.issue_issue.joins(:journals).where.not(journals: {notes: nil}) + + case category + when 'closed' + issues = issues.closed + when 'opened' + issues = issues.opened + end + + case participant_category + when 'aboutme' # 关于我的 + issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(authored assigned atme)},users: {id: current_user&.id}) + when 'authoredme' # 我创建的 + issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(authored)},users: {id: current_user&.id}) + when 'assignedme' # 我负责的 + issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(assigned)},users: {id: current_user&.id}) + when 'atme' # @我的 + issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(atme)},users: {id: current_user&.id}) + end + + # author_id + issues = issues.where(author_id: author_id) if author_id.present? + + # issue_tag_ids + issues = issues.joins(:issue_tags).where(issue_tags: {id: issue_tag_ids}) unless issue_tag_ids.blank? + + # milestone_id + issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present? + + # assigner_id + issues = issues.joins(:assigners).where(users: {id: assigner_id}) if assigner_id.present? + + # status_id + issues = issues.where(status_id: status_id) if status_id.present? + + # keyword + q = issues.ransack(subject_or_description_cont: keyword) + + scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :journals) + + + scope = scope.reorder("issues.#{sort_by} #{sort_direction}") + + @queried_issues = scope + end + +end \ No newline at end of file diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index e69de29bb..395086d59 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -0,0 +1,20 @@ +json.(issue, :id, :subject, :project_issues_index) +json.created_at issue.created_on.strftime("%Y/%m/%d %H:%M") +json.updated_at issue.updated_on.strftime("%Y/%m/%d %H:%M") +json.tags issue.issue_tags.each do |tag| + json.partial! "api/v1/issues/issue_tags/simple_detail", locals: {tag: tag} +end +json.status_name issue.issue_status&.name +json.priority_name issue.priority&.name +json.milestone_name issue.version&.name +json.author do + if issue.user.present? + json.partial! "api/v1/users/simple_user", locals: {user: issue.user} + else + json.nil! + end +end +json.assigners issue.assigners.each do |assigner| + json.partial! "api/v1/users/simple_user", locals: {user: assigner} +end +json.journals_count issue.journals.size \ No newline at end of file diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder new file mode 100644 index 000000000..e0d6ae7bd --- /dev/null +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -0,0 +1,4 @@ +# json.total_count @issues.total_count +json.issues @issues.each do |issue| + json.partial! "simple_detail", locals: {issue: issue} +end \ No newline at end of file diff --git a/app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder b/app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder index f0826fab7..8395a8e83 100644 --- a/app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/issue_tags/_simple_detail.json.jbuilder @@ -1 +1 @@ -json.(tag, :id, :name) \ No newline at end of file +json.(tag, :id, :name, :color) \ No newline at end of file From 1aeed8236da79476acfb6e2d6e575dde5b416384 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Feb 2023 09:29:02 +0800 Subject: [PATCH 007/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues/assigners_controller.rb | 1 + app/controllers/api/v1/issues/authors_controller.rb | 1 + app/controllers/api/v1/issues/issue_tags_controller.rb | 2 +- app/services/users/register_service.rb | 2 +- config/routes/api.rb | 6 +++--- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/v1/issues/assigners_controller.rb b/app/controllers/api/v1/issues/assigners_controller.rb index 421ae2eda..b2b15a90a 100644 --- a/app/controllers/api/v1/issues/assigners_controller.rb +++ b/app/controllers/api/v1/issues/assigners_controller.rb @@ -5,6 +5,7 @@ class Api::V1::Issues::AssignersController < Api::V1::BaseController # 负责人列表 def index @assigners = User.joins(assigned_issues: :project).where(projects: {id: @project&.id}) + @assigners = @assigners.order("users.id=#{current_user.id} desc, issue_assigners.created_at desc").distinct @assigners = kaminary_select_paginate(@assigners) end end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/authors_controller.rb b/app/controllers/api/v1/issues/authors_controller.rb index 8c7a4f7e6..8a5dbcdce 100644 --- a/app/controllers/api/v1/issues/authors_controller.rb +++ b/app/controllers/api/v1/issues/authors_controller.rb @@ -4,6 +4,7 @@ class Api::V1::Issues::AuthorsController < Api::V1::BaseController # 发布人列表 def index @authors = User.joins(issues: :project).where(projects: {id: @project&.id}) + @authors = @authors.order("users.id=#{current_user.id} desc").distinct @authors = kaminary_select_paginate(@authors) end end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 2b03c94fe..3fa46a4da 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -5,7 +5,7 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController def index @issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}") if params[:only_name] - @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name)) + @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color)) else @issue_tags = kaminari_paginate(@issue_tags) end diff --git a/app/services/users/register_service.rb b/app/services/users/register_service.rb index bb3b3ada1..bb984477f 100644 --- a/app/services/users/register_service.rb +++ b/app/services/users/register_service.rb @@ -12,7 +12,7 @@ class Users::RegisterService < ApplicationService namespace = strip(@namespace) password = strip(@password) - Rails.logger.info "Users::RegisterService params: ##### #{params} " + # Rails.logger.info "Users::RegisterService params: ##### #{params} " email, phone = if register_type == 1 diff --git a/config/routes/api.rb b/config/routes/api.rb index 6c262ddd0..657ca52bd 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -25,9 +25,7 @@ defaults format: :json do end end - # projects文件夹下的 - scope module: :projects do - resources :issues + resources :issues scope module: :issues do resources :issue_tags, only: [:index] resources :milestones, except: [:new, :edit] @@ -36,6 +34,8 @@ defaults format: :json do resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners' end + # projects文件夹下的 + scope module: :projects do resources :pulls, module: 'pulls' do resources :versions, only: [:index] do member do From c1d791741c4f9763a6303a9a1c3051540e2ba92d Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Feb 2023 10:15:59 +0800 Subject: [PATCH 008/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 1 + app/services/api/v1/issues/list_service.rb | 6 +++--- app/views/api/v1/issues/_simple_detail.json.jbuilder | 2 +- app/views/api/v1/issues/index.json.jbuilder | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 11375f4b9..03e33c666 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -72,6 +72,7 @@ class Issue < ApplicationRecord has_many :assigners, through: :issue_assigners has_many :issue_participants has_many :participants, through: :issue_participants + has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized scope :issue_includes, ->{includes(:user)} scope :issue_many_includes, ->{includes(journals: :user)} diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 1a7378598..39ff2eca8 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -38,7 +38,7 @@ class Api::V1::Issues::ListService < ApplicationService private def issue_query_data - issues = @project.issues.issue_issue.joins(:journals).where.not(journals: {notes: nil}) + issues = @project.issues.issue_issue case category when 'closed' @@ -76,10 +76,10 @@ class Api::V1::Issues::ListService < ApplicationService # keyword q = issues.ransack(subject_or_description_cont: keyword) - scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :journals) + scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) - scope = scope.reorder("issues.#{sort_by} #{sort_direction}") + scope = scope.reorder("issues.#{sort_by} #{sort_direction}").distinct @queried_issues = scope end diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index 395086d59..da1bdfcb1 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -17,4 +17,4 @@ end json.assigners issue.assigners.each do |assigner| json.partial! "api/v1/users/simple_user", locals: {user: assigner} end -json.journals_count issue.journals.size \ No newline at end of file +json.journals_count issue.comment_journals.size \ No newline at end of file diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index e0d6ae7bd..920e7d68d 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -1,4 +1,4 @@ -# json.total_count @issues.total_count +json.total_count @issues.total_count json.issues @issues.each do |issue| json.partial! "simple_detail", locals: {issue: issue} end \ No newline at end of file From 934b42f1a15ec07a95ddcbbd6547d838bd680b8f Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Feb 2023 16:20:16 +0800 Subject: [PATCH 009/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BC=98?= =?UTF-8?q?=E5=85=88=E7=BA=A7=E5=92=8C=E6=89=80=E6=9C=89=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/issues/issue_priorities_controller.rb | 9 +++++++++ .../api/v1/projects/collaborators_controller.rb | 10 ++++++++++ .../api/v1/issues/_simple_detail.json.jbuilder | 2 +- .../issues/issue_priorities/index.json.jbuilder | 4 ++++ .../projects/collaborators/index.json.jbuilder | 4 ++++ config/routes/api.rb | 17 +++++++++-------- 6 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 app/controllers/api/v1/issues/issue_priorities_controller.rb create mode 100644 app/controllers/api/v1/projects/collaborators_controller.rb create mode 100644 app/views/api/v1/issues/issue_priorities/index.json.jbuilder create mode 100644 app/views/api/v1/projects/collaborators/index.json.jbuilder diff --git a/app/controllers/api/v1/issues/issue_priorities_controller.rb b/app/controllers/api/v1/issues/issue_priorities_controller.rb new file mode 100644 index 000000000..d26d8f3a8 --- /dev/null +++ b/app/controllers/api/v1/issues/issue_priorities_controller.rb @@ -0,0 +1,9 @@ +class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController + + before_action :require_public_and_member_above, only: [:index] + + def index + @priorities = IssuePriority.order(position: :asc) + @priorities = kaminary_select_paginate(@priorities) + end +end \ No newline at end of file diff --git a/app/controllers/api/v1/projects/collaborators_controller.rb b/app/controllers/api/v1/projects/collaborators_controller.rb new file mode 100644 index 000000000..67a96378e --- /dev/null +++ b/app/controllers/api/v1/projects/collaborators_controller.rb @@ -0,0 +1,10 @@ +class Api::V1::Projects::CollaboratorsController < Api::V1::BaseController + + before_action :require_public_and_member_above, only: [:index] + + def index + @collaborators = @project.all_collaborators.ransack(name_or_login_cont: params[:keyword]).result + @collaborators = kaminary_select_paginate(@collaborators) + end + +end \ No newline at end of file diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index da1bdfcb1..a33cde4cf 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -17,4 +17,4 @@ end json.assigners issue.assigners.each do |assigner| json.partial! "api/v1/users/simple_user", locals: {user: assigner} end -json.journals_count issue.comment_journals.size \ No newline at end of file +json.comment_journals_count issue.comment_journals.size \ No newline at end of file diff --git a/app/views/api/v1/issues/issue_priorities/index.json.jbuilder b/app/views/api/v1/issues/issue_priorities/index.json.jbuilder new file mode 100644 index 000000000..41499d456 --- /dev/null +++ b/app/views/api/v1/issues/issue_priorities/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @priorities.total_count +json.priorities @priorities.each do |priority| + json.(priority, :id, :name) +end \ No newline at end of file diff --git a/app/views/api/v1/projects/collaborators/index.json.jbuilder b/app/views/api/v1/projects/collaborators/index.json.jbuilder new file mode 100644 index 000000000..c0c33c6ba --- /dev/null +++ b/app/views/api/v1/projects/collaborators/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @collaborators.total_count +json.collaborators @collaborators.each do |collaborator| + json.partial! "api/v1/users/simple_user", locals: {user: collaborator} +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index 657ca52bd..e4994f529 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -26,13 +26,14 @@ defaults format: :json do end resources :issues - scope module: :issues do - resources :issue_tags, only: [:index] - resources :milestones, except: [:new, :edit] - resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues' - resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors' - resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners' - end + scope module: :issues do + resources :issue_tags, only: [:index] + resources :milestones, except: [:new, :edit] + resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues' + resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors' + resources :issue_assigners, only: [:index], controller: '/api/v1/issues/assigners' + resources :issue_priorities, only: [:index] + end # projects文件夹下的 scope module: :projects do @@ -45,7 +46,7 @@ defaults format: :json do resources :journals, except: [:show, :edit] resources :reviews, only: [:index, :create] end - + resources :collaborators, only: [:index] resources :release_versions resources :webhooks do member do From 53c2ffffb3c2af8707e16a4a6923773deb33eea9 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Feb 2023 11:38:51 +0800 Subject: [PATCH 010/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=96=91?= =?UTF-8?q?=E4=BF=AE=E5=88=9B=E5=BB=BA=E4=BB=A5=E5=8F=8A=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 34 +++++- app/controllers/issues_controller.rb | 3 + app/models/issue.rb | 1 + app/models/project.rb | 15 +++ app/services/api/v1/issues/create_service.rb | 107 ++++++++++++++++++ app/services/api/v1/issues/list_service.rb | 5 +- app/views/api/v1/issues/_detail.json.jbuilder | 42 +++++++ .../v1/issues/_simple_detail.json.jbuilder | 4 +- app/views/api/v1/issues/create.json.jbuilder | 1 + app/views/api/v1/issues/index.json.jbuilder | 2 + .../_simple_detail.json.jbuilder | 1 + .../issue_priorities/index.json.jbuilder | 2 +- app/views/api/v1/issues/show.json.jbuilder | 1 + .../statues/_simple_detail.json.jbuilder | 1 + .../api/v1/issues/statues/index.json.jbuilder | 2 +- lib/tasks/fix_issue_project_issues_index.rake | 22 ++++ 16 files changed, 236 insertions(+), 7 deletions(-) create mode 100644 app/services/api/v1/issues/create_service.rb create mode 100644 app/views/api/v1/issues/_detail.json.jbuilder create mode 100644 app/views/api/v1/issues/create.json.jbuilder create mode 100644 app/views/api/v1/issues/issue_priorities/_simple_detail.json.jbuilder create mode 100644 app/views/api/v1/issues/show.json.jbuilder create mode 100644 app/views/api/v1/issues/statues/_simple_detail.json.jbuilder create mode 100644 lib/tasks/fix_issue_project_issues_index.rake diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 1decf3421..3f61259e5 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -1,12 +1,25 @@ class Api::V1::IssuesController < Api::V1::BaseController - before_action :require_public_and_member_above, only: [:index] + before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy] def index @object_results = Api::V1::Issues::ListService.call(@project, query_params, current_user) @issues = kaminari_paginate(@object_results) end + def create + @object_result = Api::V1::Issues::CreateService.call(@project, issue_params, current_user) + end + + before_action :load_issue, only: [:show, :update, :destroy] + + def show + end + + def update + @object_result = Api::V1::Issues::EditService.call(@project, issue_params, current_user) + end + private def query_params @@ -20,4 +33,23 @@ class Api::V1::IssuesController < Api::V1::BaseController :issue_tag_ids => []) end + def issue_params + params.permit( + :status_id, :priority_id, :milestone_id, + :branch_name, :start_date, :due_date, + :subject, :description, + :issue_tag_ids => [], + :assigner_ids => [], + :attachment_ids => []) + end + + def load_issue + @issue = @project.issues.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || Issue.find_by_id(params[:id]) + if @issue.blank? + render_not_found("疑修不存在!") + elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) + render_forbidden("您没有权限操作！") + end + end + end \ No newline at end of file diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index ddb0facdf..2f779f418 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -111,7 +111,9 @@ class IssuesController < ApplicationController issue_params = issue_send_params(params) Issues::CreateForm.new({subject: issue_params[:subject], description: issue_params[:description].blank? ? issue_params[:description] : issue_params[:description].b}).validate! @issue = Issue.new(issue_params) + @issue.project_issues_index = @project.get_last_project_issues_index + 1 if @issue.save! + @project.del_project_issue_cache_delete_count SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu? SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) if Site.has_notice_menu? if params[:attachment_ids].present? @@ -302,6 +304,7 @@ class IssuesController < ApplicationController login = @issue.user.try(:login) SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigned_to_id, @issue.author_id) if Site.has_notice_menu? if @issue.destroy + @project.incre_project_issue_cache_delete_count if issue_type == "2" && status_id != 5 post_to_chain("add", token, login) end diff --git a/app/models/issue.rb b/app/models/issue.rb index 03e33c666..be759d2b4 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -73,6 +73,7 @@ class Issue < ApplicationRecord has_many :issue_participants has_many :participants, through: :issue_participants has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized + has_many :operate_journals, -> {where(notes: nil)}, class_name: "Journal", :as => :journalized scope :issue_includes, ->{includes(:user)} scope :issue_many_includes, ->{includes(journals: :user)} diff --git a/app/models/project.rb b/app/models/project.rb index 840661ee7..310d3009e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -424,4 +424,19 @@ class Project < ApplicationRecord raise("项目名称包含敏感词汇，请重新输入") if name && !HarmoniousDictionary.clean?(name) raise("项目描述包含敏感词汇，请重新输入") if description && !HarmoniousDictionary.clean?(description) end + + def get_last_project_issues_index + last_issue = self.issues.last + deleted_issue_count = ($redis_cache.hget("issue_cache_delete_count", self.id) || 0).to_i + + last_issue.project_issues_index.present? ? last_issue.project_issues_index + deleted_issue_count : 1 + end + + def incre_project_issue_cache_delete_count + $redis_cache.hincrby("issue_cache_delete_count", self.id, 1) + end + + def del_project_issue_cache_delete_count + $redis_cache.hdel("issue_cache_delete_count", self.id) + end end diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb new file mode 100644 index 000000000..6b3e9685a --- /dev/null +++ b/app/services/api/v1/issues/create_service.rb @@ -0,0 +1,107 @@ +class Api::V1::Issues::CreateService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :created_issue, :current_user + attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description + attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids + + validates :subject, presence: true + validates :status_id, :priority_id, presence: true + validates :current_user, presence: true + + def initialize(project, params, current_user = nil) + @project = project + @current_user = current_user + @status_id = params[:status_id] + @priority_id = params[:priority_id] + @milestone_id = params[:milestone_id] + @branch_name = params[:branch_name] + @start_date = params[:start_date] + @due_date = params[:due_date] + @subject = params[:subject] + @description = params[:description] + @issue_tag_ids = params[:issue_tag_ids] + @assigner_ids = params[:assigner_ids] + @attachment_ids = params[:attachment_ids] + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + begin + ActiveRecord::Base.transaction do + check_issue_status + check_issue_priority + check_milestone if milestone_id.present? + load_assigners unless assigner_ids.blank? + load_attachments unless attachment_ids.blank? + load_issue_tags unless issue_tag_ids.blank? + load_participants + + @created_issue = Issue.new(issue_attributes) + @created_issue.assigners = @assigners unless assigner_ids.blank? + @created_issue.attachments = @attachments unless attachment_ids.blank? + @created_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? + @created_issue.participants = @participants + + @created_issue.save! + + project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 + end + + return @created_issue + rescue + raise Error, "服务器错误，请联系系统管理员！" + end + end + + private + def check_issue_status + raise Error, "IssueStatus不存在！" unless IssueStatus.find_by_id(status_id).present? + end + + def check_issue_priority + raise Error, "IssuePriority不存在！" unless IssuePriority.find_by_id(priority_id).present? + end + + def check_milestone + raise Error, "Milestone不存在！" unless Version.find_by_id(milestone_id).present? + end + + def load_assigners + @assigners = User.where(id: assigner_ids) + end + + def load_issue_tags + @issue_tags = IssueTag.where(id: issue_tag_ids) + end + + def load_attachments + @attachments = Attachment.where(id: attachment_ids) + end + + def load_participants + @participants = User.where(id: assigner_ids).or(User.where(id: current_user.id)) + end + + def issue_attributes + issue_attributes = { + subject: subject, + project_id: project.id, + author_id: current_user.id, + tracker_id: Tracker.first.id, + status_id: status_id, + priority_id: priority_id, + project_issues_index: (project.get_last_project_issues_index + 1), + issue_type: "1", + issue_classify: "Issue" + } + + issue_attributes.merge!({description: description}) if description.present? + issue_attributes.merge!({fixed_version_id: milestone_id}) if milestone_id.present? + issue_attributes.merge!({start_date: start_date}) if start_date.present? + issue_attributes.merge!({due_date: due_date}) if due_date.present? + issue_attributes.merge!({branch_name: branch_name}) if branch_name.present? + + issue_attributes + end +end \ No newline at end of file diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 39ff2eca8..a5609bb62 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -6,14 +6,15 @@ class Api::V1::Issues::ListService < ApplicationService attr_accessor :queried_issues validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} + validates :participant_category, inclusion: {in: %w(all aboutme authoredme assignedme atme), message: "请输入正确的ParticipantCategory"} validates :sort_by, inclusion: {in: Issue.column_names, message: '请输入正确的SortBy'}, allow_blank: true validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true + validates :current_user, presence: true def initialize(project, params, current_user=nil) - puts params @project = project @category = params[:category] || 'all' - @participant_category = params[:participant_category] + @participant_category = params[:participant_category] || 'all' @keyword = params[:keyword] @author_id = params[:author_id] @issue_tag_ids = params[:issue_tag_ids] diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder new file mode 100644 index 000000000..e2e1bde8d --- /dev/null +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -0,0 +1,42 @@ +json.(issue, :id, :subject, :project_issues_index, :description, :branch_name, :start_date, :due_date) +json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") +json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") +json.tags issue.issue_tags.each do |tag| + json.partial! "api/v1/issues/issue_tags/simple_detail", locals: {tag: tag} +end +json.status do + if issue.issue_status.present? + json.partial! "api/v1/issues/statues/simple_detail", locals: {status: issue.issue_status} + else + json.nil! + end +end +json.priority do + if issue.priority.present? + json.partial! "api/v1/issues/issue_priorities/simple_detail", locals: {priority: issue.priority} + else + json.nil! + end +end +json.milestone do + if issue.version.present? + json.partial! "api/v1/issues/milestones/simple_detail", locals: {milestone: issue.version} + else + json.nil! + end +end +json.author do + if issue.user.present? + json.partial! "api/v1/users/simple_user", locals: {user: issue.user} + else + json.nil! + end +end +json.assigners issue.assigners.each do |assigner| + json.partial! "api/v1/users/simple_user", locals: {user: assigner} +end +json.participants issue.participants.each do |participant| + json.partial! "api/v1/users/simple_user", locals: {user: participant} +end +json.comment_journals_count issue.comment_journals.size +json.operate_journals_count issue.operate_journals.size \ No newline at end of file diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index a33cde4cf..bfc2693cf 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -1,6 +1,6 @@ json.(issue, :id, :subject, :project_issues_index) -json.created_at issue.created_on.strftime("%Y/%m/%d %H:%M") -json.updated_at issue.updated_on.strftime("%Y/%m/%d %H:%M") +json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") +json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") json.tags issue.issue_tags.each do |tag| json.partial! "api/v1/issues/issue_tags/simple_detail", locals: {tag: tag} end diff --git a/app/views/api/v1/issues/create.json.jbuilder b/app/views/api/v1/issues/create.json.jbuilder new file mode 100644 index 000000000..f45ef5b2f --- /dev/null +++ b/app/views/api/v1/issues/create.json.jbuilder @@ -0,0 +1 @@ +json.partial! "api/v1/issues/detail", locals: {issue: @object_result} diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index 920e7d68d..3e820f6f4 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -1,4 +1,6 @@ json.total_count @issues.total_count +json.opened_count @issues.opened.size +json.closed_count @issues.closed.size json.issues @issues.each do |issue| json.partial! "simple_detail", locals: {issue: issue} end \ No newline at end of file diff --git a/app/views/api/v1/issues/issue_priorities/_simple_detail.json.jbuilder b/app/views/api/v1/issues/issue_priorities/_simple_detail.json.jbuilder new file mode 100644 index 000000000..b7c37147a --- /dev/null +++ b/app/views/api/v1/issues/issue_priorities/_simple_detail.json.jbuilder @@ -0,0 +1 @@ +json.(priority, :id, :name) diff --git a/app/views/api/v1/issues/issue_priorities/index.json.jbuilder b/app/views/api/v1/issues/issue_priorities/index.json.jbuilder index 41499d456..c1b8ebb25 100644 --- a/app/views/api/v1/issues/issue_priorities/index.json.jbuilder +++ b/app/views/api/v1/issues/issue_priorities/index.json.jbuilder @@ -1,4 +1,4 @@ json.total_count @priorities.total_count json.priorities @priorities.each do |priority| - json.(priority, :id, :name) + json.partial! "simple_detail", locals: {priority: priority} end \ No newline at end of file diff --git a/app/views/api/v1/issues/show.json.jbuilder b/app/views/api/v1/issues/show.json.jbuilder new file mode 100644 index 000000000..8746417b5 --- /dev/null +++ b/app/views/api/v1/issues/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "api/v1/issues/detail", locals: {issue: @issue} diff --git a/app/views/api/v1/issues/statues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/statues/_simple_detail.json.jbuilder new file mode 100644 index 000000000..f66b6c95a --- /dev/null +++ b/app/views/api/v1/issues/statues/_simple_detail.json.jbuilder @@ -0,0 +1 @@ +json.(status, :id, :name) diff --git a/app/views/api/v1/issues/statues/index.json.jbuilder b/app/views/api/v1/issues/statues/index.json.jbuilder index 2cc91fb52..9fb60acc2 100644 --- a/app/views/api/v1/issues/statues/index.json.jbuilder +++ b/app/views/api/v1/issues/statues/index.json.jbuilder @@ -1,4 +1,4 @@ json.total_count @statues.total_count json.statues @statues.each do |status| - json.(status, :id, :name) + json.partial! "simple_detail", locals: {status: status} end \ No newline at end of file diff --git a/lib/tasks/fix_issue_project_issues_index.rake b/lib/tasks/fix_issue_project_issues_index.rake new file mode 100644 index 000000000..010df5f4b --- /dev/null +++ b/lib/tasks/fix_issue_project_issues_index.rake @@ -0,0 +1,22 @@ +# 执行示例 bundle exec rake sync_version_issues:update_issues +# 线上环境执行示例 RAILS_ENV=production bundle exec rake sync_version_issues:update_issues + +namespace :fix_issue_project_issues_index do + desc "update issue project_issues_index" + + task update_issues: :environment do + puts "____________fix start________________" + + Issue.update_all(project_issues_index: nil) + + Issue.where(project_issues_index: nil).group(:project_id).count.each do |pid, count| + p = Project.find_by_id(pid) + issues = p.issues.order(created_on: :asc) + issues.find_each.with_index do |issue, index| + issue.update_column(:project_issues_index, index+1) + end + end + puts "____________fix end________________" + end + +end \ No newline at end of file From 4a8e3324af95634c2202494c3f7fd60c4aff1408 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Feb 2023 15:39:09 +0800 Subject: [PATCH 011/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 310d3009e..d258fb0d8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -429,7 +429,7 @@ class Project < ApplicationRecord last_issue = self.issues.last deleted_issue_count = ($redis_cache.hget("issue_cache_delete_count", self.id) || 0).to_i - last_issue.project_issues_index.present? ? last_issue.project_issues_index + deleted_issue_count : 1 + last_issue&.project_issues_index.present? ? last_issue.project_issues_index + deleted_issue_count : 1 end def incre_project_issue_cache_delete_count From db2d398d94d5e3a6b02864d8c9918a76e86dcc44 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 13 Feb 2023 09:43:26 +0800 Subject: [PATCH 012/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Aparticipants?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 1 + app/models/project.rb | 2 +- app/services/api/v1/issues/create_service.rb | 46 +++++++++++++++++--- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index be759d2b4..a1438761e 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -72,6 +72,7 @@ class Issue < ApplicationRecord has_many :assigners, through: :issue_assigners has_many :issue_participants has_many :participants, through: :issue_participants + has_many :show_participants, -> {joins(:issue_participants).where.not(issue_participants: {participant_type: "atme"}).distinct}, through: :issue_participants, source: :participant has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized has_many :operate_journals, -> {where(notes: nil)}, class_name: "Journal", :as => :journalized diff --git a/app/models/project.rb b/app/models/project.rb index d258fb0d8..0792c9cb0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -429,7 +429,7 @@ class Project < ApplicationRecord last_issue = self.issues.last deleted_issue_count = ($redis_cache.hget("issue_cache_delete_count", self.id) || 0).to_i - last_issue&.project_issues_index.present? ? last_issue.project_issues_index + deleted_issue_count : 1 + last_issue&.project_issues_index.present? ? last_issue.project_issues_index + deleted_issue_count : 0 end def incre_project_issue_cache_delete_count diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 6b3e9685a..8a795f395 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -32,17 +32,20 @@ class Api::V1::Issues::CreateService < ApplicationService check_issue_status check_issue_priority check_milestone if milestone_id.present? + check_issue_tags unless issue_tag_ids.blank? + check_assigners unless assigner_ids.blank? + check_attachments unless attachment_ids.blank? load_assigners unless assigner_ids.blank? load_attachments unless attachment_ids.blank? load_issue_tags unless issue_tag_ids.blank? - load_participants @created_issue = Issue.new(issue_attributes) @created_issue.assigners = @assigners unless assigner_ids.blank? @created_issue.attachments = @attachments unless attachment_ids.blank? @created_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? - @created_issue.participants = @participants - + build_author_participants + build_assinger_participants unless assigner_ids.blank? + @created_issue.save! project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 @@ -67,6 +70,29 @@ class Api::V1::Issues::CreateService < ApplicationService raise Error, "Milestone不存在！" unless Version.find_by_id(milestone_id).present? end + def check_issue_tags + raise Error, "请输入正确的标记ID数组！" unless issue_tag_ids.is_a?(Array) + raise Error, "最多可选择3个标记" if issue_tag_ids.size > 3 + issue_tag_ids.each do |tid| + raise Error, "请输入正确的标记ID！" unless IssueTag.exists?(id: tid) + end + end + + def check_assigners + raise Error, "请输入正确的负责人ID数组！" unless assigner_ids.is_a?(Array) + raise Error, "最多可选择5个负责人" if assigner_ids.size > 5 + assigner_ids.each do |aid| + raise Error, "请输入正确的负责人ID！" unless User.exists?(id: aid) + end + end + + def check_attachments + raise Error, "请输入正确的附件ID数组！" unless assigner_ids.is_a?(Array) + attachment_ids.each do |aid| + raise Error, "请输入正确的附件ID！" unless Attachment.exists?(id: aid) + end + end + def load_assigners @assigners = User.where(id: assigner_ids) end @@ -79,10 +105,6 @@ class Api::V1::Issues::CreateService < ApplicationService @attachments = Attachment.where(id: attachment_ids) end - def load_participants - @participants = User.where(id: assigner_ids).or(User.where(id: current_user.id)) - end - def issue_attributes issue_attributes = { subject: subject, @@ -104,4 +126,14 @@ class Api::V1::Issues::CreateService < ApplicationService issue_attributes end + + def build_author_participants + @created_issue.issue_participants.new({participant_type: "authored", participant_id: current_user.id}) + end + + def build_assinger_participants + assigner_ids.each do |aid| + @created_issue.issue_participants.new({participant_type: "assigned", participant_id: aid}) + end + end end \ No newline at end of file From 404a6a00e7b0bd30aa4e4150f2b12b9b50f59050 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 14 Feb 2023 23:19:17 +0800 Subject: [PATCH 013/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 37 +++- app/jobs/send_template_message_job.rb | 14 +- app/models/issue.rb | 4 +- app/models/project.rb | 6 +- .../api/v1/issues/batch_delete_service.rb | 41 ++++ .../api/v1/issues/batch_update_service.rb | 29 +++ .../api/v1/issues/concerns/checkable.rb | 45 +++++ .../api/v1/issues/concerns/loadable.rb | 19 ++ app/services/api/v1/issues/create_service.rb | 139 ++++++-------- app/services/api/v1/issues/delete_service.rb | 43 +++++ app/services/api/v1/issues/update_service.rb | 181 ++++++++++++++++++ config/routes/api.rb | 7 +- 12 files changed, 478 insertions(+), 87 deletions(-) create mode 100644 app/services/api/v1/issues/batch_delete_service.rb create mode 100644 app/services/api/v1/issues/batch_update_service.rb create mode 100644 app/services/api/v1/issues/concerns/checkable.rb create mode 100644 app/services/api/v1/issues/concerns/loadable.rb create mode 100644 app/services/api/v1/issues/delete_service.rb create mode 100644 app/services/api/v1/issues/update_service.rb diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 3f61259e5..d1addcf31 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -17,7 +17,22 @@ class Api::V1::IssuesController < Api::V1::BaseController end def update - @object_result = Api::V1::Issues::EditService.call(@project, issue_params, current_user) + @object_result = Api::V1::Issues::UpdateService.call(@project, @issue, issue_params, current_user) + end + + def destroy + @object_result = Api::V1::Issues::DeleteService.call(@project, @issue, current_user) + end + + + before_action :load_issues, only: [:batch_update, :batch_destroy] + + def batch_update + @object_result = Api::V1::Issues::BatchUpdateService.call(@project, @issues, batch_issue_params, current_user) + end + + def batch_destroy + @object_result = Api::V1::Issues::BatchDeleteService.call(@project, @issues, current_user) end private @@ -43,6 +58,13 @@ class Api::V1::IssuesController < Api::V1::BaseController :attachment_ids => []) end + def batch_issue_params + params.permit( + :status_id, :priority_id, :milestone_id, + :issue_tag_ids => [], + :assigner_ids => []) + end + def load_issue @issue = @project.issues.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || Issue.find_by_id(params[:id]) if @issue.blank? @@ -52,4 +74,17 @@ class Api::V1::IssuesController < Api::V1::BaseController end end + def load_issues + return render_error("请输入正确的ID数组！") unless params[:ids].is_a?(Array) + params[:ids].each do |id| + @issue = @project.issues.where(project_issues_index: id).where.not(id: id).take || Issue.find_by_id(id) + if @issue.blank? + return render_not_found("ID为#{id}的疑修不存在!") + elsif if @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) + return render_forbidden("ID为#{id}的疑修您没有权限操作！") + end + end + @issues = @project.issues.where(project_issues_index: params[:ids]).where.not(id: params[:ids]) || Issue.where(id: params[:ids]) + end + end \ No newline at end of file diff --git a/app/jobs/send_template_message_job.rb b/app/jobs/send_template_message_job.rb index 557d4d0fa..594a7a7b5 100644 --- a/app/jobs/send_template_message_job.rb +++ b/app/jobs/send_template_message_job.rb @@ -34,8 +34,12 @@ class SendTemplateMessageJob < ApplicationJob operator_id, issue_id = args[0], args[1] operator = User.find_by_id(operator_id) issue = Issue.find_by_id(issue_id) - return unless operator.present? && issue.present? - receivers = User.where(id: issue&.assigned_to_id).where.not(id: operator&.id) + return unless operator.present? && issue.present? + if args[2].present? + receivers = User.where(id: args[2]).where.not(id: operator&.id) + else + receivers = User.where(id: issue&.assigned_to_id).where.not(id: operator&.id) + end receivers_string, content, notification_url = MessageTemplate::IssueAssigned.get_message_content(receivers, operator, issue) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id}) receivers.find_each do |receiver| @@ -78,7 +82,11 @@ class SendTemplateMessageJob < ApplicationJob operator_id, issue_title, issue_assigned_to_id, issue_author_id = args[0], args[1], args[2], args[3] operator = User.find_by_id(operator_id) return unless operator.present? - receivers = User.where(id: [issue_assigned_to_id, issue_author_id]).where.not(id: operator&.id) + if issue_assigned_to_id.is_a?(Array) + receivers = User.where(id: issue_assigned_to_id.append(issue_author_id)).where.not(id: operator&.id) + else + receivers = User.where(id: [issue_assigned_to_id, issue_author_id]).where.not(id: operator&.id) + end receivers_string, content, notification_url = MessageTemplate::IssueDeleted.get_message_content(receivers, operator, issue_title) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_title: issue_title}) receivers.find_each do |receiver| diff --git a/app/models/issue.rb b/app/models/issue.rb index a1438761e..78ffaead7 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -68,9 +68,9 @@ class Issue < ApplicationRecord has_many :issue_tags, through: :issue_tags_relates has_many :issue_times, dependent: :destroy has_many :issue_depends, dependent: :destroy - has_many :issue_assigners + has_many :issue_assigners, dependent: :destroy has_many :assigners, through: :issue_assigners - has_many :issue_participants + has_many :issue_participants, dependent: :destroy has_many :participants, through: :issue_participants has_many :show_participants, -> {joins(:issue_participants).where.not(issue_participants: {participant_type: "atme"}).distinct}, through: :issue_participants, source: :participant has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized diff --git a/app/models/project.rb b/app/models/project.rb index 0792c9cb0..4361118e4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -432,11 +432,11 @@ class Project < ApplicationRecord last_issue&.project_issues_index.present? ? last_issue.project_issues_index + deleted_issue_count : 0 end - def incre_project_issue_cache_delete_count - $redis_cache.hincrby("issue_cache_delete_count", self.id, 1) + def incre_project_issue_cache_delete_count(count=1) + $redis_cache.hincrby("issue_cache_delete_count", self.id, count) end - def del_project_issue_cache_delete_count + def del_project_issue_cache_delete_count $redis_cache.hdel("issue_cache_delete_count", self.id) end end diff --git a/app/services/api/v1/issues/batch_delete_service.rb b/app/services/api/v1/issues/batch_delete_service.rb new file mode 100644 index 000000000..13da5d84a --- /dev/null +++ b/app/services/api/v1/issues/batch_delete_service.rb @@ -0,0 +1,41 @@ +class Api::V1::Issues::BatchDeleteService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :issues, :current_user + + validates :project, :issues, :current_user, presence: true + + def initialize(project, issues, current_user = nil) + @project = project + @issues = issues.includes(:assigners) + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + try_lock # 开始写数据，加锁 + + delete_issues + + project.incre_project_issue_cache_delete_count(@issues.size) + + if Site.has_notice_menu? + @issues.each do |issue| + SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id) + end + end + + unlock + end + + private + + def try_lock + raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::BatchDeleteService:#{project.id}", 1, nx: true, ex: 60.seconds) + end + + def unlock + $redis_cache.del("Api::V1::Issues::BatchDeleteService:#{project.id}") + end + +end \ No newline at end of file diff --git a/app/services/api/v1/issues/batch_update_service.rb b/app/services/api/v1/issues/batch_update_service.rb new file mode 100644 index 000000000..2e3e4fab7 --- /dev/null +++ b/app/services/api/v1/issues/batch_update_service.rb @@ -0,0 +1,29 @@ +class Api::V1::Issues::BatchUpdateService < ApplicationService + include ActiveModel::Model + include Api::V1::Issues::Concerns::Checkable + include Api::V1::Issues::Concerns::Loadable + + attr_reader :project, :issues, :params, :current_user + attr_reader :status_id, :priority_id, :milestone_id + attr_reader :issue_tag_ids, :assigner_ids + + validates :project, :issues, :current_user, presence: true + + def initialize(project, issues, params, current_user = nil) + @project = project + @issues = issues + @params = params + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + ActiveRecord::Base.transaction do + @issues.each do |issue| + Api::V1::Issues::UpdateService.call(project, issue, params, current_user) + end + end + end + + +end \ No newline at end of file diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb new file mode 100644 index 000000000..8ac03f053 --- /dev/null +++ b/app/services/api/v1/issues/concerns/checkable.rb @@ -0,0 +1,45 @@ +module Api::V1::Issues::Concerns::Checkable + + def check_issue_status(status_id) + raise ApplicationService::Error, "IssueStatus不存在！" unless IssueStatus.find_by_id(status_id).present? + end + + def check_issue_priority(priority_id) + raise ApplicationService::Error, "IssuePriority不存在！" unless IssuePriority.find_by_id(priority_id).present? + end + + def check_milestone(milestone_id) + raise ApplicationService::Error, "Milestone不存在！" unless Version.find_by_id(milestone_id).present? + end + + def check_issue_tags(issue_tag_ids) + raise ApplicationService::Error, "请输入正确的标记ID数组！" unless issue_tag_ids.is_a?(Array) + raise ApplicationService::Error, "最多可选择3个标记" if issue_tag_ids.size > 3 + issue_tag_ids.each do |tid| + raise ApplicationService::Error, "请输入正确的标记ID！" unless IssueTag.exists?(id: tid) + end + end + + def check_assigners(assigner_ids) + raise ApplicationService::Error, "请输入正确的负责人ID数组！" unless assigner_ids.is_a?(Array) + raise ApplicationService::Error, "最多可选择5个负责人" if assigner_ids.size > 5 + assigner_ids.each do |aid| + raise ApplicationService::Error, "请输入正确的负责人ID！" unless User.exists?(id: aid) + end + end + + def check_attachments (attachment_ids) + raise ApplicationService::Error, "请输入正确的附件ID数组！" unless attachment_ids.is_a?(Array) + attachment_ids.each do |aid| + raise ApplicationService::Error, "请输入正确的附件ID！" unless Attachment.exists?(id: aid) + end + end + + def check_atme_receivers(receivers_login) + raise ApplicationService::Error, "请输入正确的用户标识数组！" unless receivers_login.is_a?(Array) + receivers_login.each do |rlogin| + raise ApplicationService::Error, "请输入正确的用户标识！" unless User.exists?(login: rlogin) + end + end + +end diff --git a/app/services/api/v1/issues/concerns/loadable.rb b/app/services/api/v1/issues/concerns/loadable.rb new file mode 100644 index 000000000..df30042e0 --- /dev/null +++ b/app/services/api/v1/issues/concerns/loadable.rb @@ -0,0 +1,19 @@ +module Api::V1::Issues::Concerns::Loadable + + def load_assigners(assigner_ids) + @assigners = User.where(id: assigner_ids) + end + + def load_issue_tags(issue_tag_ids) + @issue_tags = IssueTag.where(id: issue_tag_ids) + end + + def load_attachments(attachment_ids) + @attachments = Attachment.where(id: attachment_ids) + end + + def load_atme_receivers(receivers_login) + @atme_receivers = User.where(login: receivers_login) + end + +end \ No newline at end of file diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 8a795f395..bee688d6d 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -1,13 +1,16 @@ class Api::V1::Issues::CreateService < ApplicationService include ActiveModel::Model + include Api::V1::Issues::Concerns::Checkable + include Api::V1::Issues::Concerns::Loadable - attr_reader :project, :created_issue, :current_user - attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description - attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids + attr_reader :project, :current_user + attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description + attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids, :receivers_login + attr_accessor :created_issue validates :subject, presence: true validates :status_id, :priority_id, presence: true - validates :current_user, presence: true + validates :project, :current_user, presence: true def initialize(project, params, current_user = nil) @project = project @@ -23,87 +26,51 @@ class Api::V1::Issues::CreateService < ApplicationService @issue_tag_ids = params[:issue_tag_ids] @assigner_ids = params[:assigner_ids] @attachment_ids = params[:attachment_ids] + @receivers_login = params[:receivers_login] end def call raise Error, errors.full_messages.join(", ") unless valid? - begin - ActiveRecord::Base.transaction do - check_issue_status - check_issue_priority - check_milestone if milestone_id.present? - check_issue_tags unless issue_tag_ids.blank? - check_assigners unless assigner_ids.blank? - check_attachments unless attachment_ids.blank? - load_assigners unless assigner_ids.blank? - load_attachments unless attachment_ids.blank? - load_issue_tags unless issue_tag_ids.blank? - - @created_issue = Issue.new(issue_attributes) - @created_issue.assigners = @assigners unless assigner_ids.blank? - @created_issue.attachments = @attachments unless attachment_ids.blank? - @created_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? - build_author_participants - build_assinger_participants unless assigner_ids.blank? - - @created_issue.save! - - project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 - end + ActiveRecord::Base.transaction do + check_issue_status(status_id) + check_issue_priority(priority_id) + check_milestone(milestone_id) if milestone_id.present? + check_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? + check_assigners(assigner_ids) unless assigner_ids.blank? + check_attachments(attachment_ids) unless attachment_ids.blank? + check_atme_receivers(receivers_login) unless receivers_login.blank? + load_attachments(attachment_ids) unless attachment_ids.blank? + load_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? + load_atme_receivers(receivers_login) unless receivers_login.blank? + + try_lock # 开始写数据，加锁 + @created_issue = Issue.new(issue_attributes) + build_author_participants + build_assigner_participants unless assigner_ids.blank? + build_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 + build_issue_project_trends if status_id.present? # 开关时间 + @created_issue.attachments = @attachments unless attachment_ids.blank? + @created_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? - return @created_issue - rescue - raise Error, "服务器错误，请联系系统管理员！" + @created_issue.save! + project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 + + # @信息发送 + AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? + + # 发消息 + if Site.has_notice_menu? + SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id, assigner_ids) unless assigner_ids.blank? + SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) + end + + unlock # 结束写数据，解锁 end + + return @created_issue end private - def check_issue_status - raise Error, "IssueStatus不存在！" unless IssueStatus.find_by_id(status_id).present? - end - - def check_issue_priority - raise Error, "IssuePriority不存在！" unless IssuePriority.find_by_id(priority_id).present? - end - - def check_milestone - raise Error, "Milestone不存在！" unless Version.find_by_id(milestone_id).present? - end - - def check_issue_tags - raise Error, "请输入正确的标记ID数组！" unless issue_tag_ids.is_a?(Array) - raise Error, "最多可选择3个标记" if issue_tag_ids.size > 3 - issue_tag_ids.each do |tid| - raise Error, "请输入正确的标记ID！" unless IssueTag.exists?(id: tid) - end - end - - def check_assigners - raise Error, "请输入正确的负责人ID数组！" unless assigner_ids.is_a?(Array) - raise Error, "最多可选择5个负责人" if assigner_ids.size > 5 - assigner_ids.each do |aid| - raise Error, "请输入正确的负责人ID！" unless User.exists?(id: aid) - end - end - - def check_attachments - raise Error, "请输入正确的附件ID数组！" unless assigner_ids.is_a?(Array) - attachment_ids.each do |aid| - raise Error, "请输入正确的附件ID！" unless Attachment.exists?(id: aid) - end - end - - def load_assigners - @assigners = User.where(id: assigner_ids) - end - - def load_issue_tags - @issue_tags = IssueTag.where(id: issue_tag_ids) - end - - def load_attachments - @attachments = Attachment.where(id: attachment_ids) - end def issue_attributes issue_attributes = { @@ -131,9 +98,27 @@ class Api::V1::Issues::CreateService < ApplicationService @created_issue.issue_participants.new({participant_type: "authored", participant_id: current_user.id}) end - def build_assinger_participants + def build_assigner_participants assigner_ids.each do |aid| @created_issue.issue_participants.new({participant_type: "assigned", participant_id: aid}) end end + + def build_issue_project_trends + @created_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: "create"}) + @created_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE}) if status_id.to_i == 5 + end + + def build_issue_journal_details + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "issue", prop_key: 1, old_value: '', value: ''}) + end + + def try_lock + raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::CreateService:#{project.id}", 1, nx: true, ex: 60.seconds) + end + + def unlock + $redis_cache.del("Api::V1::Issues::CreateService:#{project.id}") + end end \ No newline at end of file diff --git a/app/services/api/v1/issues/delete_service.rb b/app/services/api/v1/issues/delete_service.rb new file mode 100644 index 000000000..02aaa441b --- /dev/null +++ b/app/services/api/v1/issues/delete_service.rb @@ -0,0 +1,43 @@ +class Api::V1::Issues::DeleteService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :issue, :current_user + + validates :project, :issue, :current_user, presence: true + + def initialize(project, issue, current_user = nil) + @project = project + @issue = issue + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + try_lock # 开始写数据，加锁 + + delete_issue + + project.incre_project_issue_cache_delete_count + + if Site.has_notice_menu? + SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id) + end + + unlock + end + + private + + def delete_issue + raise Error, "删除疑修失败！" unless issue.destroy! + end + + def try_lock + raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::DeleteService:#{project.id}", 1, nx: true, ex: 60.seconds) + end + + def unlock + $redis_cache.del("Api::V1::Issues::DeleteService:#{project.id}") + end + +end \ No newline at end of file diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb new file mode 100644 index 000000000..49410e81a --- /dev/null +++ b/app/services/api/v1/issues/update_service.rb @@ -0,0 +1,181 @@ +class Api::V1::Issues::UpdateService < ApplicationService + include ActiveModel::Model + include Api::V1::Issues::Concerns::Checkable + include Api::V1::Issues::Concerns::Loadable + + attr_reader :project, :issue, :current_user + attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description + attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids, :receivers_login + attr_accessor :add_assigner_ids, :previous_issue_changes, :updated_issue + + validates :project, :issue, :current_user, presence: true + + def initialize(project, issue, params, current_user = nil) + @project = project + @issue = issue + @current_user = current_user + @status_id = params[:status_id] + @priority_id = params[:priority_id] + @milestone_id = params[:milestone_id] + @branch_name = params[:branch_name] + @start_date = params[:start_date] + @due_date = params[:due_date] + @subject = params[:subject] + @description = params[:description] + @issue_tag_ids = params[:issue_tag_ids] + @assigner_ids = params[:assigner_ids] + @attachment_ids = params[:attachment_ids] + @receivers_login = params[:receivers_login] + @add_assigner_ids = [] + @previous_issue_changes = {} + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + ActiveRecord::Base.transaction do + check_issue_status(status_id) if status_id.present? + check_issue_priority(priority_id) if priority_id.present? + check_milestone(milestone_id) if milestone_id.present? + check_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? + check_assigners(assigner_ids) unless assigner_ids.blank? + check_attachments(attachment_ids) unless attachment_ids.blank? + check_atme_receivers(receivers_login) unless receivers_login.blank? + load_assigners(assigner_ids) unless assigner_ids.blank? + load_attachments(attachment_ids) unless attachment_ids.blank? + load_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? + load_atme_receivers(receivers_login) unless receivers_login.blank? + + try_lock + @updated_issue = @issue + @updated_issue.load_attributes + build_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 + build_issue_project_trends if status_id.present? # 开关时间记录 + build_assigner_participants unless assigner_ids.blank? # 负责人 + @updated_issue.assigners = @assigners unless assigner_ids.blank? + @updated_issue.attachments = @attachments unless attachment_ids.blank? + @updated_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? + + @updated_issue.save! + + build_previous_issue_changes + + # @信息发送 + AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? + # 消息发送 + if Site.has_notice_menu? + SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, @issue&.id, previous_changes) unless previous_issue_changes.blank? + SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id, add_assigner_ids) unless add_assigner_ids.blank? + end + + unlock + end + end + + private + + def build_assigner_participants + @updated_issue.issue_participants.where.not(id: assigner_ids).each(&:destroy!) + assigner_ids.each do |aid| + next if @updated_issue.issue_participants.exists?(participant_id: aid) + @updated_issue.issue_participants.new({participant_type: "assigned", participant_id: aid}) + @add_assigner_ids << aid + end + end + + def build_previous_issue_changes + @previous_issue_changes = @updated_issue.previous_changes + if @updated_issue.previous_changes[:start_date].present? + @previous_issue_changes.merge!(start_date: [@updated_issue.previous_changes[:start_date][0].to_s, @updated_issue.previous_changes[:start_date][1].to_s]) + end + if @updated_issue.previous_changes[:due_date].present? + @previous_issue_changes.merge!(due_date: [@updated_issue.previous_changes[:due_date][0].to_s, @updated_issue.previous_changes[:due_date][1].to_s]) + end + end + + def build_issue_project_trends + if @updated_issue.previous_changes[:status_id].present? && @updated_issue.previous_changes[:status_id][1] == 5 + @updated_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE}) + end + if @updated_issue.previous_changes[:status_id].present? && @updated_issue.previous_changes[:status_id][0] == 5 + @updated_issue.project_trends.where(action_type: ProjectTrend::CLOSE).each(:&destroy!) + end + end + + def build_issue_journal_details + # 更改标题 + if @updated_issue.previous_changes[:subject].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "subject", old_value: @updated_issue.previous_changes[:subject][0], value: @updated_issue.previous_changes[:subject][1]}) + end + + # 更改描述 + if @updated_issue.previous_changes[:description].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "description", old_value: @updated_issue.previous_changes[:description][0], value: @updated_issue.previous_changes[:description][1]}) + end + + # 修改状态 + if @updated_issue.previous_changes[:status_id].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "status_id", old_value: @updated_issue.previous_changes[:status_id][0], value: @updated_issue.previous_changes[:status_id][1]}) + end + + # 修改优先级 + if @updated_issue.previous_changes[:priority_id].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "priority_id", old_value: @updated_issue.previous_changes[:priority_id][0], value: @updated_issue.previous_changes[:priority_id][1]}) + end + + # 修改里程碑 + if @updated_issue.previous_changes[:fixed_version_id].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "fixed_version_id", old_value: @updated_issue.previous_changes[:fixed_version_id][0], value: @updated_issue.previous_changes[:fixed_version_id][1]}) + end + + # 更改分支 + if @updated_issue.previous_changes[:branch_name].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "branch_name", old_value: @updated_issue.previous_changes[:branch_name][0], value: @updated_issue.previous_changes[:branch_name][1]}) + end + + # 更改开始时间 + if @updated_issue.previous_changes[:start_date].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "start_date", old_value: @updated_issue.previous_changes[:start_date][0], value: @updated_issue.previous_changes[:start_date][1]}) + end + + # 更改结束时间 + if @updated_issue.previous_changes[:due_date].present? + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attr", prop_key: "due_date", old_value: @updated_issue.previous_changes[:due_date][0], value: @updated_issue.previous_changes[:due_date][1]}) + end + + # 更改负责人 + if !@updated_issue.assigners.pluck(:id).sort! == assigner_ids.sort! + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "assigner", prop_key: "#{assigner_ids.size}", old_value: @updated_issue.assigners.pluck(:nickname).join(","), value: @assigners.pluck(:nickname).join(",")}) + end + + # 更改标记 + if !@updated_issue.issue_tags.pluck(:id).sort! == issue_tag_ids.sort! + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "issue_tag", prop_key: "#{issue_tag_ids.size}", old_value: @updated_issue.issue_tags.pluck(:name).join(","), value: @issue_tags.pluck(:name).join(",")}) + end + + # 更改附件 + if !@updated_issue.attachments.pluck(:id).sort! == attachment_ids.sort! + journal = @updated_issue.journals.new({user_id: current_user.id}) + journal.journal_details.new({property: "attachment", prop_key: "#{attachment_ids.size}", old_value: @updated_issue.attachments.pluck(:filename).join(","), value: @attachments.pluck(:filename).join(",")}) + end + end + + def try_lock + raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}", 1, nx: true, ex: 60.seconds) + end + + def unlock + $redis_cache.del("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}") + end + + +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index e4994f529..bf79cb16c 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -25,7 +25,12 @@ defaults format: :json do end end - resources :issues + resources :issues, except: [:new, :edit] do + collection do + patch :batch_update + delete :batch_destroy + end + end scope module: :issues do resources :issue_tags, only: [:index] resources :milestones, except: [:new, :edit] From 2899f3b18e1aebfefd79c85db06bc8e04a8e9780 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 15 Feb 2023 09:48:56 +0800 Subject: [PATCH 014/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E3=80=81=E6=9B=B4=E6=94=B9=E9=80=BB=E8=BE=91=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 27 ++++++++++++++----- .../api/v1/issues/batch_delete_service.rb | 6 +++++ .../api/v1/issues/batch_update_service.rb | 2 ++ app/services/api/v1/issues/create_service.rb | 6 ++--- app/services/api/v1/issues/delete_service.rb | 2 ++ app/services/api/v1/issues/update_service.rb | 25 ++++++++++++----- app/views/api/v1/issues/_detail.json.jbuilder | 2 +- app/views/api/v1/issues/update.json.jbuilder | 1 + 8 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 app/views/api/v1/issues/update.json.jbuilder diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index d1addcf31..567ef6b3b 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -1,6 +1,6 @@ class Api::V1::IssuesController < Api::V1::BaseController - before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy] + before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy, :batch_update, :batch_destroy] def index @object_results = Api::V1::Issues::ListService.call(@project, query_params, current_user) @@ -22,17 +22,31 @@ class Api::V1::IssuesController < Api::V1::BaseController def destroy @object_result = Api::V1::Issues::DeleteService.call(@project, @issue, current_user) + if @object_result + render_ok + else + render_error("删除疑修失败！") + end end - before_action :load_issues, only: [:batch_update, :batch_destroy] def batch_update @object_result = Api::V1::Issues::BatchUpdateService.call(@project, @issues, batch_issue_params, current_user) + if @object_result + render_ok + else + render_error("批量更新疑修失败！") + end end def batch_destroy @object_result = Api::V1::Issues::BatchDeleteService.call(@project, @issues, current_user) + if @object_result + render_ok + else + render_error("批量删除疑修失败！") + end end private @@ -55,7 +69,8 @@ class Api::V1::IssuesController < Api::V1::BaseController :subject, :description, :issue_tag_ids => [], :assigner_ids => [], - :attachment_ids => []) + :attachment_ids => [], + :receivers_login => []) end def batch_issue_params @@ -77,14 +92,14 @@ class Api::V1::IssuesController < Api::V1::BaseController def load_issues return render_error("请输入正确的ID数组！") unless params[:ids].is_a?(Array) params[:ids].each do |id| - @issue = @project.issues.where(project_issues_index: id).where.not(id: id).take || Issue.find_by_id(id) + @issue = Issue.find_by_id(id) if @issue.blank? return render_not_found("ID为#{id}的疑修不存在!") - elsif if @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) + elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) return render_forbidden("ID为#{id}的疑修您没有权限操作！") end end - @issues = @project.issues.where(project_issues_index: params[:ids]).where.not(id: params[:ids]) || Issue.where(id: params[:ids]) + @issues = Issue.where(id: params[:ids]) end end \ No newline at end of file diff --git a/app/services/api/v1/issues/batch_delete_service.rb b/app/services/api/v1/issues/batch_delete_service.rb index 13da5d84a..133f098cd 100644 --- a/app/services/api/v1/issues/batch_delete_service.rb +++ b/app/services/api/v1/issues/batch_delete_service.rb @@ -26,10 +26,16 @@ class Api::V1::Issues::BatchDeleteService < ApplicationService end unlock + + return true end private + def delete_issues + raise Error, "批量删除疑修失败！" unless @issues.destroy_all + end + def try_lock raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::BatchDeleteService:#{project.id}", 1, nx: true, ex: 60.seconds) end diff --git a/app/services/api/v1/issues/batch_update_service.rb b/app/services/api/v1/issues/batch_update_service.rb index 2e3e4fab7..ffa1ba7df 100644 --- a/app/services/api/v1/issues/batch_update_service.rb +++ b/app/services/api/v1/issues/batch_update_service.rb @@ -22,6 +22,8 @@ class Api::V1::Issues::BatchUpdateService < ApplicationService @issues.each do |issue| Api::V1::Issues::UpdateService.call(project, issue, params, current_user) end + + return true end end diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index bee688d6d..e87745950 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -47,8 +47,8 @@ class Api::V1::Issues::CreateService < ApplicationService @created_issue = Issue.new(issue_attributes) build_author_participants build_assigner_participants unless assigner_ids.blank? - build_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 - build_issue_project_trends if status_id.present? # 开关时间 + build_issue_journal_details + build_issue_project_trends @created_issue.attachments = @attachments unless attachment_ids.blank? @created_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? @@ -110,7 +110,7 @@ class Api::V1::Issues::CreateService < ApplicationService end def build_issue_journal_details - journal = @updated_issue.journals.new({user_id: current_user.id}) + journal = @created_issue.journals.new({user_id: current_user.id}) journal.journal_details.new({property: "issue", prop_key: 1, old_value: '', value: ''}) end diff --git a/app/services/api/v1/issues/delete_service.rb b/app/services/api/v1/issues/delete_service.rb index 02aaa441b..e6429390e 100644 --- a/app/services/api/v1/issues/delete_service.rb +++ b/app/services/api/v1/issues/delete_service.rb @@ -24,6 +24,8 @@ class Api::V1::Issues::DeleteService < ApplicationService end unlock + + return true end private diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 49410e81a..3084e78a9 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -47,7 +47,7 @@ class Api::V1::Issues::UpdateService < ApplicationService try_lock @updated_issue = @issue - @updated_issue.load_attributes + issue_load_attributes build_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 build_issue_project_trends if status_id.present? # 开关时间记录 build_assigner_participants unless assigner_ids.blank? # 负责人 @@ -63,27 +63,40 @@ class Api::V1::Issues::UpdateService < ApplicationService AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? # 消息发送 if Site.has_notice_menu? - SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, @issue&.id, previous_changes) unless previous_issue_changes.blank? + SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, @issue&.id, previous_issue_changes) unless previous_issue_changes.blank? SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id, add_assigner_ids) unless add_assigner_ids.blank? end unlock + + return @updated_issue end end private + def issue_load_attributes + @updated_issue.status_id = status_id if status_id.present? + @updated_issue.priority_id = priority_id if priority_id.present? + @updated_issue.fixed_version_id = milestone_id if milestone_id.present? + @updated_issue.branch_name = branch_name if branch_name.present? + @updated_issue.start_date = start_date if start_date.present? + @updated_issue.due_date = due_date if due_date.present? + @updated_issue.subject = subject if subject.present? + @updated_issue.description = description if description.present? + end + def build_assigner_participants - @updated_issue.issue_participants.where.not(id: assigner_ids).each(&:destroy!) + @updated_issue.issue_participants.where(participant_type: "assigned").where.not(participant_id: assigner_ids).each(&:destroy!) assigner_ids.each do |aid| - next if @updated_issue.issue_participants.exists?(participant_id: aid) + next if @updated_issue.issue_participants.exists?(participant_type: "assigned", participant_id: aid) @updated_issue.issue_participants.new({participant_type: "assigned", participant_id: aid}) @add_assigner_ids << aid end end def build_previous_issue_changes - @previous_issue_changes = @updated_issue.previous_changes + @previous_issue_changes = @updated_issue.previous_changes.except("updated_on", "created_on") if @updated_issue.previous_changes[:start_date].present? @previous_issue_changes.merge!(start_date: [@updated_issue.previous_changes[:start_date][0].to_s, @updated_issue.previous_changes[:start_date][1].to_s]) end @@ -97,7 +110,7 @@ class Api::V1::Issues::UpdateService < ApplicationService @updated_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE}) end if @updated_issue.previous_changes[:status_id].present? && @updated_issue.previous_changes[:status_id][0] == 5 - @updated_issue.project_trends.where(action_type: ProjectTrend::CLOSE).each(:&destroy!) + @updated_issue.project_trends.where(action_type: ProjectTrend::CLOSE).each(&:destroy!) end end diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index e2e1bde8d..82fea8098 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -35,7 +35,7 @@ end json.assigners issue.assigners.each do |assigner| json.partial! "api/v1/users/simple_user", locals: {user: assigner} end -json.participants issue.participants.each do |participant| +json.participants issue.participants.distinct.each do |participant| json.partial! "api/v1/users/simple_user", locals: {user: participant} end json.comment_journals_count issue.comment_journals.size diff --git a/app/views/api/v1/issues/update.json.jbuilder b/app/views/api/v1/issues/update.json.jbuilder new file mode 100644 index 000000000..f45ef5b2f --- /dev/null +++ b/app/views/api/v1/issues/update.json.jbuilder @@ -0,0 +1 @@ +json.partial! "api/v1/issues/detail", locals: {issue: @object_result} From 2a8e0d2be8db84d1cb16049b5af81e038e63e5c6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 15 Feb 2023 17:24:36 +0800 Subject: [PATCH 015/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=88=97=E8=A1=A8=E4=B8=8B=E6=8B=89=E6=A1=86=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/assigners_controller.rb | 3 +- .../api/v1/issues/authors_controller.rb | 1 + .../v1/issues/issue_priorities_controller.rb | 1 + .../api/v1/issues/issue_tags_controller.rb | 41 ++++++++++++++++++- .../api/v1/issues/milestones_controller.rb | 1 + .../api/v1/issues/statues_controller.rb | 1 + app/models/issue_tag.rb | 1 + app/services/users/register_service.rb | 2 +- .../issues/issue_tags/_detail.json.jbuilder | 17 ++++++++ .../v1/issues/issue_tags/index.json.jbuilder | 2 + config/routes/api.rb | 2 +- 11 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 app/views/api/v1/issues/issue_tags/_detail.json.jbuilder diff --git a/app/controllers/api/v1/issues/assigners_controller.rb b/app/controllers/api/v1/issues/assigners_controller.rb index b2b15a90a..84476138f 100644 --- a/app/controllers/api/v1/issues/assigners_controller.rb +++ b/app/controllers/api/v1/issues/assigners_controller.rb @@ -5,7 +5,8 @@ class Api::V1::Issues::AssignersController < Api::V1::BaseController # 负责人列表 def index @assigners = User.joins(assigned_issues: :project).where(projects: {id: @project&.id}) - @assigners = @assigners.order("users.id=#{current_user.id} desc, issue_assigners.created_at desc").distinct + @assigners = @assigners.order("users.id=#{current_user.id} desc").distinct + @assigners = @assigners.ransack(login_or_nickname_cont: params[:keyword]).result if params[:keyword].present? @assigners = kaminary_select_paginate(@assigners) end end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/authors_controller.rb b/app/controllers/api/v1/issues/authors_controller.rb index 8a5dbcdce..d0242a517 100644 --- a/app/controllers/api/v1/issues/authors_controller.rb +++ b/app/controllers/api/v1/issues/authors_controller.rb @@ -5,6 +5,7 @@ class Api::V1::Issues::AuthorsController < Api::V1::BaseController def index @authors = User.joins(issues: :project).where(projects: {id: @project&.id}) @authors = @authors.order("users.id=#{current_user.id} desc").distinct + @authors = @authors.ransack(login_or_nickname_cont: params[:keyword]).result if params[:keyword].present? @authors = kaminary_select_paginate(@authors) end end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/issue_priorities_controller.rb b/app/controllers/api/v1/issues/issue_priorities_controller.rb index d26d8f3a8..319994a28 100644 --- a/app/controllers/api/v1/issues/issue_priorities_controller.rb +++ b/app/controllers/api/v1/issues/issue_priorities_controller.rb @@ -4,6 +4,7 @@ class Api::V1::Issues::IssuePrioritiesController < Api::V1::BaseController def index @priorities = IssuePriority.order(position: :asc) + @priorities = @priorities.ransack(name_cont: params[:keyword]).result if params[:keyword] @priorities = kaminary_select_paginate(@priorities) end end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 3fa46a4da..63d8fb605 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -1,13 +1,42 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController - before_action :require_public_and_member_above, only: [:index] + before_action :require_public_and_member_above, only: [:index, :create, :update, :destroy] def index @issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}") + @issue_tags = @issue_tags.ransack(name_cont: params[:keyword]).result if params[:keyword].present? if params[:only_name] @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color)) else - @issue_tags = kaminari_paginate(@issue_tags) + @issue_tags = kaminari_paginate(@issue_tags.includes(:project, :user)) + end + end + + def create + @issue_tag = @project.issue_tags.new(issue_tag_params) + if @issue_tag.save! + render_ok + else + render_error("创建标记失败！") + end + end + + before_action :load_issue_tag, only: [:update, :destroy] + + def update + @issue_tag.attributes = issue_tag_params + if @issue_tag.save! + render_ok + else + render_error("更新标记失败！") + end + end + + def destroy + if @issue_tag.destroy! + render_ok + else + render_error("删除标记失败！") end end @@ -24,4 +53,12 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController order_direction = %w(desc asc).include?(order_direction) ? order_direction : "desc" order_direction end + + def issue_tag_params + params.permit(:name, :description, :color) + end + + def load_issue_tag + @issue_tag = @project.issue_tags.find_by_id(params[:id]) + end end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index f25ec498c..bb5033904 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -8,6 +8,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController else @milestones = @project.versions.includes(:issues) end + @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? @milestones = kaminary_select_paginate(@milestones) end diff --git a/app/controllers/api/v1/issues/statues_controller.rb b/app/controllers/api/v1/issues/statues_controller.rb index 0e9eff43f..5a7fbc338 100644 --- a/app/controllers/api/v1/issues/statues_controller.rb +++ b/app/controllers/api/v1/issues/statues_controller.rb @@ -5,6 +5,7 @@ class Api::V1::Issues::StatuesController < Api::V1::BaseController # 状态列表 def index @statues = IssueStatus.order("position asc") + @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present? @statues = kaminary_select_paginate(@statues) end end \ No newline at end of file diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index bf2368654..2c62117d0 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -24,5 +24,6 @@ class IssueTag < ApplicationRecord has_many :issue_tags_relates, dependent: :destroy has_many :issues, through: :issue_tags_relates belongs_to :project, optional: true, counter_cache: true + belongs_to :user, optional: true end diff --git a/app/services/users/register_service.rb b/app/services/users/register_service.rb index bb984477f..bb3b3ada1 100644 --- a/app/services/users/register_service.rb +++ b/app/services/users/register_service.rb @@ -12,7 +12,7 @@ class Users::RegisterService < ApplicationService namespace = strip(@namespace) password = strip(@password) - # Rails.logger.info "Users::RegisterService params: ##### #{params} " + Rails.logger.info "Users::RegisterService params: ##### #{params} " email, phone = if register_type == 1 diff --git a/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder new file mode 100644 index 000000000..644badf3e --- /dev/null +++ b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder @@ -0,0 +1,17 @@ +json.(tag, :name, :description, :color, :issues_count) +json.project do + if tag.project.present? + json.partial! "api/v1/projects/simple_detail", project: tag.project + else + json.nil! + end +end +json.user do + if tag.user.present? + json.partial! "api/v1/users/simple_user", user: tag.user + else + json.nil! + end +end +json.created_at tag.created_at.strftime("%Y-%m-%d %H:%M") +json.updated_at tag.updated_at.strftime("%Y-%m-%d %H:%M") \ No newline at end of file diff --git a/app/views/api/v1/issues/issue_tags/index.json.jbuilder b/app/views/api/v1/issues/issue_tags/index.json.jbuilder index 548cd1b40..0bd055b57 100644 --- a/app/views/api/v1/issues/issue_tags/index.json.jbuilder +++ b/app/views/api/v1/issues/issue_tags/index.json.jbuilder @@ -2,5 +2,7 @@ json.total_count @issue_tags.total_count json.issue_tags @issue_tags.each do |tag| if params[:only_name] json.partial! "simple_detail", locals: {tag: tag} + else + json.partial! "detail", locals: {tag: tag} end end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index bf79cb16c..15ebc44f1 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -32,7 +32,7 @@ defaults format: :json do end end scope module: :issues do - resources :issue_tags, only: [:index] + resources :issue_tags, except: [:new, :edit] resources :milestones, except: [:new, :edit] resources :issue_statues, only: [:index], controller: '/api/v1/issues/statues' resources :issue_authors, only: [:index], controller: '/api/v1/issues/authors' From b85913e4850b2e5fd5bf73444c8eca0de08f7361 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 17 Feb 2023 16:11:39 +0800 Subject: [PATCH 016/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=96=91?= =?UTF-8?q?=E4=BF=AE=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E3=80=81=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=96=91=E4=BF=AE=E6=97=A0=E6=B3=95=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/journals_controller.rb | 39 ++++ app/controllers/api/v1/issues_controller.rb | 51 +++-- app/models/journal.rb | 78 +++++++ .../api/v1/issues/batch_delete_service.rb | 13 +- app/services/api/v1/issues/create_service.rb | 19 +- app/services/api/v1/issues/delete_service.rb | 12 +- .../api/v1/issues/journals/create_service.rb | 48 ++++ .../api/v1/issues/journals/list_service.rb | 52 +++++ app/services/api/v1/issues/list_service.rb | 1 - app/services/api/v1/issues/update_service.rb | 213 +++++++++++------- app/services/application_service.rb | 9 + app/views/api/v1/issues/index.json.jbuilder | 4 +- .../journals/_children_detail.json.jbuilder | 17 ++ .../v1/issues/journals/_detail.json.jbuilder | 20 ++ .../v1/issues/journals/create.json.jbuilder | 1 + .../v1/issues/journals/index.json.jbuilder | 4 + config/routes/api.rb | 8 + 17 files changed, 448 insertions(+), 141 deletions(-) create mode 100644 app/controllers/api/v1/issues/journals_controller.rb create mode 100644 app/services/api/v1/issues/journals/create_service.rb create mode 100644 app/services/api/v1/issues/journals/list_service.rb create mode 100644 app/views/api/v1/issues/journals/_children_detail.json.jbuilder create mode 100644 app/views/api/v1/issues/journals/_detail.json.jbuilder create mode 100644 app/views/api/v1/issues/journals/create.json.jbuilder create mode 100644 app/views/api/v1/issues/journals/index.json.jbuilder diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb new file mode 100644 index 000000000..c3185a755 --- /dev/null +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -0,0 +1,39 @@ +class Api::V1::Issues::JournalsController < Api::V1::IssuesController + + before_action :require_public_and_member_above, only: [:index, :create, :destroy] + before_action :load_issue, only: [:index, :create, :destroy] + before_action :load_journal, only: [:destroy] + + def index + @object_results = Api::V1::Issues::Journals::ListService.call(@issue, query_params, current_user) + @journals = kaminari_paginate(@object_results) + end + + def create + @object_result = Api::V1::Issues::Journals::CreateService.call(@issue, journal_params, current_user) + end + + def destroy + if @journal.destroy! + render_ok + else + render_error("删除评论失败！") + end + end + + private + + def query_params + params.permit(:category, :keyword, :sort_by, :sort_direction) + end + + def journal_params + params.permit(:notes, :parent_id, :attachment_ids => []) + end + + def load_journal + @journal = @issue.journals.find_by_id(params[:id]) + return render_not_found("评论不存在！") unless @journal.present? + end + +end \ No newline at end of file diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 567ef6b3b..d1f8a83a1 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -4,6 +4,9 @@ class Api::V1::IssuesController < Api::V1::BaseController def index @object_results = Api::V1::Issues::ListService.call(@project, query_params, current_user) + @opened_issues_count = @object_results.opened.size + @closed_issues_count = @object_results.closed.size + @issues = kaminari_paginate(@object_results) end @@ -49,6 +52,31 @@ class Api::V1::IssuesController < Api::V1::BaseController end end + protected + + def load_issue + @issue = @project.issues.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || Issue.find_by_id(params[:id]) + if @issue.blank? + render_not_found("疑修不存在!") + elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) + render_forbidden("您没有权限操作！") + end + end + + def load_issues + return render_error("请输入正确的ID数组！") unless params[:ids].is_a?(Array) + params[:ids].each do |id| + @issue = Issue.find_by_id(id) + if @issue.blank? + return render_not_found("ID为#{id}的疑修不存在!") + elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) + return render_forbidden("ID为#{id}的疑修您没有权限操作！") + end + end + @issues = Issue.where(id: params[:ids]) + end + + private def query_params @@ -79,27 +107,4 @@ class Api::V1::IssuesController < Api::V1::BaseController :issue_tag_ids => [], :assigner_ids => []) end - - def load_issue - @issue = @project.issues.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || Issue.find_by_id(params[:id]) - if @issue.blank? - render_not_found("疑修不存在!") - elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) - render_forbidden("您没有权限操作！") - end - end - - def load_issues - return render_error("请输入正确的ID数组！") unless params[:ids].is_a?(Array) - params[:ids].each do |id| - @issue = Issue.find_by_id(id) - if @issue.blank? - return render_not_found("ID为#{id}的疑修不存在!") - elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) - return render_forbidden("ID为#{id}的疑修您没有权限操作！") - end - end - @issues = Issue.where(id: params[:ids]) - end - end \ No newline at end of file diff --git a/app/models/journal.rb b/app/models/journal.rb index 20297dd99..382ebd017 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -40,8 +40,11 @@ class Journal < ApplicationRecord belongs_to :journalized, polymorphic: true belongs_to :review, optional: true belongs_to :resolveer, class_name: 'User', foreign_key: :resolveer_id, optional: true + belongs_to :parent_journal, class_name: 'Journal', foreign_key: :parent_id, optional: true + belongs_to :reply_journal, class_name: 'Journal', foreign_key: :reply_id, optional: true has_many :journal_details, :dependent => :delete_all has_many :attachments, as: :container, dependent: :destroy + has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(10)}, class_name: 'Journal', foreign_key: :parent_id has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id scope :journal_includes, ->{includes(:user, :journal_details, :attachments)} @@ -54,6 +57,81 @@ class Journal < ApplicationRecord self.notes.blank? && self.journal_details.present? end + def operate_content + content = "" + detail = self.journal_details.take + case detail.property + when 'issue' + return "创建了疑修" + when 'attachment' + old_value = Attachment.where(id: detail.old_value.split(",")).pluck(:filename).join("、") + new_value = Attachment.where(id: detail.value.split(",")).pluck(:filename).join("、") + if old_value.nil? || old_value.blank? + content += "添加了#{new_value}附件" + else + new_value = "无" if new_value.blank? + content += "将附件由#{old_value}更改为#{new_value}" + end + when 'issue_tag' + old_value = IssueTag.where(id: detail.old_value.split(",")).pluck(:name, :color).map{|t| "#{t[0]}"}.join(" ") + new_value = IssueTag.where(id: detail.value.split(",")).pluck(:name, :color).map{|t| "#{t[0]}"}.join(" ") + if old_value.nil? || old_value.blank? + content += "添加了#{new_value}标记" + else + new_value = "无" if new_value.blank? + content += "将标记由#{old_value}更改为#{new_value}" + end + when 'assigner' + old_value = User.where(id: detail.old_value.split(",")).pluck(:nickname).join("、") + new_value = User.where(id: detail.value.split(",")).pluck(:nickname).join("、") + if old_value.nil? || old_value.blank? + content += "添加负责人#{new_value}" + else + new_value = "无" if new_value.blank? + content += "将负责人由#{old_value}更改为#{new_value}" + end + when 'attr' + content = "将" + case detail.prop_key + when 'subject' + return "修改了标题" + when 'description' + return "修改了描述" + when 'status_id' + old_value = IssueStatus.find_by_id(detail.old_value)&.name + new_value = IssueStatus.find_by_id(detail.value)&.name + content += "状态" + when 'priority_id' + old_value = IssuePriority.find_by_id(detail.old_value)&.name + new_value = IssuePriority.find_by_id(detail.value)&.name + content += "优先级" + when 'fixed_version_id' + old_value = Version.find_by_id(detail.old_value)&.name + new_value = Version.find_by_id(detail.value)&.name + content += "里程碑" + when 'branch_name' + old_value = detail.old_value + new_value = detail.value + content += "关联分支" + when 'start_date' + old_value = detail.old_value + new_value = detail.value + content += "开始日期" + when 'due_date' + old_value = detail.old_value + new_value = detail.value + content += "结束日期" + end + if old_value.nil? || old_value.blank? + content += "设置为#{new_value}" + else + new_value = "无" if new_value.blank? + content += "由#{old_value}更改为#{new_value}" + end + end + + end + def journal_content send_details = [] if self.is_journal_detail? diff --git a/app/services/api/v1/issues/batch_delete_service.rb b/app/services/api/v1/issues/batch_delete_service.rb index 133f098cd..45821b373 100644 --- a/app/services/api/v1/issues/batch_delete_service.rb +++ b/app/services/api/v1/issues/batch_delete_service.rb @@ -13,7 +13,7 @@ class Api::V1::Issues::BatchDeleteService < ApplicationService def call raise Error, errors.full_messages.join(", ") unless valid? - try_lock # 开始写数据，加锁 + try_lock("Api::V1::Issues::DeleteService:#{project.id}") # 开始写数据，加锁 delete_issues @@ -25,7 +25,7 @@ class Api::V1::Issues::BatchDeleteService < ApplicationService end end - unlock + unlock("Api::V1::Issues::DeleteService:#{project.id}") return true end @@ -35,13 +35,4 @@ class Api::V1::Issues::BatchDeleteService < ApplicationService def delete_issues raise Error, "批量删除疑修失败！" unless @issues.destroy_all end - - def try_lock - raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::BatchDeleteService:#{project.id}", 1, nx: true, ex: 60.seconds) - end - - def unlock - $redis_cache.del("Api::V1::Issues::BatchDeleteService:#{project.id}") - end - end \ No newline at end of file diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index e87745950..f5d9c7fa6 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -43,10 +43,11 @@ class Api::V1::Issues::CreateService < ApplicationService load_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? load_atme_receivers(receivers_login) unless receivers_login.blank? - try_lock # 开始写数据，加锁 + try_lock("Api::V1::Issues::CreateService:#{project.id}") # 开始写数据，加锁 @created_issue = Issue.new(issue_attributes) build_author_participants build_assigner_participants unless assigner_ids.blank? + build_atme_participants if @atme_receivers.present? build_issue_journal_details build_issue_project_trends @created_issue.attachments = @attachments unless attachment_ids.blank? @@ -64,7 +65,7 @@ class Api::V1::Issues::CreateService < ApplicationService SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) end - unlock # 结束写数据，解锁 + unlock("Api::V1::Issues::CreateService:#{project.id}") # 结束写数据，解锁 end return @created_issue @@ -104,6 +105,12 @@ class Api::V1::Issues::CreateService < ApplicationService end end + def build_atme_participants + atme_receivers.each do |receiver| + @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) + end + end + def build_issue_project_trends @created_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: "create"}) @created_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE}) if status_id.to_i == 5 @@ -113,12 +120,4 @@ class Api::V1::Issues::CreateService < ApplicationService journal = @created_issue.journals.new({user_id: current_user.id}) journal.journal_details.new({property: "issue", prop_key: 1, old_value: '', value: ''}) end - - def try_lock - raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::CreateService:#{project.id}", 1, nx: true, ex: 60.seconds) - end - - def unlock - $redis_cache.del("Api::V1::Issues::CreateService:#{project.id}") - end end \ No newline at end of file diff --git a/app/services/api/v1/issues/delete_service.rb b/app/services/api/v1/issues/delete_service.rb index e6429390e..a34fdced6 100644 --- a/app/services/api/v1/issues/delete_service.rb +++ b/app/services/api/v1/issues/delete_service.rb @@ -13,7 +13,7 @@ class Api::V1::Issues::DeleteService < ApplicationService def call raise Error, errors.full_messages.join(", ") unless valid? - try_lock # 开始写数据，加锁 + try_lock("Api::V1::Issues::DeleteService:#{project.id}") # 开始写数据，加锁 delete_issue @@ -23,7 +23,7 @@ class Api::V1::Issues::DeleteService < ApplicationService SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id) end - unlock + unlock("Api::V1::Issues::DeleteService:#{project.id}") return true end @@ -34,12 +34,4 @@ class Api::V1::Issues::DeleteService < ApplicationService raise Error, "删除疑修失败！" unless issue.destroy! end - def try_lock - raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::DeleteService:#{project.id}", 1, nx: true, ex: 60.seconds) - end - - def unlock - $redis_cache.del("Api::V1::Issues::DeleteService:#{project.id}") - end - end \ No newline at end of file diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb new file mode 100644 index 000000000..6fe096426 --- /dev/null +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -0,0 +1,48 @@ +class Api::V1::Issues::Journals::CreateService < ApplicationService + include ActiveModel::Model + + attr_reader :issue, :current_user, :notes, :parent_id, :attachment_ids + + validates :issue, :current_user, presence: true + + def initialize(issue, params, current_user=nil) + @issue = issue + @notes = params[:notes] + @parent_id = params[:parent_id] + @attachment_ids = params[:attachment_ids] + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + ActiveRecord::Base.transaction do + check_attachments(attachment_ids) unless attachment_ids.blank? + load_attachments(attachment_ids) unless attachment_ids.blank? + + try_lock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") + @created_journal = Journal.new(journal_attributes) + + build_comment_participants + @created_journal.attachments = @attachments + + @created_journal.save! + unlock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") + end + end + + private + + def journal_attributes + journal_attributes = { + notes: notes + } + + journal_attributes.merge!({parent_id: parent_id}) if parent_id.present? + + journal_attributes + end + + def build_comment_participants + @issue.issue_participants.new({participant_type: "commented", participant_id: current_user.id}) unless @issue.issue_participants.exists?(participant_type: "commented", participant_id: current_user.id) + end +end \ No newline at end of file diff --git a/app/services/api/v1/issues/journals/list_service.rb b/app/services/api/v1/issues/journals/list_service.rb new file mode 100644 index 000000000..02f709e55 --- /dev/null +++ b/app/services/api/v1/issues/journals/list_service.rb @@ -0,0 +1,52 @@ +class Api::V1::Issues::Journals::ListService < ApplicationService + + include ActiveModel::Model + + attr_reader :issue, :category, :keyword, :sort_by, :sort_direction + attr_accessor :queried_journals + + validates :category, inclusion: {in: %w(all comment operate), message: "请输入正确的Category"} + validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'}, allow_blank: true + validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true + + def initialize(issue, params, current_user=nil) + @issue = issue + @keyword = params[:keyword] + @category = params[:category] || 'all' + @sort_by = params[:sort_by].present? ? params[:sort_by] : 'created_on' + @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'asc').downcase + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + begin + journal_query_data + + @queried_journals + rescue + raise Error, "服务器错误，请联系系统管理员！" + end + end + + private + def journal_query_data + + @queried_journals = issue.journals + + case category + when 'comment' + @queried_journals = issue.comment_journals + when 'operate' + @queried_journals = issue.operate_journals + end + + @queried_journals = @queried_journals.parent_journals + + @queried_journals = @queried_journals.ransack(notes_cont: keyword).result if keyword.present? + + @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, first_ten_children_journals: [:parent_journal, :reply_journal]) + @queried_journals = @queried_journals.reorder("journals.#{sort_by} #{sort_direction}").distinct + + @queried_journals + end +end \ No newline at end of file diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index a5609bb62..6383a6e12 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -79,7 +79,6 @@ class Api::V1::Issues::ListService < ApplicationService scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) - scope = scope.reorder("issues.#{sort_by} #{sort_direction}").distinct @queried_issues = scope diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 3084e78a9..8abc6aae4 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -6,7 +6,7 @@ class Api::V1::Issues::UpdateService < ApplicationService attr_reader :project, :issue, :current_user attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids, :receivers_login - attr_accessor :add_assigner_ids, :previous_issue_changes, :updated_issue + attr_accessor :add_assigner_ids, :previous_issue_changes, :updated_issue, :atme_receivers validates :project, :issue, :current_user, presence: true @@ -40,23 +40,29 @@ class Api::V1::Issues::UpdateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.blank? check_attachments(attachment_ids) unless attachment_ids.blank? check_atme_receivers(receivers_login) unless receivers_login.blank? - load_assigners(assigner_ids) unless assigner_ids.blank? - load_attachments(attachment_ids) unless attachment_ids.blank? - load_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? + load_assigners(assigner_ids) + load_attachments(attachment_ids) + load_issue_tags(issue_tag_ids) load_atme_receivers(receivers_login) unless receivers_login.blank? - try_lock + try_lock("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}") @updated_issue = @issue issue_load_attributes - build_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 + build_assigner_issue_journal_details unless assigner_ids.nil?# 操作记录 + build_attachment_issue_journal_details unless attachment_ids.nil? + build_issue_tag_issue_journal_details unless issue_tag_ids.nil? build_issue_project_trends if status_id.present? # 开关时间记录 - build_assigner_participants unless assigner_ids.blank? # 负责人 - @updated_issue.assigners = @assigners unless assigner_ids.blank? - @updated_issue.attachments = @attachments unless attachment_ids.blank? - @updated_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? + build_assigner_participants unless assigner_ids.nil? # 负责人 + build_edit_participants + build_atme_participants if @atme_receivers.present? + @updated_issue.assigners = @assigners || User.none unless assigner_ids.nil? + @updated_issue.attachments = @attachments || Attachment.none unless attachment_ids.nil? + @updated_issue.issue_tags = @issue_tags || IssueTag.none unless issue_tag_ids.nil? + @updated_issue.updated_on = Time.now @updated_issue.save! + build_after_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 build_previous_issue_changes # @信息发送 @@ -67,7 +73,7 @@ class Api::V1::Issues::UpdateService < ApplicationService SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id, add_assigner_ids) unless add_assigner_ids.blank? end - unlock + unlock("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}") return @updated_issue end @@ -87,108 +93,147 @@ class Api::V1::Issues::UpdateService < ApplicationService end def build_assigner_participants - @updated_issue.issue_participants.where(participant_type: "assigned").where.not(participant_id: assigner_ids).each(&:destroy!) - assigner_ids.each do |aid| - next if @updated_issue.issue_participants.exists?(participant_type: "assigned", participant_id: aid) - @updated_issue.issue_participants.new({participant_type: "assigned", participant_id: aid}) - @add_assigner_ids << aid + if assigner_ids.blank? + @updated_issue.issue_participants.where(participant_type: "assigned").each(&:destroy!) + else + @updated_issue.issue_participants.where(participant_type: "assigned").where.not(participant_id: assigner_ids).each(&:destroy!) + assigner_ids.each do |aid| + next if @updated_issue.issue_participants.exists?(participant_type: "assigned", participant_id: aid) + @updated_issue.issue_participants.new({participant_type: "assigned", participant_id: aid}) + @add_assigner_ids << aid + end + end + end + + def build_edit_participants + @updated_issue.issue_participants.new({participant_type: "edited", participant_id: current_user.id}) unless @updated_issue.issue_participants.exists?(participant_type: "edited", participant_id: current_user.id) + end + + def build_atme_participants + atme_receivers.each do |receiver| + next if @updated_issue.issue_participants.exists?(participant_type: "atme", participant_id: receiver.id) + @updated_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end def build_previous_issue_changes @previous_issue_changes = @updated_issue.previous_changes.except("updated_on", "created_on") - if @updated_issue.previous_changes[:start_date].present? - @previous_issue_changes.merge!(start_date: [@updated_issue.previous_changes[:start_date][0].to_s, @updated_issue.previous_changes[:start_date][1].to_s]) + if @updated_issue.previous_changes["start_date"].present? + @previous_issue_changes.merge!(start_date: [@updated_issue.previous_changes["start_date"][0].to_s, @updated_issue.previous_changes["start_date"][1].to_s]) end - if @updated_issue.previous_changes[:due_date].present? - @previous_issue_changes.merge!(due_date: [@updated_issue.previous_changes[:due_date][0].to_s, @updated_issue.previous_changes[:due_date][1].to_s]) + if @updated_issue.previous_changes["due_date"].present? + @previous_issue_changes.merge!(due_date: [@updated_issue.previous_changes["due_date"][0].to_s, @updated_issue.previous_changes["due_date"][1].to_s]) end end def build_issue_project_trends - if @updated_issue.previous_changes[:status_id].present? && @updated_issue.previous_changes[:status_id][1] == 5 + if @updated_issue.previous_changes["status_id"].present? && @updated_issue.previous_changes["status_id"][1] == 5 @updated_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE}) end - if @updated_issue.previous_changes[:status_id].present? && @updated_issue.previous_changes[:status_id][0] == 5 + if @updated_issue.previous_changes["status_id"].present? && @updated_issue.previous_changes["status_id"][0] == 5 @updated_issue.project_trends.where(action_type: ProjectTrend::CLOSE).each(&:destroy!) end end - def build_issue_journal_details - # 更改标题 - if @updated_issue.previous_changes[:subject].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "subject", old_value: @updated_issue.previous_changes[:subject][0], value: @updated_issue.previous_changes[:subject][1]}) - end + def build_after_issue_journal_details + begin + # 更改标题 + if @updated_issue.previous_changes["subject"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "subject", old_value: @updated_issue.previous_changes["subject"][0], value: @updated_issue.previous_changes["subject"][1]}) + end - # 更改描述 - if @updated_issue.previous_changes[:description].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "description", old_value: @updated_issue.previous_changes[:description][0], value: @updated_issue.previous_changes[:description][1]}) - end + # 更改描述 + if @updated_issue.previous_changes["description"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "description", old_value: @updated_issue.previous_changes["description"][0], value: @updated_issue.previous_changes["description"][1]}) + end - # 修改状态 - if @updated_issue.previous_changes[:status_id].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "status_id", old_value: @updated_issue.previous_changes[:status_id][0], value: @updated_issue.previous_changes[:status_id][1]}) - end + # 修改状态 + if @updated_issue.previous_changes["status_id"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "status_id", old_value: @updated_issue.previous_changes["status_id"][0], value: @updated_issue.previous_changes["status_id"][1]}) + end - # 修改优先级 - if @updated_issue.previous_changes[:priority_id].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "priority_id", old_value: @updated_issue.previous_changes[:priority_id][0], value: @updated_issue.previous_changes[:priority_id][1]}) - end + # 修改优先级 + if @updated_issue.previous_changes["priority_id"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "priority_id", old_value: @updated_issue.previous_changes["priority_id"][0], value: @updated_issue.previous_changes["priority_id"][1]}) + end - # 修改里程碑 - if @updated_issue.previous_changes[:fixed_version_id].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "fixed_version_id", old_value: @updated_issue.previous_changes[:fixed_version_id][0], value: @updated_issue.previous_changes[:fixed_version_id][1]}) - end + # 修改里程碑 + if @updated_issue.previous_changes["fixed_version_id"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "fixed_version_id", old_value: @updated_issue.previous_changes["fixed_version_id"][0], value: @updated_issue.previous_changes["fixed_version_id"][1]}) + end - # 更改分支 - if @updated_issue.previous_changes[:branch_name].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "branch_name", old_value: @updated_issue.previous_changes[:branch_name][0], value: @updated_issue.previous_changes[:branch_name][1]}) - end + # 更改分支 + if @updated_issue.previous_changes["branch_name"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "branch_name", old_value: @updated_issue.previous_changes["branch_name"][0], value: @updated_issue.previous_changes["branch_name"][1]}) + end - # 更改开始时间 - if @updated_issue.previous_changes[:start_date].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "start_date", old_value: @updated_issue.previous_changes[:start_date][0], value: @updated_issue.previous_changes[:start_date][1]}) - end + # 更改开始时间 + if @updated_issue.previous_changes["start_date"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "start_date", old_value: @updated_issue.previous_changes["start_date"][0], value: @updated_issue.previous_changes["start_date"][1]}) + end - # 更改结束时间 - if @updated_issue.previous_changes[:due_date].present? - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attr", prop_key: "due_date", old_value: @updated_issue.previous_changes[:due_date][0], value: @updated_issue.previous_changes[:due_date][1]}) - end - - # 更改负责人 - if !@updated_issue.assigners.pluck(:id).sort! == assigner_ids.sort! - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "assigner", prop_key: "#{assigner_ids.size}", old_value: @updated_issue.assigners.pluck(:nickname).join(","), value: @assigners.pluck(:nickname).join(",")}) - end - - # 更改标记 - if !@updated_issue.issue_tags.pluck(:id).sort! == issue_tag_ids.sort! - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "issue_tag", prop_key: "#{issue_tag_ids.size}", old_value: @updated_issue.issue_tags.pluck(:name).join(","), value: @issue_tags.pluck(:name).join(",")}) - end - - # 更改附件 - if !@updated_issue.attachments.pluck(:id).sort! == attachment_ids.sort! - journal = @updated_issue.journals.new({user_id: current_user.id}) - journal.journal_details.new({property: "attachment", prop_key: "#{attachment_ids.size}", old_value: @updated_issue.attachments.pluck(:filename).join(","), value: @attachments.pluck(:filename).join(",")}) + # 更改结束时间 + if @updated_issue.previous_changes["due_date"].present? + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "due_date", old_value: @updated_issue.previous_changes["due_date"][0], value: @updated_issue.previous_changes["due_date"][1]}) + end + rescue + raise Error, "创建操作记录失败!" end end - def try_lock - raise Error, "请稍后再试！" unless $redis_cache.set("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}", 1, nx: true, ex: 60.seconds) + def build_assigner_issue_journal_details + begin + # 更改负责人 + new_assigner_ids = @assigner_ids + new_assigner_ids = [] if @assigner_ids.nil? + now_assigner_ids = @updated_issue.assigners.pluck(:id) + if !(now_assigner_ids & assigner_ids).empty? || !(now_assigner_ids.empty? && new_assigner_ids.empty?) + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "assigner", prop_key: "#{new_assigner_ids.size}", old_value: now_assigner_ids.join(","), value: new_assigner_ids.join(",")}) + end + + rescue + raise Error, "创建操作记录失败!" + end end - def unlock - $redis_cache.del("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}") + def build_issue_tag_issue_journal_details + begin + # 更改标记 + new_issue_tag_ids = @issue_tag_ids + new_issue_tag_ids = [] if @issue_tag_ids.nil? + now_issue_tag_ids = @updated_issue.issue_tags.pluck(:id) + if !(now_issue_tag_ids & new_issue_tag_ids).empty? || !(now_issue_tag_ids.empty? && new_issue_tag_ids.empty?) + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "issue_tag", prop_key: "#{new_issue_tag_ids.size}", old_value: now_issue_tag_ids.join(","), value: new_issue_tag_ids.join(",")}) + end + rescue + raise Error, "创建操作记录失败!" + end end + + def build_attachment_issue_journal_details + begin + # 更改附件 + new_attachment_ids = @attachment_ids + new_attachment_ids = [] if @attachment_ids.nil? + now_attachment_ids = @updated_issue.attachments.pluck(:id) + if !(now_attachment_ids & new_attachment_ids).empty? || !(now_attachment_ids.empty? && new_attachment_ids.empty?) + journal = @updated_issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attachment", prop_key: "#{new_attachment_ids.size}", old_value: now_attachment_ids.join(","), value: new_attachment_ids.join(",")}) + end + rescue + raise Error, "创建操作记录失败!" + end + end end \ No newline at end of file diff --git a/app/services/application_service.rb b/app/services/application_service.rb index 2fa59ed29..93f7ed48c 100644 --- a/app/services/application_service.rb +++ b/app/services/application_service.rb @@ -9,6 +9,15 @@ class ApplicationService content.gsub(regex, '') end + protected + def try_lock(key) + raise Error, "请稍后再试！" unless $redis_cache.set(key, 1, nx: true, ex: 60.seconds) + end + + def unlock(key) + $redis_cache.del(key) + end + private def strip(str) diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index 3e820f6f4..1a324eb27 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -1,6 +1,6 @@ json.total_count @issues.total_count -json.opened_count @issues.opened.size -json.closed_count @issues.closed.size +json.opened_count @opened_issues_count +json.closed_count @closed_issues_count json.issues @issues.each do |issue| json.partial! "simple_detail", locals: {issue: issue} end \ No newline at end of file diff --git a/app/views/api/v1/issues/journals/_children_detail.json.jbuilder b/app/views/api/v1/issues/journals/_children_detail.json.jbuilder new file mode 100644 index 000000000..38bbda404 --- /dev/null +++ b/app/views/api/v1/issues/journals/_children_detail.json.jbuilder @@ -0,0 +1,17 @@ +json.(journal, :id, :notes, :comments_count) +json.created_at journal.created_on.strftime("%Y-%m-%d %H:%M") +json.updated_at journal.updated_on.strftime("%Y-%m-%d %H:%M") +json.user do + if journal.user.present? + json.partial! "api/v1/users/simple_user", user: journal.user + else + json.nil! + end +end +json.reply_user do + if journal.reply_journal&.user&.present? + json.partial! "api/v1/users/simple_user", user: journal.reply_journal.user + else + json.nil! + end +end \ No newline at end of file diff --git a/app/views/api/v1/issues/journals/_detail.json.jbuilder b/app/views/api/v1/issues/journals/_detail.json.jbuilder new file mode 100644 index 000000000..418da24a8 --- /dev/null +++ b/app/views/api/v1/issues/journals/_detail.json.jbuilder @@ -0,0 +1,20 @@ +json.id journal.id +json.is_journal_detail journal.is_journal_detail? +json.created_at journal.created_on.strftime("%Y-%m-%d %H:%M") +json.updated_at journal.updated_on.strftime("%Y-%m-%d %H:%M") +json.user do + if journal.user.present? + json.partial! "api/v1/users/simple_user", user: journal.user + else + json.nil! + end +end +if journal.is_journal_detail? + json.operate_content journal.is_journal_detail? ? journal.operate_content : nil +else + json.notes journal.notes + json.comments_count journal.comments_count + json.children_journals journal.first_ten_children_journals.each do |journal| + json.partial! "children_detail", journal: journal + end +end diff --git a/app/views/api/v1/issues/journals/create.json.jbuilder b/app/views/api/v1/issues/journals/create.json.jbuilder new file mode 100644 index 000000000..91f3f3174 --- /dev/null +++ b/app/views/api/v1/issues/journals/create.json.jbuilder @@ -0,0 +1 @@ +json.partial! "detail", journal: @object_result \ No newline at end of file diff --git a/app/views/api/v1/issues/journals/index.json.jbuilder b/app/views/api/v1/issues/journals/index.json.jbuilder new file mode 100644 index 000000000..bea6746a6 --- /dev/null +++ b/app/views/api/v1/issues/journals/index.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @journals.total_count +json.journals @journals do |journal| + json.partial! "detail", journal: journal +end \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index 15ebc44f1..6c9b3dcdf 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -30,6 +30,14 @@ defaults format: :json do patch :batch_update delete :batch_destroy end + + member do + resources :journals, module: :issues, only: [:index, :create, :update, :destroy] do + member do + get :children_journals + end + end + end end scope module: :issues do resources :issue_tags, except: [:new, :edit] From df38df45d5427097fa0ed953591f6ca4d41615cc Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 17 Feb 2023 17:24:27 +0800 Subject: [PATCH 017/133] =?UTF-8?q?fixed=20=E5=90=91jianmu=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=97=B6=E9=A1=B9=E7=9B=AE=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=97=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/open_project_dev_ops_job.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/jobs/open_project_dev_ops_job.rb b/app/jobs/open_project_dev_ops_job.rb index 64115f25f..b3fe99e6f 100644 --- a/app/jobs/open_project_dev_ops_job.rb +++ b/app/jobs/open_project_dev_ops_job.rb @@ -5,6 +5,7 @@ class OpenProjectDevOpsJob < ApplicationJob def perform(project_id, user_id) project = Project.find_by(id: project_id) + return if project.blank? user = User.find_by(id: user_id) code = jianmu_devops_code(project, user) uri = URI.parse("#{jianmu_devops_url}/activate?code=#{URI.encode_www_form_component(code)}") From 15d71bfd24afe4e10297a8889389e993fb4d3d41 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 17 Feb 2023 17:40:09 +0800 Subject: [PATCH 018/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index f5d9c7fa6..ffc08eb96 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -39,6 +39,7 @@ class Api::V1::Issues::CreateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.blank? check_attachments(attachment_ids) unless attachment_ids.blank? check_atme_receivers(receivers_login) unless receivers_login.blank? + load_assigners(assigner_ids) unless assigner_ids.blank? load_attachments(attachment_ids) unless attachment_ids.blank? load_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? load_atme_receivers(receivers_login) unless receivers_login.blank? @@ -50,6 +51,7 @@ class Api::V1::Issues::CreateService < ApplicationService build_atme_participants if @atme_receivers.present? build_issue_journal_details build_issue_project_trends + @created_issue.assigners = @assigners unless assigner_ids.blank? @created_issue.attachments = @attachments unless attachment_ids.blank? @created_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? From c63a86a797059320b22f3939735a099c12dbf99e Mon Sep 17 00:00:00 2001 From: yystopf Date: Sat, 18 Feb 2023 23:23:33 +0800 Subject: [PATCH 019/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E8=A1=A5=E8=B6=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/journals_controller.rb | 19 ++++++--- app/models/journal.rb | 2 +- .../api/v1/issues/concerns/checkable.rb | 3 ++ .../issues/journals/children_list_service.rb | 42 +++++++++++++++++++ .../api/v1/issues/journals/create_service.rb | 21 +++++++--- .../api/v1/issues/journals/update_service.rb | 37 ++++++++++++++++ .../journals/children_journals.json.jbuilder | 4 ++ .../v1/issues/journals/update.json.jbuilder | 1 + 8 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 app/services/api/v1/issues/journals/children_list_service.rb create mode 100644 app/services/api/v1/issues/journals/update_service.rb create mode 100644 app/views/api/v1/issues/journals/children_journals.json.jbuilder create mode 100644 app/views/api/v1/issues/journals/update.json.jbuilder diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index c3185a755..55e820611 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -1,8 +1,8 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController - before_action :require_public_and_member_above, only: [:index, :create, :destroy] - before_action :load_issue, only: [:index, :create, :destroy] - before_action :load_journal, only: [:destroy] + before_action :require_public_and_member_above, only: [:index, :create, :children_journals, :update, :destroy] + before_action :load_issue, only: [:index, :create, :children_journals, :update, :destroy] + before_action :load_journal, only: [:children_journals, :update, :destroy] def index @object_results = Api::V1::Issues::Journals::ListService.call(@issue, query_params, current_user) @@ -13,6 +13,15 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController @object_result = Api::V1::Issues::Journals::CreateService.call(@issue, journal_params, current_user) end + def children_journals + @object_results = Api::V1::Issues::Journals::ChildrenListService.call(@issue, @journal, query_params, current_user) + @journals = kaminari_paginate(@object_results) + end + + def update + @object_result = Api::V1::Issues::Journals::UpdateService.call(@issue, @journal, journal_params, current_user) + end + def destroy if @journal.destroy! render_ok @@ -28,11 +37,11 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController end def journal_params - params.permit(:notes, :parent_id, :attachment_ids => []) + params.permit(:notes, :parent_id, :reply_id, :attachment_ids => []) end def load_journal - @journal = @issue.journals.find_by_id(params[:id]) + @journal = Journal.find_by_id(params[:id]) return render_not_found("评论不存在！") unless @journal.present? end diff --git a/app/models/journal.rb b/app/models/journal.rb index 382ebd017..6472d559d 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -40,7 +40,7 @@ class Journal < ApplicationRecord belongs_to :journalized, polymorphic: true belongs_to :review, optional: true belongs_to :resolveer, class_name: 'User', foreign_key: :resolveer_id, optional: true - belongs_to :parent_journal, class_name: 'Journal', foreign_key: :parent_id, optional: true + belongs_to :parent_journal, class_name: 'Journal', foreign_key: :parent_id, optional: true, counter_cache: :comments_count belongs_to :reply_journal, class_name: 'Journal', foreign_key: :reply_id, optional: true has_many :journal_details, :dependent => :delete_all has_many :attachments, as: :container, dependent: :destroy diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb index 8ac03f053..d013c3033 100644 --- a/app/services/api/v1/issues/concerns/checkable.rb +++ b/app/services/api/v1/issues/concerns/checkable.rb @@ -42,4 +42,7 @@ module Api::V1::Issues::Concerns::Checkable end end + def check_parent_journal(parent_id) + raise ApplicationService::Error, "ParentJournal不存在！" unless Journal.find_by_id(parent_id).present? + end end diff --git a/app/services/api/v1/issues/journals/children_list_service.rb b/app/services/api/v1/issues/journals/children_list_service.rb new file mode 100644 index 000000000..d46f9fbbe --- /dev/null +++ b/app/services/api/v1/issues/journals/children_list_service.rb @@ -0,0 +1,42 @@ +class Api::V1::Issues::Journals::ChildrenListService < ApplicationService + + include ActiveModel::Model + + attr_reader :issue, :journal, :keyword, :sort_by, :sort_direction + attr_accessor :queried_journals + + validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'}, allow_blank: true + validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true + + + def initialize(issue, journal, params, current_user=nil) + @issue = issue + @journal = journal + @keyword = params[:keyword] + @sort_by = params[:sort_by].present? ? params[:sort_by] : 'created_on' + @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'asc').downcase + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + begin + journal_query_data + + return @queried_journals + rescue + raise Error, "服务器错误，请联系系统管理员！" + + end + end + + private + def journal_query_data + @queried_journals = journal.children_journals + + @queried_journals = @queried_journals.ransack(notes_cont: keyword).result if keyword.present? + @queried_journals = @queried_journals.includes(:user, :attachments, :reply_journal) + @queried_journals = @queried_journals.reorder("journals.#{sort_by} #{sort_direction}").distinct + + @queried_journals + end +end \ No newline at end of file diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index 6fe096426..6bd2479d9 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -1,32 +1,41 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService include ActiveModel::Model + include Api::V1::Issues::Concerns::Checkable + include Api::V1::Issues::Concerns::Loadable - attr_reader :issue, :current_user, :notes, :parent_id, :attachment_ids + attr_reader :issue, :current_user, :notes, :parent_id, :reply_id, :attachment_ids + attr_accessor :created_journal - validates :issue, :current_user, presence: true + validates :notes, :issue, :current_user, presence: true def initialize(issue, params, current_user=nil) @issue = issue @notes = params[:notes] @parent_id = params[:parent_id] + @reply_id = params[:reply_id] @attachment_ids = params[:attachment_ids] @current_user = current_user end def call raise Error, errors.full_messages.join(", ") unless valid? + raise Error, "请输入回复的评论ID" if parent_id.present? && !reply_id.present? ActiveRecord::Base.transaction do + check_parent_journal(parent_id) if parent_id.present? + check_parent_journal(reply_id) if reply_id.present? check_attachments(attachment_ids) unless attachment_ids.blank? load_attachments(attachment_ids) unless attachment_ids.blank? try_lock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") - @created_journal = Journal.new(journal_attributes) + @created_journal = @issue.journals.new(journal_attributes) build_comment_participants - @created_journal.attachments = @attachments + @created_journal.attachments = @attachments unless attachment_ids.blank? @created_journal.save! unlock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") + + @created_journal end end @@ -34,10 +43,12 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService def journal_attributes journal_attributes = { - notes: notes + notes: notes, + user_id: current_user.id } journal_attributes.merge!({parent_id: parent_id}) if parent_id.present? + journal_attributes.merge!({reply_id: reply_id}) if reply_id.present? journal_attributes end diff --git a/app/services/api/v1/issues/journals/update_service.rb b/app/services/api/v1/issues/journals/update_service.rb new file mode 100644 index 000000000..321c79cdb --- /dev/null +++ b/app/services/api/v1/issues/journals/update_service.rb @@ -0,0 +1,37 @@ +class Api::V1::Issues::Journals::UpdateService < ApplicationService + include ActiveModel::Model + include Api::V1::Issues::Concerns::Checkable + include Api::V1::Issues::Concerns::Loadable + + attr_reader :issue, :journal, :current_user, :notes, :attachment_ids + attr_accessor :updated_journal + + validates :notes, :issue, :journal, :current_user, presence: true + + def initialize(issue, journal, params, current_user=nil) + @issue = issue + @journal = journal + @notes = params[:notes] + @attachment_ids = params[:attachment_ids] + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + ActiveRecord::Base.transaction do + check_attachments(attachment_ids) unless attachment_ids.blank? + load_attachments(attachment_ids) unless attachment_ids.blank? + + try_lock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}") + @updated_journal = @journal + @updated_journal.notes = notes + @updated_journal.attachments = @attachments unless attachment_ids.blank? + + @updated_journal.save! + unlock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}") + + @updated_journal + end + end + +end \ No newline at end of file diff --git a/app/views/api/v1/issues/journals/children_journals.json.jbuilder b/app/views/api/v1/issues/journals/children_journals.json.jbuilder new file mode 100644 index 000000000..c0cd04501 --- /dev/null +++ b/app/views/api/v1/issues/journals/children_journals.json.jbuilder @@ -0,0 +1,4 @@ +json.total_count @journals.total_count +json.journals @journals do |journal| + json.partial! "children_detail", journal: journal +end \ No newline at end of file diff --git a/app/views/api/v1/issues/journals/update.json.jbuilder b/app/views/api/v1/issues/journals/update.json.jbuilder new file mode 100644 index 000000000..91f3f3174 --- /dev/null +++ b/app/views/api/v1/issues/journals/update.json.jbuilder @@ -0,0 +1 @@ +json.partial! "detail", journal: @object_result \ No newline at end of file From 121fa2bff47f6faa771fc08fe900552a9792cedb Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 20 Feb 2023 11:42:22 +0800 Subject: [PATCH 020/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=87=8C?= =?UTF-8?q?=E7=A8=8B=E7=A2=91=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/milestones_controller.rb | 55 +++++++++++++---- app/models/version.rb | 10 +++- .../api/v1/issues/batch_update_service.rb | 4 +- .../milestones/detail_issues_service.rb | 59 +++++++++++++++++++ .../issues/milestones/_detail.json.jbuilder | 6 ++ .../v1/issues/milestones/index.json.jbuilder | 2 + .../v1/issues/milestones/show.json.jbuilder | 11 ++++ 7 files changed, 135 insertions(+), 12 deletions(-) create mode 100644 app/services/api/v1/issues/milestones/detail_issues_service.rb create mode 100644 app/views/api/v1/issues/milestones/_detail.json.jbuilder create mode 100644 app/views/api/v1/issues/milestones/show.json.jbuilder diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index bb5033904..79b1aa15b 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -1,32 +1,67 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController - before_action :require_public_and_member_above, only: [:index] + before_action :require_public_and_member_above + before_action :load_milestone, only: [:show, :update, :destroy] # 里程碑列表 def index if params[:only_name] - @milestones = @project.versions + @milestones = @project.versions.select(:id, :name) + @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? + @milestones = kaminary_select_paginate(@milestones) else - @milestones = @project.versions.includes(:issues) + @milestones = @project.versions.includes(:issues, :closed_issues, :opened_issues) + @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening + @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? + @milestones = kaminari_paginate(@milestones) end - @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? - @milestones = kaminary_select_paginate(@milestones) end + def create + @milestone = @project.versions.new(milestone_params) + if @milestone.save! + render_ok + else + render_error(@milestone.errors.full_messages.join(",")) + end + end + # 里程碑详情 def show - end - - def create + @object_results = Api::V1::Issues::Milestones::DetailIssuesService.call(@project, @milestone, query_params, current_user) + @closed_issues_count = @object_results.closed.size + @opened_issues_count = @object_results.opened.size + @issues = kaminari_paginate(@object_results) end def update + @milestone.attributes = milestone_params + if @milestone.save! + render_ok + else + render_error(@milestone.errors.full_messages.join(",")) + end end def destroy + if @milestone.destroy! + render_ok + else + render_error("删除里程碑失败！") + end end - private - + def milestone_params + params.permit(:name, :description, :effective_date) + end + + def query_params + params.permit(:category, :author_id, :assigner_id, :sort_by, :sort_direction, :issue_tag_ids => []) + end + + def load_milestone + @milestone = @project.versions.find_by_id(params[:id]) + return render_not_found('里程碑不存在！') unless @milestone.present? + end end \ No newline at end of file diff --git a/app/models/version.rb b/app/models/version.rb index 41256833a..fab193b96 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -28,6 +28,9 @@ class Version < ApplicationRecord has_many :issues, class_name: "Issue", foreign_key: "fixed_version_id" belongs_to :user, optional: true + has_many :opened_issues, -> {where(issue_classify: "Issue").where.not(status_id: 5)}, class_name: "Issue", foreign_key: :fixed_version_id + has_many :closed_issues, -> {where(issue_classify: "Issue", status_id: 5)}, class_name: "Issue", foreign_key: :fixed_version_id + scope :version_includes, ->{includes(:issues, :user)} scope :closed, ->{where(status: 'closed')} scope :opening, ->{where(status: 'open')} @@ -43,6 +46,11 @@ class Version < ApplicationRecord after_create :send_create_message_to_notice_system after_save :send_update_message_to_notice_system + def issue_percent + issues_total_count = opened_issues.size + closed_issues.size + issues_total_count.zero? ? 0.0 : closed_issues.size.to_f / issues_total_count + end + def version_user User.select(:login, :lastname,:firstname, :nickname)&.find_by_id(self.user_id) end @@ -53,6 +61,6 @@ class Version < ApplicationRecord end def send_update_message_to_notice_system - SendTemplateMessageJob.perform_later('ProjectMilestoneCompleted', self.id) if Site.has_notice_menu? && self.percent == 1.0 + SendTemplateMessageJob.perform_later('ProjectMilestoneCompleted', self.id) if Site.has_notice_menu? && self.issue_percent == 1.0 end end diff --git a/app/services/api/v1/issues/batch_update_service.rb b/app/services/api/v1/issues/batch_update_service.rb index ffa1ba7df..cf09650ce 100644 --- a/app/services/api/v1/issues/batch_update_service.rb +++ b/app/services/api/v1/issues/batch_update_service.rb @@ -20,7 +20,9 @@ class Api::V1::Issues::BatchUpdateService < ApplicationService raise Error, errors.full_messages.join(", ") unless valid? ActiveRecord::Base.transaction do @issues.each do |issue| - Api::V1::Issues::UpdateService.call(project, issue, params, current_user) + if issue.issue_classify == "Issue" + Api::V1::Issues::UpdateService.call(project, issue, params, current_user) + end end return true diff --git a/app/services/api/v1/issues/milestones/detail_issues_service.rb b/app/services/api/v1/issues/milestones/detail_issues_service.rb new file mode 100644 index 000000000..1328805b3 --- /dev/null +++ b/app/services/api/v1/issues/milestones/detail_issues_service.rb @@ -0,0 +1,59 @@ +class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :category, :author_id, :assigner_id, :issue_tag_ids, :sort_by, :sort_direction, :current_user + attr_accessor :queried_issues + + validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} + validates :sort_by, inclusion: {in: Issue.column_names, message: '请输入正确的SortBy'}, allow_blank: true + validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true + validates :current_user, presence: true + + def initialize(project, milestone, params, current_user=nil) + @project = project + @milestone = milestone + @category = params[:category] || 'all' + @author_id = params[:author_id] + @assigner_id = params[:assigner_id] + @issue_tag_ids = params[:issue_tag_ids] + @sort_by = params[:sort_by].present? ? params[:sort_by] : 'updated_on' + @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + begin + issue_query_data + + queried_issues + rescue + raise Error, "服务器错误，请联系系统管理员！" + end + end + + private + def issue_query_data + issues = @milestone.issues.issue_issue + + case category + when 'closed' + issues = issues.closed + when 'opened' + issues = issues.opened + end + + # author_id + issues = issues.where(author_id: author_id) if author_id.present? + + # assigner_id + issues = issues.joins(:assigners).where(users: {id: assigner_id}).or(issues.where(assigned_to_id: assigner_id)) if assigner_id.present? + + scope = issues.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) + + scope = scope.reorder("issues.#{sort_by} #{sort_direction}").distinct + + @queried_issues = scope + end + +end \ No newline at end of file diff --git a/app/views/api/v1/issues/milestones/_detail.json.jbuilder b/app/views/api/v1/issues/milestones/_detail.json.jbuilder new file mode 100644 index 000000000..a7d66ae28 --- /dev/null +++ b/app/views/api/v1/issues/milestones/_detail.json.jbuilder @@ -0,0 +1,6 @@ +json.(milestone, :id, :name, :description, :effective_date, :status) +json.issues_count milestone.opened_issues.size + milestone.closed_issues.size +json.close_issues_count milestone.closed_issues.size +json.percent milestone.issue_percent +json.created_at milestone.created_on.strftime("%Y-%m-%d %H:%M") +json.updated_on milestone.updated_on.strftime("%Y-%m-%d %H:%M") diff --git a/app/views/api/v1/issues/milestones/index.json.jbuilder b/app/views/api/v1/issues/milestones/index.json.jbuilder index 012549bd3..cea2b43b7 100644 --- a/app/views/api/v1/issues/milestones/index.json.jbuilder +++ b/app/views/api/v1/issues/milestones/index.json.jbuilder @@ -2,5 +2,7 @@ json.total_count @milestones.total_count json.milestones @milestones.each do |milestone| if params[:only_name] json.partial! "simple_detail", locals: {milestone: milestone} + else + json.partial! "detail", locals: {milestone: milestone} end end \ No newline at end of file diff --git a/app/views/api/v1/issues/milestones/show.json.jbuilder b/app/views/api/v1/issues/milestones/show.json.jbuilder new file mode 100644 index 000000000..01632e9d0 --- /dev/null +++ b/app/views/api/v1/issues/milestones/show.json.jbuilder @@ -0,0 +1,11 @@ +json.milestone do + json.partial! "detail", locals: {milestone: @milestone} +end +json.total_issues_count @issues.total_count +json.closed_issues_count @closed_issues_count +json.opened_issues_count @opened_issues_count +json.issues @issues.each do |issue| + if issue.issue_classify == "Issue" + json.partial! "api/v1/issues/simple_detail", locals: {issue: issue} + end +end \ No newline at end of file From 656d5b69b6e4e693189c76c072630d272d47da4c Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 20 Feb 2023 13:54:00 +0800 Subject: [PATCH 021/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=99=84=E4=BB=B6=E5=86=85=E5=AE=B9=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/attachments/_simple_detail.json.jbuilder | 7 +++++++ app/views/api/v1/issues/_detail.json.jbuilder | 5 ++++- .../api/v1/issues/journals/_children_detail.json.jbuilder | 3 +++ app/views/api/v1/issues/journals/_detail.json.jbuilder | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 app/views/api/v1/attachments/_simple_detail.json.jbuilder diff --git a/app/views/api/v1/attachments/_simple_detail.json.jbuilder b/app/views/api/v1/attachments/_simple_detail.json.jbuilder new file mode 100644 index 000000000..3d56eb82f --- /dev/null +++ b/app/views/api/v1/attachments/_simple_detail.json.jbuilder @@ -0,0 +1,7 @@ +json.id attachment.id +json.title attachment.title +json.filesize number_to_human_size(attachment.filesize) +json.is_pdf attachment.is_pdf? +json.url attachment.is_pdf? ? download_url(attachment,disposition:"inline") : download_url(attachment) +json.created_on attachment.created_on.strftime("%Y-%m-%d %H:%M") +json.content_type attachment.content_type diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index 82fea8098..3961270ae 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -39,4 +39,7 @@ json.participants issue.participants.distinct.each do |participant| json.partial! "api/v1/users/simple_user", locals: {user: participant} end json.comment_journals_count issue.comment_journals.size -json.operate_journals_count issue.operate_journals.size \ No newline at end of file +json.operate_journals_count issue.operate_journals.size +json.attachments issue.attachments.each do |attachment| + json.partial! "api/v1/attachments/simple_detail", locals: {attachment: attachment} +end \ No newline at end of file diff --git a/app/views/api/v1/issues/journals/_children_detail.json.jbuilder b/app/views/api/v1/issues/journals/_children_detail.json.jbuilder index 38bbda404..3fbb438b3 100644 --- a/app/views/api/v1/issues/journals/_children_detail.json.jbuilder +++ b/app/views/api/v1/issues/journals/_children_detail.json.jbuilder @@ -14,4 +14,7 @@ json.reply_user do else json.nil! end +end +json.attachments journal.attachments.each do |attachment| + json.partial! "api/v1/attachments/simple_detail", locals: {attachment: attachment} end \ No newline at end of file diff --git a/app/views/api/v1/issues/journals/_detail.json.jbuilder b/app/views/api/v1/issues/journals/_detail.json.jbuilder index 418da24a8..7e8232bdc 100644 --- a/app/views/api/v1/issues/journals/_detail.json.jbuilder +++ b/app/views/api/v1/issues/journals/_detail.json.jbuilder @@ -17,4 +17,7 @@ else json.children_journals journal.first_ten_children_journals.each do |journal| json.partial! "children_detail", journal: journal end + json.attachments journal.attachments do |attachment| + json.partial! "api/v1/attachments/simple_detail", locals: {attachment: attachment} + end end From cb3bb23e7918159e14f7b928e7db160524e1c4b7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 20 Feb 2023 16:47:19 +0800 Subject: [PATCH 022/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/base_controller.rb | 1 - .../api/v1/issues/issue_tags_controller.rb | 3 ++- app/controllers/api/v1/issues/journals_controller.rb | 5 +++++ .../api/v1/issues/milestones_controller.rb | 3 ++- app/controllers/api/v1/issues_controller.rb | 12 +++++++----- .../api/v1/projects/collaborators_controller.rb | 2 +- app/views/api/v1/issues/show.json.jbuilder | 1 + 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index 771adcc05..c6a4f180d 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -52,7 +52,6 @@ class Api::V1::BaseController < ApplicationController # 具有仓库的操作权限或者fork仓库的操作权限 def require_operate_above_or_fork_project @project = load_project - puts !current_user.admin? && !@project.operator?(current_user) && !(@project.fork_project.present? && @project.fork_project.operator?(current_user)) return render_forbidden if !current_user.admin? && !@project.operator?(current_user) && !(@project.fork_project.present? && @project.fork_project.operator?(current_user)) end diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 63d8fb605..7038ddcae 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -1,6 +1,7 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController - before_action :require_public_and_member_above, only: [:index, :create, :update, :destroy] + before_action :require_public_and_member_above, only: [:index] + before_action :require_operate_above, only: [:create, :update, :destroy] def index @issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}") diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index 55e820611..cd0996277 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -3,6 +3,7 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController before_action :require_public_and_member_above, only: [:index, :create, :children_journals, :update, :destroy] before_action :load_issue, only: [:index, :create, :children_journals, :update, :destroy] before_action :load_journal, only: [:children_journals, :update, :destroy] + before_action :check_journal_operate_permission, only: [:update, :destroy] def index @object_results = Api::V1::Issues::Journals::ListService.call(@issue, query_params, current_user) @@ -45,4 +46,8 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController return render_not_found("评论不存在！") unless @journal.present? end + def check_journal_operate_permission + return render_forbidden("您没有操作权限！") unless current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user || @journal.user == current_user) + end + end \ No newline at end of file diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 79b1aa15b..3bbbbdefa 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -1,5 +1,6 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController - before_action :require_public_and_member_above + before_action :require_public_and_member_above, only: [:index, :show] + before_action :require_operate_above, only: [:create, :update, :destroy] before_action :load_milestone, only: [:show, :update, :destroy] # 里程碑列表 diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index d1f8a83a1..562a360dc 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -1,6 +1,8 @@ class Api::V1::IssuesController < Api::V1::BaseController - before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy, :batch_update, :batch_destroy] + before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy] + before_action :require_operate_above, only: [:batch_update, :batch_destroy] + before_action :check_issue_operate_permission, only: [:update, :destroy] def index @object_results = Api::V1::Issues::ListService.call(@project, query_params, current_user) @@ -17,6 +19,7 @@ class Api::V1::IssuesController < Api::V1::BaseController before_action :load_issue, only: [:show, :update, :destroy] def show + @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user) end def update @@ -58,8 +61,6 @@ class Api::V1::IssuesController < Api::V1::BaseController @issue = @project.issues.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || Issue.find_by_id(params[:id]) if @issue.blank? render_not_found("疑修不存在!") - elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) - render_forbidden("您没有权限操作！") end end @@ -69,13 +70,14 @@ class Api::V1::IssuesController < Api::V1::BaseController @issue = Issue.find_by_id(id) if @issue.blank? return render_not_found("ID为#{id}的疑修不存在!") - elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?) - return render_forbidden("ID为#{id}的疑修您没有权限操作！") end end @issues = Issue.where(id: params[:ids]) end + def check_issue_operate_permission + return render_forbidden("您没有操作权限！") unless current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user) + end private diff --git a/app/controllers/api/v1/projects/collaborators_controller.rb b/app/controllers/api/v1/projects/collaborators_controller.rb index 67a96378e..cd9002a99 100644 --- a/app/controllers/api/v1/projects/collaborators_controller.rb +++ b/app/controllers/api/v1/projects/collaborators_controller.rb @@ -3,7 +3,7 @@ class Api::V1::Projects::CollaboratorsController < Api::V1::BaseController before_action :require_public_and_member_above, only: [:index] def index - @collaborators = @project.all_collaborators.ransack(name_or_login_cont: params[:keyword]).result + @collaborators = @project.all_collaborators.like(params[:keyword]) @collaborators = kaminary_select_paginate(@collaborators) end diff --git a/app/views/api/v1/issues/show.json.jbuilder b/app/views/api/v1/issues/show.json.jbuilder index 8746417b5..55028fc64 100644 --- a/app/views/api/v1/issues/show.json.jbuilder +++ b/app/views/api/v1/issues/show.json.jbuilder @@ -1 +1,2 @@ json.partial! "api/v1/issues/detail", locals: {issue: @issue} +json.user_permission @user_permission From 465761875336542e1bed6bb602226d9116b15cf7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 20 Feb 2023 17:25:07 +0800 Subject: [PATCH 023/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AErake=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue_status.rb | 17 +++++- app/models/issue_tag.rb | 20 +++++++ lib/tasks/fix_issue_project_issues_index.rake | 22 -------- lib/tasks/upgrade_issue_generate_data.rake | 53 +++++++++++++++++++ 4 files changed, 89 insertions(+), 23 deletions(-) delete mode 100644 lib/tasks/fix_issue_project_issues_index.rake create mode 100644 lib/tasks/upgrade_issue_generate_data.rake diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index a58346ea7..819313866 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -20,10 +20,25 @@ class IssueStatus < ApplicationRecord ADD = 1 SOLVING = 2 SOLVED = 3 - FEEDBACK = 4 + # FEEDBACK = 4 CLOSED = 5 REJECTED = 6 has_many :issues belongs_to :project, optional: true + + def self.init_data + map = { + "1" => "新增", + "2" => "正在解决", + "3" => "已解决", + "5" => "关闭", + "6" => "拒绝" + } + IssueStatus.order(id: :asc).each do |stat| + next if map[stat.id] == stat.name + Issue.where(status_id: stat.id).each{|i| i.update_column(:status_id, 1)} + stat.destroy! + end + end end diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index 2c62117d0..b111ad2db 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -26,4 +26,24 @@ class IssueTag < ApplicationRecord belongs_to :project, optional: true, counter_cache: true belongs_to :user, optional: true + def self.init_data(project_id) + data = [ + ["缺陷", "表示项目存在问题", "#d92d4c"], + ["功能", "表示新功能申请", "#ee955a"], + ["疑问", "表示存在的问题", "#2d6ddc"], + ["支持", "表示特定功能或特定需求", "#019549"], + ["任务", "表示需要分配的任务", "#01a30d"], + ["协助", "表示需要社区用户协助", "#2a0dc1"], + ["搁置", "表示此问题不会继续处理", "#892794"], + ["文档", "表示文档材料补充", "#9ed600"], + ["测试", "表示需要测试的需求", "#2897b9"], + ["重复", "表示已存在类似的疑修", "#bb5332"] + ] + data.each do |item| + next if IssueTag.exists?(project_id: project_id, name: item[0]) + IssueTag.create!(project_id: project_id, name: item[0], description: item[1], color: item[2]) + end + end + + end diff --git a/lib/tasks/fix_issue_project_issues_index.rake b/lib/tasks/fix_issue_project_issues_index.rake deleted file mode 100644 index 010df5f4b..000000000 --- a/lib/tasks/fix_issue_project_issues_index.rake +++ /dev/null @@ -1,22 +0,0 @@ -# 执行示例 bundle exec rake sync_version_issues:update_issues -# 线上环境执行示例 RAILS_ENV=production bundle exec rake sync_version_issues:update_issues - -namespace :fix_issue_project_issues_index do - desc "update issue project_issues_index" - - task update_issues: :environment do - puts "____________fix start________________" - - Issue.update_all(project_issues_index: nil) - - Issue.where(project_issues_index: nil).group(:project_id).count.each do |pid, count| - p = Project.find_by_id(pid) - issues = p.issues.order(created_on: :asc) - issues.find_each.with_index do |issue, index| - issue.update_column(:project_issues_index, index+1) - end - end - puts "____________fix end________________" - end - -end \ No newline at end of file diff --git a/lib/tasks/upgrade_issue_generate_data.rake b/lib/tasks/upgrade_issue_generate_data.rake new file mode 100644 index 000000000..47cfb145d --- /dev/null +++ b/lib/tasks/upgrade_issue_generate_data.rake @@ -0,0 +1,53 @@ + + +namespace :upgrade_issue_generate_data do + # 执行示例 bundle exec rake upgrade_issue_generate_data:project_issues_index + # 线上环境执行示例 RAILS_ENV=production bundle exec rake upgrade_issue_generate_data:project_issues_index + desc "upgrade_issue_generate_data: fix issue project_issues_index" + + task project_issues_index: :environment do + puts "____________fix start________________" + + Issue.update_all(project_issues_index: nil) + count = 0 + Issue.where(project_issues_index: nil).group(:project_id).count.each do |pid, count| + p = Project.find_by_id(pid) + issues = p.issues.order(created_on: :asc) + issues.find_each.with_index do |issue, index| + count += 1 + issue.update_column(:project_issues_index, index+1) + end + end + puts "____________fix end_______total:#{count}_________" + end + + # 执行示例 bundle exec rake upgrade_issue_generate_data:project_init_issue_tags_and_status + # 线上环境执行示例 RAILS_ENV=production bundle exec rake upgrade_issue_generate_data:project_init_issue_tags_and_status + desc "upgrade_issue_generate_data: fix project init issue_tags" + + task project_init_issue_tags_and_status: :environment do + puts "____________fix start________________" + IssueStatus.init_data + IssueTag.where(user_id: nil).destroy_all + count = 0 + Project.order(created_at: :desc).find_each do |project| + count += 1 + IssueTag.init_data(project.id) + end + puts "____________fix end____total:#{count}__________" + end + + # 执行示例 bundle exec rake upgrade_issue_generate_data:move_assigned_to_id_to_assigners + # 线上环境执行示例 RAILS_ENV=production bundle exec rake upgrade_issue_generate_data:move_assigned_to_id_to_assigners + desc "upgrade_issue_generate_data: fix issue assigner to assigners" + + task move_assigned_to_id_to_assigners: :environment do + puts "____________fix start________________" + count = 0 + Issue.where.not(assigned_to_id: nil).find_each do |issue| + count += 1 + issue.assigners = User.where(id: issue.assigned_to_id) + end + puts "____________fix end____total:#{count}__________" + end +end \ No newline at end of file From 02526878fe91db9ff20d15d9116806196f283473 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 20 Feb 2023 18:22:14 +0800 Subject: [PATCH 024/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=A0=E6=B3=95=E8=AE=BE=E7=BD=AE=E7=A9=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 1 + app/models/issue_status.rb | 9 ++++++--- app/services/api/v1/issues/update_service.rb | 10 +++++----- app/services/projects/create_service.rb | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 562a360dc..93de448af 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -5,6 +5,7 @@ class Api::V1::IssuesController < Api::V1::BaseController before_action :check_issue_operate_permission, only: [:update, :destroy] def index + IssueTag.init_data(@project.id) if @project.issue_tags.size < 10 @object_results = Api::V1::Issues::ListService.call(@project, query_params, current_user) @opened_issues_count = @object_results.opened.size @closed_issues_count = @object_results.closed.size diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index 819313866..eb4db1dcc 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -36,9 +36,12 @@ class IssueStatus < ApplicationRecord "6" => "拒绝" } IssueStatus.order(id: :asc).each do |stat| - next if map[stat.id] == stat.name - Issue.where(status_id: stat.id).each{|i| i.update_column(:status_id, 1)} - stat.destroy! + if map[stat.id] == stat.name + IssueStatus.find_or_create_by(id: stat.id, name: stat.name) + else + Issue.where(status_id: stat.id).each{|i| i.update_column(:status_id, 1)} + stat.destroy! + end end end end diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 8abc6aae4..597880eb3 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -84,12 +84,12 @@ class Api::V1::Issues::UpdateService < ApplicationService def issue_load_attributes @updated_issue.status_id = status_id if status_id.present? @updated_issue.priority_id = priority_id if priority_id.present? - @updated_issue.fixed_version_id = milestone_id if milestone_id.present? - @updated_issue.branch_name = branch_name if branch_name.present? - @updated_issue.start_date = start_date if start_date.present? - @updated_issue.due_date = due_date if due_date.present? + @updated_issue.fixed_version_id = milestone_id unless milestone_id.nil? + @updated_issue.branch_name = branch_name unless branch_name.nil? + @updated_issue.start_date = start_date unless start_date.nil? + @updated_issue.due_date = due_date unless due_date.nil? @updated_issue.subject = subject if subject.present? - @updated_issue.description = description if description.present? + @updated_issue.description = description unless description.nil? end def build_assigner_participants diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 2b4523bf5..ff36dfe52 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -14,6 +14,7 @@ class Projects::CreateService < ApplicationService ActiveRecord::Base.transaction do if @project.save! Project.update_common_projects_count! + IssueTag.init_data(@project.id) ProjectUnit.init_types(@project.id) Repositories::CreateService.new(user, @project, repository_params).call upgrade_project_category_private_projects_count From b18051ec31dc19e3ed429568b444873656091958 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 21 Feb 2023 13:55:40 +0800 Subject: [PATCH 025/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=87=8C?= =?UTF-8?q?=E7=A8=8B=E7=A2=91=E7=9B=B8=E5=85=B3=E6=95=B0=E9=87=8F=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/milestones_controller.rb | 20 ++++++++++++++----- .../issues/milestones/_detail.json.jbuilder | 1 + .../v1/issues/milestones/index.json.jbuilder | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 3bbbbdefa..4de6dffbf 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -5,14 +5,16 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController # 里程碑列表 def index + @milestones = @project.versions + @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? + @closed_milestone_count = @milestones.closed.size + @opening_milestone_count = @milestones.opening.size + @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening if params[:only_name] - @milestones = @project.versions.select(:id, :name) - @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? + @milestones = @milestones.select(:id, :name) @milestones = kaminary_select_paginate(@milestones) else - @milestones = @project.versions.includes(:issues, :closed_issues, :opened_issues) - @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening - @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? + @milestones = @milestones.includes(:issues, :closed_issues, :opened_issues) @milestones = kaminari_paginate(@milestones) end end @@ -65,4 +67,12 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController return render_not_found('里程碑不存在！') unless @milestone.present? end + def sort_by + Version.columns.include?(params.fetch(:sort_by, "created_on")) ? params.fetch(:sort_by, "created_on") : "created_on" + end + + def sort_direction + %w(desc asc).include?(params.fetch(:sort_direction, "updated_on")) ? params.fetch(:sort_direction, "updated_on") : "updated_on" + end + end \ No newline at end of file diff --git a/app/views/api/v1/issues/milestones/_detail.json.jbuilder b/app/views/api/v1/issues/milestones/_detail.json.jbuilder index a7d66ae28..b71f41c7e 100644 --- a/app/views/api/v1/issues/milestones/_detail.json.jbuilder +++ b/app/views/api/v1/issues/milestones/_detail.json.jbuilder @@ -1,5 +1,6 @@ json.(milestone, :id, :name, :description, :effective_date, :status) json.issues_count milestone.opened_issues.size + milestone.closed_issues.size +json.opened_issues_count milestone.opened_issues.size json.close_issues_count milestone.closed_issues.size json.percent milestone.issue_percent json.created_at milestone.created_on.strftime("%Y-%m-%d %H:%M") diff --git a/app/views/api/v1/issues/milestones/index.json.jbuilder b/app/views/api/v1/issues/milestones/index.json.jbuilder index cea2b43b7..38623d2b4 100644 --- a/app/views/api/v1/issues/milestones/index.json.jbuilder +++ b/app/views/api/v1/issues/milestones/index.json.jbuilder @@ -1,3 +1,5 @@ +json.closed_milestone_count @closed_milestone_count +json.opening_milestone_count @opening_milestone_count json.total_count @milestones.total_count json.milestones @milestones.each do |milestone| if params[:only_name] From cab5466ae4f04c9311606ea5936c6e61c45e5c7b Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 21 Feb 2023 15:31:00 +0800 Subject: [PATCH 026/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8E=92=E8=A1=8C=E6=A6=9C=E9=A1=B9=E7=9B=AE=E9=9C=80?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/projects_rank/index.html.erb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/admins/projects_rank/index.html.erb b/app/views/admins/projects_rank/index.html.erb index 056e0a0da..d3a7926b7 100644 --- a/app/views/admins/projects_rank/index.html.erb +++ b/app/views/admins/projects_rank/index.html.erb @@ -19,15 +19,15 @@ 排名 - 项目 - 得分 - 访问数 - 关注数 - 点赞数 - fork数 - 疑修数 - 合并请求数 - 提交数 + 项目 + 得分 + 访问数 + 关注数 + 点赞数 + fork数 + 疑修数 + 合并请求数 + 提交数 @@ -38,7 +38,7 @@ <% owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id"]}")%> /<%= project_common["identifier"]%>"> - <%= project_common["name"] %> + <%= "#{owner_common["name"]}/#{project_common["name"]}" %> From 3a5d8e75df408ac987a29b5d68e75b0718ef50bb Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 21 Feb 2023 15:39:52 +0800 Subject: [PATCH 027/133] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86sidebar=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/shared/_sidebar.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index 88ba91205..5e6cb4d24 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -15,9 +15,9 @@
  • <%= sidebar_item(admins_path, '概览', icon: 'dashboard', controller: 'admins-dashboards') %>
  • - <%= sidebar_item_group('#user-submenu', '排行榜', icon: 'user') do %> + <%= sidebar_item_group('#rank-submenu', '排行榜', icon: 'calendar') do %>
  • <%= sidebar_item(admins_users_rank_index_path, '用户排行榜', icon: 'user', controller: 'admins-users_rank') %>
    • -
  • <%= sidebar_item(admins_projects_rank_index_path, '项目排行榜', icon: 'user', controller: 'admins-projects_rank') %>
    • +
  • <%= sidebar_item(admins_projects_rank_index_path, '项目排行榜', icon: 'database', controller: 'admins-projects_rank') %>
    • <% end %>
  • From 47a5fe24c8ce0b386db5f049f586e8c3dbafd7c2 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 21 Feb 2023 16:43:28 +0800 Subject: [PATCH 028/133] =?UTF-8?q?=E8=B0=83=E6=95=B4Bot=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3,fixed=E6=B3=A8=E5=86=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/installations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/installations_controller.rb b/app/controllers/installations_controller.rb index 20dd25e40..3379af47c 100644 --- a/app/controllers/installations_controller.rb +++ b/app/controllers/installations_controller.rb @@ -37,7 +37,7 @@ class InstallationsController < ApplicationController # 注册bot对应oauth应用 Doorkeeper::Application.create!(name: @bot.name, uid: @bot.client_id, secret: @bot.client_secret, redirect_uri: "https://gitlink.org.cn") # 注册bot对应用户 - result = autologin_register(User.generate_user_login('b'), nil, "#{SecureRandom.hex(6)}", 'bot', nickname: @bot.name) + result = autologin_register(User.generate_user_login('b'), nil, "#{SecureRandom.hex(6)}", 'bot', nil, nickname: @bot.name) tip_exception(-1, result[:message]) if result[:message].present? @bot.uid = result[:user][:id] @bot.save From 311776a00414f6b7cff8da424e8744591b235e35 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 21 Feb 2023 18:30:29 +0800 Subject: [PATCH 029/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=88=97=E8=A1=A8=E6=97=A0id=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/issues/issue_tags/_detail.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder index 644badf3e..332e47373 100644 --- a/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder +++ b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder @@ -1,4 +1,4 @@ -json.(tag, :name, :description, :color, :issues_count) +json.(tag,:id, :name, :description, :color, :issues_count) json.project do if tag.project.present? json.partial! "api/v1/projects/simple_detail", project: tag.project From b9e2a3736c40ecd7fbdc1ebc104b994c5757ca73 Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Tue, 21 Feb 2023 17:38:09 +0800 Subject: [PATCH 030/133] admins org list --- .../javascripts/admins/organizations.js | 2 + .../stylesheets/admins/organizations.scss | 3 ++ .../admins/organizations_controller.rb | 23 ++++++++ app/helpers/admins/organizations_helper.rb | 2 + app/models/organization.rb | 51 ++++++++++++++++++ .../admins/delete_organization_service.rb | 28 ++++++++++ app/views/admins/organizations/edit.html.erb | 41 ++++++++++++++ app/views/admins/organizations/index.html.erb | 8 +++ app/views/admins/organizations/index.js.erb | 1 + .../admins/organizations/index.json.jbuilder | 6 +++ .../organizations/shared/_org_list.html.erb | 45 ++++++++++++++++ .../shared/_project_list.html.erb | 53 +++++++++++++++++++ app/views/admins/organizations/show.html.erb | 38 +++++++++++++ app/views/admins/shared/_sidebar.html.erb | 3 +- config/routes.rb | 2 +- .../admins/organizations_controller_spec.rb | 5 ++ .../admins/organizations_helper_spec.rb | 15 ++++++ 17 files changed, 324 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/admins/organizations.js create mode 100644 app/assets/stylesheets/admins/organizations.scss create mode 100644 app/controllers/admins/organizations_controller.rb create mode 100644 app/helpers/admins/organizations_helper.rb create mode 100644 app/services/admins/delete_organization_service.rb create mode 100644 app/views/admins/organizations/edit.html.erb create mode 100644 app/views/admins/organizations/index.html.erb create mode 100644 app/views/admins/organizations/index.js.erb create mode 100644 app/views/admins/organizations/index.json.jbuilder create mode 100644 app/views/admins/organizations/shared/_org_list.html.erb create mode 100644 app/views/admins/organizations/shared/_project_list.html.erb create mode 100644 app/views/admins/organizations/show.html.erb create mode 100644 spec/controllers/admins/organizations_controller_spec.rb create mode 100644 spec/helpers/admins/organizations_helper_spec.rb diff --git a/app/assets/javascripts/admins/organizations.js b/app/assets/javascripts/admins/organizations.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/admins/organizations.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. diff --git a/app/assets/stylesheets/admins/organizations.scss b/app/assets/stylesheets/admins/organizations.scss new file mode 100644 index 000000000..a3cf9ca1f --- /dev/null +++ b/app/assets/stylesheets/admins/organizations.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admins/organizations controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/admins/organizations_controller.rb b/app/controllers/admins/organizations_controller.rb new file mode 100644 index 000000000..4e40a509e --- /dev/null +++ b/app/controllers/admins/organizations_controller.rb @@ -0,0 +1,23 @@ +class Admins::OrganizationsController < Admins::BaseController + before_action :finder_org, except: [:index] + + def index + @orgs = paginate Organization.all + end + + def show + end + + def destroy + @org.destroy! + Admins::DeleteOrganizationService.call(@org.login) + render_delete_success + end + + private + + def finder_org + @org = Organization.find(params[:id]) + end + +end diff --git a/app/helpers/admins/organizations_helper.rb b/app/helpers/admins/organizations_helper.rb new file mode 100644 index 000000000..0265ab1e4 --- /dev/null +++ b/app/helpers/admins/organizations_helper.rb @@ -0,0 +1,2 @@ +module Admins::OrganizationsHelper +end diff --git a/app/models/organization.rb b/app/models/organization.rb index adf43a2cd..17eb28918 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -144,6 +144,57 @@ class Organization < Owner end end + def projects_count + Project.where( user_id: self.id).count + end + + # 用户账号状态 + def active? + status == User::STATUS_ACTIVE + end + + def registered? + status == User::STATUS_REGISTERED + end + + def locked? + status == User::STATUS_LOCKED + end + + def need_edit_info? + status == User::STATUS_EDIT_INFO + end + + def activate + self.status = User::STATUS_ACTIVE + end + + def register + self.status = User::STATUS_REGISTERED + end + + def lock + self.status = User::STATUS_LOCKED + end + + def need_edit_info + self.status = User::STATUS_EDIT_INFO + end + + def activate! + update_attribute(:status, STATUS_ACTIVE) + prohibit_gitea_user_login!(false) + end + + def register! + update_attribute(:status, STATUS_REGISTERED) + end + + def lock! + update_attribute(:status, STATUS_LOCKED) + prohibit_gitea_user_login! + end + def real_name name = lastname + firstname name = name.blank? ? (nickname.blank? ? login : nickname) : name diff --git a/app/services/admins/delete_organization_service.rb b/app/services/admins/delete_organization_service.rb new file mode 100644 index 000000000..db842845b --- /dev/null +++ b/app/services/admins/delete_organization_service.rb @@ -0,0 +1,28 @@ +class Admins::DeleteOrganizationService < Gitea::ClientService + attr_reader :token, :name + + def initialize(name) + @name = name + end + + def call + response = delete(url, params) + render_status(response) + end + + private + def params + Hash.new.merge(token: token) + end + + def url + "/orgs/#{name}".freeze + end + + def token + { + username: GiteaService.gitea_config[:access_key_id], + password: GiteaService.gitea_config[:access_key_secret] + } + end +end diff --git a/app/views/admins/organizations/edit.html.erb b/app/views/admins/organizations/edit.html.erb new file mode 100644 index 000000000..0cc9909f0 --- /dev/null +++ b/app/views/admins/organizations/edit.html.erb @@ -0,0 +1,41 @@ +<% + define_admin_breadcrumbs do + add_admin_breadcrumb('组织管理', admins_organizations_path) + add_admin_breadcrumb('组织详情') + end +%> + +
    + + + <%= simple_form_for(@org, url: admins_organization_path(@org)) do |f| %> + +
    基本信息
    +
    +
    + <%= f.input :login, label: '登录名', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-11', value: @org.login } %> +
    + +
    + <%= f.input :lastname, label: '姓名', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-md-11', value: @org.real_name } %> +
    + + +
    + +
    + <%= f.button :submit, value: '保存', class: 'btn-primary mr-3 px-4' %> + <%= link_to '取消', admins_organizations_path, class: 'btn btn-secondary px-4' %> +
    + <% end %> +
    diff --git a/app/views/admins/organizations/index.html.erb b/app/views/admins/organizations/index.html.erb new file mode 100644 index 000000000..7c96b57ee --- /dev/null +++ b/app/views/admins/organizations/index.html.erb @@ -0,0 +1,8 @@ +<% define_admin_breadcrumbs do %> + <% add_admin_breadcrumb('组织管理', admins_organizations_path) %> +<% end %> + +
    + <%= render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } %> +
    + diff --git a/app/views/admins/organizations/index.js.erb b/app/views/admins/organizations/index.js.erb new file mode 100644 index 000000000..7e750ecf9 --- /dev/null +++ b/app/views/admins/organizations/index.js.erb @@ -0,0 +1 @@ +$('.users-list-container').html("<%= j( render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } ) %>"); \ No newline at end of file diff --git a/app/views/admins/organizations/index.json.jbuilder b/app/views/admins/organizations/index.json.jbuilder new file mode 100644 index 000000000..1278c3c13 --- /dev/null +++ b/app/views/admins/organizations/index.json.jbuilder @@ -0,0 +1,6 @@ +json.count @orgs.total_count +json.orgs do + json.array! @orgs.each do |org| + json.extract! org, :id, :login, :nickname + end +end \ No newline at end of file diff --git a/app/views/admins/organizations/shared/_org_list.html.erb b/app/views/admins/organizations/shared/_org_list.html.erb new file mode 100644 index 000000000..b8fac30d0 --- /dev/null +++ b/app/views/admins/organizations/shared/_org_list.html.erb @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + <% if organizations.present? %> + <% organizations.each_with_index do |org, index| %> + + + + + + + + + + <% end %> + <% else %> + <%= render 'admins/shared/no_data_for_table' %> + <% end %> + +
    序号login昵称<%= sort_tag('创建于', name: 'created_on', path: admins_organizations_path) %><%= sort_tag('最后登录', name: 'last_login_on', path: admins_organizations_path) %>项目数操作
    <%= list_index_no((params[:page] || 1).to_i, index) %> + <%= link_to "/#{org.login}", target: '_blank' do %> + <%= overflow_hidden_span org.login, width: 100 %> + <% end %> + <%= org.nickname %> <%= display_text(org.created_on&.strftime('%Y-%m-%d %H:%M')) %><%= display_text(org.last_login_on&.strftime('%Y-%m-%d %H:%M')) %><%= link_to org.projects_count, "/#{org.login}", target: "_blank" %> + <%= link_to '查看', admins_organization_path(org), class: 'action' %> +
    + <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %> +
    + + <%= delete_link '删除', admins_organization_path(org, element: ".user-item-#{org.id}"), class: 'dropdown-item delete-user-action' %> +
    +
    +
    + +<%= render partial: 'admins/shared/paginate', locals: { objects: organizations } %> diff --git a/app/views/admins/organizations/shared/_project_list.html.erb b/app/views/admins/organizations/shared/_project_list.html.erb new file mode 100644 index 000000000..e828938ff --- /dev/null +++ b/app/views/admins/organizations/shared/_project_list.html.erb @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + <% if projects.present? %> + <% projects.each_with_index do |project, index| %> + + + + + + + + + + + + + + + + <% end %> + <% else %> + <%= render 'admins/shared/no_data_for_table' %> + <% end %> + +
    序号ID项目名称公开推荐Issues资源Pulls里程碑成员管理员<%= sort_tag('创建时间', name: 'created_on', path: admins_projects_path) %>操作
    <%= list_index_no((params[:page] || 1).to_i, index) %><%= project.id %> + <%= link_to(project.name, "/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %> + <%= project.is_public ? '√' : '' %><%= project.recommend ? '√' : '' %><%= project.issues.size %><%= project.attachments.size %><%= project&.pull_requests_count %><%= project.versions.size %><%= project.members.size %> + <%= link_to_project(project) %> + <%= project.created_on&.strftime('%Y-%m-%d %H:%M') %> + <% if project.is_public %> + <%= javascript_void_link '推荐', class: 'action recommend-action', data: { id: project.id }, style: project.recommend ? 'display: none;' : '' %> + <%= javascript_void_link '取消推荐', class: 'action unrecommend-action', data: { id: project.id }, style: project.recommend ? '' : 'display: none;' %> + <%= link_to "设置推荐等级", edit_admins_project_path(project.id), remote: true, class: "action edit-recommend-action", style: project.recommend ? '' : 'display: none;' %> + <% end %> + <%= link_to "删除", admins_project_path(project.id), method: :delete, data:{confirm: "确认删除的吗？"}, class: "delete-project-action" %> +
    \ No newline at end of file diff --git a/app/views/admins/organizations/show.html.erb b/app/views/admins/organizations/show.html.erb new file mode 100644 index 000000000..b40f1c258 --- /dev/null +++ b/app/views/admins/organizations/show.html.erb @@ -0,0 +1,38 @@ +<% + define_admin_breadcrumbs do + add_admin_breadcrumb('组织管理', admins_organizations_path) + add_admin_breadcrumb('组织详情') + end +%> + +
    + + + <%= simple_form_for(@org, url: admins_organization_path(@org)) do |f| %> + +
    基本信息
    +
    +
    + <%= f.input :login, label: '登录名', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-11', value: @org.login } %> +
    + +
    + <%= f.input :lastname, label: '姓名', wrapper_html: { class: 'col-md-3' }, input_html: { readonly: true, class: 'col-md-11', value: @org.real_name } %> +
    + + +
    + <% end %> +

    组织项目

    + <%= render partial: 'admins/organizations/shared/project_list', locals: { projects: @org.projects } %> + +
    diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index dc2d2944e..e1199f787 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -15,7 +15,7 @@
    • <%= sidebar_item(admins_path, '概览', icon: 'dashboard', controller: 'admins-dashboards') %>
    • - <%= sidebar_item_group('#rank-submenu', '排行榜', icon: 'calendar') do %> + <%= sidebar_item_group('#user-rank-submenu', '排行榜', icon: 'calendar') do %>
    • <%= sidebar_item(admins_users_rank_index_path, '用户排行榜', icon: 'user', controller: 'admins-users_rank') %>
    • <%= sidebar_item(admins_projects_rank_index_path, '项目排行榜', icon: 'database', controller: 'admins-projects_rank') %>
      • <% end %> @@ -23,6 +23,7 @@
    • <%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
    • <%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %>
      • +
    • <%= sidebar_item(admins_organizations_path, '组织列表', icon: 'user', controller: 'admins-organization') %>
      • <% end %>
    • diff --git a/config/routes.rb b/config/routes.rb index 3d6cc8f55..3488bacb4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -816,7 +816,7 @@ Rails.application.routes.draw do resources :school_statistics, only: [:index] do get :contrast, on: :collection end - + resources :organizations, only: [:index, :edit, :show, :destroy] resources :users, only: [:index, :edit, :update, :destroy] do member do post :reward_grade diff --git a/spec/controllers/admins/organizations_controller_spec.rb b/spec/controllers/admins/organizations_controller_spec.rb new file mode 100644 index 000000000..a0df61f17 --- /dev/null +++ b/spec/controllers/admins/organizations_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Admins::OrganizationsController, type: :controller do + +end diff --git a/spec/helpers/admins/organizations_helper_spec.rb b/spec/helpers/admins/organizations_helper_spec.rb new file mode 100644 index 000000000..2f0a719a0 --- /dev/null +++ b/spec/helpers/admins/organizations_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Admins::OrganizationsHelper. For example: +# +# describe Admins::OrganizationsHelper 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 Admins::OrganizationsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From ac8372d7e142bc07b8b84608fd12969e508bf8bc Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Wed, 22 Feb 2023 08:26:59 +0800 Subject: [PATCH 031/133] orgs search --- .../admins/organizations_controller.rb | 6 +++++- app/queries/admins/organization_query.rb | 21 +++++++++++++++++++ app/views/admins/organizations/index.html.erb | 9 ++++++++ app/views/admins/organizations/index.js.erb | 2 +- .../organizations/shared/_org_list.html.erb | 2 ++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 app/queries/admins/organization_query.rb diff --git a/app/controllers/admins/organizations_controller.rb b/app/controllers/admins/organizations_controller.rb index 4e40a509e..35fb4dee8 100644 --- a/app/controllers/admins/organizations_controller.rb +++ b/app/controllers/admins/organizations_controller.rb @@ -2,7 +2,11 @@ class Admins::OrganizationsController < Admins::BaseController before_action :finder_org, except: [:index] def index - @orgs = paginate Organization.all + params[:sort_by] = params[:sort_by].presence || 'created_on' + params[:sort_direction] = params[:sort_direction].presence || 'desc' + + orgs = Admins::OrganizationQuery.call(params) + @orgs = paginate orgs end def show diff --git a/app/queries/admins/organization_query.rb b/app/queries/admins/organization_query.rb new file mode 100644 index 000000000..09dbab9e3 --- /dev/null +++ b/app/queries/admins/organization_query.rb @@ -0,0 +1,21 @@ +class Admins::OrganizationQuery < ApplicationQuery + include CustomSortable + attr_reader :params + sort_columns :created_on, :last_login_on, :experience, :grade, default_by: :created_on, default_direction: :desc + + def initialize(params) + @params = params + end + + def call + orgs = Organization.all + # 关键字检索 + keyword = params[:keyword].to_s.strip.presence + if keyword + sql = 'nickname LIKE :keyword OR login LIKE :keyword' + orgs = orgs.where(sql, keyword: "%#{keyword}%") + end + + custom_sort(orgs, params[:sort_by], params[:sort_direction]) + end +end \ No newline at end of file diff --git a/app/views/admins/organizations/index.html.erb b/app/views/admins/organizations/index.html.erb index 7c96b57ee..7cd2ba8fa 100644 --- a/app/views/admins/organizations/index.html.erb +++ b/app/views/admins/organizations/index.html.erb @@ -1,6 +1,15 @@ <% define_admin_breadcrumbs do %> <% add_admin_breadcrumb('组织管理', admins_organizations_path) %> <% end %> +
      + <%= form_tag(admins_organizations_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> + + <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: 'login/昵称') %> + + <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> + <% end %> + +
      <%= render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } %> diff --git a/app/views/admins/organizations/index.js.erb b/app/views/admins/organizations/index.js.erb index 7e750ecf9..5cf62a739 100644 --- a/app/views/admins/organizations/index.js.erb +++ b/app/views/admins/organizations/index.js.erb @@ -1 +1 @@ -$('.users-list-container').html("<%= j( render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } ) %>"); \ No newline at end of file +$('.organizations-list-container').html("<%= j( render partial: 'admins/organizations/shared/org_list', locals: { organizations: @orgs } ) %>"); \ No newline at end of file diff --git a/app/views/admins/organizations/shared/_org_list.html.erb b/app/views/admins/organizations/shared/_org_list.html.erb index b8fac30d0..9f3f857e8 100644 --- a/app/views/admins/organizations/shared/_org_list.html.erb +++ b/app/views/admins/organizations/shared/_org_list.html.erb @@ -2,6 +2,7 @@ 序号 + ID login 昵称 <%= sort_tag('创建于', name: 'created_on', path: admins_organizations_path) %> @@ -15,6 +16,7 @@ <% organizations.each_with_index do |org, index| %> <%= list_index_no((params[:page] || 1).to_i, index) %> + <%= org.id %> <%= link_to "/#{org.login}", target: '_blank' do %> <%= overflow_hidden_span org.login, width: 100 %> From 05f103b0c49f6cbc4cee1f7c1fb6b9a397806564 Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Wed, 22 Feb 2023 09:12:16 +0800 Subject: [PATCH 032/133] team count and delete orgs --- app/models/organization.rb | 49 ++----------------- .../admins/delete_organization_service.rb | 13 +---- .../organizations/shared/_org_list.html.erb | 18 +++---- 3 files changed, 16 insertions(+), 64 deletions(-) diff --git a/app/models/organization.rb b/app/models/organization.rb index 17eb28918..d61dda567 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -147,52 +147,13 @@ class Organization < Owner def projects_count Project.where( user_id: self.id).count end - - # 用户账号状态 - def active? - status == User::STATUS_ACTIVE + + def teams_count + teams.count end - def registered? - status == User::STATUS_REGISTERED - end - - def locked? - status == User::STATUS_LOCKED - end - - def need_edit_info? - status == User::STATUS_EDIT_INFO - end - - def activate - self.status = User::STATUS_ACTIVE - end - - def register - self.status = User::STATUS_REGISTERED - end - - def lock - self.status = User::STATUS_LOCKED - end - - def need_edit_info - self.status = User::STATUS_EDIT_INFO - end - - def activate! - update_attribute(:status, STATUS_ACTIVE) - prohibit_gitea_user_login!(false) - end - - def register! - update_attribute(:status, STATUS_REGISTERED) - end - - def lock! - update_attribute(:status, STATUS_LOCKED) - prohibit_gitea_user_login! + def organization_users_count + organization_users.count end def real_name diff --git a/app/services/admins/delete_organization_service.rb b/app/services/admins/delete_organization_service.rb index db842845b..f5760b364 100644 --- a/app/services/admins/delete_organization_service.rb +++ b/app/services/admins/delete_organization_service.rb @@ -1,24 +1,15 @@ class Admins::DeleteOrganizationService < Gitea::ClientService attr_reader :token, :name - + def initialize(name) @name = name end def call - response = delete(url, params) - render_status(response) + Gitea::Organization::DeleteService.call(token,name) end private - def params - Hash.new.merge(token: token) - end - - def url - "/orgs/#{name}".freeze - end - def token { username: GiteaService.gitea_config[:access_key_id], diff --git a/app/views/admins/organizations/shared/_org_list.html.erb b/app/views/admins/organizations/shared/_org_list.html.erb index 9f3f857e8..25878b296 100644 --- a/app/views/admins/organizations/shared/_org_list.html.erb +++ b/app/views/admins/organizations/shared/_org_list.html.erb @@ -1,14 +1,14 @@ - - + - - - - - + + + + + + @@ -16,7 +16,6 @@ <% organizations.each_with_index do |org, index| %> - - + +
      序号ID序号 login昵称<%= sort_tag('创建于', name: 'created_on', path: admins_organizations_path) %><%= sort_tag('最后登录', name: 'last_login_on', path: admins_organizations_path) %>项目数操作昵称<%= sort_tag('创建于', name: 'created_on', path: admins_organizations_path) %>团队成员项目数操作
      <%= list_index_no((params[:page] || 1).to_i, index) %><%= org.id %> <%= link_to "/#{org.login}", target: '_blank' do %> <%= overflow_hidden_span org.login, width: 100 %> @@ -24,7 +23,8 @@ <%= org.nickname %> <%= display_text(org.created_on&.strftime('%Y-%m-%d %H:%M')) %><%= display_text(org.last_login_on&.strftime('%Y-%m-%d %H:%M')) %><%= link_to org.teams_count, "/#{org.login}", target: "_blank" %><%= link_to org.organization_users_count, "/#{org.login}", target: "_blank" %> <%= link_to org.projects_count, "/#{org.login}", target: "_blank" %> <%= link_to '查看', admins_organization_path(org), class: 'action' %> From ee77be7c8abfa4edda738f464f263c5024de98e2 Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Wed, 22 Feb 2023 09:25:49 +0800 Subject: [PATCH 033/133] fix --- app/views/admins/shared/_sidebar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index e1199f787..37f819bde 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -15,7 +15,7 @@
      • <%= sidebar_item(admins_path, '概览', icon: 'dashboard', controller: 'admins-dashboards') %>
      • - <%= sidebar_item_group('#user-rank-submenu', '排行榜', icon: 'calendar') do %> + <%= sidebar_item_group('#rank-submenu', '排行榜', icon: 'calendar') do %>
      • <%= sidebar_item(admins_users_rank_index_path, '用户排行榜', icon: 'user', controller: 'admins-users_rank') %>
      • <%= sidebar_item(admins_projects_rank_index_path, '项目排行榜', icon: 'database', controller: 'admins-projects_rank') %>
        • <% end %> From 5f3d51027e03fe413ec8e8688c3af03aa9ecdf26 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 22 Feb 2023 09:36:13 +0800 Subject: [PATCH 034/133] =?UTF-8?q?fixed=20=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/shared/_sidebar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index 37f819bde..00ae3e821 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -23,7 +23,7 @@
      • <%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
      • <%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %>
        • -
      • <%= sidebar_item(admins_organizations_path, '组织列表', icon: 'user', controller: 'admins-organization') %>
        • +
      • <%= sidebar_item(admins_organizations_path, '组织列表', icon: 'user', controller: 'admins-organizations') %>
        • s <% end %>
      • From 6c1f9cabda4ac98a6a86c4d4341c11db2b177fcf Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 22 Feb 2023 09:38:32 +0800 Subject: [PATCH 035/133] =?UTF-8?q?fixed=20=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/shared/_sidebar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index 00ae3e821..fc2fe6068 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -23,7 +23,7 @@
      • <%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
      • <%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %>
        • -
      • <%= sidebar_item(admins_organizations_path, '组织列表', icon: 'user', controller: 'admins-organizations') %>
        • s +
      • <%= sidebar_item(admins_organizations_path, '组织列表', icon: 'user', controller: 'admins-organizations') %>
        • <% end %>
      • From 8239f13eaa89809d429b5407ab03973fb566cfa1 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 Feb 2023 09:55:05 +0800 Subject: [PATCH 036/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/issue_tags_controller.rb | 2 +- .../api/v1/issues/journals_controller.rb | 2 +- .../api/v1/issues/milestones_controller.rb | 1 + app/controllers/api/v1/issues_controller.rb | 4 ++-- lib/tasks/upgrade_issue_generate_data.rake | 14 ++++++++------ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 7038ddcae..077ac1474 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -1,5 +1,5 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController - + before_action :require_login, except: [:index] before_action :require_public_and_member_above, only: [:index] before_action :require_operate_above, only: [:create, :update, :destroy] diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index cd0996277..b184392a0 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -1,5 +1,5 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController - + before_action :require_login, except: [:index, :children_journals] before_action :require_public_and_member_above, only: [:index, :create, :children_journals, :update, :destroy] before_action :load_issue, only: [:index, :create, :children_journals, :update, :destroy] before_action :load_journal, only: [:children_journals, :update, :destroy] diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 4de6dffbf..b3f30e084 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -1,4 +1,5 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController + before_action :require_login, except: [:index, :show] before_action :require_public_and_member_above, only: [:index, :show] before_action :require_operate_above, only: [:create, :update, :destroy] before_action :load_milestone, only: [:show, :update, :destroy] diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 93de448af..35634a1ad 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -1,5 +1,5 @@ class Api::V1::IssuesController < Api::V1::BaseController - + before_action :require_login, except: [:index, :show] before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy] before_action :require_operate_above, only: [:batch_update, :batch_destroy] before_action :check_issue_operate_permission, only: [:update, :destroy] @@ -77,7 +77,7 @@ class Api::V1::IssuesController < Api::V1::BaseController end def check_issue_operate_permission - return render_forbidden("您没有操作权限！") unless current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user) + return render_forbidden("您没有操作权限！") unless @project.member?(current_user) || current_user.admin? || @issue.user == current_user end private diff --git a/lib/tasks/upgrade_issue_generate_data.rake b/lib/tasks/upgrade_issue_generate_data.rake index 47cfb145d..3cefd32b8 100644 --- a/lib/tasks/upgrade_issue_generate_data.rake +++ b/lib/tasks/upgrade_issue_generate_data.rake @@ -37,16 +37,18 @@ namespace :upgrade_issue_generate_data do puts "____________fix end____total:#{count}__________" end - # 执行示例 bundle exec rake upgrade_issue_generate_data:move_assigned_to_id_to_assigners - # 线上环境执行示例 RAILS_ENV=production bundle exec rake upgrade_issue_generate_data:move_assigned_to_id_to_assigners - desc "upgrade_issue_generate_data: fix issue assigner to assigners" + # 执行示例 bundle exec rake upgrade_issue_generate_data:build_assigners_and_participants + # 线上环境执行示例 RAILS_ENV=production bundle exec rake upgrade_issue_generate_data:build_assigners_and_participants + desc "upgrade_issue_generate_data: fix issue assigners and participants" - task move_assigned_to_id_to_assigners: :environment do + task build_assigners_and_participants: :environment do puts "____________fix start________________" count = 0 - Issue.where.not(assigned_to_id: nil).find_each do |issue| + Issue.order(created_on: :desc)find_each do |issue| count += 1 - issue.assigners = User.where(id: issue.assigned_to_id) + issue.issue_assigners.find_or_create_by(assigner_id: issue.assigned_to_id) + issue.issue_participants.find_or_create_by(participant_id: issue.assigned_to_id, participant_type: 'assigned') + issue.issue_participants.find_or_create_by(participant_id: issue.author_id, participant_type: 'authored') end puts "____________fix end____total:#{count}__________" end From ed5d12654ef9566456bde8c58f780e1c55ff66a8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 Feb 2023 09:57:39 +0800 Subject: [PATCH 037/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/upgrade_issue_generate_data.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/upgrade_issue_generate_data.rake b/lib/tasks/upgrade_issue_generate_data.rake index 3cefd32b8..857644eee 100644 --- a/lib/tasks/upgrade_issue_generate_data.rake +++ b/lib/tasks/upgrade_issue_generate_data.rake @@ -44,7 +44,7 @@ namespace :upgrade_issue_generate_data do task build_assigners_and_participants: :environment do puts "____________fix start________________" count = 0 - Issue.order(created_on: :desc)find_each do |issue| + Issue.order(created_on: :desc).find_each do |issue| count += 1 issue.issue_assigners.find_or_create_by(assigner_id: issue.assigned_to_id) issue.issue_participants.find_or_create_by(participant_id: issue.assigned_to_id, participant_type: 'assigned') From e440ee8483a6d76b3599d42d93ce523ba37e3aab Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Wed, 22 Feb 2023 10:38:40 +0800 Subject: [PATCH 038/133] api/users/{{user}}/messages add check auth --- app/controllers/users/messages_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/users/messages_controller.rb b/app/controllers/users/messages_controller.rb index 5116f580f..4feb4a98e 100644 --- a/app/controllers/users/messages_controller.rb +++ b/app/controllers/users/messages_controller.rb @@ -1,6 +1,7 @@ class Users::MessagesController < Users::BaseController before_action :private_user_resources! before_action :find_receivers, only: [:create] + before_action :check_auth def index limit = params[:limit] || params[:per_page] @@ -63,6 +64,10 @@ class Users::MessagesController < Users::BaseController end private + def check_auth + return render_forbidden unless current_user.admin? || observed_logged_user? + end + def message_type @message_type = begin case params[:type] From 54b7f2c72666018cf94a2dec6a3573cc7d44cb55 Mon Sep 17 00:00:00 2001 From: chenjing <28122123@qq.com> Date: Wed, 22 Feb 2023 10:48:23 +0800 Subject: [PATCH 039/133] fix api/users/:login/headmaps.json bug --- app/controllers/users/headmaps_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/users/headmaps_controller.rb b/app/controllers/users/headmaps_controller.rb index 7c88b5681..7faba1e50 100644 --- a/app/controllers/users/headmaps_controller.rb +++ b/app/controllers/users/headmaps_controller.rb @@ -10,15 +10,15 @@ class Users::HeadmapsController < Users::BaseController private def start_stamp if params[:year].present? - Date.new(params[:year], 1).to_time.to_i + Date.new(params[:year].to_i, 1).to_time.to_i else - Date.today.to_time.to_i - 365*24*60*60 + (Date.today - 1.years).to_time.to_i end end def end_stamp if params[:year].present? - Date.new(params[:year], 1).to_time.to_i + 365*24*60*60 + (Date.new(params[:year].to_i, 1) + 1.years).to_time.to_i else Date.today.to_time.to_i end From 54a85a60fab8c4a1a712896157eb68b9c4a1e050 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 Feb 2023 13:56:02 +0800 Subject: [PATCH 040/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E7=96=91?= =?UTF-8?q?=E4=BF=AE=E5=88=97=E8=A1=A8=E5=BC=80=E5=90=AF=E3=80=81=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=95=B0=E9=87=8F=E8=A7=84=E5=88=99=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 8 ++++---- app/models/issue_priority.rb | 17 +++++++++++++++++ app/models/issue_status.rb | 2 +- app/services/api/v1/issues/list_service.rb | 18 ++++++++++-------- lib/tasks/upgrade_issue_generate_data.rake | 1 + 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 35634a1ad..782c87813 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -6,11 +6,11 @@ class Api::V1::IssuesController < Api::V1::BaseController def index IssueTag.init_data(@project.id) if @project.issue_tags.size < 10 - @object_results = Api::V1::Issues::ListService.call(@project, query_params, current_user) - @opened_issues_count = @object_results.opened.size - @closed_issues_count = @object_results.closed.size + @object_result = Api::V1::Issues::ListService.call(@project, query_params, current_user) + @opened_issues_count = @object_result[:opened_issues_count] + @closed_issues_count = @object_result[:closed_issues_count] - @issues = kaminari_paginate(@object_results) + @issues = kaminari_paginate(@object_result[:data]) end def create diff --git a/app/models/issue_priority.rb b/app/models/issue_priority.rb index 27865a70f..c8ef73299 100644 --- a/app/models/issue_priority.rb +++ b/app/models/issue_priority.rb @@ -15,4 +15,21 @@ class IssuePriority < ApplicationRecord has_many :issues + + def self.init_data + map = { + "1" => "低", + "2" => "正常", + "3" => "高", + "4" => "紧急" + } + IssuePriority.order(id: :asc).each do |prty| + if map["#{prty.id}"] == prty.name + IssuePriority.find_or_create_by(id: prty.id, name: prty.name) + else + Issue.where(priority_id: prty.id).each{|i| i.update_column(:priority_id, 2)} + prty.destroy! + end + end + end end diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index eb4db1dcc..fcce29c32 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -36,7 +36,7 @@ class IssueStatus < ApplicationRecord "6" => "拒绝" } IssueStatus.order(id: :asc).each do |stat| - if map[stat.id] == stat.name + if map["#{stat.id}"] == stat.name IssueStatus.find_or_create_by(id: stat.id, name: stat.name) else Issue.where(status_id: stat.id).each{|i| i.update_column(:status_id, 1)} diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 6383a6e12..8acf20133 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -3,11 +3,11 @@ class Api::V1::Issues::ListService < ApplicationService attr_reader :project, :category, :participant_category, :keyword, :author_id, :issue_tag_ids attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user - attr_accessor :queried_issues + attr_accessor :queried_issues, :closed_issues_count, :opened_issues_count validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} validates :participant_category, inclusion: {in: %w(all aboutme authoredme assignedme atme), message: "请输入正确的ParticipantCategory"} - validates :sort_by, inclusion: {in: Issue.column_names, message: '请输入正确的SortBy'}, allow_blank: true + validates :sort_by, inclusion: {in: ['issues.created_on', 'issues.updated_on', 'issue_priorities.position'], message: '请输入正确的SortBy'}, allow_blank: true validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true validates :current_user, presence: true @@ -21,7 +21,7 @@ class Api::V1::Issues::ListService < ApplicationService @milestone_id = params[:milestone_id] @assigner_id = params[:assigner_id] @status_id = params[:status_id] - @sort_by = params[:sort_by].present? ? params[:sort_by] : 'updated_on' + @sort_by = params[:sort_by].present? ? params[:sort_by] : 'issues.updated_on' @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase @current_user = current_user end @@ -31,7 +31,7 @@ class Api::V1::Issues::ListService < ApplicationService begin issue_query_data - queried_issues + return {data: queried_issues, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count} rescue raise Error, "服务器错误，请联系系统管理员！" end @@ -40,6 +40,8 @@ class Api::V1::Issues::ListService < ApplicationService private def issue_query_data issues = @project.issues.issue_issue + @closed_issues_count = issues.closed.size + @opened_issues_count = issues.opened.size case category when 'closed' @@ -52,11 +54,11 @@ class Api::V1::Issues::ListService < ApplicationService when 'aboutme' # 关于我的 issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(authored assigned atme)},users: {id: current_user&.id}) when 'authoredme' # 我创建的 - issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(authored)},users: {id: current_user&.id}) + issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'assigned'},users: {id: current_user&.id}) when 'assignedme' # 我负责的 - issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(assigned)},users: {id: current_user&.id}) + issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'assigned'},users: {id: current_user&.id}) when 'atme' # @我的 - issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(atme)},users: {id: current_user&.id}) + issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'atme'},users: {id: current_user&.id}) end # author_id @@ -79,7 +81,7 @@ class Api::V1::Issues::ListService < ApplicationService scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) - scope = scope.reorder("issues.#{sort_by} #{sort_direction}").distinct + scope = scope.reorder("#{sort_by} #{sort_direction}").distinct @queried_issues = scope end diff --git a/lib/tasks/upgrade_issue_generate_data.rake b/lib/tasks/upgrade_issue_generate_data.rake index 857644eee..1fbe5df24 100644 --- a/lib/tasks/upgrade_issue_generate_data.rake +++ b/lib/tasks/upgrade_issue_generate_data.rake @@ -27,6 +27,7 @@ namespace :upgrade_issue_generate_data do task project_init_issue_tags_and_status: :environment do puts "____________fix start________________" + IssuePriority.init_data IssueStatus.init_data IssueTag.where(user_id: nil).destroy_all count = 0 From a07da79e89d4d564d1b71822346472890390b7ac Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 Feb 2023 14:42:52 +0800 Subject: [PATCH 041/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96=E6=A0=87=E7=AD=BE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 3 ++- app/models/issue_tag.rb | 1 + app/services/api/v1/issues/list_service.rb | 24 +++++++++++---------- app/views/api/v1/issues/index.json.jbuilder | 3 ++- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 782c87813..c511f88b2 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -5,8 +5,9 @@ class Api::V1::IssuesController < Api::V1::BaseController before_action :check_issue_operate_permission, only: [:update, :destroy] def index - IssueTag.init_data(@project.id) if @project.issue_tags.size < 10 + IssueTag.init_data(@project.id) unless $redis_cache.hget("project_init_issue_tags", @project.id) @object_result = Api::V1::Issues::ListService.call(@project, query_params, current_user) + @total_issues_count = @object_result[:total_issues_count] @opened_issues_count = @object_result[:opened_issues_count] @closed_issues_count = @object_result[:closed_issues_count] diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index b111ad2db..c938e8386 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -43,6 +43,7 @@ class IssueTag < ApplicationRecord next if IssueTag.exists?(project_id: project_id, name: item[0]) IssueTag.create!(project_id: project_id, name: item[0], description: item[1], color: item[2]) end + $redis_cache.hset("project_init_issue_tags", project_id, 1) end diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 8acf20133..6cea89327 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -3,7 +3,7 @@ class Api::V1::Issues::ListService < ApplicationService attr_reader :project, :category, :participant_category, :keyword, :author_id, :issue_tag_ids attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user - attr_accessor :queried_issues, :closed_issues_count, :opened_issues_count + attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} validates :participant_category, inclusion: {in: %w(all aboutme authoredme assignedme atme), message: "请输入正确的ParticipantCategory"} @@ -31,7 +31,7 @@ class Api::V1::Issues::ListService < ApplicationService begin issue_query_data - return {data: queried_issues, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count} + return {data: queried_issues, total_issues_count: @total_issues_count, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count} rescue raise Error, "服务器错误，请联系系统管理员！" end @@ -40,15 +40,6 @@ class Api::V1::Issues::ListService < ApplicationService private def issue_query_data issues = @project.issues.issue_issue - @closed_issues_count = issues.closed.size - @opened_issues_count = issues.opened.size - - case category - when 'closed' - issues = issues.closed - when 'opened' - issues = issues.opened - end case participant_category when 'aboutme' # 关于我的 @@ -61,6 +52,17 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'atme'},users: {id: current_user&.id}) end + @total_issues_count = issues.size + @closed_issues_count = issues.closed.size + @opened_issues_count = issues.opened.size + + case category + when 'closed' + issues = issues.closed + when 'opened' + issues = issues.opened + end + # author_id issues = issues.where(author_id: author_id) if author_id.present? diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index 1a324eb27..50165b60b 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -1,6 +1,7 @@ -json.total_count @issues.total_count +json.total_issues_count @opened_issues_count json.opened_count @opened_issues_count json.closed_count @closed_issues_count +json.total_count @issues.total_count json.issues @issues.each do |issue| json.partial! "simple_detail", locals: {issue: issue} end \ No newline at end of file From c781ca0da13b61f6abadbb8eff869b674495714e Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 Feb 2023 15:56:44 +0800 Subject: [PATCH 042/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/milestones_controller.rb | 2 +- app/controllers/api/v1/issues_controller.rb | 2 +- app/models/issue_tag.rb | 2 +- app/services/api/v1/issues/list_service.rb | 28 +++++++++---------- .../milestones/detail_issues_service.rb | 12 ++++---- .../v1/issues/journals/_detail.json.jbuilder | 2 ++ 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index b3f30e084..d0fc0be4a 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -60,7 +60,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController end def query_params - params.permit(:category, :author_id, :assigner_id, :sort_by, :sort_direction, :issue_tag_ids => []) + params.permit(:category, :author_id, :assigner_id, :sort_by, :sort_direction, :issue_tag_ids) end def load_milestone diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index c511f88b2..7f2b5ee4d 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -91,7 +91,7 @@ class Api::V1::IssuesController < Api::V1::BaseController :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, - :issue_tag_ids => []) + :issue_tag_ids) end def issue_params diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index c938e8386..787b72bca 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -34,7 +34,7 @@ class IssueTag < ApplicationRecord ["支持", "表示特定功能或特定需求", "#019549"], ["任务", "表示需要分配的任务", "#01a30d"], ["协助", "表示需要社区用户协助", "#2a0dc1"], - ["搁置", "表示此问题不会继续处理", "#892794"], + ["搁置", "表示此问题暂时不会继续处理", "#892794"], ["文档", "表示文档材料补充", "#9ed600"], ["测试", "表示需要测试的需求", "#2897b9"], ["重复", "表示已存在类似的疑修", "#bb5332"] diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 6cea89327..ed9a43a46 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -17,7 +17,7 @@ class Api::V1::Issues::ListService < ApplicationService @participant_category = params[:participant_category] || 'all' @keyword = params[:keyword] @author_id = params[:author_id] - @issue_tag_ids = params[:issue_tag_ids] + @issue_tag_ids = params[:issue_tag_ids].split(",") @milestone_id = params[:milestone_id] @assigner_id = params[:assigner_id] @status_id = params[:status_id] @@ -52,17 +52,6 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'atme'},users: {id: current_user&.id}) end - @total_issues_count = issues.size - @closed_issues_count = issues.closed.size - @opened_issues_count = issues.opened.size - - case category - when 'closed' - issues = issues.closed - when 'opened' - issues = issues.opened - end - # author_id issues = issues.where(author_id: author_id) if author_id.present? @@ -79,9 +68,20 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.where(status_id: status_id) if status_id.present? # keyword - q = issues.ransack(subject_or_description_cont: keyword) + issues = issues.ransack(subject_or_description_cont: keyword).result - scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) + @total_issues_count = issues.size + @closed_issues_count = issues.closed.size + @opened_issues_count = issues.opened.size + + case category + when 'closed' + issues = issues.closed + when 'opened' + issues = issues.opened + end + + scope = issues.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) scope = scope.reorder("#{sort_by} #{sort_direction}").distinct diff --git a/app/services/api/v1/issues/milestones/detail_issues_service.rb b/app/services/api/v1/issues/milestones/detail_issues_service.rb index 1328805b3..c6b250a58 100644 --- a/app/services/api/v1/issues/milestones/detail_issues_service.rb +++ b/app/services/api/v1/issues/milestones/detail_issues_service.rb @@ -5,7 +5,7 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService attr_accessor :queried_issues validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} - validates :sort_by, inclusion: {in: Issue.column_names, message: '请输入正确的SortBy'}, allow_blank: true + validates :sort_by, inclusion: {in: ['issues.created_on', 'issues.updated_on', 'issue_priorities.position'], message: '请输入正确的SortBy'}, allow_blank: true validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true validates :current_user, presence: true @@ -15,7 +15,7 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService @category = params[:category] || 'all' @author_id = params[:author_id] @assigner_id = params[:assigner_id] - @issue_tag_ids = params[:issue_tag_ids] + @issue_tag_ids = params[:issue_tag_ids].present? ? params[:issue_tag_ids].split(",") : [] @sort_by = params[:sort_by].present? ? params[:sort_by] : 'updated_on' @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase @current_user = current_user @@ -47,11 +47,13 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService issues = issues.where(author_id: author_id) if author_id.present? # assigner_id - issues = issues.joins(:assigners).where(users: {id: assigner_id}).or(issues.where(assigned_to_id: assigner_id)) if assigner_id.present? + issues = issues.joins(:assigners).where(users: {id: assigner_id}).or(issues.joins(:assigners).where(assigned_to_id: assigner_id)) if assigner_id.present? - scope = issues.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) + issues = issues.joins(:issue_tags).where(issue_tags: {id: issue_tag_ids}) if issue_tag_ids.present? - scope = scope.reorder("issues.#{sort_by} #{sort_direction}").distinct + scope = issues.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals).references(:assigners) + + scope = scope.reorder("#{sort_by} #{sort_direction}").distinct @queried_issues = scope end diff --git a/app/views/api/v1/issues/journals/_detail.json.jbuilder b/app/views/api/v1/issues/journals/_detail.json.jbuilder index 7e8232bdc..264997bbd 100644 --- a/app/views/api/v1/issues/journals/_detail.json.jbuilder +++ b/app/views/api/v1/issues/journals/_detail.json.jbuilder @@ -10,6 +10,8 @@ json.user do end end if journal.is_journal_detail? + detail = journal.journal_details.take + json.operate_category detail.property == "attr" ? detail.prop_key : detail.property json.operate_content journal.is_journal_detail? ? journal.operate_content : nil else json.notes journal.notes From 317ff3c76b6ed1f1ed180ea5ab16ece60e527c6f Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 Feb 2023 16:05:24 +0800 Subject: [PATCH 043/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/list_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index ed9a43a46..c1b386345 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -17,7 +17,7 @@ class Api::V1::Issues::ListService < ApplicationService @participant_category = params[:participant_category] || 'all' @keyword = params[:keyword] @author_id = params[:author_id] - @issue_tag_ids = params[:issue_tag_ids].split(",") + @issue_tag_ids = params[:issue_tag_ids].present? ? params[:issue_tag_ids].split(",") : [] @milestone_id = params[:milestone_id] @assigner_id = params[:assigner_id] @status_id = params[:status_id] From edc00d28a7cd0da0de8381429c01ce5a61f1a7d5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 22 Feb 2023 16:25:40 +0800 Subject: [PATCH 044/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues/issue_tags_controller.rb | 2 +- app/models/issue_tag.rb | 2 ++ app/views/api/v1/issues/index.json.jbuilder | 2 +- app/views/api/v1/issues/issue_tags/_detail.json.jbuilder | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 077ac1474..2a5038e63 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -9,7 +9,7 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController if params[:only_name] @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color)) else - @issue_tags = kaminari_paginate(@issue_tags.includes(:project, :user)) + @issue_tags = kaminari_paginate(@issue_tags.includes(:project, :user, :issue_issues, :pull_request_issues)) end end diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index 787b72bca..5381da9be 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -23,6 +23,8 @@ class IssueTag < ApplicationRecord has_many :issue_tags_relates, dependent: :destroy has_many :issues, through: :issue_tags_relates + has_many :issue_issues, -> {where(issue_classify: [nil,"issue"])}, source: :issue, through: :issue_tags_relates + has_many :pull_request_issues, -> {where(issue_classify: "pull_request")}, source: :issue, through: :issue_tags_relates belongs_to :project, optional: true, counter_cache: true belongs_to :user, optional: true diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index 50165b60b..8d9861f24 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -1,4 +1,4 @@ -json.total_issues_count @opened_issues_count +json.total_issues_count @total_issues_count json.opened_count @opened_issues_count json.closed_count @closed_issues_count json.total_count @issues.total_count diff --git a/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder index 332e47373..43daf1a4a 100644 --- a/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder +++ b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder @@ -1,4 +1,6 @@ -json.(tag,:id, :name, :description, :color, :issues_count) +json.(tag,:id, :name, :description, :color) +json.issues_count tag.issue_issues.size +json.pull_requests_count tag.pull_request_issues.size json.project do if tag.project.present? json.partial! "api/v1/projects/simple_detail", project: tag.project From dc9ca7d0ca6dc5fee5a590f6d9749584fd283bbe Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 15:24:30 +0800 Subject: [PATCH 045/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E7=96=91?= =?UTF-8?q?=E4=BF=AEparam=E4=B8=BAindex=E4=BB=A5=E5=8F=8A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=BB=9F=E8=AE=A1=E6=A0=87=E7=AD=BE=E4=B8=8B=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/journals_controller.rb | 13 ++++++++++--- .../api/v1/issues/milestones_controller.rb | 1 + app/controllers/api/v1/issues_controller.rb | 8 +++----- app/models/issue_tags_relate.rb | 12 +++++++++++- .../v1/issues/milestones/detail_issues_service.rb | 2 +- app/views/api/v1/issues/index.json.jbuilder | 1 + .../api/v1/issues/issue_tags/_detail.json.jbuilder | 4 ++-- config/routes/api.rb | 2 +- ...30223065106_add_some_columns_to_issue_upgrade.rb | 5 +++++ lib/tasks/upgrade_issue_generate_data.rake | 6 +++++- 10 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 db/migrate/20230223065106_add_some_columns_to_issue_upgrade.rb diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index b184392a0..596c8d9e9 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -1,7 +1,7 @@ -class Api::V1::Issues::JournalsController < Api::V1::IssuesController +class Api::V1::Issues::JournalsController < Api::V1::BaseController before_action :require_login, except: [:index, :children_journals] - before_action :require_public_and_member_above, only: [:index, :create, :children_journals, :update, :destroy] - before_action :load_issue, only: [:index, :create, :children_journals, :update, :destroy] + before_action :require_public_and_member_above + before_action :load_issue before_action :load_journal, only: [:children_journals, :update, :destroy] before_action :check_journal_operate_permission, only: [:update, :destroy] @@ -41,6 +41,13 @@ class Api::V1::Issues::JournalsController < Api::V1::IssuesController params.permit(:notes, :parent_id, :reply_id, :attachment_ids => []) end + def load_issue + @issue = @project.issues.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index]) + if @issue.blank? + render_not_found("疑修不存在!") + end + end + def load_journal @journal = Journal.find_by_id(params[:id]) return render_not_found("评论不存在！") unless @journal.present? diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index d0fc0be4a..fba207c5c 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -11,6 +11,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController @closed_milestone_count = @milestones.closed.size @opening_milestone_count = @milestones.opening.size @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening + @milestones = milestones.order("#{sort_by} #{sort_direction}") if params[:only_name] @milestones = @milestones.select(:id, :name) @milestones = kaminary_select_paginate(@milestones) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 7f2b5ee4d..acf92e834 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -57,10 +57,10 @@ class Api::V1::IssuesController < Api::V1::BaseController end end - protected + private def load_issue - @issue = @project.issues.where(project_issues_index: params[:id]).where.not(id: params[:id]).take || Issue.find_by_id(params[:id]) + @issue = @project.issues.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index]) if @issue.blank? render_not_found("疑修不存在!") end @@ -79,9 +79,7 @@ class Api::V1::IssuesController < Api::V1::BaseController def check_issue_operate_permission return render_forbidden("您没有操作权限！") unless @project.member?(current_user) || current_user.admin? || @issue.user == current_user - end - - private + end def query_params params.permit( diff --git a/app/models/issue_tags_relate.rb b/app/models/issue_tags_relate.rb index df9fd81ae..8bd1486d7 100644 --- a/app/models/issue_tags_relate.rb +++ b/app/models/issue_tags_relate.rb @@ -15,5 +15,15 @@ class IssueTagsRelate < ApplicationRecord belongs_to :issue - belongs_to :issue_tag, counter_cache: :issues_count + belongs_to :issue_tag + + after_create :increment_issue_tags_counter_cache + + def increment_issue_tags_counter_cache + if self.issue.issue_classify == "Issue" + IssueTag.increment_counter :issues_count, issue_tag_id + else + IssueTag.increment_counter :pull_requests_count, issue_tag_id + end + end end diff --git a/app/services/api/v1/issues/milestones/detail_issues_service.rb b/app/services/api/v1/issues/milestones/detail_issues_service.rb index c6b250a58..a6fc5815d 100644 --- a/app/services/api/v1/issues/milestones/detail_issues_service.rb +++ b/app/services/api/v1/issues/milestones/detail_issues_service.rb @@ -16,7 +16,7 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService @author_id = params[:author_id] @assigner_id = params[:assigner_id] @issue_tag_ids = params[:issue_tag_ids].present? ? params[:issue_tag_ids].split(",") : [] - @sort_by = params[:sort_by].present? ? params[:sort_by] : 'updated_on' + @sort_by = params[:sort_by].present? ? params[:sort_by] : 'issues.updated_on' @sort_direction = (params[:sort_direction].present? ? params[:sort_direction] : 'desc').downcase @current_user = current_user end diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index 8d9861f24..6a04c56ac 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -2,6 +2,7 @@ json.total_issues_count @total_issues_count json.opened_count @opened_issues_count json.closed_count @closed_issues_count json.total_count @issues.total_count +json.has_created_issues @project.issues.size > 0 json.issues @issues.each do |issue| json.partial! "simple_detail", locals: {issue: issue} end \ No newline at end of file diff --git a/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder index 43daf1a4a..8fef8b1f6 100644 --- a/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder +++ b/app/views/api/v1/issues/issue_tags/_detail.json.jbuilder @@ -1,6 +1,6 @@ json.(tag,:id, :name, :description, :color) -json.issues_count tag.issue_issues.size -json.pull_requests_count tag.pull_request_issues.size +json.issues_count tag.issues_count +json.pull_requests_count tag.pull_requests_count json.project do if tag.project.present? json.partial! "api/v1/projects/simple_detail", project: tag.project diff --git a/config/routes/api.rb b/config/routes/api.rb index 6c9b3dcdf..5c82d3367 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -25,7 +25,7 @@ defaults format: :json do end end - resources :issues, except: [:new, :edit] do + resources :issues, param: :index, except: [:new, :edit] do collection do patch :batch_update delete :batch_destroy diff --git a/db/migrate/20230223065106_add_some_columns_to_issue_upgrade.rb b/db/migrate/20230223065106_add_some_columns_to_issue_upgrade.rb new file mode 100644 index 000000000..161328746 --- /dev/null +++ b/db/migrate/20230223065106_add_some_columns_to_issue_upgrade.rb @@ -0,0 +1,5 @@ +class AddSomeColumnsToIssueUpgrade < ActiveRecord::Migration[5.2] + def change + add_column :issue_tags, :pull_requests_count, :integer, default: 0 + end +end diff --git a/lib/tasks/upgrade_issue_generate_data.rake b/lib/tasks/upgrade_issue_generate_data.rake index 1fbe5df24..6d016a653 100644 --- a/lib/tasks/upgrade_issue_generate_data.rake +++ b/lib/tasks/upgrade_issue_generate_data.rake @@ -29,9 +29,13 @@ namespace :upgrade_issue_generate_data do puts "____________fix start________________" IssuePriority.init_data IssueStatus.init_data + IssueTag.order(created_at: :desc).find_each do |it| + it.update_column(:issues_count, it.issue_issues.size) + it.update_column(:pull_requests_count, it.pull_request_issues.size) + end IssueTag.where(user_id: nil).destroy_all count = 0 - Project.order(created_at: :desc).find_each do |project| + Project.order(created_on: :desc).find_each do |project| count += 1 IssueTag.init_data(project.id) end From 1fcdbe9dcef890434e8b5271cffeb40c1c5682df Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 15:26:30 +0800 Subject: [PATCH 046/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues/milestones_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index fba207c5c..426dca0bf 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -11,7 +11,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController @closed_milestone_count = @milestones.closed.size @opening_milestone_count = @milestones.opening.size @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening - @milestones = milestones.order("#{sort_by} #{sort_direction}") + @milestones = @milestones.order("#{sort_by} #{sort_direction}") if params[:only_name] @milestones = @milestones.select(:id, :name) @milestones = kaminary_select_paginate(@milestones) From c589fcc6a4c6fd4e1dc8138f02cc0baf9f1b7972 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 15:27:26 +0800 Subject: [PATCH 047/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues/milestones_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 426dca0bf..535dbe05d 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -11,7 +11,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController @closed_milestone_count = @milestones.closed.size @opening_milestone_count = @milestones.opening.size @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening - @milestones = @milestones.order("#{sort_by} #{sort_direction}") + @milestones = @milestones.order("versions.#{sort_by} #{sort_direction}") if params[:only_name] @milestones = @milestones.select(:id, :name) @milestones = kaminary_select_paginate(@milestones) From 7cb2321c02af0c3a4282d1144e1724611c800cc5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 15:31:03 +0800 Subject: [PATCH 048/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues/milestones_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 535dbe05d..26a3dbbf6 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -11,7 +11,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController @closed_milestone_count = @milestones.closed.size @opening_milestone_count = @milestones.opening.size @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening - @milestones = @milestones.order("versions.#{sort_by} #{sort_direction}") + @milestones = @milestones.reorder("versions.#{sort_by} #{sort_direction}") if params[:only_name] @milestones = @milestones.select(:id, :name) @milestones = kaminary_select_paginate(@milestones) @@ -74,7 +74,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController end def sort_direction - %w(desc asc).include?(params.fetch(:sort_direction, "updated_on")) ? params.fetch(:sort_direction, "updated_on") : "updated_on" + %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc" end end \ No newline at end of file From dc01d7fc3edf0cc12cf1197fb572cd41aedc79f7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 16:18:09 +0800 Subject: [PATCH 049/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/milestones_controller.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 26a3dbbf6..760ece707 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -70,11 +70,16 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController end def sort_by - Version.columns.include?(params.fetch(:sort_by, "created_on")) ? params.fetch(:sort_by, "created_on") : "created_on" + sort_by = params.fetch(:sort_by, "created_on") + sort_by = Version.column_names.include?(sort_by) ? sort_by : "created_on" + + sort_by end - def sort_direction - %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc" + def sort_direction + sort_direction = params.fetch(:sort_direction, "desc").downcase + sort_direction = %w(desc asc).include?(sort_direction) ? sort_direction : "desc" + sort_direction end end \ No newline at end of file From 8487c67bab006dcda462638210a276ff2901d3be Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 17:32:55 +0800 Subject: [PATCH 050/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aissue=5Fclas?= =?UTF-8?q?sify=20=E4=BD=BF=E7=94=A8=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 3 +++ app/models/issue_tags_relate.rb | 2 +- app/models/version.rb | 4 ++-- app/services/api/v1/issues/batch_update_service.rb | 2 +- app/services/api/v1/issues/create_service.rb | 2 +- app/services/api/v1/issues/list_service.rb | 6 +++--- app/services/api/v1/issues/update_service.rb | 10 +++++----- app/views/api/v1/issues/_detail.json.jbuilder | 2 +- app/views/api/v1/issues/_simple_detail.json.jbuilder | 4 ++-- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 78ffaead7..fefa6960c 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -73,6 +73,9 @@ class Issue < ApplicationRecord has_many :issue_participants, dependent: :destroy has_many :participants, through: :issue_participants has_many :show_participants, -> {joins(:issue_participants).where.not(issue_participants: {participant_type: "atme"}).distinct}, through: :issue_participants, source: :participant + has_many :show_assigners, -> {order("issue_assigners.created_at desc").limit(5)}, through: :issue_assigners, source: :assigner + has_many :show_issue_tags, -> {order("issue_tags_relates.created_at desc").limit(3)}, through: :issue_tags_relates, source: :issue_tag + has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized has_many :operate_journals, -> {where(notes: nil)}, class_name: "Journal", :as => :journalized diff --git a/app/models/issue_tags_relate.rb b/app/models/issue_tags_relate.rb index 8bd1486d7..13eaa780f 100644 --- a/app/models/issue_tags_relate.rb +++ b/app/models/issue_tags_relate.rb @@ -20,7 +20,7 @@ class IssueTagsRelate < ApplicationRecord after_create :increment_issue_tags_counter_cache def increment_issue_tags_counter_cache - if self.issue.issue_classify == "Issue" + if self.issue.issue_classify == "issue" IssueTag.increment_counter :issues_count, issue_tag_id else IssueTag.increment_counter :pull_requests_count, issue_tag_id diff --git a/app/models/version.rb b/app/models/version.rb index fab193b96..1e14a135c 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -28,8 +28,8 @@ class Version < ApplicationRecord has_many :issues, class_name: "Issue", foreign_key: "fixed_version_id" belongs_to :user, optional: true - has_many :opened_issues, -> {where(issue_classify: "Issue").where.not(status_id: 5)}, class_name: "Issue", foreign_key: :fixed_version_id - has_many :closed_issues, -> {where(issue_classify: "Issue", status_id: 5)}, class_name: "Issue", foreign_key: :fixed_version_id + has_many :opened_issues, -> {where(issue_classify: "issue").where.not(status_id: 5)}, class_name: "Issue", foreign_key: :fixed_version_id + has_many :closed_issues, -> {where(issue_classify: "issue", status_id: 5)}, class_name: "Issue", foreign_key: :fixed_version_id scope :version_includes, ->{includes(:issues, :user)} scope :closed, ->{where(status: 'closed')} diff --git a/app/services/api/v1/issues/batch_update_service.rb b/app/services/api/v1/issues/batch_update_service.rb index cf09650ce..ccf783dca 100644 --- a/app/services/api/v1/issues/batch_update_service.rb +++ b/app/services/api/v1/issues/batch_update_service.rb @@ -20,7 +20,7 @@ class Api::V1::Issues::BatchUpdateService < ApplicationService raise Error, errors.full_messages.join(", ") unless valid? ActiveRecord::Base.transaction do @issues.each do |issue| - if issue.issue_classify == "Issue" + if issue.issue_classify == "issue" Api::V1::Issues::UpdateService.call(project, issue, params, current_user) end end diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index ffc08eb96..b6b785188 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -85,7 +85,7 @@ class Api::V1::Issues::CreateService < ApplicationService priority_id: priority_id, project_issues_index: (project.get_last_project_issues_index + 1), issue_type: "1", - issue_classify: "Issue" + issue_classify: "issue" } issue_attributes.merge!({description: description}) if description.present? diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index c1b386345..979f50c3d 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -56,7 +56,7 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.where(author_id: author_id) if author_id.present? # issue_tag_ids - issues = issues.joins(:issue_tags).where(issue_tags: {id: issue_tag_ids}) unless issue_tag_ids.blank? + issues = issues.joins(:issue_tags).ransack(issue_tags_id_in_all: issue_tag_ids).result unless issue_tag_ids.blank? # milestone_id issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present? @@ -68,7 +68,7 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.where(status_id: status_id) if status_id.present? # keyword - issues = issues.ransack(subject_or_description_cont: keyword).result + issues = issues.ransack(subject_or_description_cont: keyword).result if keyword.present? @total_issues_count = issues.size @closed_issues_count = issues.closed.size @@ -81,7 +81,7 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.opened end - scope = issues.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals) + scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :issue_tags, :comment_journals) scope = scope.reorder("#{sort_by} #{sort_direction}").distinct diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 597880eb3..a120dabc7 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -36,14 +36,14 @@ class Api::V1::Issues::UpdateService < ApplicationService check_issue_status(status_id) if status_id.present? check_issue_priority(priority_id) if priority_id.present? check_milestone(milestone_id) if milestone_id.present? - check_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? - check_assigners(assigner_ids) unless assigner_ids.blank? - check_attachments(attachment_ids) unless attachment_ids.blank? - check_atme_receivers(receivers_login) unless receivers_login.blank? + check_issue_tags(issue_tag_ids) unless issue_tag_ids.nil? + check_assigners(assigner_ids) unless assigner_ids.nil? + check_attachments(attachment_ids) unless attachment_ids.nil? + check_atme_receivers(receivers_login) unless receivers_login.nil? load_assigners(assigner_ids) load_attachments(attachment_ids) load_issue_tags(issue_tag_ids) - load_atme_receivers(receivers_login) unless receivers_login.blank? + load_atme_receivers(receivers_login) unless receivers_login.nil? try_lock("Api::V1::Issues::UpdateService:#{project.id}:#{issue.id}") @updated_issue = @issue diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index 3961270ae..a39cdde9e 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -32,7 +32,7 @@ json.author do json.nil! end end -json.assigners issue.assigners.each do |assigner| +json.assigners issue.show_assigners.each do |assigner| json.partial! "api/v1/users/simple_user", locals: {user: assigner} end json.participants issue.participants.distinct.each do |participant| diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index bfc2693cf..7e0d6b11f 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -1,7 +1,7 @@ json.(issue, :id, :subject, :project_issues_index) json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") -json.tags issue.issue_tags.each do |tag| +json.tags issue.show_issue_tags.each do |tag| json.partial! "api/v1/issues/issue_tags/simple_detail", locals: {tag: tag} end json.status_name issue.issue_status&.name @@ -14,7 +14,7 @@ json.author do json.nil! end end -json.assigners issue.assigners.each do |assigner| +json.assigners issue.show_assigners.each do |assigner| json.partial! "api/v1/users/simple_user", locals: {user: assigner} end json.comment_journals_count issue.comment_journals.size \ No newline at end of file From 3fd04109d61c1f274c71f4c844671d1fa1df7457 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 20:54:48 +0800 Subject: [PATCH 051/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/journals_controller.rb | 4 ++-- app/models/issue.rb | 4 ++-- app/services/api/v1/issues/create_service.rb | 1 + .../api/v1/issues/journals/create_service.rb | 16 ++++++++++++++- .../api/v1/issues/journals/update_service.rb | 20 ++++++++++++++++++- app/services/api/v1/issues/list_service.rb | 4 ++-- app/services/api/v1/issues/update_service.rb | 1 + 7 files changed, 42 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index 596c8d9e9..12406ef49 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -38,7 +38,7 @@ class Api::V1::Issues::JournalsController < Api::V1::BaseController end def journal_params - params.permit(:notes, :parent_id, :reply_id, :attachment_ids => []) + params.permit(:notes, :parent_id, :reply_id, :attachment_ids => [], :receivers_login => []) end def load_issue @@ -54,7 +54,7 @@ class Api::V1::Issues::JournalsController < Api::V1::BaseController end def check_journal_operate_permission - return render_forbidden("您没有操作权限！") unless current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user || @journal.user == current_user) + return render_forbidden("您没有操作权限！") unless @project.member?(current_user) || current_user.admin? || @issue.user == current_user || @journal.user == current_user || @journal.parent_journal&.user == current_user end end \ No newline at end of file diff --git a/app/models/issue.rb b/app/models/issue.rb index fefa6960c..3efaac03a 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -73,8 +73,8 @@ class Issue < ApplicationRecord has_many :issue_participants, dependent: :destroy has_many :participants, through: :issue_participants has_many :show_participants, -> {joins(:issue_participants).where.not(issue_participants: {participant_type: "atme"}).distinct}, through: :issue_participants, source: :participant - has_many :show_assigners, -> {order("issue_assigners.created_at desc").limit(5)}, through: :issue_assigners, source: :assigner - has_many :show_issue_tags, -> {order("issue_tags_relates.created_at desc").limit(3)}, through: :issue_tags_relates, source: :issue_tag + has_many :show_assigners, -> {joins(:issue_assigners).order("issue_assigners.created_at desc").limit(5)}, through: :issue_assigners, source: :assigner + has_many :show_issue_tags, -> {joins(:issue_tags_relates).order("issue_tags_relates.created_at desc").limit(3)}, through: :issue_tags_relates, source: :issue_tag has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized has_many :operate_journals, -> {where(notes: nil)}, class_name: "Journal", :as => :journalized diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index b6b785188..e353b86e0 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -55,6 +55,7 @@ class Api::V1::Issues::CreateService < ApplicationService @created_issue.attachments = @attachments unless attachment_ids.blank? @created_issue.issue_tags = @issue_tags unless issue_tag_ids.blank? + @created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.blank? @created_issue.save! project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index 6bd2479d9..470636120 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -3,7 +3,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService include Api::V1::Issues::Concerns::Checkable include Api::V1::Issues::Concerns::Loadable - attr_reader :issue, :current_user, :notes, :parent_id, :reply_id, :attachment_ids + attr_reader :issue, :current_user, :notes, :parent_id, :reply_id, :attachment_ids, :receivers_login attr_accessor :created_journal validates :notes, :issue, :current_user, presence: true @@ -14,6 +14,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService @parent_id = params[:parent_id] @reply_id = params[:reply_id] @attachment_ids = params[:attachment_ids] + @receivers_login = params[:receivers_login] @current_user = current_user end @@ -24,15 +25,22 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService check_parent_journal(parent_id) if parent_id.present? check_parent_journal(reply_id) if reply_id.present? check_attachments(attachment_ids) unless attachment_ids.blank? + check_atme_receivers(receivers_login) unless receivers_login.blank? load_attachments(attachment_ids) unless attachment_ids.blank? + load_atme_receivers(receivers_login) unless receivers_login.blank? try_lock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") @created_journal = @issue.journals.new(journal_attributes) build_comment_participants + build_atme_participants if @atme_receivers.present? @created_journal.attachments = @attachments unless attachment_ids.blank? @created_journal.save! + + # @信息发送 + AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? + unlock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") @created_journal @@ -56,4 +64,10 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService def build_comment_participants @issue.issue_participants.new({participant_type: "commented", participant_id: current_user.id}) unless @issue.issue_participants.exists?(participant_type: "commented", participant_id: current_user.id) end + + def build_atme_participants + atme_receivers.each do |receiver| + @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) + end + end end \ No newline at end of file diff --git a/app/services/api/v1/issues/journals/update_service.rb b/app/services/api/v1/issues/journals/update_service.rb index 321c79cdb..0b356f93e 100644 --- a/app/services/api/v1/issues/journals/update_service.rb +++ b/app/services/api/v1/issues/journals/update_service.rb @@ -3,7 +3,7 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService include Api::V1::Issues::Concerns::Checkable include Api::V1::Issues::Concerns::Loadable - attr_reader :issue, :journal, :current_user, :notes, :attachment_ids + attr_reader :issue, :journal, :current_user, :notes, :attachment_ids, :receivers_login attr_accessor :updated_journal validates :notes, :issue, :journal, :current_user, presence: true @@ -13,6 +13,7 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService @journal = journal @notes = params[:notes] @attachment_ids = params[:attachment_ids] + @receivers_login = params[:receivers_login] @current_user = current_user end @@ -20,18 +21,35 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService raise Error, errors.full_messages.join(", ") unless valid? ActiveRecord::Base.transaction do check_attachments(attachment_ids) unless attachment_ids.blank? + check_atme_receivers(receivers_login) unless receivers_login.blank? load_attachments(attachment_ids) unless attachment_ids.blank? + load_atme_receivers(receivers_login) unless receivers_login.blank? try_lock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}") @updated_journal = @journal @updated_journal.notes = notes + + build_atme_participants if @atme_receivers.present? + @updated_journal.attachments = @attachments unless attachment_ids.blank? @updated_journal.save! + + # @信息发送 + AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? + unlock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}") @updated_journal end end + private + + def build_atme_participants + atme_receivers.each do |receiver| + @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) + end + end + end \ No newline at end of file diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 979f50c3d..a57fbf34d 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -56,8 +56,8 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.where(author_id: author_id) if author_id.present? # issue_tag_ids - issues = issues.joins(:issue_tags).ransack(issue_tags_id_in_all: issue_tag_ids).result unless issue_tag_ids.blank? - + issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(",")).result unless issue_tag_ids.blank? + # milestone_id issues = issues.where(fixed_version_id: milestone_id) if milestone_id.present? diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index a120dabc7..25b9d23c1 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -58,6 +58,7 @@ class Api::V1::Issues::UpdateService < ApplicationService @updated_issue.assigners = @assigners || User.none unless assigner_ids.nil? @updated_issue.attachments = @attachments || Attachment.none unless attachment_ids.nil? @updated_issue.issue_tags = @issue_tags || IssueTag.none unless issue_tag_ids.nil? + @created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.nil? @updated_issue.updated_on = Time.now @updated_issue.save! From e53d6cd7631c216f2565ba62ea47ef4940f3ecd4 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Feb 2023 21:03:40 +0800 Subject: [PATCH 052/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/update_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 25b9d23c1..9f6a1f736 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -58,7 +58,7 @@ class Api::V1::Issues::UpdateService < ApplicationService @updated_issue.assigners = @assigners || User.none unless assigner_ids.nil? @updated_issue.attachments = @attachments || Attachment.none unless attachment_ids.nil? @updated_issue.issue_tags = @issue_tags || IssueTag.none unless issue_tag_ids.nil? - @created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.nil? + @updated_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.nil? @updated_issue.updated_on = Time.now @updated_issue.save! From 267279df2d03f76f498f2f414b671431fe2efa20 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 24 Feb 2023 09:04:29 +0800 Subject: [PATCH 053/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/issue_tags_controller.rb | 18 +++++++++--------- app/services/api/v1/issues/list_service.rb | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 2a5038e63..99fc7d45c 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -4,8 +4,8 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController before_action :require_operate_above, only: [:create, :update, :destroy] def index - @issue_tags = @project.issue_tags.order("#{order_by} #{order_direction}") @issue_tags = @issue_tags.ransack(name_cont: params[:keyword]).result if params[:keyword].present? + @issue_tags = @project.issue_tags.reorder("#{sort_by} #{sort_direction}") if params[:only_name] @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color)) else @@ -43,16 +43,16 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController private - def order_by - order_by = params.fetch(:order_by, "created_at") - order_by = IssueTag.column_names.include?(order_by) ? order_by : "created_at" - order_by + def sort_by + sort_by = params.fetch(:sort_by, "created_at") + sort_by = IssueTag.column_names.include?(sort_by) ? sort_by : "created_at" + sort_by end - def order_direction - order_direction = params.fetch(:order_direction, "desc").downcase - order_direction = %w(desc asc).include?(order_direction) ? order_direction : "desc" - order_direction + def sort_direction + sort_direction = params.fetch(:sort_direction, "desc").downcase + sort_direction = %w(desc asc).include?(sort_direction) ? sort_direction : "desc" + sort_direction end def issue_tag_params diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index a57fbf34d..e5a96a481 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -70,9 +70,9 @@ class Api::V1::Issues::ListService < ApplicationService # keyword issues = issues.ransack(subject_or_description_cont: keyword).result if keyword.present? - @total_issues_count = issues.size - @closed_issues_count = issues.closed.size - @opened_issues_count = issues.opened.size + @total_issues_count = issues.distinct.size + @closed_issues_count = issues.closed.distinct.size + @opened_issues_count = issues.opened.distinct.size case category when 'closed' From 35bb8fbc1113b845b8a99010be95ba3136d4c12b Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 24 Feb 2023 10:24:57 +0800 Subject: [PATCH 054/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 2 +- app/models/issue.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index acf92e834..1f155c5ea 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -2,7 +2,6 @@ class Api::V1::IssuesController < Api::V1::BaseController before_action :require_login, except: [:index, :show] before_action :require_public_and_member_above, only: [:index, :show, :create, :update, :destroy] before_action :require_operate_above, only: [:batch_update, :batch_destroy] - before_action :check_issue_operate_permission, only: [:update, :destroy] def index IssueTag.init_data(@project.id) unless $redis_cache.hget("project_init_issue_tags", @project.id) @@ -19,6 +18,7 @@ class Api::V1::IssuesController < Api::V1::BaseController end before_action :load_issue, only: [:show, :update, :destroy] + before_action :check_issue_operate_permission, only: [:update, :destroy] def show @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user) diff --git a/app/models/issue.rb b/app/models/issue.rb index 3efaac03a..fa25c06a6 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -73,8 +73,8 @@ class Issue < ApplicationRecord has_many :issue_participants, dependent: :destroy has_many :participants, through: :issue_participants has_many :show_participants, -> {joins(:issue_participants).where.not(issue_participants: {participant_type: "atme"}).distinct}, through: :issue_participants, source: :participant - has_many :show_assigners, -> {joins(:issue_assigners).order("issue_assigners.created_at desc").limit(5)}, through: :issue_assigners, source: :assigner - has_many :show_issue_tags, -> {joins(:issue_tags_relates).order("issue_tags_relates.created_at desc").limit(3)}, through: :issue_tags_relates, source: :issue_tag + has_many :show_assigners, -> {joins(:issue_assigners).order("issue_assigners.created_at desc").distinct.limit(5)}, through: :issue_assigners, source: :assigner + has_many :show_issue_tags, -> {joins(:issue_tags_relates).order("issue_tags_relates.created_at desc").distinct.limit(3)}, through: :issue_tags_relates, source: :issue_tag has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized has_many :operate_journals, -> {where(notes: nil)}, class_name: "Journal", :as => :journalized From b616c971dbf0f7c42e76b0959fc85f0cc4590f66 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 24 Feb 2023 14:32:21 +0800 Subject: [PATCH 055/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/issue_tags_controller.rb | 2 +- app/models/issue.rb | 4 ++-- app/models/issue_tag.rb | 4 ++++ app/models/issue_tags_relate.rb | 14 ++++++++++++++ app/services/api/v1/issues/list_service.rb | 2 +- app/services/api/v1/issues/update_service.rb | 2 +- app/views/api/v1/issues/_detail.json.jbuilder | 2 +- lib/tasks/upgrade_issue_generate_data.rake | 3 +-- 8 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/v1/issues/issue_tags_controller.rb b/app/controllers/api/v1/issues/issue_tags_controller.rb index 99fc7d45c..fe2ecceab 100644 --- a/app/controllers/api/v1/issues/issue_tags_controller.rb +++ b/app/controllers/api/v1/issues/issue_tags_controller.rb @@ -4,8 +4,8 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController before_action :require_operate_above, only: [:create, :update, :destroy] def index - @issue_tags = @issue_tags.ransack(name_cont: params[:keyword]).result if params[:keyword].present? @issue_tags = @project.issue_tags.reorder("#{sort_by} #{sort_direction}") + @issue_tags = @issue_tags.ransack(name_cont: params[:keyword]).result if params[:keyword].present? if params[:only_name] @issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color)) else diff --git a/app/models/issue.rb b/app/models/issue.rb index fa25c06a6..9fe7b0a9a 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -73,8 +73,8 @@ class Issue < ApplicationRecord has_many :issue_participants, dependent: :destroy has_many :participants, through: :issue_participants has_many :show_participants, -> {joins(:issue_participants).where.not(issue_participants: {participant_type: "atme"}).distinct}, through: :issue_participants, source: :participant - has_many :show_assigners, -> {joins(:issue_assigners).order("issue_assigners.created_at desc").distinct.limit(5)}, through: :issue_assigners, source: :assigner - has_many :show_issue_tags, -> {joins(:issue_tags_relates).order("issue_tags_relates.created_at desc").distinct.limit(3)}, through: :issue_tags_relates, source: :issue_tag + has_many :show_assigners, -> {joins(:issue_assigners).distinct}, through: :issue_assigners, source: :assigner + has_many :show_issue_tags, -> {joins(:issue_tags_relates).distinct}, through: :issue_tags_relates, source: :issue_tag has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized has_many :operate_journals, -> {where(notes: nil)}, class_name: "Journal", :as => :journalized diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index 5381da9be..100373e80 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -48,5 +48,9 @@ class IssueTag < ApplicationRecord $redis_cache.hset("project_init_issue_tags", project_id, 1) end + def reset_counter_field + self.update_column(:issues_count, issue_issues.size) + self.update_column(:pull_requests_count, pull_request_issues.size) + end end diff --git a/app/models/issue_tags_relate.rb b/app/models/issue_tags_relate.rb index 13eaa780f..fc753e95b 100644 --- a/app/models/issue_tags_relate.rb +++ b/app/models/issue_tags_relate.rb @@ -18,12 +18,26 @@ class IssueTagsRelate < ApplicationRecord belongs_to :issue_tag after_create :increment_issue_tags_counter_cache + after_destroy :decrement_issue_tags_counter_cache def increment_issue_tags_counter_cache + Rails.logger.info "11111" + Rails.logger.info self.issue.issue_classify + if self.issue.issue_classify == "issue" IssueTag.increment_counter :issues_count, issue_tag_id else IssueTag.increment_counter :pull_requests_count, issue_tag_id end end + + def decrement_issue_tags_counter_cache + Rails.logger.info "2222222" + Rails.logger.info self.issue.issue_classify + if self.issue.issue_classify == "issue" + IssueTag.decrement_counter :issues_count, issue_tag_id + else + IssueTag.decrement_counter :pull_requests_count, issue_tag_id + end + end end diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index e5a96a481..f88e1fc63 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -81,7 +81,7 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.opened end - scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :issue_tags, :comment_journals) + scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals) scope = scope.reorder("#{sort_by} #{sort_direction}").distinct diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 9f6a1f736..6a472a9fc 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -57,7 +57,7 @@ class Api::V1::Issues::UpdateService < ApplicationService build_atme_participants if @atme_receivers.present? @updated_issue.assigners = @assigners || User.none unless assigner_ids.nil? @updated_issue.attachments = @attachments || Attachment.none unless attachment_ids.nil? - @updated_issue.issue_tags = @issue_tags || IssueTag.none unless issue_tag_ids.nil? + @updated_issue.issue_tags_relates.destroy_all & @updated_issue.issue_tags = @issue_tags || IssueTag.none unless issue_tag_ids.nil? @updated_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.nil? @updated_issue.updated_on = Time.now diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index a39cdde9e..193357ce1 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -1,7 +1,7 @@ json.(issue, :id, :subject, :project_issues_index, :description, :branch_name, :start_date, :due_date) json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") -json.tags issue.issue_tags.each do |tag| +json.tags issue.show_issue_tags.each do |tag| json.partial! "api/v1/issues/issue_tags/simple_detail", locals: {tag: tag} end json.status do diff --git a/lib/tasks/upgrade_issue_generate_data.rake b/lib/tasks/upgrade_issue_generate_data.rake index 6d016a653..34a266f25 100644 --- a/lib/tasks/upgrade_issue_generate_data.rake +++ b/lib/tasks/upgrade_issue_generate_data.rake @@ -30,8 +30,7 @@ namespace :upgrade_issue_generate_data do IssuePriority.init_data IssueStatus.init_data IssueTag.order(created_at: :desc).find_each do |it| - it.update_column(:issues_count, it.issue_issues.size) - it.update_column(:pull_requests_count, it.pull_request_issues.size) + it.reset_counter_field end IssueTag.where(user_id: nil).destroy_all count = 0 From dab636d1228e49dd856afedc84968cf16f1c03f2 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 24 Feb 2023 15:26:40 +0800 Subject: [PATCH 056/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/milestones_controller.rb | 10 ++++--- .../milestones/detail_issues_service.rb | 26 +++++++++++-------- .../v1/issues/milestones/show.json.jbuilder | 5 ++-- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 760ece707..2ccd2ab90 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -32,10 +32,12 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController # 里程碑详情 def show - @object_results = Api::V1::Issues::Milestones::DetailIssuesService.call(@project, @milestone, query_params, current_user) - @closed_issues_count = @object_results.closed.size - @opened_issues_count = @object_results.opened.size - @issues = kaminari_paginate(@object_results) + @object_result = Api::V1::Issues::Milestones::DetailIssuesService.call(@project, @milestone, query_params, current_user) + @total_issues_count = @object_result[:total_issues_count] + @opened_issues_count = @object_result[:opened_issues_count] + @closed_issues_count = @object_result[:closed_issues_count] + + @issues = kaminari_paginate(@object_result[:data]) end def update diff --git a/app/services/api/v1/issues/milestones/detail_issues_service.rb b/app/services/api/v1/issues/milestones/detail_issues_service.rb index a6fc5815d..8b6f69aed 100644 --- a/app/services/api/v1/issues/milestones/detail_issues_service.rb +++ b/app/services/api/v1/issues/milestones/detail_issues_service.rb @@ -2,7 +2,7 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService include ActiveModel::Model attr_reader :project, :category, :author_id, :assigner_id, :issue_tag_ids, :sort_by, :sort_direction, :current_user - attr_accessor :queried_issues + attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} validates :sort_by, inclusion: {in: ['issues.created_on', 'issues.updated_on', 'issue_priorities.position'], message: '请输入正确的SortBy'}, allow_blank: true @@ -26,7 +26,7 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService begin issue_query_data - queried_issues + return {data: queried_issues, total_issues_count: @total_issues_count, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count} rescue raise Error, "服务器错误，请联系系统管理员！" end @@ -36,6 +36,18 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService def issue_query_data issues = @milestone.issues.issue_issue + # author_id + issues = issues.where(author_id: author_id) if author_id.present? + + # assigner_id + issues = issues.joins(:assigners).where(users: {id: assigner_id}).or(issues.joins(:assigners).where(assigned_to_id: assigner_id)) if assigner_id.present? + + issues = issues.ransack(issue_tags_value_cont: issue_tag_ids.sort!.join(",")).result unless issue_tag_ids.blank? + + @total_issues_count = issues.distinct.size + @closed_issues_count = issues.closed.distinct.size + @opened_issues_count = issues.opened.distinct.size + case category when 'closed' issues = issues.closed @@ -43,15 +55,7 @@ class Api::V1::Issues::Milestones::DetailIssuesService < ApplicationService issues = issues.opened end - # author_id - issues = issues.where(author_id: author_id) if author_id.present? - - # assigner_id - issues = issues.joins(:assigners).where(users: {id: assigner_id}).or(issues.joins(:assigners).where(assigned_to_id: assigner_id)) if assigner_id.present? - - issues = issues.joins(:issue_tags).where(issue_tags: {id: issue_tag_ids}) if issue_tag_ids.present? - - scope = issues.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals).references(:assigners) + scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :version, :show_issue_tags, :comment_journals).references(:assigners) scope = scope.reorder("#{sort_by} #{sort_direction}").distinct diff --git a/app/views/api/v1/issues/milestones/show.json.jbuilder b/app/views/api/v1/issues/milestones/show.json.jbuilder index 01632e9d0..ce1886522 100644 --- a/app/views/api/v1/issues/milestones/show.json.jbuilder +++ b/app/views/api/v1/issues/milestones/show.json.jbuilder @@ -1,11 +1,12 @@ json.milestone do json.partial! "detail", locals: {milestone: @milestone} end -json.total_issues_count @issues.total_count +json.total_issues_count @total_issues_count json.closed_issues_count @closed_issues_count json.opened_issues_count @opened_issues_count +json.total_count @issues.total_count json.issues @issues.each do |issue| - if issue.issue_classify == "Issue" + if issue.issue_classify == "issue" json.partial! "api/v1/issues/simple_detail", locals: {issue: issue} end end \ No newline at end of file From 2e0b32f86b961ecaaab59099780c9afabda87cc2 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 10:46:56 +0800 Subject: [PATCH 057/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aatme?= =?UTF-8?q?=E5=92=8Cissue=20category=20=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 2 +- app/services/api/v1/issues/list_service.rb | 16 ++++++++-------- app/services/api/v1/issues/update_service.rb | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index e353b86e0..ec4aeac0b 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -109,7 +109,7 @@ class Api::V1::Issues::CreateService < ApplicationService end def build_atme_participants - atme_receivers.each do |receiver| + @atme_receivers.each do |receiver| @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index f88e1fc63..66e64d02b 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -28,13 +28,13 @@ class Api::V1::Issues::ListService < ApplicationService def call raise Error, errors.full_messages.join(", ") unless valid? - begin + # begin issue_query_data return {data: queried_issues, total_issues_count: @total_issues_count, closed_issues_count: @closed_issues_count, opened_issues_count: @opened_issues_count} - rescue - raise Error, "服务器错误，请联系系统管理员！" - end + # rescue + # raise Error, "服务器错误，请联系系统管理员！" + # end end private @@ -43,13 +43,13 @@ class Api::V1::Issues::ListService < ApplicationService case participant_category when 'aboutme' # 关于我的 - issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: %(authored assigned atme)},users: {id: current_user&.id}) + issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %(authored assigned atme), participant_id: current_user&.id}) when 'authoredme' # 我创建的 - issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'assigned'},users: {id: current_user&.id}) + issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'authored', participant_id: current_user&.id}) when 'assignedme' # 我负责的 - issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'assigned'},users: {id: current_user&.id}) + issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'assigned', participant_id: current_user&.id}) when 'atme' # @我的 - issues = issues.joins(:participants, :issue_participants).where(issue_participants: {participant_type: 'atme'},users: {id: current_user&.id}) + issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'atme', participant_id: current_user&.id}) end # author_id diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 6a472a9fc..45274b9c4 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -111,7 +111,7 @@ class Api::V1::Issues::UpdateService < ApplicationService end def build_atme_participants - atme_receivers.each do |receiver| + @atme_receivers.each do |receiver| next if @updated_issue.issue_participants.exists?(participant_type: "atme", participant_id: receiver.id) @updated_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end From a30a3c56b60b920cba056e76a054e4f1d3470443 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 10:55:53 +0800 Subject: [PATCH 058/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/journals/create_service.rb | 2 +- app/services/api/v1/issues/journals/update_service.rb | 2 +- app/services/api/v1/issues/list_service.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index 470636120..72270f63e 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -66,7 +66,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService end def build_atme_participants - atme_receivers.each do |receiver| + @atme_receivers.each do |receiver| @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end diff --git a/app/services/api/v1/issues/journals/update_service.rb b/app/services/api/v1/issues/journals/update_service.rb index 0b356f93e..4c301bc41 100644 --- a/app/services/api/v1/issues/journals/update_service.rb +++ b/app/services/api/v1/issues/journals/update_service.rb @@ -47,7 +47,7 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService private def build_atme_participants - atme_receivers.each do |receiver| + @atme_receivers.each do |receiver| @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 66e64d02b..fa27f4ee4 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -43,7 +43,7 @@ class Api::V1::Issues::ListService < ApplicationService case participant_category when 'aboutme' # 关于我的 - issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %(authored assigned atme), participant_id: current_user&.id}) + issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: %w(authored assigned atme), participant_id: current_user&.id}) when 'authoredme' # 我创建的 issues = issues.joins(:issue_participants).where(issue_participants: {participant_type: 'authored', participant_id: current_user&.id}) when 'assignedme' # 我负责的 From 4c26085e58615bede02b57a57056cf07f9714f52 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 11:07:09 +0800 Subject: [PATCH 059/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/journals/create_service.rb | 2 +- app/services/api/v1/issues/journals/update_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index 72270f63e..0fd7b3760 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -67,7 +67,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService def build_atme_participants @atme_receivers.each do |receiver| - @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) + @issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end end \ No newline at end of file diff --git a/app/services/api/v1/issues/journals/update_service.rb b/app/services/api/v1/issues/journals/update_service.rb index 4c301bc41..3ac35b519 100644 --- a/app/services/api/v1/issues/journals/update_service.rb +++ b/app/services/api/v1/issues/journals/update_service.rb @@ -48,7 +48,7 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService def build_atme_participants @atme_receivers.each do |receiver| - @created_issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) + @issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end From ff025e07dd89747e5610a2f0612140b54815b829 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 11:25:37 +0800 Subject: [PATCH 060/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=87=8C?= =?UTF-8?q?=E7=A8=8B=E7=A2=91=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81id?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues/milestones_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/issues/milestones_controller.rb b/app/controllers/api/v1/issues/milestones_controller.rb index 2ccd2ab90..003a464dc 100644 --- a/app/controllers/api/v1/issues/milestones_controller.rb +++ b/app/controllers/api/v1/issues/milestones_controller.rb @@ -7,7 +7,7 @@ class Api::V1::Issues::MilestonesController < Api::V1::BaseController # 里程碑列表 def index @milestones = @project.versions - @milestones = @milestones.ransack(name_or_description_cont: params[:keyword]).result if params[:keyword].present? + @milestones = @milestones.ransack(id_eq: params[:keyword]).result.or(@milestones.ransack(name_or_description_cont: params[:keyword]).result) if params[:keyword].present? @closed_milestone_count = @milestones.closed.size @opening_milestone_count = @milestones.opening.size @milestones = params[:category] == "closed" ? @milestones.closed : @milestones.opening From f05cf0c000a181447b27c46724c8ba0454ba5530 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 14:12:25 +0800 Subject: [PATCH 061/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/journal.rb b/app/models/journal.rb index 6472d559d..57f53c125 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -45,7 +45,7 @@ class Journal < ApplicationRecord has_many :journal_details, :dependent => :delete_all has_many :attachments, as: :container, dependent: :destroy has_many :first_ten_children_journals, -> { order(created_on: :asc).limit(10)}, class_name: 'Journal', foreign_key: :parent_id - has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id + has_many :children_journals, class_name: 'Journal', foreign_key: :parent_id, dependent: :destroy scope :journal_includes, ->{includes(:user, :journal_details, :attachments)} scope :parent_journals, ->{where(parent_id: nil)} From ddb5010e6ddc250f5c4342829d47a71c5fde55b8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 15:04:18 +0800 Subject: [PATCH 062/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aissue=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=9C=80=E6=8E=92=E9=99=A4pr=E4=B8=8Bissue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues/journals_controller.rb | 2 +- app/controllers/api/v1/issues_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index 12406ef49..f7a24ea05 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -42,7 +42,7 @@ class Api::V1::Issues::JournalsController < Api::V1::BaseController end def load_issue - @issue = @project.issues.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index]) + @issue = @project.issues.issue_issue.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index]) if @issue.blank? render_not_found("疑修不存在!") end diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 1f155c5ea..84f4dd722 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -60,7 +60,7 @@ class Api::V1::IssuesController < Api::V1::BaseController private def load_issue - @issue = @project.issues.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index]) + @issue = @project.issues.issue_issue.where(project_issues_index: params[:index]).where.not(id: params[:index]).take || Issue.find_by_id(params[:index]) if @issue.blank? render_not_found("疑修不存在!") end From acaa28cd028c79dc7aed8c7ed71a825a2c5be390 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 15:13:35 +0800 Subject: [PATCH 063/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Alast=20index?= =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 4361118e4..55c3ba86c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -426,7 +426,7 @@ class Project < ApplicationRecord end def get_last_project_issues_index - last_issue = self.issues.last + last_issue = self.issues.issue_issue.last deleted_issue_count = ($redis_cache.hget("issue_cache_delete_count", self.id) || 0).to_i last_issue&.project_issues_index.present? ? last_issue.project_issues_index + deleted_issue_count : 0 From ed7f5a08bb0d0a30ae19d2feefac57e4b6e857f8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 27 Feb 2023 15:17:10 +0800 Subject: [PATCH 064/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Arake?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/upgrade_issue_generate_data.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/upgrade_issue_generate_data.rake b/lib/tasks/upgrade_issue_generate_data.rake index 34a266f25..07382a1e9 100644 --- a/lib/tasks/upgrade_issue_generate_data.rake +++ b/lib/tasks/upgrade_issue_generate_data.rake @@ -8,9 +8,9 @@ namespace :upgrade_issue_generate_data do task project_issues_index: :environment do puts "____________fix start________________" - Issue.update_all(project_issues_index: nil) + Issue.issue_issue.update_all(project_issues_index: nil) count = 0 - Issue.where(project_issues_index: nil).group(:project_id).count.each do |pid, count| + Issue.issue_issue.where(project_issues_index: nil).group(:project_id).count.each do |pid, count| p = Project.find_by_id(pid) issues = p.issues.order(created_on: :asc) issues.find_each.with_index do |issue, index| From f8350c4043893ef410c89d047ceba1a66103df7a Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 27 Feb 2023 16:02:08 +0800 Subject: [PATCH 065/133] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index b4c21e044..877aca463 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,6 +66,9 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), + ai_shang_v1_url: ai_shang_url(project,"v1"), + ai_shang_v2_url: ai_shang_url(project,"v2"), + ai_shang_v3_url: ai_shang_v3_url(project,"v3"), ignore_id: project.ignore_id }).compact @@ -138,6 +141,34 @@ module ProjectsHelper "#{saas_url}/oauth/login?product_account_id=PA1001218&tenant_code=TI1001383&oauth_url=#{oauth_url}&token=#{token.value}" end + def ai_shang_url(project, version) + url = EduSetting.get("ai_shang_url") || "https://shang.gitlink.org.cn" + case project.identifier.to_s.downcase + when nil then "" + when 'rails' then "#{url}/#{version}/rails/entropy" + when 'jittor' then "#{url}/#{version}/jittor/entropy" + when 'paddle' then "#{url}/#{version}/Paddle/entropy" + when 'vue' then "#{url}/#{version}/vue/entropy" + when 'bootstrap' then "#{url}/#{version}/bootstrap/entropy" + when 'tensorflow' then "#{url}/#{version}/tensorflow/entropy" + else '' + end + end + + def ai_shang_v3_url(project, version) + url = EduSetting.get("ai_shang_v3_url") || "https://entropy.ingress.isa.buaanlsde.cn" + case project.identifier.to_s.downcase + when nil then "" + when 'rails' then "#{url}/rails/entropy" + when 'jittor' then "#{url}/jittor/entropy" + when 'paddle' then "#{url}/Paddle/entropy" + when 'vue' then "#{url}/vue/entropy" + when 'bootstrap' then "#{url}/bootstrap/entropy" + when 'tensorflow' then "#{url}/tensorflow/entropy" + else '' + end + end + def aes_encrypt(key, des_text) # des_text='{"access_key_id":"STS.NTuC9RVmWfJqj3JkcMzPnDf7X","access_key_secret":"E8NxRZWGNxxMfwgt5nFLnBFgg6AzgXCZkSNCyqygLuHM","end_point":"oss-accelerate.aliyuncs.com","security_token":"CAIS8gF1q6Ft5B2yfSjIr5fACIPmu7J20YiaaBX7j2MYdt9Cq6Ocujz2IHhMenVhA+8Wv/02n2hR7PcYlq9IS55VWEqc/VXLaywQo22beIPkl5Gfz95t0e+IewW6Dxr8w7WhAYHQR8/cffGAck3NkjQJr5LxaTSlWS7OU/TL8+kFCO4aRQ6ldzFLKc5LLw950q8gOGDWKOymP2yB4AOSLjIx6lAt2T8vs/7hmZPFukSFtjCglL9J/baWC4O/csxhMK14V9qIx+FsfsLDqnUIs0YWpf0p3P0doGyf54vMWUM05A6dduPS7txkLAJwerjVl1/ADxc0/hqAASXhPeiktbmDjwvnSn4iKcSGQ+xoQB468eHXNdvf13dUlbbE1+JhRi0pZIB2UCtN9oTsLHcwIHt+EJaoMd3+hGwPVmvHSXzECDFHylZ8l/pzTwlE/aCtZyVmI5cZEvmWu2xBa3GRbULo7lLvyeX1cHTVmVWf4Nk6D09PzTU8qlAj","bucket":"edu-bigfiles1","region":"oss-cn-hangzhou","callback_url":"https://data.educoder.net/api/buckets/callback.json","bucket_host":"data.educoder.net"}' # des = OpenSSL::Cipher::Cipher.new('aes-256-ctr') From 46da5a0d84f96d8d23628cdb2ebabbd372744d8d Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 27 Feb 2023 16:41:40 +0800 Subject: [PATCH 066/133] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 877aca463..738463f22 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,9 +66,9 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), - ai_shang_v1_url: ai_shang_url(project,"v1"), - ai_shang_v2_url: ai_shang_url(project,"v2"), - ai_shang_v3_url: ai_shang_v3_url(project,"v3"), + ai_shang_v1_url: ai_shang_v1_url(project), + ai_shang_v2_url: ai_shang_v2_url(project), + ai_shang_v3_url: ai_shang_v3_url(project), ignore_id: project.ignore_id }).compact @@ -141,21 +141,35 @@ module ProjectsHelper "#{saas_url}/oauth/login?product_account_id=PA1001218&tenant_code=TI1001383&oauth_url=#{oauth_url}&token=#{token.value}" end - def ai_shang_url(project, version) + def ai_shang_v1_url(project) url = EduSetting.get("ai_shang_url") || "https://shang.gitlink.org.cn" case project.identifier.to_s.downcase when nil then "" - when 'rails' then "#{url}/#{version}/rails/entropy" - when 'jittor' then "#{url}/#{version}/jittor/entropy" - when 'paddle' then "#{url}/#{version}/Paddle/entropy" - when 'vue' then "#{url}/#{version}/vue/entropy" - when 'bootstrap' then "#{url}/#{version}/bootstrap/entropy" - when 'tensorflow' then "#{url}/#{version}/tensorflow/entropy" + when 'rails' then "#{url}/v1/rails/entropy" + when 'jittor' then "#{url}/v1/jittor/entropy" + when 'paddle' then "#{url}/v1/Paddle/entropy" + when 'vue' then "#{url}/v1/vue/entropy" + when 'bootstrap' then "#{url}/v1/bootstrap/entropy" + when 'tensorflow' then "#{url}/v1/tensorflow/entropy" else '' end end - def ai_shang_v3_url(project, version) + def ai_shang_v2_url(project) + url = EduSetting.get("ai_shang_url") || "https://shang.gitlink.org.cn" + case project.identifier.to_s.downcase + when nil then "" + when 'rails' then "#{url}/v2/getMediumData?repo_login=rails&repo_name=rails" + when 'jittor' then "#{url}/v2/getMediumData?repo_login=Jittor&repo_name=jittor" + when 'paddle' then "#{url}/v2/getMediumData?repo_login=PaddlePaddle&repo_name=Paddle" + when 'vue' then "#{url}/v2/getMediumData?repo_login=vuejs&repo_name=vue" + when 'bootstrap' then "#{url}/v2/getMediumData?repo_login=twbs&repo_name=bootstrap" + when 'tensorflow' then "#{url}/v2/getMediumData?repo_login=tensorflow&repo_name=tensorflow" + else '' + end + end + + def ai_shang_v3_url(project) url = EduSetting.get("ai_shang_v3_url") || "https://entropy.ingress.isa.buaanlsde.cn" case project.identifier.to_s.downcase when nil then "" From 558d720203ebd87b2d61a6def820a7d1f62248b4 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 28 Feb 2023 09:26:45 +0800 Subject: [PATCH 067/133] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=88=B0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/projects/code_stats_controller.rb | 2 +- app/helpers/projects_helper.rb | 3 --- app/views/api/v1/projects/code_stats/index.json.jbuilder | 7 +++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/v1/projects/code_stats_controller.rb b/app/controllers/api/v1/projects/code_stats_controller.rb index 7ec671f3c..0f2b2dd36 100644 --- a/app/controllers/api/v1/projects/code_stats_controller.rb +++ b/app/controllers/api/v1/projects/code_stats_controller.rb @@ -3,6 +3,6 @@ class Api::V1::Projects::CodeStatsController < Api::V1::BaseController def index @result_object = Api::V1::Projects::CodeStats::ListService.call(@project, {ref: params[:ref]}, current_user&.gitea_token) - puts @result_object + # puts @result_object end end \ No newline at end of file diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 738463f22..2728b7546 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,9 +66,6 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), - ai_shang_v1_url: ai_shang_v1_url(project), - ai_shang_v2_url: ai_shang_v2_url(project), - ai_shang_v3_url: ai_shang_v3_url(project), ignore_id: project.ignore_id }).compact diff --git a/app/views/api/v1/projects/code_stats/index.json.jbuilder b/app/views/api/v1/projects/code_stats/index.json.jbuilder index 0b64270f7..c41fbc1ba 100644 --- a/app/views/api/v1/projects/code_stats/index.json.jbuilder +++ b/app/views/api/v1/projects/code_stats/index.json.jbuilder @@ -4,11 +4,14 @@ json.change_files @result_object["change_files"] json.additions @result_object["additions"] json.deletions @result_object["deletions"] json.commit_count_in_all_branches @result_object["commit_count_in_all_branches"] -json.authors @result_object["authors"].each do |author| +json.authors @result_object["authors"].each do |author| json.author do json.partial! 'api/v1/users/commit_user_email', locals: { user: render_cache_commit_author(author), name: author['name'], email: author['email'] } end json.commits author["commits"] json.additions author["additions"] json.deletions author["deletions"] -end \ No newline at end of file +end +json.ai_shang_v1_url ai_shang_v1_url(@project) +json.ai_shang_v2_url ai_shang_v2_url(@project) +json.ai_shang_v3_url ai_shang_v3_url(@project) \ No newline at end of file From 5a7aaff11292702a557c0dd17b11ebe722247330 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 28 Feb 2023 09:37:18 +0800 Subject: [PATCH 068/133] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=88=B0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/projects/code_stats/index.json.jbuilder | 5 +---- app/views/project_trends/index.json.jbuilder | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/api/v1/projects/code_stats/index.json.jbuilder b/app/views/api/v1/projects/code_stats/index.json.jbuilder index c41fbc1ba..3f98fa1ee 100644 --- a/app/views/api/v1/projects/code_stats/index.json.jbuilder +++ b/app/views/api/v1/projects/code_stats/index.json.jbuilder @@ -11,7 +11,4 @@ json.authors @result_object["authors"].each do |author| json.commits author["commits"] json.additions author["additions"] json.deletions author["deletions"] -end -json.ai_shang_v1_url ai_shang_v1_url(@project) -json.ai_shang_v2_url ai_shang_v2_url(@project) -json.ai_shang_v3_url ai_shang_v3_url(@project) \ No newline at end of file +end \ No newline at end of file diff --git a/app/views/project_trends/index.json.jbuilder b/app/views/project_trends/index.json.jbuilder index 6dca7bdb5..14f975236 100644 --- a/app/views/project_trends/index.json.jbuilder +++ b/app/views/project_trends/index.json.jbuilder @@ -14,4 +14,7 @@ json.project_trends do json.partial! "detail", trend: trend end end +json.ai_shang_v1_url ai_shang_v1_url(@project) +json.ai_shang_v2_url ai_shang_v2_url(@project) +json.ai_shang_v3_url ai_shang_v3_url(@project) From 4091872091d8b56c4f9ee993f2786a3a50dac212 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 28 Feb 2023 14:40:27 +0800 Subject: [PATCH 069/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=A0=87=E8=AE=B0=E4=BB=BB=E5=8A=A1=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue_tag.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index 100373e80..c6b6af8aa 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -34,7 +34,7 @@ class IssueTag < ApplicationRecord ["功能", "表示新功能申请", "#ee955a"], ["疑问", "表示存在的问题", "#2d6ddc"], ["支持", "表示特定功能或特定需求", "#019549"], - ["任务", "表示需要分配的任务", "#01a30d"], + ["任务", "表示需要分配的任务", "#c1a30d"], ["协助", "表示需要社区用户协助", "#2a0dc1"], ["搁置", "表示此问题暂时不会继续处理", "#892794"], ["文档", "表示文档材料补充", "#9ed600"], From 6f9d902e70058678642188215c8dee7a26528043 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 28 Feb 2023 14:59:06 +0800 Subject: [PATCH 070/133] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=88=B0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 14 ++++++++++++++ app/views/project_trends/index.json.jbuilder | 1 + 2 files changed, 15 insertions(+) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 2728b7546..99cf0e01a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -166,6 +166,20 @@ module ProjectsHelper end end + def ai_shang_v4_url(project) + url = EduSetting.get("ai_shang_url") || "https://shang.gitlink.org.cn" + case project.identifier.to_s.downcase + when nil then "" + when 'rails' then "#{url}/v2/getIndexData?repo_login=rails&repo_name=rails" + when 'jittor' then "#{url}/v2/getIndexData?repo_login=Jittor&repo_name=jittor" + when 'paddle' then "#{url}/v2/getIndexData?repo_login=PaddlePaddle&repo_name=Paddle" + when 'vue' then "#{url}/v2/getIndexData?repo_login=vuejs&repo_name=vue" + when 'bootstrap' then "#{url}/v2/getIndexData?repo_login=twbs&repo_name=bootstrap" + when 'tensorflow' then "#{url}/v2/getIndexData?repo_login=tensorflow&repo_name=tensorflow" + else '' + end + end + def ai_shang_v3_url(project) url = EduSetting.get("ai_shang_v3_url") || "https://entropy.ingress.isa.buaanlsde.cn" case project.identifier.to_s.downcase diff --git a/app/views/project_trends/index.json.jbuilder b/app/views/project_trends/index.json.jbuilder index 14f975236..abfd651ef 100644 --- a/app/views/project_trends/index.json.jbuilder +++ b/app/views/project_trends/index.json.jbuilder @@ -17,4 +17,5 @@ end json.ai_shang_v1_url ai_shang_v1_url(@project) json.ai_shang_v2_url ai_shang_v2_url(@project) json.ai_shang_v3_url ai_shang_v3_url(@project) +json.ai_shang_v4_url ai_shang_v4_url(@project) From 2842df87c6f5ff0fa12ab21056c13e9eb19f6c08 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 28 Feb 2023 15:01:23 +0800 Subject: [PATCH 071/133] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=88=B0=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 99cf0e01a..5ed680ba3 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -186,7 +186,7 @@ module ProjectsHelper when nil then "" when 'rails' then "#{url}/rails/entropy" when 'jittor' then "#{url}/jittor/entropy" - when 'paddle' then "#{url}/Paddle/entropy" + when 'paddle' then "#{url}/paddle/entropy" when 'vue' then "#{url}/vue/entropy" when 'bootstrap' then "#{url}/bootstrap/entropy" when 'tensorflow' then "#{url}/tensorflow/entropy" From a80b4d954ee4f4bd3a8441fbac838a29d440b812 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 28 Feb 2023 16:03:33 +0800 Subject: [PATCH 072/133] =?UTF-8?q?dockerfile=E5=8F=AF=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_simple_entry.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/repositories/_simple_entry.json.jbuilder b/app/views/repositories/_simple_entry.json.jbuilder index aae0e613c..339214cc4 100644 --- a/app/views/repositories/_simple_entry.json.jbuilder +++ b/app/views/repositories/_simple_entry.json.jbuilder @@ -2,7 +2,7 @@ if @project.forge? is_dir = @sub_entries.is_a?(Array) file_name = entry['name'] file_type = file_name.starts_with?('.') ? file_name[1..-1] : File.extname(file_name.to_s)[1..-1] - direct_download = file_name.to_s.downcase != "Makefile".downcase && download_type(file_type) + direct_download = ["makefile","dockerfile"].exclude?(file_name.to_s.downcase) && download_type(file_type) image_type = image_type?(file_type) json.name file_name json.sha entry['sha'] From ec44376e4d99fe01d9c6de41431b38673065e0ba Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 28 Feb 2023 16:57:44 +0800 Subject: [PATCH 073/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aissue=20?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E4=B8=AD@=E6=97=A0=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 2 +- app/services/api/v1/issues/journals/create_service.rb | 5 +++-- app/services/api/v1/issues/journals/update_service.rb | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index ec4aeac0b..a7ddf7e77 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -60,7 +60,7 @@ class Api::V1::Issues::CreateService < ApplicationService project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 # @信息发送 - AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? + AtmeService.call(current_user, @atme_receivers, @created_issue) unless receivers_login.blank? # 发消息 if Site.has_notice_menu? diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index 0fd7b3760..82a279d45 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -4,7 +4,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService include Api::V1::Issues::Concerns::Loadable attr_reader :issue, :current_user, :notes, :parent_id, :reply_id, :attachment_ids, :receivers_login - attr_accessor :created_journal + attr_accessor :created_journal, :atme_receivers validates :notes, :issue, :current_user, presence: true @@ -39,7 +39,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService @created_journal.save! # @信息发送 - AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? + AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? unlock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") @@ -67,6 +67,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService def build_atme_participants @atme_receivers.each do |receiver| + next if @issue.issue_participants.exists?(participant_type: "atme", participant_id: receiver.id) @issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end diff --git a/app/services/api/v1/issues/journals/update_service.rb b/app/services/api/v1/issues/journals/update_service.rb index 3ac35b519..70c6fe4d5 100644 --- a/app/services/api/v1/issues/journals/update_service.rb +++ b/app/services/api/v1/issues/journals/update_service.rb @@ -4,7 +4,7 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService include Api::V1::Issues::Concerns::Loadable attr_reader :issue, :journal, :current_user, :notes, :attachment_ids, :receivers_login - attr_accessor :updated_journal + attr_accessor :updated_journal, :atme_receivers validates :notes, :issue, :journal, :current_user, presence: true @@ -36,7 +36,7 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService @updated_journal.save! # @信息发送 - AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? + AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? unlock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}") @@ -48,6 +48,7 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService def build_atme_participants @atme_receivers.each do |receiver| + next if @issue.issue_participants.exists?(participant_type: "atme", participant_id: receiver.id) @issue.issue_participants.new({participant_type: "atme", participant_id: receiver.id}) end end From e59e4e4bd5432d6dd57008690b86af6648b93fde Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 28 Feb 2023 17:05:38 +0800 Subject: [PATCH 074/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/journals/create_service.rb | 9 +++++---- app/services/api/v1/issues/journals/update_service.rb | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index 82a279d45..dce00349b 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -24,10 +24,10 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService ActiveRecord::Base.transaction do check_parent_journal(parent_id) if parent_id.present? check_parent_journal(reply_id) if reply_id.present? - check_attachments(attachment_ids) unless attachment_ids.blank? - check_atme_receivers(receivers_login) unless receivers_login.blank? - load_attachments(attachment_ids) unless attachment_ids.blank? - load_atme_receivers(receivers_login) unless receivers_login.blank? + check_attachments(attachment_ids) unless attachment_ids.nil? + check_atme_receivers(receivers_login) unless receivers_login.nil? + load_attachments(attachment_ids) unless attachment_ids.nil? + load_atme_receivers(receivers_login) unless receivers_login.nil? try_lock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") @created_journal = @issue.journals.new(journal_attributes) @@ -37,6 +37,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService @created_journal.attachments = @attachments unless attachment_ids.blank? @created_journal.save! + @issue.save! # @信息发送 AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? diff --git a/app/services/api/v1/issues/journals/update_service.rb b/app/services/api/v1/issues/journals/update_service.rb index 70c6fe4d5..e5031aafe 100644 --- a/app/services/api/v1/issues/journals/update_service.rb +++ b/app/services/api/v1/issues/journals/update_service.rb @@ -20,10 +20,10 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService def call raise Error, errors.full_messages.join(", ") unless valid? ActiveRecord::Base.transaction do - check_attachments(attachment_ids) unless attachment_ids.blank? - check_atme_receivers(receivers_login) unless receivers_login.blank? - load_attachments(attachment_ids) unless attachment_ids.blank? - load_atme_receivers(receivers_login) unless receivers_login.blank? + check_attachments(attachment_ids) unless attachment_ids.nil? + check_atme_receivers(receivers_login) unless receivers_login.nil? + load_attachments(attachment_ids) unless attachment_ids.nil? + load_atme_receivers(receivers_login) unless receivers_login.nil? try_lock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}") @updated_journal = @journal @@ -31,9 +31,10 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService build_atme_participants if @atme_receivers.present? - @updated_journal.attachments = @attachments unless attachment_ids.blank? + @updated_journal.attachments = @attachments unless attachment_ids.nil? @updated_journal.save! + @issue.save! # @信息发送 AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? From b8724c02f7d1abe00e45057fb1cf373c53ae7089 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 1 Mar 2023 14:40:11 +0800 Subject: [PATCH 075/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9D=83=E9=99=90=E5=85=B3=E4=BA=8E=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/concerns/project_operable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/project_operable.rb b/app/models/concerns/project_operable.rb index 10b03cf72..0bac02ce6 100644 --- a/app/models/concerns/project_operable.rb +++ b/app/models/concerns/project_operable.rb @@ -194,7 +194,7 @@ module ProjectOperable if owner.is_a?(User) managers.exists?(user_id: user.id) elsif owner.is_a?(Organization) - managers.exists?(user_id: user.id) || owner.is_owner?(user.id) || owner.is_only_admin?(user.id) + managers.exists?(user_id: user.id) || owner.is_owner?(user.id) || (owner.is_only_admin?(user.id) && (teams.pluck(:id) & user.teams.pluck(:id)).size > 0) else false end @@ -205,7 +205,7 @@ module ProjectOperable if owner.is_a?(User) developers.exists?(user_id: user.id) elsif owner.is_a?(Organization) - developers.exists?(user_id: user.id) || owner.is_only_write?(user.id) + developers.exists?(user_id: user.id) || (owner.is_only_write?(user.id) && (teams.pluck(:id) & user.teams.pluck(:id)).size > 0) else false end From 5216e61479838911520a2e4c07b641f7ad61c1a5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 1 Mar 2023 16:34:27 +0800 Subject: [PATCH 076/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E4=B8=AD=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E7=9A=84=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/journal.rb b/app/models/journal.rb index 57f53c125..a789f28cd 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -73,8 +73,8 @@ class Journal < ApplicationRecord content += "将附件由#{old_value}更改为#{new_value}" end when 'issue_tag' - old_value = IssueTag.where(id: detail.old_value.split(",")).pluck(:name, :color).map{|t| "#{t[0]}"}.join(" ") - new_value = IssueTag.where(id: detail.value.split(",")).pluck(:name, :color).map{|t| "#{t[0]}"}.join(" ") + old_value = IssueTag.where(id: detail.old_value.split(",")).pluck(:name).join("、") + new_value = IssueTag.where(id: detail.value.split(",")).pluck(:name).join("、") if old_value.nil? || old_value.blank? content += "添加了#{new_value}标记" else From b1c10d66f9cfb0e057bd8f517048c8f9a2784a4e Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 2 Mar 2023 13:49:50 +0800 Subject: [PATCH 077/133] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E7=A1=AE?= =?UTF-8?q?=E6=9D=83=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 319 +++++++++++++++ app/controllers/issues_controller.rb | 13 +- app/controllers/journals_controller.rb | 7 +- app/controllers/projects_controller.rb | 3 +- app/controllers/pull_requests_controller.rb | 53 ++- app/controllers/users_controller.rb | 383 +++++++++++++++++- app/forms/base_form.rb | 8 + app/forms/projects/create_form.rb | 5 +- app/helpers/tag_chosen_helper.rb | 3 +- app/models/concerns/watchable.rb | 205 ++++++++-- app/queries/application_query.rb | 49 +++ app/queries/blockchain/balance_query.rb | 31 ++ .../blockchain/balance_query_one_project.rb | 12 + app/queries/blockchain/repo_basic_info.rb | 13 + app/queries/projects/list_my_query.rb | 6 + app/services/application_service.rb | 144 +++++-- app/services/blockchain/create_issue.rb | 28 ++ app/services/blockchain/create_trade.rb | 29 ++ app/services/blockchain/fix_issue.rb | 28 ++ .../blockchain/invoke_blockchain_api.rb | 34 ++ app/services/blockchain/transfer_service.rb | 36 ++ app/services/projects/create_service.rb | 14 +- config/configuration.yml.example | 3 + config/routes.rb | 15 + ...30070048_add_use_blockchain_to_projects.rb | 5 + ...81736_add_blockchain_token_num_to_issue.rb | 5 + 26 files changed, 1354 insertions(+), 97 deletions(-) create mode 100644 app/queries/blockchain/balance_query.rb create mode 100644 app/queries/blockchain/balance_query_one_project.rb create mode 100644 app/queries/blockchain/repo_basic_info.rb create mode 100644 app/services/blockchain/create_issue.rb create mode 100644 app/services/blockchain/create_trade.rb create mode 100644 app/services/blockchain/fix_issue.rb create mode 100644 app/services/blockchain/invoke_blockchain_api.rb create mode 100644 app/services/blockchain/transfer_service.rb create mode 100644 db/migrate/20201230070048_add_use_blockchain_to_projects.rb create mode 100644 db/migrate/20210421081736_add_blockchain_token_num_to_issue.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8129df8f1..f98c3c456 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -832,6 +832,325 @@ class ApplicationController < ActionController::Base HotSearchKeyword.add(keyword) end + # author: zxh + # blockchain相关项目活动调用函数 + # return true: 表示上链操作成功; return false: 表示上链操作失败 + def push_activity_2_blockchain(activity_type, model) + if activity_type == "issue_create" + + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return true + end + + id = model['id'] + + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + identifier = project['identifier'] + + author_id = project['user_id'] + author = User.find(author_id) + username = author['login'] + + action = 'opened' + + title = model['subject'] + content = model['description'] + created_at = model['created_on'] + updated_at = model['updated_on'] + + # 调用区块链接口 + params = { + "request-type": "upload issue info", + "issue_id": "gitlink-" + id.to_s, + "repo_id": "gitlink-" + project_id.to_s, + "issue_number": 0, # 暂时不需要改字段 + "reponame": identifier, + "ownername": ownername, + "username": username, + "action": action, + "title": title, + "content": content, + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 10 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + + elsif activity_type == "issue_comment_create" + issue_comment_id = model['id'] + issue_id = model['journalized_id'] + parent_id = model['parent_id'].nil? ? "" : model['parent_id'] + + issue = Issue.find(issue_id) + issue_classify = issue['issue_classify'] # issue或pull_request + project_id = issue['project_id'] + project = Project.find(project_id) + + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return + end + + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + author_id = model['user_id'] + author = User.find(author_id) + username = author['login'] + + action = 'created' + + content = model['notes'] + created_at = model['created_on'] + + if issue_classify == "issue" + params = { + "request-type": "upload issue comment info", + "issue_comment_id": "gitlink-" + issue_comment_id.to_s, + "issue_comment_number": 0, # 暂时不需要 + "issue_number": 0, # 暂时不需要 + "issue_id": "gitlink-" + issue_id.to_s, + "repo_id": "gitlink-" + project.id.to_s, + "parent_id": parent_id.to_s, + "reponame": identifier, + "ownername": ownername, + "username": username, + "action": action, + "content": content, + "created_at": created_at, + }.to_json + elsif issue_classify == "pull_request" + params = { + "request-type": "upload pull request comment info", + "pull_request_comment_id": "gitlink-" + issue_comment_id.to_s, + "pull_request_comment_number": 0, # 不考虑该字段 + "pull_request_number": 0, # 不考虑该字段 + "pull_request_id": "gitlink-" + issue_id.to_s, + "parent_id": parent_id.to_s, + "repo_id": "gitlink-" + project.id.to_s, + "reponame": identifier, + "ownername": ownername, + "username": username, + "action": action, + "content": content, + "created_at": created_at, + }.to_json + end + + # 调用区块链接口 + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 10 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + elsif activity_type == "pull_request_create" + # 调用区块链接口 + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return + end + + pull_request_id = model['id'] + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + action = 'opened' + + title = model['title'] + content = model['body'] + + source_branch = model['head'] + source_repo_id = model['fork_project_id'].nil? ? project_id : model['fork_project_id'] + + target_branch = model['base'] + target_repo_id = project_id + + author_id = model['user_id'] + author = User.find(author_id) + username = author['login'] + + created_at = model['created_at'] + updated_at = model['updated_at'] + + # 查询pull request对应的commit信息 + commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number']) + if commits.nil? + raise Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 + end + commit_shas = [] + commits.each do |c| + commit_shas << c["Sha"] + end + params = { + "request-type": "upload pull request info", + "pull_request_id": "gitlink-" + pull_request_id.to_s, + "pull_request_number": 0, # trustie没有该字段 + "repo_id": "gitlink-" + project_id.to_s, + "ownername": ownername, + "reponame": identifier, + "username": username, + "action": action, + "title": title, + "content": content, + "source_branch": source_branch, + "target_branch": target_branch, + "reviewers": [], # trustie没有该字段 + "commit_shas": commit_shas, + "merge_user": "", # trustie没有该字段 + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 9 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + elsif activity_type == "pull_request_merge" + # 调用区块链接口 + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return + end + + pull_request_id = model['id'] + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + action = 'merged' + + created_at = model['created_at'] + updated_at = model['updated_at'] + + # 查询pull request对应的commit信息 + commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number']) + if commits.nil? + raise Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 + end + commit_shas = [] + commits.each do |c| + commit_shas << c["Sha"] + end + + # 将pull request相关信息写入链上 + params = { + "request-type": "upload pull request info", + "pull_request_id": "gitlink-" + pull_request_id.to_s, + "pull_request_number": 0, # trustie没有该字段 + "repo_id": "gitlink-" + project_id.to_s, + "ownername": ownername, + "reponame": identifier, + "username": username, + "action": action, + "title": title, + "content": content, + "source_branch": source_branch, + "target_branch": target_branch, + "reviewers": [], # trustie没有该字段 + "commit_shas": commit_shas, + "merge_user": "", # trustie没有该字段 + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 9 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + + + # 将commit相关信息写入链上 + commit_shas.each do |commit_sha| + commit_diff = Gitea::Commit::DiffService.call(ownername, identifier, commit_sha, owner['gitea_token']) + commit = Gitea::Commit::InfoService.call(ownername, identifier, commit_sha, owner['gitea_token']) + params = { + "request-type": "upload commit info", + "commit_hash": commit_sha, + "repo_id": "gitlink-" + project_id.to_s, + "author": commit['commit']['author']['name'], + "author_email": commit['commit']['author']['email'], + "committer": commit['commit']['committer']['name'], + "committer_email": commit['commit']['committer']['email'], + "author_time": commit['commit']['author']['date'], + "committer_time": commit['commit']['committer']['date'], + "content": commit['commit']['message'], + "commit_diff": commit_diff['Files'].to_s + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 7 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + end + + elsif activity_type == "pull_request_refuse" + + # 调用区块链接口 + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return true + end + + pull_request_id = model['id'] + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + action = 'refused' + + # 将pull request相关信息写入链上 + params = { + "request-type": "upload pull request info", + "pull_request_id": "gitlink-" + pull_request_id.to_s, + "pull_request_number": 0, # trustie没有该字段 + "repo_id": "gitlink-" + project_id.to_s, + "ownername": ownername, + "reponame": identifier, + "username": username, + "action": action, + "title": title, + "content": content, + "source_branch": source_branch, + "target_branch": target_branch, + "reviewers": [], # trustie没有该字段 + "commit_shas": commit_shas, + "merge_user": "", # trustie没有该字段 + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 9 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + end + end def find_atme_receivers @atme_receivers = User.where(login: params[:receivers_login]) end diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 67fe65641..dfc551e3c 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -151,6 +151,7 @@ class IssuesController < ApplicationController end @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create") + @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE) if params[:status_id].to_i == 5 @@ -159,6 +160,15 @@ class IssuesController < ApplicationController # 新增时向grimoirelab推送事件 IssueWebhookJob.set(wait: 5.seconds).perform_later(@issue.id) + # author: zxh + # 扣除发起人的token + if @issue.blockchain_token_num > 0 + Blockchain::CreateIssue.call(user_id: @issue.author_id, project_id: @issue.project_id, token_num: @issue.blockchain_token_num) + end + + # 调用上链API存证 + push_activity_2_blockchain("issue_create", @issue) + render json: {status: 0, message: "创建成功", id: @issue.id} else normal_status(-1, "创建失败") @@ -546,7 +556,8 @@ class IssuesController < ApplicationController branch_name: params[:branch_name].to_s, issue_classify: "issue", author_id: current_user.id, - project_id: @project.id + project_id: @project.id, + blockchain_token_num: params[:blockchain_token_num] } end diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 6dc1e29c9..ff5e28cc1 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -47,10 +47,15 @@ class JournalsController < ApplicationController Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" AtmeService.call(current_user, @atme_receivers, journal) if @atme_receivers.size > 0 # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal") + + # author: zxh + # 调用上链API + push_activity_2_blockchain("issue_comment_create", journal) + render :json => { status: 0, message: "评论成功", id: journal.id} - # normal_status(0, "评论成功") else normal_status(-1, "评论失败") + raise ActiveRecord::Rollback end end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 52c776477..053c89e02 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -273,7 +273,8 @@ class ProjectsController < ApplicationController private def project_params params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier, - :project_category_id, :project_language_id, :license_id, :ignore_id, :private) + :project_category_id, :project_language_id, :license_id, :ignore_id, :private, + :blockchain, :blockchain_token_all, :blockchain_init_token) end def mirror_params diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 2b9bbbe6f..5a6742037 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -6,6 +6,7 @@ class PullRequestsController < ApplicationController before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits] before_action :load_pull_request, only: [:files, :commits] before_action :find_atme_receivers, only: [:create, :update] + include TagChosenHelper include ApplicationHelper @@ -73,6 +74,11 @@ class PullRequestsController < ApplicationController SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) if Site.has_notice_menu? Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" AtmeService.call(current_user, @atme_receivers, @pull_request) if @atme_receivers.size > 0 + + # author: zxh + # 调用上链API + push_activity_2_blockchain("pull_request_create", @pull_request) + else render_error("create pull request error: #{@gitea_pull_request[:status]}") raise ActiveRecord::Rollback @@ -119,7 +125,7 @@ class PullRequestsController < ApplicationController end else return normal_status(-1, "请输入正确的标记。") - end + end end if params[:status_id].to_i == 5 @issue.issue_times.update_all(end_time: Time.now) @@ -149,12 +155,16 @@ class PullRequestsController < ApplicationController ActiveRecord::Base.transaction do begin colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user) - if colsed === true + # author: zxh + # 调用上链API + push_activity_2_blockchain("pull_request_refuse", @pull_request) + + if colsed === true @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE) # 合并请求下issue处理为关闭 @issue&.update_attributes!({status_id:5}) SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id) if Site.has_notice_menu? - normal_status(1, "已拒绝") + normal_status(1, "已拒绝") else normal_status(-1, '合并失败') end @@ -198,6 +208,43 @@ class PullRequestsController < ApplicationController # @pull_request.project_trend_status! @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::MERGE) @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id) + + # author: zxh + # 调用上链API + push_activity_2_blockchain("pull_request_merge", @pull_request) + + # 查看是否fix了相关issue，如果fix就转账 + if params["fix_issue_id"].nil? || params["fix_issue_id"] == "" + else + issue = Issue.find_by(id: params["fix_issue_id"]) + if issue.nil? + normal_status(-1, "关联issue失败") + raise ActiveRecord::Rollback + else + token_num = issue.blockchain_token_num + token_num = token_num.nil? ? 0 : token_num + owner = User.find_by(login: params["owner"]) + pr = PullRequest.find_by(id: params["pull_request"]["id"]) + if owner.nil? || pr.nil? + normal_status(-1, "关联issue失败") + raise ActiveRecord::Rollback + else + project = Project.find_by(user_id: owner.id, identifier: params["project_id"]) + if project.nil? + normal_status(-1, "关联issue失败") + raise ActiveRecord::Rollback + else + author_id = pr.user_id + if token_num > 0 + Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) + end + # update issue to state 5 + issue.update(status_id: 5) + end + end + end + end + # 合并请求下issue处理为关闭 @issue&.update_attributes!({status_id:5}) SendTemplateMessageJob.perform_later('PullRequestMerged', current_user.id, @pull_request.id) if Site.has_notice_menu? diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 33fd93f83..6aee4b584 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,8 +2,8 @@ class UsersController < ApplicationController include ApplicationHelper include Ci::DbConnectable - before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard] - before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard] + before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard, :hovercard4proj] + before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard, :hovercard4proj] before_action :require_login, only: %i[me sync_user_info] before_action :connect_to_ci_db, only: [:get_user_info] before_action :convert_image!, only: [:update, :update_image] @@ -81,9 +81,134 @@ class UsersController < ApplicationController @watchers = paginate(watchers) end + def contribution_perc + project_id = params[:project_id] + @project = Project.find(project_id) + user_id = params[:id] + @user = User.find(user_id) + + def cal_perc(count_user, count_all) + (count_user * 1.0 / (count_all + 0.000000001)).round(5) + end + + if @project['use_blockchain'] == true or @project['use_blockchain'] == 1 + balance_user = Blockchain::BalanceQueryOneProject.call({"user_id": user_id, "project_id": project_id}) + balance_all = Blockchain::RepoBasicInfo.call({"project_id": project_id})["cur_supply"] + scores = { + "final" => cal_perc(balance_user, balance_all), + "blockchain" => true + } + else + # 获取所有行为对应的项目内记录总数和个人记录数 + features = { + "requirement" => {}, + "development" => {}, + "review" => {} + } + + # 1. issue创建 + issues = Issue.where(project_id: project_id, issue_classify: 'issue') + issue_all = issues.count + issue_user = issues.where(author_id: user_id).count + features["requirement"] = features["requirement"].merge({"issue" => {"all" => issue_all, "perc" => cal_perc(issue_user, issue_all)}}) + # 2. 里程碑创建 + milestones = Version.where(project_id: project_id) + milestone_all = milestones.count + milestone_user = milestones.where(user_id: user_id).count + features["requirement"] = features["requirement"].merge({"milestone" => {"all" => milestone_all, "perc" => cal_perc(milestone_user, milestone_all)}}) + # 3. issue评论 + issue_comments = Journal.joins("INNER JOIN issues on journals.journalized_id=issues.id").where("issues.project_id=#{project_id} and journalized_type='Issue' and issues.issue_classify='issue'") + issue_comment_all = issue_comments.count + issue_comment_user = issue_comments.where("journals.user_id=#{user_id}").count + features["requirement"] = features["requirement"].merge({"issue_comment" => {"all" => issue_comment_all, "perc" => cal_perc(issue_comment_user, issue_comment_all)}}) + # 4. 合并请求 + prs = PullRequest.where(project_id: project_id) + pr_all = prs.count + pr_user = prs.where(user_id: user_id).count + features["development"] = features["development"].merge({"pr" => {"all" => pr_all, "perc" => cal_perc(pr_user, pr_all)}}) + # 5. pr评论 + pr_comments = Journal.joins("INNER JOIN issues on journals.journalized_id=issues.id").where("issues.project_id=#{project_id} and journalized_type='Issue' and issues.issue_classify='pull_request'") + pr_comment_all = pr_comments.count + pr_comment_user = pr_comments.where("journals.user_id=#{user_id}").count + features["review"] = features["review"].merge({"pr_comment" => {"all" => pr_comment_all, "perc" => cal_perc(pr_comment_user, pr_comment_all)}}) + # 6. 代码行评论 + line_comments = Journal.joins("INNER JOIN pull_requests on journals.journalized_id=pull_requests.id").where("pull_requests.project_id=#{project_id} and journalized_type='PullRequest'") + line_comment_all = line_comments.count + line_comment_user = line_comments.where("journals.user_id=#{user_id}").count + features["review"] = features["review"].merge({"line_comment" => {"all" => line_comment_all, "perc" => cal_perc(line_comment_user, line_comment_all)}}) + # 7. 代码行、commit贡献统计 + code_contributions = Api::V1::Projects::CodeStats::ListService.call(@project, {ref: nil}) + commit_all = code_contributions["commit_count"] + addition_all = code_contributions["additions"] + deletion_all = code_contributions["deletions"] + + commit_user = 0 + addition_user = 0 + deletion_user = 0 + code_contributions["authors"].each do |author| + if author["name"] == @user.login + commit_user = author["commits"] + addition_user = author["additions"] + deletion_user = author["deletions"] + end + end + + features["development"] = features["development"].merge({"commit" => {"all" => commit_all, "perc" => cal_perc(commit_user, commit_all)}}) + features["development"] = features["development"].merge({"addition" => {"all" => addition_all, "perc" => cal_perc(addition_user, addition_all)}}) + features["development"] = features["development"].merge({"deletion" => {"all" => deletion_all, "perc" => cal_perc(deletion_user, deletion_all)}}) + + def cal_weight(features) + weights = {} # 计算每一项的权重 + categories = [] + features.each do |key, _| + categories << key + weights[key] = Hash.new + end + count_all = 0 + counts = {} + categories.each do |category| + count_1 = 0 + features[category].each do |_, value| + count_1 += value["all"] + end + count_all += count_1 + counts[category] = count_1 + features[category].each do |key, value| + weight = cal_perc(value["all"], count_1) + weights[category] = weights[category].merge({key => weight}) + end + end + categories.each do |category| + weight = cal_perc(counts[category], count_all) + weights[category] = weights[category].merge({"category_weight" => weight}) + end + return weights + end + + weights_categories = cal_weight(features) + scores = { + "final" => 0.0, + "blockchain" => false + } + features.each do |category, value_1| + category_score = 0.0 + value_1.each do |action, value_2| + category_score += weights_categories[category][action] * value_2["perc"] + end + scores["final"] += weights_categories[category]["category_weight"] * category_score.round(4) + scores = scores.merge({category => category_score.round(4)}) + end + end + render json: { scores: scores } + end + def hovercard end + # author: zxh, 查询贡献者的贡献度 + def hovercard4proj + end + def update return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id) @@ -94,11 +219,11 @@ class UsersController < ApplicationController end end - def update_image - return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) + def update_image + return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id) - Util.write_file(@image, avatar_path(@user)) + Util.write_file(@image, avatar_path(@user)) return render_ok({message: '头像修改成功'}) rescue Exception => e uid_logger_error(e.message) @@ -284,6 +409,252 @@ class UsersController < ApplicationController @projects = paginate(scope) end + + # query all projects with tokens by a user + def blockchain_balance + #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + is_current_admin_user = true + results = Blockchain::BalanceQuery.call(params, is_current_admin_user) + if results[:status] == 0 + @total_count = results[:projects].size + @projects = results[:projects] + else + @total_count = -1 + @projects = [] + end + + render json: { status: results[:status], projects: @projects, total_count: @total_count } + end + + # query one balance + def blockchain_balance_one_project + #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + is_current_admin_user = true + if is_current_admin_user + owner = User.find_by(login: params['owner_login']) + if owner.nil? + normal_status(-1, "创建者无法找到") + else + p = Project.find_by(user_id: owner.id, identifier: params['project_identifier']) + balance = Blockchain::BalanceQueryOneProject.call({"user_id": params['user_id'].to_i, "project_id": p.id.to_i}) + render json: { status: 0, balance: balance} + end + else + normal_status(-1, "缺少权限") + end + + end + + + def blockchain_transfer + #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['payer_id'].to_i) + is_current_admin_user = true + + if is_current_admin_user + Blockchain::TransferService.call(params) + render json: {status: 2} # 重新查询余额 + else + normal_status(-1, "缺少权限") + end + rescue Exception => e + normal_status(-1, e.to_s) + end + + # exchange money + def blockchain_exchange + #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + #require 'alipay' + ## setup the client to communicate with either production API or sandbox API + ## https://openapi.alipay.com/gateway.do (Production) + ## https://openapi.alipaydev.com/gateway.do (Sandbox) + #api_url = 'https://openapi.alipay.com/gateway.do' + # + ## setup your own credentials and certificates + #app_id = '2021002140631434' + #app_private_key="-----BEGIN RSA PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCPDsgc0n0RWRnbe9OMqtUbde8gu88OyjuZm8cJXeiSING18HX56C5zV4DsHQ6K9/JmQi/NYCc7/2Prh66Bei0L4Xm5TysJTPYi90+WlbJJESFF6fqULi8sSqZXUtaoMKRcUyeR144l2GQgXbZWBbVSQeZW5DqUDlurTF0I7vQ21wGqxQqBjQK8PSVw5hF+aIsNOfAY9M1tzdD5Jzo2Y3FJdsbXIJNMyhJJCZ+7KHFqma7lpjkXdCoyh/nOISkQdGtFI29gI94sqewI2AMU84uxuBIE3h90iLT+8xrd2dQKdBS7qfhQ3PgkBPVNs5jxsVBqSFdSFT6zcqFdHJzulCUJAgMBAAECggEAWocAGz0X5+J6emnhdSKluLrol85BORrAnHP3f/XtNouOKZQBFCPZQSQecUvx5/7/ZbZ8iXpPWahDkshJpaWq29nTLXDryvboyze1JZWVPKeaZqOp7htLvrt+h8PkEoq1d7cnUyMU0N4eflzPBaCXHXaWTGYgq5Bqcfvg48ZSxGBYeHt5WWU2+GW5fpsaVBBYkdyxxGMoy/bzYzGhvfSJkexqnl0XkAAODa02mu3WsHrzRid6Mf+3syYbq/MfUodU6Vng2tbCqwnWrHCyrD4RYl6rg1TKuAv2YAfBhLzwBxHYVC4SRqzjs+8AaOQoF+lCjr4JklPhEuRThzD31YwIAQKBgQDAg4S7ciMmxvbNxR+1eimoAYLLF9jPpPU6w3VFNPb4rDu4tX77bNf082YplfJX5TYtZKjKPKyYG87K6slGunyPL4AFRW81WPB9u1uP26dihyPCBSUE01jKRPPfRrQnnru5fpm8LL3L03V3yA6J+GyQ8wltRJJi1eBSSm+IWRsZewKBgQC+PBD9J1LYOEIVeK9KvN8BpkA1ZIkk//VuJaoGfVXn+1EzM1yFB05fnsEQkHFynisvuCIr7pH63HcdyffQhe1YOnw9iDCG1zPjsi5uTe9WAM0dnb7xdsaLPr/Q2LyoDOTN9344Qovy1AAnpWtGTn6omgHst5nZpp/mHOuBlKiqSwKBgBKRXM77fjpyPEGyfpFxW+0xYB0YirfUUDa/vWLUbfGkIwp4ruuvHtEoXLUsGjiyCdys9b6zxW3SWMqnhIxG1la1HSLlBInfryphVL52UBmnsSI4fs6NV+YCaocheaTMoYyNkmRc6F1tYsoPyJ80D7yXRFR+paPUvxMQzNsYxQ1bAoGAHd2uSSBQWFPUxCwzUQd/93FTaU6EXYO103okTGqG/ymsoN4ya0wvWMHCy8fxl64PV6mP69fDoV/Vb57SwjEUhyJ/eOWVwMWuhtPliDnCFn1/tmOao6wjFZ9fW/l6/OMxVMjDTy/bat8vuwm0YtBWAEBVhwV4KPyI5AasTqa5KCsCgYB/usnqhVx2zt+MxpBt2Q9Vxc0zXcZxMDs69UUdTY86gjcJyCFGe3bbumUcyfSJzIznC2hfFX5ZyS0oMwiAzWtslRMh9LRh3kofD/6BogL3RKOlBk3iekvQ8Gn0tbwk2Qzr4WJgfA7A4GTf5r7Y+bvOfazzsUQAfSK6nUTIlOj2Ew==\n-----END RSA PRIVATE KEY-----\n" + #alipay_public_key="-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgHXLD1BshMymbqqtZVKNyo95FNfxzXzaw3P1eI0KeO6RaL+JzrWxzIBFfTjkWv/8WM9u/NcXMOFt2QO9q5KIDx6PkqjRDTd1hgP/cTgdjOHQqnVSihCrQDVCDBSOXIujC8Lk/P4pFVRhQkYeZqEb1qb8b/2tzTY8g9PKKBSCQv7SfgL2TBcpAVbb+9xdJ6VainC/wYGk8T+c+st1hXnuBJSS0m7LFxJOsYkNk0wbA0tfdZLrO3us2F7sjC9t4h/05nr+gSuDkzo+1kCEefYLqScexN+vnQiLoylp/C82wNiP6okxfhmHz3EcYfUqUyGTN/oFaFcPFPpUtFNS8jFV9QIDAQAB\n-----END PUBLIC KEY-----\n" + # + ## initialize a client to communicate with the Alipay API + #@alipay_client = Alipay::Client.new( + # url: api_url, + # app_id: app_id, + # app_private_key: app_private_key, + # alipay_public_key: alipay_public_key + #) + # + #return_result = @alipay_client.page_execute_url( + # method: 'alipay.trade.page.pay', + # biz_content: JSON.generate({ + # out_trade_no: '20210420104600', + # product_code: 'FAST_INSTANT_TRADE_PAY', + # total_amount: '0.01', + # subject: 'test' + # }, ascii_only: true), # ascii_only is important! + # timestamp: '2021-04-20 10:46:00' + #) + #render json: { pay_url: return_result } + # + + # 替代解决方案 + # 读取所有交易信息 + end + # # + # # def blockchain_create_trade + # # #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + # # is_current_admin_user = true + # # if is_current_admin_user + # # user_id = params['user_id'].to_i + # # project_id = params['project_id'].to_i + # # money = params['money'].to_f + # # #description = params['description'] + # # token_num = params['token_num'].to_i + # # # 锁仓 + # # result = Blockchain::CreateTrade.call({user_id: user_id, project_id: project_id, token_num: token_num}) + # # if result == false + # # normal_status(-1, "创建交易失败") + # # else + # # bt = BlockchainTrade.new(user_id: user_id, project_id: project_id, token_num: token_num, money: money, state: 0) # state=0表示创建交易; state=1表示执行中; state=2表示执行完成 + # # bt.save() + # # status = 2 # 交易创建成功 + # # render json: { status: status } + # # end + # # else + # # normal_status(-1, "缺少权限") + # # end + # # end + # # + # # + # # def blockchain_get_trades + # # trades = BlockchainTrade.where(state: 0).all() + # # results = [] + # # trades.each do |t| + # # project_id = t.project_id + # # project = Project.find_by(id: project_id) + # # if !project.nil? + # # owner = User.find_by(id: project.user_id) + # # else + # # owner = nil + # # end + # # user_id = t.user_id + # # creator = User.find_by(id: user_id) + # # if project.nil? || owner.nil? || creator.nil? + # # else + # # results << [creator, owner, project, t] + # # end + # # end + # # render json: { results: results } + # # end + # # + # # def blockchain_trade + # # #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + # # is_current_admin_user = true + # # if is_current_admin_user + # # user_id2 = params['user_id2'].to_i + # # trade_id = params['trade_id'].to_i + # # BlockchainTrade.find(trade_id).update(user_id2: user_id2, state: 1) # state=1表示锁定了，等待线下卖家发货 + # # render json: {status: 2} # window.location.reload() + # # else + # # normal_status(-1, "缺少权限") + # # end + # # end + # + # + # def blockchain_verify_trade + # #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + # is_current_admin_user = true + # if is_current_admin_user + # trade_id = params['trade_id'].to_i + # BlockchainTrade.find(trade_id).update(state: 2) # state=2表示确认收货 + # render json: {status: 2} # window.location.reload() + # else + # normal_status(-1, "缺少权限") + # end + # end + # + # def blockchain_get_verify_trades + # #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + # is_current_admin_user = true + # if is_current_admin_user + # trades = BlockchainTrade.where(state: 1).all() + # results = [] + # trades.each do |t| + # project_id = t.project_id + # project = Project.find_by(id: project_id) + # if !project.nil? + # owner = User.find_by(id: project.user_id) + # else + # owner = nil + # end + # user_id = t.user_id + # creator = User.find_by(id: user_id) + # user_id2 = t.user_id2 + # buyer = User.find_by(id: user_id2) + # if project.nil? || owner.nil? || creator.nil? || buyer.nil? + # else + # results << [creator, owner, project, t, buyer] + # end + # end + # render json: { results: results } + # else + # normal_status(-1, "缺少权限") + # end + # end + # + # def blockchain_get_history_trades + # #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) + # is_current_admin_user = true + # if is_current_admin_user + # trades = BlockchainTrade.where(state: 2).all() + # results = [] + # trades.each do |t| + # project_id = t.project_id + # project = Project.find_by(id: project_id) + # if !project.nil? + # owner = User.find_by(id: project.user_id) + # else + # owner = nil + # end + # user_id = t.user_id + # creator = User.find_by(id: user_id) + # user_id2 = t.user_id2 + # buyer = User.find_by(id: user_id2) + # if project.nil? || owner.nil? || creator.nil? || buyer.nil? + # else + # results << [creator, owner, project, t, buyer] + # end + # end + # render json: { results: results } + # else + # normal_status(-1, "缺少权限") + # end + # end + + + def blockchain_get_issue_token_num + issue_id = params["issue_id"]['orderId'].to_i + issue = Issue.find_by(id: issue_id) + project = Project.find(issue.project_id) + if project[:use_blockchain] + render json: {"blockchain_token_num": issue.blockchain_token_num} + else + render json: {"blockchain_token_num": -1} # 未使用blockchain + end + end + + + def blockchain_get_unclosed_issue_list + ownername = params["ownername"] + identifier = params["reponame"] + owner = User.find_by(login: ownername) + project = Project.find_by(user_id: owner.id, identifier: identifier) + unclosed_issues = Issue.where(project_id: project.id, issue_classify: "issue").where.not(status_id: 5) + results = [] + unclosed_issues.each do |i| + results << [i.id, i.subject] + end + render json: {unclosed_issues: results} + end + # TODO 其他平台登录时同步修改gitea平台对应用户的密码 # 该方法主要用于：别的平台初次部署对接forge平台，同步用户后，gitea平台对应的用户密码与forge平台用户密码不一致是问题 def sync_gitea_pwd @@ -322,7 +693,7 @@ class UsersController < ApplicationController end end - def email_search + def email_search return render_error('请输入email') if params[:email].blank? @user = User.find_by(mail: params[:email]) end diff --git a/app/forms/base_form.rb b/app/forms/base_form.rb index ca82fa4bb..db745e8d8 100644 --- a/app/forms/base_form.rb +++ b/app/forms/base_form.rb @@ -30,6 +30,14 @@ class BaseForm raise "项目名称已被使用." if Project.where(user_id: user_id, name: project_name.strip).exists? end + def check_blockchain_token_all(blockchain_token_all) + raise "请正确填写项目token总数." if (Float(blockchain_token_all) rescue false) == false or blockchain_token_all.to_i < 0 or Float(blockchain_token_all) != blockchain_token_all.to_i + end + + def check_blockchain_init_token(blockchain_init_token) + raise "请正确填写项目创始人token占比." if (Float(blockchain_init_token) rescue false) == false or blockchain_init_token.to_i < 0 or blockchain_init_token.to_i > 100 or Float(blockchain_init_token) != blockchain_init_token.to_i + end + def check_reversed_keyword(repository_name) raise "项目标识已被占用." if ReversedKeyword.check_exists?(repository_name) end diff --git a/app/forms/projects/create_form.rb b/app/forms/projects/create_form.rb index c51c2c60f..c9fcb44e6 100644 --- a/app/forms/projects/create_form.rb +++ b/app/forms/projects/create_form.rb @@ -1,6 +1,7 @@ class Projects::CreateForm < BaseForm attr_accessor :user_id, :name, :description, :repository_name, :project_category_id, - :project_language_id, :ignore_id, :license_id, :private, :owner + :project_language_id, :ignore_id, :license_id, :private, :owner, + :blockchain, :blockchain_token_all, :blockchain_init_token validates :user_id, :name, :repository_name, presence: true validates :repository_name, format: { with: CustomRegexp::REPOSITORY_NAME_REGEX, multiline: true, message: "只能含有数字、字母、下划线且不能以下划线开头和结尾" } @@ -15,6 +16,8 @@ class Projects::CreateForm < BaseForm check_project_language(project_language_id) check_project_name(user_id, name) unless name.blank? check_repository_name(user_id, repository_name) unless repository_name.blank? + check_blockchain_token_all(blockchain_token_all) unless blockchain_token_all.blank? + check_blockchain_init_token(blockchain_init_token) unless blockchain_init_token.blank? end def check_license diff --git a/app/helpers/tag_chosen_helper.rb b/app/helpers/tag_chosen_helper.rb index 520b868fa..784efcf29 100644 --- a/app/helpers/tag_chosen_helper.rb +++ b/app/helpers/tag_chosen_helper.rb @@ -21,7 +21,8 @@ module TagChosenHelper "issue_tag": render_issue_tags(project), "issue_type": render_issue_species, "all_issues": all_issues, - "branches": render_branches(project) + "branches": render_branches(project), + "use_blockchain": project['use_blockchain'] } end diff --git a/app/models/concerns/watchable.rb b/app/models/concerns/watchable.rb index 008d382f3..9eb0172d7 100644 --- a/app/models/concerns/watchable.rb +++ b/app/models/concerns/watchable.rb @@ -1,45 +1,160 @@ -module Watchable - extend ActiveSupport::Concern - - included do - has_many :watchers, as: :watchable, dependent: :destroy - has_many :watcher_users, through: :watchers, source: :user, validate: false - - scope :watched_by, -> (user_id) { includes(:watchers).where(watchers: { user_id: user_id }) } - scope :following, -> (user_id) { watched_by(user_id) } - end - - def watched?(watchable) - watchable.watchers.exists?(user: self) - end - - def watch!(watchable) - watchable.watchers.create!(user: self, created_at: Time.current) - end - - def unwatch!(watchable) - obj = watchable.watchers.find_by(user: self) - obj.destroy! if obj.present? - end - - # 我正在关注的、我追随的 - def following - User.following(self.id) - end - - def following_count - following.size - end - - # 关注我的、我的粉丝、我的追随者 - def followers - watcher_users - end - - def followers_count - followers.size - end - - module ClassMethods - end -end +module Watchable + extend ActiveSupport::Concern + + included do + has_many :watchers, as: :watchable, dependent: :destroy + has_many :watcher_users, through: :watchers, source: :user, validate: false + + scope :watched_by, -> (user_id) { includes(:watchers).where(watchers: { user_id: user_id }) } + scope :following, -> (user_id) { watched_by(user_id) } + end + + def watched?(watchable) + watchable.watchers.exists?(user: self) + end + + def watch!(watchable) + watchable.watchers.create!(user: self, created_at: Time.current) + end + + def unwatch!(watchable) + obj = watchable.watchers.find_by(user: self) + obj.destroy! if obj.present? + end + + # 我正在关注的、我追随的 + def following + User.following(self.id) + end + + def following_count + following.size + end + + def contribution_perc + project_identifier = params[:project_identifier] + user_login = params[:id] + @project = Project.find_by_identifier(project_identifier) + @user = User.find_by_login(user_login) + + def cal_perc(count_user, count_all) + (count_user * 1.0 / (count_all + 0.000000001)).round(5) + end + + if @project['use_blockchain'] == true or @project['use_blockchain'] == 1 + balance_user = Blockchain::BalanceQueryOneProject.call({"user_id": @user.id, "project_id": @project.id}) + balance_all = Blockchain::RepoBasicInfo.call({"project_id": @project.id})["cur_supply"] + score = cal_perc(balance_user, balance_all) + else + # 获取所有行为对应的项目内记录总数和个人记录数 + features = { + "requirement" => {}, + "development" => {}, + "review" => {} + } + + # 1. issue创建 + issues = Issue.where(project_id: @project.id, issue_classify: 'issue') + issue_all = issues.count + issue_user = issues.where(author_id: @user.id).count + features["requirement"] = features["requirement"].merge({"issue" => {"all" => issue_all, "perc" => cal_perc(issue_user, issue_all)}}) + # 2. 里程碑创建 + milestones = Version.where(project_id: @project.id) + milestone_all = milestones.count + milestone_user = milestones.where(user_id: @user.id).count + features["requirement"] = features["requirement"].merge({"milestone" => {"all" => milestone_all, "perc" => cal_perc(milestone_user, milestone_all)}}) + # 3. issue评论 + issue_comments = Journal.joins("INNER JOIN issues on journals.journalized_id=issues.id").where("issues.project_id=#{@project.id} and journalized_type='Issue' and issues.issue_classify='issue'") + issue_comment_all = issue_comments.count + issue_comment_user = issue_comments.where("journals.user_id=#{@user.id}").count + features["requirement"] = features["requirement"].merge({"issue_comment" => {"all" => issue_comment_all, "perc" => cal_perc(issue_comment_user, issue_comment_all)}}) + # 4. 合并请求 + prs = PullRequest.where(project_id: @project.id) + pr_all = prs.count + pr_user = prs.where(user_id: @user.id).count + features["development"] = features["development"].merge({"pr" => {"all" => pr_all, "perc" => cal_perc(pr_user, pr_all)}}) + # 5. pr评论 + pr_comments = Journal.joins("INNER JOIN issues on journals.journalized_id=issues.id").where("issues.project_id=#{@project.id} and journalized_type='Issue' and issues.issue_classify='pull_request'") + pr_comment_all = pr_comments.count + pr_comment_user = pr_comments.where("journals.user_id=#{@user.id}").count + features["review"] = features["review"].merge({"pr_comment" => {"all" => pr_comment_all, "perc" => cal_perc(pr_comment_user, pr_comment_all)}}) + # 6. 代码行评论 + line_comments = Journal.joins("INNER JOIN pull_requests on journals.journalized_id=pull_requests.id").where("pull_requests.project_id=#{@project.id} and journalized_type='PullRequest'") + line_comment_all = line_comments.count + line_comment_user = line_comments.where("journals.user_id=#{@user.id}").count + features["review"] = features["review"].merge({"line_comment" => {"all" => line_comment_all, "perc" => cal_perc(line_comment_user, line_comment_all)}}) + # 7. 代码行、commit贡献统计 + code_contributions = Api::V1::Projects::CodeStats::ListService.call(@project, {ref: nil}) + commit_all = code_contributions["commit_count"] + addition_all = code_contributions["additions"] + deletion_all = code_contributions["deletions"] + + commit_user = 0 + addition_user = 0 + deletion_user = 0 + code_contributions["authors"].each do |author| + if author["name"] == @user.login + commit_user = author["commits"] + addition_user = author["additions"] + deletion_user = author["deletions"] + end + end + + features["development"] = features["development"].merge({"commit" => {"all" => commit_all, "perc" => cal_perc(commit_user, commit_all)}}) + features["development"] = features["development"].merge({"addition" => {"all" => addition_all, "perc" => cal_perc(addition_user, addition_all)}}) + features["development"] = features["development"].merge({"deletion" => {"all" => deletion_all, "perc" => cal_perc(deletion_user, deletion_all)}}) + + def cal_weight(features) + weights = {} # 计算每一项的权重 + categories = [] + features.each do |key, _| + categories << key + weights[key] = Hash.new + end + count_all = 0 + counts = {} + categories.each do |category| + count_1 = 0 + features[category].each do |_, value| + count_1 += value["all"] + end + count_all += count_1 + counts[category] = count_1 + features[category].each do |key, value| + weight = cal_perc(value["all"], count_1) + weights[category] = weights[category].merge({key => weight}) + end + end + categories.each do |category| + weight = cal_perc(counts[category], count_all) + weights[category] = weights[category].merge({"category_weight" => weight}) + end + return weights + end + + weights_categories = cal_weight(features) + score = 0.0 + features.each do |category, value_1| + category_score = 0.0 + value_1.each do |action, value_2| + category_score += weights_categories[category][action] * value_2["perc"] + end + score += weights_categories[category]["category_weight"] * category_score.round(4) + end + end + score + (score * 100).round(1).to_s + "%" + end + + # 关注我的、我的粉丝、我的追随者 + def followers + watcher_users + end + + def followers_count + followers.size + end + + module ClassMethods + end +end diff --git a/app/queries/application_query.rb b/app/queries/application_query.rb index c66af94c0..fdef1b71d 100644 --- a/app/queries/application_query.rb +++ b/app/queries/application_query.rb @@ -6,4 +6,53 @@ class ApplicationQuery def strip_param(key) params[key].to_s.strip.presence end + + # find all the repos that a user has tokens + def find_repo_with_token(user_id) + params = { + "request-type": "query user balance of all repos", + "username": user_id.to_s + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] != 0 + raise "区块链接口请求失败." + else + token_list = resp_body['UserBalanceList'].nil? ? [] : resp_body['UserBalanceList'] + return token_list + end + end + + + # find one repo that a user has tokens + def find_one_balance(user_id, project_id) + # return 3 statuses: UnknownErr/ResUserNotExisted/Success + params = { + "request-type": "query user balance of single repo", + "username": user_id.to_s, + "token_name": project_id.to_s + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 0 + return resp_body['balance'] + elsif resp_body['status'] == 100 + return 0 # 找不到用户返回0 + else + raise "区块链接口请求失败." + end + end + + # query the basic info of a repository + def find_blockchain_repo_info(project_id) + params = { + "request-type": "query repo basic info", + "token_name": project_id.to_s + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 0 + return resp_body + else + raise "区块链接口请求失败." + end + end + end \ No newline at end of file diff --git a/app/queries/blockchain/balance_query.rb b/app/queries/blockchain/balance_query.rb new file mode 100644 index 000000000..669370a54 --- /dev/null +++ b/app/queries/blockchain/balance_query.rb @@ -0,0 +1,31 @@ +class Blockchain::BalanceQuery < ApplicationQuery + + attr_reader :params, :is_current_admin_user + + def initialize(params,is_current_admin_user) + @params = params + @is_current_admin_user = is_current_admin_user + end + + def call + if is_current_admin_user + token_list = find_repo_with_token(params["user_id"]) + result_list = [] + token_list.each do |t| + project = Project.find_by(id: t['token_name'].to_i) + if project.nil? + next + end + owner = User.find_by(id: project.user_id) + if owner.nil? || project.nil? + else + balance = t['balance'] + result_list << [owner, project, balance] + end + end + results = {"status": 0, "projects": result_list} + else + results = {"status": 1} # query failed + end + end +end diff --git a/app/queries/blockchain/balance_query_one_project.rb b/app/queries/blockchain/balance_query_one_project.rb new file mode 100644 index 000000000..c4ec19e21 --- /dev/null +++ b/app/queries/blockchain/balance_query_one_project.rb @@ -0,0 +1,12 @@ +class Blockchain::BalanceQueryOneProject < ApplicationQuery + + attr_reader :params, :is_current_admin_user + + def initialize(params) + @params = params + end + + def call + find_one_balance(params[:user_id].to_s, params[:project_id].to_s) + end +end diff --git a/app/queries/blockchain/repo_basic_info.rb b/app/queries/blockchain/repo_basic_info.rb new file mode 100644 index 000000000..df17b7a04 --- /dev/null +++ b/app/queries/blockchain/repo_basic_info.rb @@ -0,0 +1,13 @@ +class Blockchain::RepoBasicInfo < ApplicationQuery + + attr_reader :params, :is_current_admin_user + + def initialize(params) + @params = params + end + + def call + info = find_blockchain_repo_info(params[:project_id].to_s) + return info + end +end diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 6c7f38d9c..7e555b529 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -38,6 +38,12 @@ class Projects::ListMyQuery < ApplicationQuery # projects = projects.visible.joins(:members).where(members: { user_id: user.id }) # elsif params[:category].to_s == "private" # projects = projects.is_private.joins(:members).where(members: { user_id: user.id }) + elsif params[:category].to_s == "blockchain_token" # 所有钱包中有token的项目有哪些 + token_list = find_repo_with_token(user.id) + project_names = token_list.map { |x| x['token_name'] } + projects = projects.where(name: project_names) + tokens = token_list.map { |x| x['balance'] } + puts "pause" end if params[:is_public].present? diff --git a/app/services/application_service.rb b/app/services/application_service.rb index 9c70bbeb2..df06f3960 100644 --- a/app/services/application_service.rb +++ b/app/services/application_service.rb @@ -1,35 +1,109 @@ -class ApplicationService - include Callable - - Error = Class.new(StandardError) - - def regix_emoji content - " " if content.blank? - regex = /[^a-zA-Z0-9\u4E00-\u9FFF]/ - content.gsub(regex, '') - end - - protected - def try_lock(key) - raise Error, "请稍后再试！" unless $redis_cache.set(key, 1, nx: true, ex: 60.seconds) - end - - def unlock(key) - $redis_cache.del(key) - end - - private - - def strip(str) - str.to_s.strip.presence - end - - def str_to_boolean str - ActiveModel::Type::Boolean.new.cast str - end - - def phone_mail_type value - value =~ /^1\d{10}$/ ? 1 : 0 - end - -end +class ApplicationService + include Callable + + Error = Class.new(StandardError) + + def regix_emoji content + " " if content.blank? + regex = /[^a-zA-Z0-9\u4E00-\u9FFF]/ + content.gsub(regex, '') + end + + protected + def try_lock(key) + raise Error, "请稍后再试！" unless $redis_cache.set(key, 1, nx: true, ex: 60.seconds) + end + + def unlock(key) + $redis_cache.del(key) + end + + private + + def strip(str) + str.to_s.strip.presence + end + + def str_to_boolean str + ActiveModel::Type::Boolean.new.cast str + end + + # params: params from index.js page + def create_repo_on_blockchain(params, project) + username = params['user_id'].to_s + token_name = project.id.to_s + total_supply = params['blockchain_token_all'].to_i + token_balance = [[username, (total_supply * params['blockchain_init_token'].to_i / 100).to_i]] + + params = { + "request-type": "create repo", + "username": username, + "token_name": token_name, + "total_supply": total_supply, + "token_balance": token_balance + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] != 0 + raise "区块链接口请求失败." + end + end + + + def transfer_balance_on_blockchain(payer, payee, token_name, amount) + + params = { + "request-type": "transfer amount", + "payer": payer, + "payee": payee, + "token_name": token_name, + "amount": amount + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 5 or resp_body['status'] == 106 or resp_body['status'] == 105 + raise resp_body['message'] + elsif resp_body['status'] != 0 + raise "区块链接口请求失败." + else + end + end + + + def lock_balance_on_blockchain(username, tokenname, amount) + + params = { + "request-type": "lock user balance", + "username": username, + "token_name": tokenname, + "amount": amount + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 5 or resp_body['status'] == 106 or resp_body['status'] == 103 + raise resp_body['message'] + elsif resp_body['status'] != 0 + raise "区块链接口请求失败." + else + end + end + + + def unlock_balance_on_blockchain(username, tokenname, amount) + + params = { + "request-type": "unlock user balance", + "username": username, + "token_name": tokenname, + "amount": amount + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 5 or resp_body['status'] == 106 or resp_body['status'] == 104 + raise resp_body['message'] + elsif resp_body['status'] != 0 + raise "区块链接口请求失败." + else + end + end + def phone_mail_type value + value =~ /^1\d{10}$/ ? 1 : 0 + end + +end diff --git a/app/services/blockchain/create_issue.rb b/app/services/blockchain/create_issue.rb new file mode 100644 index 000000000..c3ab5ad49 --- /dev/null +++ b/app/services/blockchain/create_issue.rb @@ -0,0 +1,28 @@ +class Blockchain::CreateIssue < ApplicationService + + attr_reader :params + + def initialize(params) + @params = params + end + + def call + ActiveRecord::Base.transaction do + username = @params[:user_id].to_s + token_name = @params[:project_id].to_s + amount = @params[:token_num].to_i + + # 调用token锁仓函数 + lock_balance_on_blockchain(username, token_name, amount) + end + rescue => e + puts "转账失败: #{e.message}" + raise Error, e.message + end + + private + + def no_use + puts "this function does not have any usage" + end +end \ No newline at end of file diff --git a/app/services/blockchain/create_trade.rb b/app/services/blockchain/create_trade.rb new file mode 100644 index 000000000..a4de98783 --- /dev/null +++ b/app/services/blockchain/create_trade.rb @@ -0,0 +1,29 @@ +class Blockchain::CreateTrade < ApplicationService + + attr_reader :params + + def initialize(params) + @params = params + end + + def call + ActiveRecord::Base.transaction do + username = @params[:user_id].to_s + token_name = @params[:project_id].to_s + amount = @params[:token_num].to_i + + # 调用token锁仓函数 + results = lock_balance_on_blockchain(username, token_name, amount) + return results + end + rescue => e + puts "转账失败: #{e.message}" + raise Error, e.message + end + + private + + def no_use + puts "this function does not have any usage" + end +end \ No newline at end of file diff --git a/app/services/blockchain/fix_issue.rb b/app/services/blockchain/fix_issue.rb new file mode 100644 index 000000000..332202792 --- /dev/null +++ b/app/services/blockchain/fix_issue.rb @@ -0,0 +1,28 @@ +class Blockchain::FixIssue < ApplicationService + + attr_reader :params + + def initialize(params) + @params = params + end + + def call + ActiveRecord::Base.transaction do + username = @params[:user_id].to_s + token_name = @params[:project_id].to_s + amount = @params[:token_num].to_i + + # 调用token锁仓函数 + unlock_balance_on_blockchain(username, token_name, amount) + end + rescue => e + puts "关联issue失败: #{e.message}" + raise Error, e.message + end + + private + + def no_use + puts "this function does not have any usage" + end +end \ No newline at end of file diff --git a/app/services/blockchain/invoke_blockchain_api.rb b/app/services/blockchain/invoke_blockchain_api.rb new file mode 100644 index 000000000..d485e171c --- /dev/null +++ b/app/services/blockchain/invoke_blockchain_api.rb @@ -0,0 +1,34 @@ +class Blockchain::InvokeBlockchainApi < ApplicationService + # 调用blockchain + + attr_reader :params + + def initialize(params) + @params = params + end + + def call + begin + uri = Blockchain.blockchain_config[:api_url] + uri = URI.parse(URI.encode(uri.strip)) + res = Net::HTTP.start(uri.host, uri.port) do |http| + req = Net::HTTP::Post.new(uri) + req['Content-Type'] = 'application/json' + req.body = @params + http.request(req) + end + if res.code.to_i != 200 + raise "区块链接口请求失败." + else + res_body = JSON.parse(res.body) + if res_body.has_key?("status") + else + raise "区块链接口请求失败." + end + end + return res_body + rescue Exception => e + raise "区块链接口请求失败." + end + end +end \ No newline at end of file diff --git a/app/services/blockchain/transfer_service.rb b/app/services/blockchain/transfer_service.rb new file mode 100644 index 000000000..4f7425e5d --- /dev/null +++ b/app/services/blockchain/transfer_service.rb @@ -0,0 +1,36 @@ +class Blockchain::TransferService < ApplicationService + + attr_reader :params + + def initialize(params) + @params = params + end + + def call + ActiveRecord::Base.transaction do + transfer_amount = params['transfer_amount'] + if (Float(transfer_amount) rescue false) == false or transfer_amount.to_i < 0 or Float(transfer_amount) != transfer_amount.to_i + raise Error, "请输入正确的转账金额" + end + transfer_amount = params['transfer_amount'].to_i + transfer_login = params['transfer_login'] + payer = params['payer_id'].to_s + payee = User.find_by(login: transfer_login) + if payee.nil? + raise Error, "未找到接收转账的用户" + else + payee = payee.id.to_s + token_name = params['project_id'].to_s + # 调用token转移函数 + transfer_balance_on_blockchain(payer, payee, token_name, transfer_amount) + end + end + end + + private + + def no_use + puts "this function does not have any usage" + end + +end \ No newline at end of file diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index ff36dfe52..c4f892f7f 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -18,6 +18,9 @@ class Projects::CreateService < ApplicationService ProjectUnit.init_types(@project.id) Repositories::CreateService.new(user, @project, repository_params).call upgrade_project_category_private_projects_count + if repo_use_blockchain + create_repo_on_blockchain(params, @project) + end else Rails.logger.info("#############___________create_project_erros______###########{@project.errors.messages}") end @@ -30,7 +33,7 @@ class Projects::CreateService < ApplicationService private - def upgrade_project_category_private_projects_count + def upgrade_project_category_private_projects_count # 如果为空或者项目为公有项目直接返回 return unless params[:project_category_id].present? return if repo_is_public @@ -38,7 +41,7 @@ class Projects::CreateService < ApplicationService project_category.increment!(:private_projects_count, 1) end - def authroize_user_id_success + def authroize_user_id_success (user.id == params[:user_id].to_i) || (user.organizations.find_by_id(params[:user_id]).present?) end @@ -53,7 +56,8 @@ class Projects::CreateService < ApplicationService ignore_id: params[:ignore_id], license_id: params[:license_id], website: params[:website], - identifier: params[:repository_name] + identifier: params[:repository_name], + use_blockchain: repo_use_blockchain # 新增,zxh } end @@ -72,4 +76,8 @@ class Projects::CreateService < ApplicationService def repo_is_public params[:private].blank? ? true : !(ActiveModel::Type::Boolean.new.cast(params[:private]).nil? ? false : ActiveModel::Type::Boolean.new.cast(params[:private])) end + + def repo_use_blockchain + params[:blockchain].blank? ? false : params[:blockchain] + end end diff --git a/config/configuration.yml.example b/config/configuration.yml.example index f056dee1b..6ae32e4f3 100644 --- a/config/configuration.yml.example +++ b/config/configuration.yml.example @@ -75,6 +75,9 @@ default: &default forum: domain: '' base_url: '/api' + # 区块链相关配置 + blockchain: + api_url: 'blockchain service url' production: <<: *default diff --git a/config/routes.rb b/config/routes.rb index 3488bacb4..2a837190f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -123,6 +123,20 @@ Rails.application.routes.draw do put 'commons/unhidden', to: 'commons#unhidden' delete 'commons/delete', to: 'commons#delete' + # blockchain related routes + get 'users/blockchain/balance', to: 'users#blockchain_balance' + post 'users/blockchain/balance_project', to: 'users#blockchain_balance_one_project' + post 'users/blockchain/transfer', to: 'users#blockchain_transfer' + post 'users/blockchain/exchange', to: 'users#blockchain_exchange' + post 'users/blockchain/create_trade', to: 'users#blockchain_create_trade' + get '/users/blockchain/get_trades', to: 'users#blockchain_get_trades' + post '/users/blockchain/trade', to: 'users#blockchain_trade' + get '/users/blockchain/get_verify_trades', to: 'users#blockchain_get_verify_trades' + post '/users/blockchain/verify_trade', to: 'users#blockchain_verify_trade' + get '/users/blockchain/get_history_trades', to: 'users#blockchain_get_history_trades' + post '/blockchain/issue/get_token_num', to: 'users#blockchain_get_issue_token_num' + get '/projects/blockchain/get_unclosed_issue_list', to: 'users#blockchain_get_unclosed_issue_list' + resources :owners, only: [:index, :show] scope module: :organizations do @@ -243,6 +257,7 @@ Rails.application.routes.draw do get :watch_users get :fan_users get :hovercard + get :hovercard4proj # author: zxh, 获取用户对项目的贡献情况 put :update_image get :get_image end diff --git a/db/migrate/20201230070048_add_use_blockchain_to_projects.rb b/db/migrate/20201230070048_add_use_blockchain_to_projects.rb new file mode 100644 index 000000000..f7e2fdde0 --- /dev/null +++ b/db/migrate/20201230070048_add_use_blockchain_to_projects.rb @@ -0,0 +1,5 @@ +class AddUseBlockchainToProjects < ActiveRecord::Migration[5.2] + def change + add_column :projects, :use_blockchain, :boolean, default: 0 + end +end diff --git a/db/migrate/20210421081736_add_blockchain_token_num_to_issue.rb b/db/migrate/20210421081736_add_blockchain_token_num_to_issue.rb new file mode 100644 index 000000000..1391667e5 --- /dev/null +++ b/db/migrate/20210421081736_add_blockchain_token_num_to_issue.rb @@ -0,0 +1,5 @@ +class AddBlockchainTokenNumToIssue < ActiveRecord::Migration[5.2] + def change + add_column :issues, :blockchain_token_num, :integer + end +end From bc862f8d98324fee25f9eb76cae5f153967c8c4a Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 3 Mar 2023 18:01:46 +0800 Subject: [PATCH 078/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E6=94=B6=E5=88=B0?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/send_template_message_job.rb | 10 +++------- app/models/message_template/issue_changed.rb | 8 ++++---- app/services/api/v1/issues/update_service.rb | 15 +++++++++------ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/jobs/send_template_message_job.rb b/app/jobs/send_template_message_job.rb index a45516ae5..c40a3c9bd 100644 --- a/app/jobs/send_template_message_job.rb +++ b/app/jobs/send_template_message_job.rb @@ -35,11 +35,7 @@ class SendTemplateMessageJob < ApplicationJob operator = User.find_by_id(operator_id) issue = Issue.find_by_id(issue_id) return unless operator.present? && issue.present? - if args[2].present? - receivers = User.where(id: args[2]).where.not(id: operator&.id) - else - receivers = User.where(id: issue&.assigned_to_id).where.not(id: operator&.id) - end + receivers = issue&.assigners.where.not(id: operator&.id) receivers_string, content, notification_url = MessageTemplate::IssueAssigned.get_message_content(receivers, operator, issue) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id}) receivers.find_each do |receiver| @@ -60,7 +56,7 @@ class SendTemplateMessageJob < ApplicationJob operator = User.find_by_id(operator_id) issue = Issue.find_by_id(issue_id) return unless operator.present? && issue.present? - receivers = User.where(id: [issue&.assigned_to_id, issue&.author_id]).where.not(id: operator&.id) + receivers = User.where(id: issue.assigners.pluck(:id).append(issue&.author_id)).where.not(id: operator&.id) receivers_string, content, notification_url = MessageTemplate::IssueChanged.get_message_content(receivers, operator, issue, change_params.symbolize_keys) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {operator_id: operator.id, issue_id: issue.id, change_params: change_params.symbolize_keys}) receivers.find_each do |receiver| @@ -71,7 +67,7 @@ class SendTemplateMessageJob < ApplicationJob issue_id = args[0] issue = Issue.find_by_id(issue_id) return unless issue.present? - receivers = User.where(id: [issue&.assigned_to_id, issue&.author_id]) + receivers = User.where(id: issue.assigners.pluck(:id).append(issue&.author_id)) receivers_string, content, notification_url = MessageTemplate::IssueExpire.get_message_content(receivers, issue) Notice::Write::CreateService.call(receivers_string, content, notification_url, source, {issue_id: issue.id}) receivers.find_each do |receiver| diff --git a/app/models/message_template/issue_changed.rb b/app/models/message_template/issue_changed.rb index e8a5e5cdb..f5e8c7628 100644 --- a/app/models/message_template/issue_changed.rb +++ b/app/models/message_template/issue_changed.rb @@ -209,16 +209,16 @@ class MessageTemplate::IssueChanged < MessageTemplate change_count = change_params.keys.size # 疑修负责人修改 if change_params[:assigned_to_id].present? - assigner1 = User.find_by_id(change_params[:assigned_to_id][0]) - assigner2 = User.find_by_id(change_params[:assigned_to_id][1]) + assigner1 = User.where(id: change_params[:assigned_to_id][0]) + assigner2 = User.where(id: change_params[:assigned_to_id][1]) if change_count > 1 content.sub!('{ifassigner}', '
        ') else content.sub!('{ifassigner}', '') end content.sub!('{endassigner}', '') - content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员') - content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员') + content.gsub!('{assigner1}', assigner1.present? ? assigner1.map{|a| a&.real_name}.join("、") : '无') + content.gsub!('{assigner2}', assigner2.present? ? assigner2.map{|a| a&.real_name}.join("、") : '无') else content.gsub!(/({ifassigner})(.*)({endassigner})/, '') end diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 45274b9c4..9aa9d6bb1 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -55,7 +55,10 @@ class Api::V1::Issues::UpdateService < ApplicationService build_assigner_participants unless assigner_ids.nil? # 负责人 build_edit_participants build_atme_participants if @atme_receivers.present? - @updated_issue.assigners = @assigners || User.none unless assigner_ids.nil? + unless assigner_ids.nil? + @previous_issue_changes.merge!(assigned_to_id: [@updated_issue.assigners.pluck(:id), @assigners.pluck(:id)]) + @updated_issue.assigners = @assigners || User.none + end @updated_issue.attachments = @attachments || Attachment.none unless attachment_ids.nil? @updated_issue.issue_tags_relates.destroy_all & @updated_issue.issue_tags = @issue_tags || IssueTag.none unless issue_tag_ids.nil? @updated_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.nil? @@ -118,12 +121,12 @@ class Api::V1::Issues::UpdateService < ApplicationService end def build_previous_issue_changes - @previous_issue_changes = @updated_issue.previous_changes.except("updated_on", "created_on") - if @updated_issue.previous_changes["start_date"].present? - @previous_issue_changes.merge!(start_date: [@updated_issue.previous_changes["start_date"][0].to_s, @updated_issue.previous_changes["start_date"][1].to_s]) + @previous_issue_changes.merge!(@updated_issue.previous_changes.slice("status_id", "priority_id", "fixed_version_id", "issue_tags_value", "branch_name").symbolize_keys) + if @updated_issue.previous_changes[:start_date].present? + @previous_issue_changes.merge!(start_date: [@updated_issue.previous_changes[:start_date][0].to_s, @updated_issue.previous_changes[:start_date][1].to_s]) end - if @updated_issue.previous_changes["due_date"].present? - @previous_issue_changes.merge!(due_date: [@updated_issue.previous_changes["due_date"][0].to_s, @updated_issue.previous_changes["due_date"][1].to_s]) + if @updated_issue.previous_changes[:due_date].present? + @previous_issue_changes.merge!(due_date: [@updated_issue.previous_changes[:due_date][0].to_s, @updated_issue.previous_changes[:due_date][1].to_s]) end end From b5383bfa5a8dffb1a661ec7dc5524f9320960bab Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 3 Mar 2023 18:43:18 +0800 Subject: [PATCH 079/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=86=85=E5=AE=B9=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 7 +++++-- app/models/message_template/issue_changed.rb | 12 ++++++------ app/views/api/v1/issues/index.json.jbuilder | 6 +++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 84f4dd722..6f615e498 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -9,8 +9,11 @@ class Api::V1::IssuesController < Api::V1::BaseController @total_issues_count = @object_result[:total_issues_count] @opened_issues_count = @object_result[:opened_issues_count] @closed_issues_count = @object_result[:closed_issues_count] - - @issues = kaminari_paginate(@object_result[:data]) + if params[:only_name].present? + @issues = kaminary_select_paginate(@object_result[:data].pluck(:id, :subject)) + else + @issues = kaminari_paginate(@object_result[:data]) + end end def create diff --git a/app/models/message_template/issue_changed.rb b/app/models/message_template/issue_changed.rb index f5e8c7628..5ac3a120f 100644 --- a/app/models/message_template/issue_changed.rb +++ b/app/models/message_template/issue_changed.rb @@ -31,16 +31,16 @@ class MessageTemplate::IssueChanged < MessageTemplate change_count = change_params.keys.size # 疑修负责人修改 if change_params[:assigned_to_id].present? - assigner1 = User.find_by_id(change_params[:assigned_to_id][0]) - assigner2 = User.find_by_id(change_params[:assigned_to_id][1]) + assigner1 = User.where(id: change_params[:assigned_to_id][0]) + assigner2 = User.where(id: change_params[:assigned_to_id][1]) if change_count > 1 content.sub!('{ifassigner}', '
        ') else content.sub!('{ifassigner}', '') end content.sub!('{endassigner}', '') - content.gsub!('{assigner1}', assigner1.present? ? assigner1&.real_name : '未指派成员') - content.gsub!('{assigner2}', assigner2.present? ? assigner2&.real_name : '未指派成员') + content.gsub!('{assigner1}', assigner1.present? ? assigner1.map{|a| a&.real_name}.join("、") : '未指派成员') + content.gsub!('{assigner2}', assigner2.present? ? assigner2.map{|a| a&.real_name}.join("、") : '未指派成员') else content.gsub!(/({ifassigner})(.*)({endassigner})/, '') end @@ -217,8 +217,8 @@ class MessageTemplate::IssueChanged < MessageTemplate content.sub!('{ifassigner}', '') end content.sub!('{endassigner}', '') - content.gsub!('{assigner1}', assigner1.present? ? assigner1.map{|a| a&.real_name}.join("、") : '无') - content.gsub!('{assigner2}', assigner2.present? ? assigner2.map{|a| a&.real_name}.join("、") : '无') + content.gsub!('{assigner1}', assigner1.present? ? assigner1.map{|a| a&.real_name}.join("、") : '未指派成员') + content.gsub!('{assigner2}', assigner2.present? ? assigner2.map{|a| a&.real_name}.join("、") : '未指派成员') else content.gsub!(/({ifassigner})(.*)({endassigner})/, '') end diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index 6a04c56ac..ddc36ffb7 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -4,5 +4,9 @@ json.closed_count @closed_issues_count json.total_count @issues.total_count json.has_created_issues @project.issues.size > 0 json.issues @issues.each do |issue| - json.partial! "simple_detail", locals: {issue: issue} + if params[:only_name].present? + json.partial! "simple_detail", locals: {issue: issue} + else + json.(issue, :id, :subject) + end end \ No newline at end of file From 2827e28b0736c2028bce160dbe3bc39c1fae57b3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 6 Mar 2023 10:33:26 +0800 Subject: [PATCH 080/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=AF=84?= =?UTF-8?q?=E8=AE=BA/=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/issues/journals_controller.rb | 7 ++++-- .../api/v1/issues/journals/list_service.rb | 22 +++++++++++-------- .../v1/issues/journals/index.json.jbuilder | 3 +++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index f7a24ea05..7a8b9b24b 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -6,8 +6,11 @@ class Api::V1::Issues::JournalsController < Api::V1::BaseController before_action :check_journal_operate_permission, only: [:update, :destroy] def index - @object_results = Api::V1::Issues::Journals::ListService.call(@issue, query_params, current_user) - @journals = kaminari_paginate(@object_results) + @object_result = Api::V1::Issues::Journals::ListService.call(@issue, query_params, current_user) + @total_journals_count = @object_result[:total_journals_count] + @total_operate_journals_count = @object_result[:total_operate_journals_count] + @total_comment_journals_count = @object_result[:total_comment_journals_count] + @journals = kaminari_paginate(@object_result[:data]) end def create diff --git a/app/services/api/v1/issues/journals/list_service.rb b/app/services/api/v1/issues/journals/list_service.rb index 02f709e55..486fa5d3f 100644 --- a/app/services/api/v1/issues/journals/list_service.rb +++ b/app/services/api/v1/issues/journals/list_service.rb @@ -3,7 +3,7 @@ class Api::V1::Issues::Journals::ListService < ApplicationService include ActiveModel::Model attr_reader :issue, :category, :keyword, :sort_by, :sort_direction - attr_accessor :queried_journals + attr_accessor :queried_journals, :total_journals_count, :total_operate_journals_count, :total_comment_journals_count validates :category, inclusion: {in: %w(all comment operate), message: "请输入正确的Category"} validates :sort_by, inclusion: {in: Journal.column_names, message: '请输入正确的SortBy'}, allow_blank: true @@ -22,7 +22,7 @@ class Api::V1::Issues::Journals::ListService < ApplicationService begin journal_query_data - @queried_journals + {data: @queried_journals, total_journals_count: @total_journals_count, total_operate_journals_count: total_operate_journals_count, total_comment_journals_count: total_comment_journals_count} rescue raise Error, "服务器错误，请联系系统管理员！" end @@ -33,17 +33,21 @@ class Api::V1::Issues::Journals::ListService < ApplicationService @queried_journals = issue.journals - case category - when 'comment' - @queried_journals = issue.comment_journals - when 'operate' - @queried_journals = issue.operate_journals - end - @queried_journals = @queried_journals.parent_journals @queried_journals = @queried_journals.ransack(notes_cont: keyword).result if keyword.present? + @total_journals_count = queried_journals.distinct.size + @total_operate_journals_count = @queried_journals.where(notes: nil).distinct.size + @total_comment_journals_count = @queried_journals.where.not(notes: nil).distinct.size + + case category + when 'comment' + @queried_journals = @queried_journals.where.not(notes: nil) + when 'operate' + @queried_journals = @queried_journals.where(notes: nil) + end + @queried_journals = @queried_journals.includes(:journal_details, :user, :attachments, first_ten_children_journals: [:parent_journal, :reply_journal]) @queried_journals = @queried_journals.reorder("journals.#{sort_by} #{sort_direction}").distinct diff --git a/app/views/api/v1/issues/journals/index.json.jbuilder b/app/views/api/v1/issues/journals/index.json.jbuilder index bea6746a6..49f94aa37 100644 --- a/app/views/api/v1/issues/journals/index.json.jbuilder +++ b/app/views/api/v1/issues/journals/index.json.jbuilder @@ -1,3 +1,6 @@ +json.total_journals_count @total_journals_count +json.total_operate_journals_count @total_operate_journals_count +json.total_comment_journals_count @total_comment_journals_count json.total_count @journals.total_count json.journals @journals do |journal| json.partial! "detail", journal: journal From 5580a96fe75e0f1520da10bd18a99b48337f62c6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 6 Mar 2023 10:42:12 +0800 Subject: [PATCH 081/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/issues/index.json.jbuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/api/v1/issues/index.json.jbuilder b/app/views/api/v1/issues/index.json.jbuilder index ddc36ffb7..39a467dd4 100644 --- a/app/views/api/v1/issues/index.json.jbuilder +++ b/app/views/api/v1/issues/index.json.jbuilder @@ -5,8 +5,8 @@ json.total_count @issues.total_count json.has_created_issues @project.issues.size > 0 json.issues @issues.each do |issue| if params[:only_name].present? - json.partial! "simple_detail", locals: {issue: issue} - else json.(issue, :id, :subject) + else + json.partial! "simple_detail", locals: {issue: issue} end end \ No newline at end of file From 620ed26e45ad123a8dd824d068d1685f9227c4e6 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 6 Mar 2023 17:49:28 +0800 Subject: [PATCH 082/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8F=98=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/base_controller.rb | 2 +- app/controllers/api/v1/issues/journals_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index c6a4f180d..bcb0c4e86 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -23,7 +23,7 @@ class Api::V1::BaseController < ApplicationController def kaminary_select_paginate(relation) limit = params[:limit] || params[:per_page] - limit = (limit.to_i.zero? || limit.to_i > 100) ? 100 : limit.to_i + limit = (limit.to_i.zero? || limit.to_i > 200) ? 200 : limit.to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i relation.page(page).per(limit) diff --git a/app/controllers/api/v1/issues/journals_controller.rb b/app/controllers/api/v1/issues/journals_controller.rb index 7a8b9b24b..cee2b81e8 100644 --- a/app/controllers/api/v1/issues/journals_controller.rb +++ b/app/controllers/api/v1/issues/journals_controller.rb @@ -10,7 +10,7 @@ class Api::V1::Issues::JournalsController < Api::V1::BaseController @total_journals_count = @object_result[:total_journals_count] @total_operate_journals_count = @object_result[:total_operate_journals_count] @total_comment_journals_count = @object_result[:total_comment_journals_count] - @journals = kaminari_paginate(@object_result[:data]) + @journals = kaminary_select_paginate(@object_result[:data]) end def create From 9cd150be88e3cfaa4b9e0506fb20706f8426e366 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 7 Mar 2023 09:49:17 +0800 Subject: [PATCH 083/133] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=A1=AE=E6=9D=83?= =?UTF-8?q?=E6=BF=80=E5=8A=B1=E7=9A=84=E7=94=A8=E6=88=B7=E6=88=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 1 + app/views/users/get_user_info.json.jbuilder | 1 + 2 files changed, 2 insertions(+) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5ed680ba3..cef8c3e04 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,6 +66,7 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), + open_blockchain: EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.id) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(project.identifier), ignore_id: project.ignore_id }).compact diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index 68bfa6589..ee4e75179 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -28,3 +28,4 @@ json.message_unread_total @message_unread_total json.has_trace_user @user.trace_user.present? json.is_new @user.login.present? && params[:login].to_s.include?("#{@user.login}") json.nps EduSetting.get("nps-on-off-switch").to_s == 'true' && UserNp.where(user_id: current_user.id).where("created_at >= ?", (Time.now - 30.days).beginning_of_day ).blank? +json.open_blockchain EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.id) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.login) From db845e7df01c1f151b930dbe70380493b32accd6 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 7 Mar 2023 09:59:42 +0800 Subject: [PATCH 084/133] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=A1=AE=E6=9D=83?= =?UTF-8?q?=E6=BF=80=E5=8A=B1=E7=9A=84=E7=94=A8=E6=88=B7=E6=88=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- app/views/users/get_user_info.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index cef8c3e04..03e06ec6e 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,7 +66,7 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), - open_blockchain: EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.id) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(project.identifier), + open_blockchain: EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.id.to_s) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(project.identifier), ignore_id: project.ignore_id }).compact diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index ee4e75179..dc8315ea2 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -28,4 +28,4 @@ json.message_unread_total @message_unread_total json.has_trace_user @user.trace_user.present? json.is_new @user.login.present? && params[:login].to_s.include?("#{@user.login}") json.nps EduSetting.get("nps-on-off-switch").to_s == 'true' && UserNp.where(user_id: current_user.id).where("created_at >= ?", (Time.now - 30.days).beginning_of_day ).blank? -json.open_blockchain EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.id) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.login) +json.open_blockchain EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.id.to_s) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(@user.login) From 9da61bd69e23974fc217a934a9db3048a728d153 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 7 Mar 2023 16:34:31 +0800 Subject: [PATCH 085/133] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=97=B6count=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 053c89e02..440379ac3 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -39,13 +39,14 @@ class ProjectsController < ApplicationController category_id = params[:category_id] @total_count = - if category_id.blank? - # ps = ProjectStatistic.first - # ps.common_projects_count + ps.mirror_projects_count unless ps.blank? + if category_id.blank? && params[:search].blank? + # 默认查询时count性能问题处理 + ProjectCategory.sum("projects_count") - Project.visible.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id").where("organization_extensions.visibility =2").count + elsif params[:search].present? @projects.total_count else - cate = ProjectCategory.find_by(id: category_id) - cate&.projects_count || 0 + cate = ProjectCategory.find_by(id: category_id) + cate&.projects_count || 0 end end From 4b618d1a6160e84ff771bd6d0a051b1b4c1821ce Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 10:33:00 +0800 Subject: [PATCH 086/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5issue=E8=B7=B3=E8=BD=AC=E4=BD=BF?= =?UTF-8?q?=E7=94=A8index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message_template/issue_assigned.rb | 4 ++-- app/models/message_template/issue_assigner_expire.rb | 2 +- app/models/message_template/issue_atme.rb | 2 +- app/models/message_template/issue_changed.rb | 4 ++-- app/models/message_template/issue_expire.rb | 4 ++-- app/models/message_template/project_issue.rb | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/message_template/issue_assigned.rb b/app/models/message_template/issue_assigned.rb index 7f8494f69..7973ed477 100644 --- a/app/models/message_template/issue_assigned.rb +++ b/app/models/message_template/issue_assigned.rb @@ -26,7 +26,7 @@ class MessageTemplate::IssueAssigned < MessageTemplate project = issue&.project owner = project&.owner content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject) - url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s) + url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s) return receivers_string(receivers), content, url rescue => e Rails.logger.info("MessageTemplate::IssueAssigned.get_message_content [ERROR] #{e}") @@ -52,7 +52,7 @@ class MessageTemplate::IssueAssigned < MessageTemplate content.gsub!('{repository}', project&.name) content.gsub!('{baseurl}', base_url) content.gsub!('{title}', issue&.subject) - content.gsub!('{id}', issue&.id.to_s) + content.gsub!('{id}', issue&.project_issues_index.to_s) content.gsub!('{platform}', PLATFORM) return receiver&.mail, title, content diff --git a/app/models/message_template/issue_assigner_expire.rb b/app/models/message_template/issue_assigner_expire.rb index 610c51175..8f9417a41 100644 --- a/app/models/message_template/issue_assigner_expire.rb +++ b/app/models/message_template/issue_assigner_expire.rb @@ -20,7 +20,7 @@ class MessageTemplate::IssueAssignerExpire < MessageTemplate project = issue&.project owner = project&.owner content = sys_notice.gsub('{title}', issue&.subject) - url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s) + url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s) return receivers_string(receivers), content, url rescue => e Rails.logger.info("MessageTemplate::IssueAssignerExpire.get_message_content [ERROR] #{e}") diff --git a/app/models/message_template/issue_atme.rb b/app/models/message_template/issue_atme.rb index 04eb132e4..7709ed05f 100644 --- a/app/models/message_template/issue_atme.rb +++ b/app/models/message_template/issue_atme.rb @@ -20,7 +20,7 @@ class MessageTemplate::IssueAtme < MessageTemplate project = issue&.project owner = project&.owner content = sys_notice.gsub('{nickname}', operator&.real_name).gsub('{title}', issue&.subject) - url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s) + url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s) return receivers_string(receivers), content, url rescue => e Rails.logger.info("MessageTemplate::IssueAtme.get_message_content [ERROR] #{e}") diff --git a/app/models/message_template/issue_changed.rb b/app/models/message_template/issue_changed.rb index 5ac3a120f..43e2cee7d 100644 --- a/app/models/message_template/issue_changed.rb +++ b/app/models/message_template/issue_changed.rb @@ -27,7 +27,7 @@ class MessageTemplate::IssueChanged < MessageTemplate project = issue&.project owner = project&.owner content = MessageTemplate::IssueChanged.sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject) - url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s) + url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s) change_count = change_params.keys.size # 疑修负责人修改 if change_params[:assigned_to_id].present? @@ -205,7 +205,7 @@ class MessageTemplate::IssueChanged < MessageTemplate content.gsub!('{identifier}', project&.identifier) content.gsub!('{repository}', project&.name) content.gsub!('{title}', issue&.subject) - content.gsub!('{id}', issue&.id.to_s) + content.gsub!('{id}', issue&.project_issues_index.to_s) change_count = change_params.keys.size # 疑修负责人修改 if change_params[:assigned_to_id].present? diff --git a/app/models/message_template/issue_expire.rb b/app/models/message_template/issue_expire.rb index d77965f13..eedd53500 100644 --- a/app/models/message_template/issue_expire.rb +++ b/app/models/message_template/issue_expire.rb @@ -28,7 +28,7 @@ class MessageTemplate::IssueExpire < MessageTemplate project = issue&.project owner = project&.owner content = sys_notice.gsub('{title}', issue&.subject) - url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s) + url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s) return receivers_string(receivers), content, url rescue => e @@ -53,7 +53,7 @@ class MessageTemplate::IssueExpire < MessageTemplate content.gsub!('{repository}', project&.name) content.gsub!('{baseurl}', base_url) content.gsub!('{title}', issue&.subject) - content.gsub!('{id}', issue&.id.to_s) + content.gsub!('{id}', issue&.project_issues_index.to_s) content.gsub!('{platform}', PLATFORM) return receiver&.mail, title, content diff --git a/app/models/message_template/project_issue.rb b/app/models/message_template/project_issue.rb index e04830836..e262cd589 100644 --- a/app/models/message_template/project_issue.rb +++ b/app/models/message_template/project_issue.rb @@ -27,7 +27,7 @@ class MessageTemplate::ProjectIssue < MessageTemplate receivers = managers + followers return '', '', '' if receivers.blank? content = sys_notice.gsub('{nickname1}', operator&.real_name).gsub('{nickname2}', owner&.real_name).gsub('{repository}', project&.name).gsub('{title}', issue&.subject) - url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.id.to_s) + url = notification_url.gsub('{owner}', owner&.login).gsub('{identifier}', project&.identifier).gsub('{id}', issue&.project_issues_index.to_s) return receivers_string(receivers), content, url rescue => e @@ -54,7 +54,7 @@ class MessageTemplate::ProjectIssue < MessageTemplate content.gsub!('{repository}', project&.name) content.gsub!('{login2}', owner&.login) content.gsub!('{identifier}', project&.identifier) - content.gsub!('{id}', issue&.id.to_s) + content.gsub!('{id}', issue&.project_issues_index.to_s) content.gsub!('{title}', issue&.subject) content.gsub!('{platform}', PLATFORM) From 917bae4321d1bab1f377bb0bca4d1c0afd7238aa Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 11:09:04 +0800 Subject: [PATCH 087/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=96=91=E4=BF=AE=E6=B6=88=E6=81=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index a7ddf7e77..30f4a11ef 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -64,8 +64,8 @@ class Api::V1::Issues::CreateService < ApplicationService # 发消息 if Site.has_notice_menu? - SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id, assigner_ids) unless assigner_ids.blank? - SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) + SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @created_issue&.id, assigner_ids) unless assigner_ids.blank? + SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @created_issue&.id) end unlock("Api::V1::Issues::CreateService:#{project.id}") # 结束写数据，解锁 From 6e16a9397c45a1ae0d6f44ad4b9b5a45573afe28 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 9 Mar 2023 16:02:50 +0800 Subject: [PATCH 088/133] =?UTF-8?q?fixed=20=E6=90=9C=E7=B4=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=B6=E8=BF=87=E8=99=91=E8=A1=A8=E6=83=85=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/owner.rb | 2 ++ app/models/user.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/owner.rb b/app/models/owner.rb index 2763dc80f..75ec6a2c3 100644 --- a/app/models/owner.rb +++ b/app/models/owner.rb @@ -69,6 +69,8 @@ class Owner < ApplicationRecord has_many :applied_transfer_projects, dependent: :destroy scope :like, lambda { |keywords| + # 表情处理 + keywords = keywords.each_char.select { |c| c.bytes.first < 240 }.join('') sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search " where(sql, :search => "%#{keywords.strip}%") unless keywords.blank? } diff --git a/app/models/user.rb b/app/models/user.rb index 193e6c68f..997053e0c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -185,6 +185,8 @@ class User < Owner # Groups and active users scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) } scope :like, lambda { |keywords| + # 表情处理 + keywords = keywords.each_char.select { |c| c.bytes.first < 240 }.join('') sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search" where(sql, :search => "%#{keywords.strip}%") unless keywords.blank? } From 701d5dea4085d7869dbe59c82bcba37afeb7e094 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 9 Mar 2023 16:06:04 +0800 Subject: [PATCH 089/133] =?UTF-8?q?fixed=20=E6=90=9C=E7=B4=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=B6=E8=BF=87=E8=99=91=E8=A1=A8=E6=83=85=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/owner.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/owner.rb b/app/models/owner.rb index 75ec6a2c3..d348970f0 100644 --- a/app/models/owner.rb +++ b/app/models/owner.rb @@ -70,7 +70,7 @@ class Owner < ApplicationRecord scope :like, lambda { |keywords| # 表情处理 - keywords = keywords.each_char.select { |c| c.bytes.first < 240 }.join('') + keywords = keywords.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search " where(sql, :search => "%#{keywords.strip}%") unless keywords.blank? } diff --git a/app/models/user.rb b/app/models/user.rb index 997053e0c..5e21212ab 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -186,7 +186,7 @@ class User < Owner scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) } scope :like, lambda { |keywords| # 表情处理 - keywords = keywords.each_char.select { |c| c.bytes.first < 240 }.join('') + keywords = keywords.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search" where(sql, :search => "%#{keywords.strip}%") unless keywords.blank? } From d993df7df4de5472827eb57599bd91011b6cc6c5 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 9 Mar 2023 16:07:38 +0800 Subject: [PATCH 090/133] =?UTF-8?q?fixed=20=E6=90=9C=E7=B4=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=B6=E8=BF=87=E8=99=91=E8=A1=A8=E6=83=85=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/owner.rb | 2 ++ app/models/user.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/owner.rb b/app/models/owner.rb index 2763dc80f..d348970f0 100644 --- a/app/models/owner.rb +++ b/app/models/owner.rb @@ -69,6 +69,8 @@ class Owner < ApplicationRecord has_many :applied_transfer_projects, dependent: :destroy scope :like, lambda { |keywords| + # 表情处理 + keywords = keywords.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search " where(sql, :search => "%#{keywords.strip}%") unless keywords.blank? } diff --git a/app/models/user.rb b/app/models/user.rb index 193e6c68f..5e21212ab 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -185,6 +185,8 @@ class User < Owner # Groups and active users scope :active, lambda { where(status: [STATUS_ACTIVE, STATUS_EDIT_INFO]) } scope :like, lambda { |keywords| + # 表情处理 + keywords = keywords.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search OR mail LIKE :search OR nickname LIKE :search" where(sql, :search => "%#{keywords.strip}%") unless keywords.blank? } From 6f7b40ec244b436952deea79cd2b7341f5b79d9f Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 9 Mar 2023 16:22:48 +0800 Subject: [PATCH 091/133] =?UTF-8?q?fixed=20=E6=90=9C=E7=B4=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E6=97=B6=E8=BF=87=E8=99=91=E8=A1=A8?= =?UTF-8?q?=E6=83=85=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations/projects_controller.rb | 9 ++++++--- app/models/project.rb | 2 ++ app/queries/projects/list_my_query.rb | 6 ++++-- app/queries/projects/list_query.rb | 4 +++- app/services/api/v1/users/projects/list_service.rb | 4 +++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/controllers/organizations/projects_controller.rb b/app/controllers/organizations/projects_controller.rb index b36a76125..ab5c9ef5d 100644 --- a/app/controllers/organizations/projects_controller.rb +++ b/app/controllers/organizations/projects_controller.rb @@ -8,14 +8,17 @@ class Organizations::ProjectsController < Organizations::BaseController .joins(team_projects: {team: :team_users}) .where(team_users: {user_id: current_user.id}).to_sql @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects") - - @projects = @projects.ransack(name_or_identifier_cont: params[:search]).result if params[:search].present? + # 表情处理 + keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('') + @projects = @projects.ransack(name_or_identifier_cont: keywords).result if params[:search].present? @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}") @projects = paginate(@projects) end def search tip_exception("请输入搜索关键词") if params[:search].nil? + # 表情处理 + keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('') public_projects_sql = @organization.projects.where(is_public: true).to_sql private_projects_sql = @organization.projects .where(is_public: false) @@ -23,7 +26,7 @@ class Organizations::ProjectsController < Organizations::BaseController .where(team_users: {user_id: current_user.id}).to_sql @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects") - @projects = @projects.ransack(name_or_identifier_cont: params[:search]).result + @projects = @projects.ransack(name_or_identifier_cont: keywords).result @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}") end diff --git a/app/models/project.rb b/app/models/project.rb index 68a8d071d..54d6ac520 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -240,6 +240,8 @@ class Project < ApplicationRecord end def self.search_project(search) + # 表情处理 + search = search.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') ransack(name_or_identifier_cont: search) end # 创建者 diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 6c7f38d9c..bc0cda1a2 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -52,8 +52,10 @@ class Projects::ListMyQuery < ApplicationQuery elsif params[:project_type].to_s === "sync_mirror" projects = projects.sync_mirror end - - q = projects.ransack(name_or_identifier_cont: params[:search]) + + # 表情处理 + keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('') + q = projects.ransack(name_or_identifier_cont: keywords) scope = q.result.includes(:project_category, :project_language,:owner, :repository, :has_pinned_users) diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 6b0843540..2b048bd87 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -51,7 +51,9 @@ class Projects::ListQuery < ApplicationQuery # items = items.where(id: @ids).by_name_or_identifier(params[:search]) items = items.where(id: @ids) else - items = items.by_name_or_identifier(params[:search]).or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id))) + # 表情处理 + keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('') + items = items.by_name_or_identifier(keywords).or(main_collection.where(user_id: Owner.like(keywords).pluck(:id))) end items end diff --git a/app/services/api/v1/users/projects/list_service.rb b/app/services/api/v1/users/projects/list_service.rb index 8b3bffef0..47457c58c 100644 --- a/app/services/api/v1/users/projects/list_service.rb +++ b/app/services/api/v1/users/projects/list_service.rb @@ -73,8 +73,10 @@ class Api::V1::Users::Projects::ListService < ApplicationService end - projects = projects.with_project_type(project_type) + projects = projects.with_project_type(project_type) + # 表情处理 + search = search.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') q = projects.ransack(name_or_identifier_cont: search) scope = q.result.includes(:project_category, :project_language,:owner, :repository, :has_pinned_users) From 6bb3f9297327a700147344d6fe6cded11519f55a Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 9 Mar 2023 17:45:03 +0800 Subject: [PATCH 092/133] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=A1=AE=E6=9D=83?= =?UTF-8?q?=E6=BF=80=E5=8A=B1=E7=9A=84=E7=94=A8=E6=88=B7=E6=88=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=8F=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 03e06ec6e..3461160f8 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,7 +66,7 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), - open_blockchain: EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.id.to_s) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(project.identifier), + open_blockchain: EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.id.to_s) || EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.identifier) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(user.id) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(user.login), ignore_id: project.ignore_id }).compact From a0d4f2f404c6e8a808f43906c8313ca1c4cd5df0 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 10 Mar 2023 14:35:20 +0800 Subject: [PATCH 093/133] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 3461160f8..c904b1743 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,7 +66,6 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), - open_blockchain: EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.id.to_s) || EduSetting.get("open_blockchain_projects").to_s.split(",").include?(project.identifier) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(user.id) || EduSetting.get("open_blockchain_users").to_s.split(",").include?(user.login), ignore_id: project.ignore_id }).compact @@ -182,7 +181,7 @@ module ProjectsHelper end def ai_shang_v3_url(project) - url = EduSetting.get("ai_shang_v3_url") || "https://entropy.ingress.isa.buaanlsde.cn" + url = EduSetting.get("ai_shang_v3_url") || "https://shang.gitlink.org.cn/v3" case project.identifier.to_s.downcase when nil then "" when 'rails' then "#{url}/rails/entropy" From 18156ffd8d61324d67883fc5a6f96ed8efcb1cbb Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 2 Mar 2023 15:55:46 +0800 Subject: [PATCH 094/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=85=B3=E8=81=94=E7=96=91=E4=BF=AE?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 48 ++++++++----------- app/models/issue.rb | 2 + app/models/pull_attached_issue.rb | 22 +++++++++ app/models/pull_request.rb | 2 + app/services/pull_requests/create_service.rb | 15 ++++++ ...30302063013_create_pull_attached_issues.rb | 10 ++++ 6 files changed, 71 insertions(+), 28 deletions(-) create mode 100644 app/models/pull_attached_issue.rb create mode 100644 db/migrate/20230302063013_create_pull_attached_issues.rb diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 5a6742037..6f3ca4d34 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -127,6 +127,18 @@ class PullRequestsController < ApplicationController return normal_status(-1, "请输入正确的标记。") end end + if params[:attached_issue_ids].present? + if params[:attached_issue_ids].is_a?(Array) && params[:attached_issue_ids].size > 1 + return normal_status(-1, "最多只能关联一个疑修。") + elsif params[:attached_issue_ids].is_a?(Array) && params[:attached_issue_ids].size == 1 + @pull_request&.pull_attached_issues&.destroy_all + params[:attached_issue_ids].each do |issue| + PullAttachedIssue.create!(issue_id: issue, pull_request_id: @pull_request.id) + end + else + return normal_status(-1, "请输入正确的疑修。") + end + end if params[:status_id].to_i == 5 @issue.issue_times.update_all(end_time: Time.now) end @@ -214,35 +226,15 @@ class PullRequestsController < ApplicationController push_activity_2_blockchain("pull_request_merge", @pull_request) # 查看是否fix了相关issue，如果fix就转账 - if params["fix_issue_id"].nil? || params["fix_issue_id"] == "" - else - issue = Issue.find_by(id: params["fix_issue_id"]) - if issue.nil? - normal_status(-1, "关联issue失败") - raise ActiveRecord::Rollback - else - token_num = issue.blockchain_token_num - token_num = token_num.nil? ? 0 : token_num - owner = User.find_by(login: params["owner"]) - pr = PullRequest.find_by(id: params["pull_request"]["id"]) - if owner.nil? || pr.nil? - normal_status(-1, "关联issue失败") - raise ActiveRecord::Rollback - else - project = Project.find_by(user_id: owner.id, identifier: params["project_id"]) - if project.nil? - normal_status(-1, "关联issue失败") - raise ActiveRecord::Rollback - else - author_id = pr.user_id - if token_num > 0 - Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) - end - # update issue to state 5 - issue.update(status_id: 5) - end - end + @pull_request.attached_issues.each do |issue| + token_num = issue.blockchain_token_num + token_num = token_num.nil? ? 0 : token_num + author_id = @pull_request.user_id + if token_num > 0 + Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) end + # update issue to state 5 + issue.update(status_id: 5) end # 合并请求下issue处理为关闭 diff --git a/app/models/issue.rb b/app/models/issue.rb index 9c61f3ec3..0fb5291e0 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -79,6 +79,8 @@ class Issue < ApplicationRecord has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized has_many :operate_journals, -> {where(notes: nil)}, class_name: "Journal", :as => :journalized + has_many :pull_attached_issues, dependent: :destroy + has_many :attach_pull_requests, through: :pull_attached_issues, source: :pull_request scope :issue_includes, ->{includes(:user)} scope :issue_many_includes, ->{includes(journals: :user)} diff --git a/app/models/pull_attached_issue.rb b/app/models/pull_attached_issue.rb new file mode 100644 index 000000000..c93a95d65 --- /dev/null +++ b/app/models/pull_attached_issue.rb @@ -0,0 +1,22 @@ +# == Schema Information +# +# Table name: pull_attached_issues +# +# id :integer not null, primary key +# pull_request_id :integer +# issue_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_pull_attached_issues_on_issue_id (issue_id) +# index_pull_attached_issues_on_pull_request_id (pull_request_id) +# + +class PullAttachedIssue < ApplicationRecord + + belongs_to :pull_request + belongs_to :issue + +end diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index 270e7dc76..648912f5a 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -44,6 +44,8 @@ class PullRequest < ApplicationRecord has_many :pull_requests_reviewers, dependent: :destroy has_many :reviewers, through: :pull_requests_reviewers has_many :mark_files, dependent: :destroy + has_many :pull_attached_issues, dependent: :destroy + has_many :attached_issues, through: :pull_attached_issues, source: :issue scope :merged_and_closed, ->{where.not(status: 0)} scope :opening, -> {where(status: 0)} diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb index 258d0e31b..c2c6cfb22 100644 --- a/app/services/pull_requests/create_service.rb +++ b/app/services/pull_requests/create_service.rb @@ -20,6 +20,7 @@ class PullRequests::CreateService < ApplicationService save_tiding! save_project_trend! save_custom_journal_detail! + save_pull_attached_issues! end [pull_request, gitea_pull_request] @@ -111,6 +112,20 @@ class PullRequests::CreateService < ApplicationService end end + def save_pull_attached_issues! + if attached_issue_ids.size > 1 + raise "最多只能关联一个疑修。" + else + attached_issue_ids.each do |issue| + PullAttachedIssue.create!(issue_id: issue, pull_request_id: pull_request&.id) + end + end + end + + def issue_tag_ids + Array(@params[:attached_issue_ids]) + end + def gitea_pull_request @gitea_pull_request ||= create_gitea_pull_request! end diff --git a/db/migrate/20230302063013_create_pull_attached_issues.rb b/db/migrate/20230302063013_create_pull_attached_issues.rb new file mode 100644 index 000000000..c3b4f6528 --- /dev/null +++ b/db/migrate/20230302063013_create_pull_attached_issues.rb @@ -0,0 +1,10 @@ +class CreatePullAttachedIssues < ActiveRecord::Migration[5.2] + def change + create_table :pull_attached_issues do |t| + t.references :pull_request + t.references :issue + + t.timestamps + end + end +end From aba5de8bb883ea7d3c36c75b6c5b8ecffb0c8b1c Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 2 Mar 2023 16:20:35 +0800 Subject: [PATCH 095/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=96=91?= =?UTF-8?q?=E4=BF=AE=E6=96=B0=E5=A2=9E=E6=82=AC=E8=B5=8F=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 2 +- app/services/api/v1/issues/create_service.rb | 5 ++++- app/services/api/v1/issues/list_service.rb | 4 ++-- app/services/api/v1/issues/update_service.rb | 5 ++++- app/views/api/v1/issues/_detail.json.jbuilder | 2 +- app/views/api/v1/issues/_simple_detail.json.jbuilder | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 6f615e498..689d8e520 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -99,7 +99,7 @@ class Api::V1::IssuesController < Api::V1::BaseController params.permit( :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, - :subject, :description, + :subject, :description, :blockchain_token_num, :issue_tag_ids => [], :assigner_ids => [], :attachment_ids => [], diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 30f4a11ef..ae9d45c95 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -4,13 +4,14 @@ class Api::V1::Issues::CreateService < ApplicationService include Api::V1::Issues::Concerns::Loadable attr_reader :project, :current_user - attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description + attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description, :blockchain_token_num attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids, :receivers_login attr_accessor :created_issue validates :subject, presence: true validates :status_id, :priority_id, presence: true validates :project, :current_user, presence: true + validates :blockchain_token_num, numericality: {greater_than: 0} def initialize(project, params, current_user = nil) @project = project @@ -23,6 +24,7 @@ class Api::V1::Issues::CreateService < ApplicationService @due_date = params[:due_date] @subject = params[:subject] @description = params[:description] + @blockchain_token_num = params[:blockchain_token_num] @issue_tag_ids = params[:issue_tag_ids] @assigner_ids = params[:assigner_ids] @attachment_ids = params[:attachment_ids] @@ -94,6 +96,7 @@ class Api::V1::Issues::CreateService < ApplicationService issue_attributes.merge!({start_date: start_date}) if start_date.present? issue_attributes.merge!({due_date: due_date}) if due_date.present? issue_attributes.merge!({branch_name: branch_name}) if branch_name.present? + issue_attributes.merge!({blockchain_token_num: blockchain_token_num}) if blockchain_token_num.present? issue_attributes end diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index fa27f4ee4..7019dc8e4 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -7,7 +7,7 @@ class Api::V1::Issues::ListService < ApplicationService validates :category, inclusion: {in: %w(all opened closed), message: "请输入正确的Category"} validates :participant_category, inclusion: {in: %w(all aboutme authoredme assignedme atme), message: "请输入正确的ParticipantCategory"} - validates :sort_by, inclusion: {in: ['issues.created_on', 'issues.updated_on', 'issue_priorities.position'], message: '请输入正确的SortBy'}, allow_blank: true + validates :sort_by, inclusion: {in: ['issues.created_on', 'issues.updated_on', 'issues.blockchain_token_num', 'issue_priorities.position'], message: '请输入正确的SortBy'}, allow_blank: true validates :sort_direction, inclusion: {in: %w(asc desc), message: '请输入正确的SortDirection'}, allow_blank: true validates :current_user, presence: true @@ -68,7 +68,7 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.where(status_id: status_id) if status_id.present? # keyword - issues = issues.ransack(subject_or_description_cont: keyword).result if keyword.present? + issues = issues.ransack(id_eq: params[:keyword]).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present? @total_issues_count = issues.distinct.size @closed_issues_count = issues.closed.distinct.size diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 9aa9d6bb1..4d3495022 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -4,11 +4,12 @@ class Api::V1::Issues::UpdateService < ApplicationService include Api::V1::Issues::Concerns::Loadable attr_reader :project, :issue, :current_user - attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description + attr_reader :status_id, :priority_id, :milestone_id, :branch_name, :start_date, :due_date, :subject, :description, :blockchain_token_num attr_reader :issue_tag_ids, :assigner_ids, :attachment_ids, :receivers_login attr_accessor :add_assigner_ids, :previous_issue_changes, :updated_issue, :atme_receivers validates :project, :issue, :current_user, presence: true + validates :blockchain_token_num, numericality: {greater_than: 0} def initialize(project, issue, params, current_user = nil) @project = project @@ -22,6 +23,7 @@ class Api::V1::Issues::UpdateService < ApplicationService @due_date = params[:due_date] @subject = params[:subject] @description = params[:description] + @blockchain_token_num = params[:blockchain_token_num] @issue_tag_ids = params[:issue_tag_ids] @assigner_ids = params[:assigner_ids] @attachment_ids = params[:attachment_ids] @@ -94,6 +96,7 @@ class Api::V1::Issues::UpdateService < ApplicationService @updated_issue.due_date = due_date unless due_date.nil? @updated_issue.subject = subject if subject.present? @updated_issue.description = description unless description.nil? + @updated_issue.blockchain_token_num = blockchain_token_num unless blockchain_token_num.nil? end def build_assigner_participants diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index 193357ce1..d1b6352c7 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -1,4 +1,4 @@ -json.(issue, :id, :subject, :project_issues_index, :description, :branch_name, :start_date, :due_date) +json.(issue, :id, :subject, :project_issues_index, :description, :branch_name, :start_date, :due_date, :blockchain_token_num) json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") json.tags issue.show_issue_tags.each do |tag| diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index 7e0d6b11f..27424deff 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -1,4 +1,4 @@ -json.(issue, :id, :subject, :project_issues_index) +json.(issue, :id, :subject, :project_issues_index, :blockchain_token_num) json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") json.tags issue.show_issue_tags.each do |tag| From c9c16aef8d23a4844497629e1cd802e36471dff3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 2 Mar 2023 17:06:49 +0800 Subject: [PATCH 096/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E7=89=88=E7=96=91=E4=BF=AE=E4=B8=8A=E9=93=BE=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 16 +++++++++------- app/controllers/journals_controller.rb | 2 +- app/controllers/pull_requests_controller.rb | 8 ++++---- app/models/site.rb | 4 ++++ app/services/api/v1/issues/create_service.rb | 12 ++++++++++++ .../api/v1/issues/journals/create_service.rb | 2 ++ .../v1/projects/pulls/journals/create_service.rb | 2 ++ 7 files changed, 34 insertions(+), 12 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index dfc551e3c..0302bd5b8 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -160,14 +160,16 @@ class IssuesController < ApplicationController # 新增时向grimoirelab推送事件 IssueWebhookJob.set(wait: 5.seconds).perform_later(@issue.id) - # author: zxh - # 扣除发起人的token - if @issue.blockchain_token_num > 0 - Blockchain::CreateIssue.call(user_id: @issue.author_id, project_id: @issue.project_id, token_num: @issue.blockchain_token_num) - end + if Site.has_blockchain? + # author: zxh + # 扣除发起人的token + if @issue.blockchain_token_num > 0 + Blockchain::CreateIssue.call(user_id: @issue.author_id, project_id: @issue.project_id, token_num: @issue.blockchain_token_num) + end - # 调用上链API存证 - push_activity_2_blockchain("issue_create", @issue) + # 调用上链API存证 + push_activity_2_blockchain("issue_create", @issue) + end render json: {status: 0, message: "创建成功", id: @issue.id} else diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index ff5e28cc1..a8804a8c6 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -50,7 +50,7 @@ class JournalsController < ApplicationController # author: zxh # 调用上链API - push_activity_2_blockchain("issue_comment_create", journal) + push_activity_2_blockchain("issue_comment_create", journal) if Site.has_blockchain? render :json => { status: 0, message: "评论成功", id: journal.id} else diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 6f3ca4d34..55b8aedf5 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -77,7 +77,7 @@ class PullRequestsController < ApplicationController # author: zxh # 调用上链API - push_activity_2_blockchain("pull_request_create", @pull_request) + push_activity_2_blockchain("pull_request_create", @pull_request) if Site.has_blockchain? else render_error("create pull request error: #{@gitea_pull_request[:status]}") @@ -169,7 +169,7 @@ class PullRequestsController < ApplicationController colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user) # author: zxh # 调用上链API - push_activity_2_blockchain("pull_request_refuse", @pull_request) + push_activity_2_blockchain("pull_request_refuse", @pull_request) if Site.has_blockchain? if colsed === true @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE) @@ -223,7 +223,7 @@ class PullRequestsController < ApplicationController # author: zxh # 调用上链API - push_activity_2_blockchain("pull_request_merge", @pull_request) + push_activity_2_blockchain("pull_request_merge", @pull_request) if Site.has_blockchain? # 查看是否fix了相关issue，如果fix就转账 @pull_request.attached_issues.each do |issue| @@ -231,7 +231,7 @@ class PullRequestsController < ApplicationController token_num = token_num.nil? ? 0 : token_num author_id = @pull_request.user_id if token_num > 0 - Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) + Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) if Site.has_blockchain? end # update issue to state 5 issue.update(status_id: 5) diff --git a/app/models/site.rb b/app/models/site.rb index a8b725ef6..097306fb5 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -30,6 +30,10 @@ class Site < ApplicationRecord self.common.where(key: 'notice').present? end + def self.has_blockchain? + self.common.where(key: 'blockchain').present? + end + private def self.set_add_menu! adds= [ diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index ae9d45c95..4b2f658d0 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -59,8 +59,20 @@ class Api::V1::Issues::CreateService < ApplicationService @created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.blank? @created_issue.save! + + if Site.has_blockchain? + if @created_issue.blockchain_token_num > 0 + Blockchain::CreateIssue.call(user_id: @created_issue.author_id, project_id: @created_issue.project_id, token_num: @created_issue.blockchain_token_num) + end + + push_activity_2_blockchain("issue_create", @created_issue) + end + project.del_project_issue_cache_delete_count # 把缓存里存储项目删除issue的个数清除掉 + # 新增时向grimoirelab推送事件 + IssueWebhookJob.set(wait: 5.seconds).perform_later(@created_issue.id) + # @信息发送 AtmeService.call(current_user, @atme_receivers, @created_issue) unless receivers_login.blank? diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index dce00349b..9f50311fa 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -39,6 +39,8 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService @created_journal.save! @issue.save! + push_activity_2_blockchain("issue_comment_create", @created_journal) if Site.has_blockchain? + # @信息发送 AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? diff --git a/app/services/api/v1/projects/pulls/journals/create_service.rb b/app/services/api/v1/projects/pulls/journals/create_service.rb index df207771b..c9abca83c 100644 --- a/app/services/api/v1/projects/pulls/journals/create_service.rb +++ b/app/services/api/v1/projects/pulls/journals/create_service.rb @@ -30,6 +30,8 @@ class Api::V1::Projects::Pulls::Journals::CreateService < ApplicationService create_comment_journal end + push_activity_2_blockchain("issue_comment_create", @journal) if Site.has_blockchain? + journal end From 129d2651b2ab6e0c2789d149b1bdedd1c43c4194 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 6 Mar 2023 09:27:05 +0800 Subject: [PATCH 097/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=96=91=E4=BF=AE=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/show.json.jbuilder | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 27c393de5..7aa0081e9 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -51,4 +51,8 @@ json.issue do json.issue_tags @issue.get_issue_tags end +json.attached_issues @pull_request.attached_issues.each do |issue| + json.(issue, :id,:subject) +end + json.conflict_files @pull_request.conflict_files From a2916415053dbe2ec9ee35356bdee5da50425a34 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Mar 2023 10:46:17 +0800 Subject: [PATCH 098/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=82=AC?= =?UTF-8?q?=E8=B5=8F=E9=87=91=E9=A2=9D=E6=A0=B9=E6=8D=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/v1/issues/_detail.json.jbuilder | 3 ++- app/views/api/v1/issues/_simple_detail.json.jbuilder | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index d1b6352c7..83e83d981 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -1,4 +1,5 @@ -json.(issue, :id, :subject, :project_issues_index, :description, :branch_name, :start_date, :due_date, :blockchain_token_num) +json.(issue, :id, :subject, :project_issues_index, :description, :branch_name, :start_date, :due_date) +json.blockchain_token_num issue.project&.use_blockchain ? issue.blockchain_token_num : nil json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") json.tags issue.show_issue_tags.each do |tag| diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index 27424deff..4f288ce20 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -1,4 +1,5 @@ -json.(issue, :id, :subject, :project_issues_index, :blockchain_token_num) +json.(issue, :id, :subject, :project_issues_index) +json.blockchain_token_num issue.project&.use_blockchain ? issue.blockchain_token_num : nil json.created_at issue.created_on.strftime("%Y-%m-%d %H:%M") json.updated_at issue.updated_on.strftime("%Y-%m-%d %H:%M") json.tags issue.show_issue_tags.each do |tag| From 3e0df7c1b9ce9d3d04a5bd7a7c6dc48c19335bf5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Mar 2023 15:38:54 +0800 Subject: [PATCH 099/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B8=8A?= =?UTF-8?q?=E9=93=BE=E9=9C=80=E8=A6=81=E9=A1=B9=E7=9B=AE=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 2 +- app/controllers/journals_controller.rb | 2 +- app/controllers/pull_requests_controller.rb | 8 ++++---- app/services/api/v1/issues/create_service.rb | 2 +- app/services/api/v1/issues/journals/create_service.rb | 2 +- .../api/v1/projects/pulls/journals/create_service.rb | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 0302bd5b8..c1f2ea1f0 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -160,7 +160,7 @@ class IssuesController < ApplicationController # 新增时向grimoirelab推送事件 IssueWebhookJob.set(wait: 5.seconds).perform_later(@issue.id) - if Site.has_blockchain? + if Site.has_blockchain? && @project.use_blockchain # author: zxh # 扣除发起人的token if @issue.blockchain_token_num > 0 diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index a8804a8c6..834cdbd4e 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -50,7 +50,7 @@ class JournalsController < ApplicationController # author: zxh # 调用上链API - push_activity_2_blockchain("issue_comment_create", journal) if Site.has_blockchain? + push_activity_2_blockchain("issue_comment_create", journal) if Site.has_blockchain? && @project.use_blockchain render :json => { status: 0, message: "评论成功", id: journal.id} else diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 55b8aedf5..d095a02fa 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -77,7 +77,7 @@ class PullRequestsController < ApplicationController # author: zxh # 调用上链API - push_activity_2_blockchain("pull_request_create", @pull_request) if Site.has_blockchain? + push_activity_2_blockchain("pull_request_create", @pull_request) if Site.has_blockchain? && @project.use_blockchain else render_error("create pull request error: #{@gitea_pull_request[:status]}") @@ -169,7 +169,7 @@ class PullRequestsController < ApplicationController colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user) # author: zxh # 调用上链API - push_activity_2_blockchain("pull_request_refuse", @pull_request) if Site.has_blockchain? + push_activity_2_blockchain("pull_request_refuse", @pull_request) if Site.has_blockchain? && @project.use_blockchain if colsed === true @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE) @@ -223,7 +223,7 @@ class PullRequestsController < ApplicationController # author: zxh # 调用上链API - push_activity_2_blockchain("pull_request_merge", @pull_request) if Site.has_blockchain? + push_activity_2_blockchain("pull_request_merge", @pull_request) if Site.has_blockchain? && @project.use_blockchain # 查看是否fix了相关issue，如果fix就转账 @pull_request.attached_issues.each do |issue| @@ -231,7 +231,7 @@ class PullRequestsController < ApplicationController token_num = token_num.nil? ? 0 : token_num author_id = @pull_request.user_id if token_num > 0 - Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) if Site.has_blockchain? + Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) if Site.has_blockchain? && @project.use_blockchain end # update issue to state 5 issue.update(status_id: 5) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 4b2f658d0..2069b8761 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -60,7 +60,7 @@ class Api::V1::Issues::CreateService < ApplicationService @created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.blank? @created_issue.save! - if Site.has_blockchain? + if Site.has_blockchain? && @project.use_blockchain if @created_issue.blockchain_token_num > 0 Blockchain::CreateIssue.call(user_id: @created_issue.author_id, project_id: @created_issue.project_id, token_num: @created_issue.blockchain_token_num) end diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index 9f50311fa..d3daff1df 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -39,7 +39,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService @created_journal.save! @issue.save! - push_activity_2_blockchain("issue_comment_create", @created_journal) if Site.has_blockchain? + push_activity_2_blockchain("issue_comment_create", @created_journal) if Site.has_blockchain? && @project.use_blockchain # @信息发送 AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? diff --git a/app/services/api/v1/projects/pulls/journals/create_service.rb b/app/services/api/v1/projects/pulls/journals/create_service.rb index c9abca83c..051c6777c 100644 --- a/app/services/api/v1/projects/pulls/journals/create_service.rb +++ b/app/services/api/v1/projects/pulls/journals/create_service.rb @@ -30,7 +30,7 @@ class Api::V1::Projects::Pulls::Journals::CreateService < ApplicationService create_comment_journal end - push_activity_2_blockchain("issue_comment_create", @journal) if Site.has_blockchain? + push_activity_2_blockchain("issue_comment_create", @journal) if Site.has_blockchain? && @project.use_blockchain journal end From b44ab1e39e3f9d1dc128a592c37421871a513b6c Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Mar 2023 17:22:00 +0800 Subject: [PATCH 100/133] fix --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 2a837190f..c544c9198 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -258,6 +258,7 @@ Rails.application.routes.draw do get :fan_users get :hovercard get :hovercard4proj # author: zxh, 获取用户对项目的贡献情况 + get :contribution_perc put :update_image get :get_image end From 75d74f80cacc4d7f6fca1361c65d14b6b0ef2d70 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Mar 2023 17:43:10 +0800 Subject: [PATCH 101/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=82=AC?= =?UTF-8?q?=E8=B5=8F=E9=87=91=E9=A2=9D=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 2 +- app/services/api/v1/issues/update_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 2069b8761..ddb3b7af5 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -11,7 +11,7 @@ class Api::V1::Issues::CreateService < ApplicationService validates :subject, presence: true validates :status_id, :priority_id, presence: true validates :project, :current_user, presence: true - validates :blockchain_token_num, numericality: {greater_than: 0} + validates :blockchain_token_num, numericality: {greater_than: 0}, allow_blank: true def initialize(project, params, current_user = nil) @project = project diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 4d3495022..ddbd67d82 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -9,7 +9,7 @@ class Api::V1::Issues::UpdateService < ApplicationService attr_accessor :add_assigner_ids, :previous_issue_changes, :updated_issue, :atme_receivers validates :project, :issue, :current_user, presence: true - validates :blockchain_token_num, numericality: {greater_than: 0} + validates :blockchain_token_num, numericality: {greater_than: 0}, allow_blank: true def initialize(project, issue, params, current_user = nil) @project = project From 90773483b84937314f373deb4552215e7673036c Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 7 Mar 2023 20:49:08 +0800 Subject: [PATCH 102/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/libs/blockchain.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/libs/blockchain.rb diff --git a/app/libs/blockchain.rb b/app/libs/blockchain.rb new file mode 100644 index 000000000..e2c7804aa --- /dev/null +++ b/app/libs/blockchain.rb @@ -0,0 +1,20 @@ +class Blockchain + class << self + def blockchain_config + blockchain_config = {} + + begin + config = Rails.application.config_for(:configuration).symbolize_keys! + blockchain_config = config[:blockchain].symbolize_keys! + raise 'blockchain config missing' if blockchain_config.blank? + rescue => ex + raise ex if Rails.env.production? + + puts %Q{\033[33m [warning] blockchain config or configuration.yml missing, + please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m} + blockchain_config = {} + end + blockchain_config + end + end +end \ No newline at end of file From 47a8f1707302e0a2fcf1643ba00a6180ce6792a0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Mar 2023 11:05:24 +0800 Subject: [PATCH 103/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E8=AE=B0=E5=BD=95=E4=BD=BF=E7=94=A8json=20builder?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=B4=A1=E7=8C=AE=E8=80=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E5=8D=A0=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/models/concerns/watchable.rb | 8 +++----- app/queries/blockchain/balance_query.rb | 2 +- app/views/repositories/_contributor.json.jbuilder | 1 + app/views/repositories/contributors.json.jbuilder | 2 +- app/views/users/blockchain_balance.json.jbuilder | 5 +++++ 6 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 app/views/users/blockchain_balance.json.jbuilder diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6aee4b584..1b51e3b12 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -423,7 +423,7 @@ class UsersController < ApplicationController @projects = [] end - render json: { status: results[:status], projects: @projects, total_count: @total_count } + # render json: { status: results[:status], projects: @projects, total_count: @total_count } end # query one balance diff --git a/app/models/concerns/watchable.rb b/app/models/concerns/watchable.rb index 9eb0172d7..dc2b67f67 100644 --- a/app/models/concerns/watchable.rb +++ b/app/models/concerns/watchable.rb @@ -31,11 +31,9 @@ module Watchable following.size end - def contribution_perc - project_identifier = params[:project_identifier] - user_login = params[:id] - @project = Project.find_by_identifier(project_identifier) - @user = User.find_by_login(user_login) + def contribution_perc(project) + @project = project + @user = self def cal_perc(count_user, count_all) (count_user * 1.0 / (count_all + 0.000000001)).round(5) diff --git a/app/queries/blockchain/balance_query.rb b/app/queries/blockchain/balance_query.rb index 669370a54..a1bb76eea 100644 --- a/app/queries/blockchain/balance_query.rb +++ b/app/queries/blockchain/balance_query.rb @@ -20,7 +20,7 @@ class Blockchain::BalanceQuery < ApplicationQuery if owner.nil? || project.nil? else balance = t['balance'] - result_list << [owner, project, balance] + result_list << {project: project, balance: balance} end end results = {"status": 0, "projects": result_list} diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder index 56fa9ce86..2efaa0073 100644 --- a/app/views/repositories/_contributor.json.jbuilder +++ b/app/views/repositories/_contributor.json.jbuilder @@ -13,4 +13,5 @@ else json.type user["type"] json.name user["name"] json.image_url user["avatar_url"] + json.blockchain_perc user.contribution_perc(project) end diff --git a/app/views/repositories/contributors.json.jbuilder b/app/views/repositories/contributors.json.jbuilder index 2fb6abae8..4534de693 100644 --- a/app/views/repositories/contributors.json.jbuilder +++ b/app/views/repositories/contributors.json.jbuilder @@ -1,6 +1,6 @@ total_count = @contributors.size json.list @contributors.each do |contributor| - json.partial! 'contributor', locals: { contributor: contributor } + json.partial! 'contributor', locals: { contributor: contributor, project: @project } end json.total_count total_count diff --git a/app/views/users/blockchain_balance.json.jbuilder b/app/views/users/blockchain_balance.json.jbuilder new file mode 100644 index 000000000..83293cf09 --- /dev/null +++ b/app/views/users/blockchain_balance.json.jbuilder @@ -0,0 +1,5 @@ +json.total_count @total_count +json.projects @projects.each do |p| + json.partial! 'projects/detail', locals: { project: p[:project] } + json.balance p[:balance] +end \ No newline at end of file From b0e117b06569c7893efb8c22a1294e8f722a1258 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Mar 2023 11:22:34 +0800 Subject: [PATCH 104/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=B4=A1?= =?UTF-8?q?=E7=8C=AE=E5=8D=A0=E6=AF=94=E9=9C=80=E5=A2=9E=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E7=A1=AE=E6=9D=83?= =?UTF-8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_contributor.json.jbuilder | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder index 2efaa0073..ed8a581a6 100644 --- a/app/views/repositories/_contributor.json.jbuilder +++ b/app/views/repositories/_contributor.json.jbuilder @@ -13,5 +13,8 @@ else json.type user["type"] json.name user["name"] json.image_url user["avatar_url"] - json.blockchain_perc user.contribution_perc(project) + if project.use_blockchain + db_user = User.find_by_id(user["id"]) + json.blockchain_perc db_user.contribution_perc(project) + end end From 70de1136e12204cef9c38681219fe1d9c9d28f2a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Mar 2023 17:45:54 +0800 Subject: [PATCH 105/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BD=AC=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 2 +- app/services/application_service.rb | 318 +++++++++++++++++++ 2 files changed, 319 insertions(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index ddb3b7af5..6a10df87c 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -62,7 +62,7 @@ class Api::V1::Issues::CreateService < ApplicationService if Site.has_blockchain? && @project.use_blockchain if @created_issue.blockchain_token_num > 0 - Blockchain::CreateIssue.call(user_id: @created_issue.author_id, project_id: @created_issue.project_id, token_num: @created_issue.blockchain_token_num) + Blockchain::CreateIssue.call({user_id: @created_issue.author_id, project_id: @created_issue.project_id, token_num: @created_issue.blockchain_token_num}) end push_activity_2_blockchain("issue_create", @created_issue) diff --git a/app/services/application_service.rb b/app/services/application_service.rb index df06f3960..259a720fc 100644 --- a/app/services/application_service.rb +++ b/app/services/application_service.rb @@ -102,6 +102,324 @@ class ApplicationService else end end + + def push_activity_2_blockchain(activity_type, model) + if activity_type == "issue_create" + + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return true + end + + id = model['id'] + + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + identifier = project['identifier'] + + author_id = project['user_id'] + author = User.find(author_id) + username = author['login'] + + action = 'opened' + + title = model['subject'] + content = model['description'] + created_at = model['created_on'] + updated_at = model['updated_on'] + + # 调用区块链接口 + params = { + "request-type": "upload issue info", + "issue_id": "gitlink-" + id.to_s, + "repo_id": "gitlink-" + project_id.to_s, + "issue_number": 0, # 暂时不需要改字段 + "reponame": identifier, + "ownername": ownername, + "username": username, + "action": action, + "title": title, + "content": content, + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 10 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + + elsif activity_type == "issue_comment_create" + issue_comment_id = model['id'] + issue_id = model['journalized_id'] + parent_id = model['parent_id'].nil? ? "" : model['parent_id'] + + issue = Issue.find(issue_id) + issue_classify = issue['issue_classify'] # issue或pull_request + project_id = issue['project_id'] + project = Project.find(project_id) + + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return + end + + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + author_id = model['user_id'] + author = User.find(author_id) + username = author['login'] + + action = 'created' + + content = model['notes'] + created_at = model['created_on'] + + if issue_classify == "issue" + params = { + "request-type": "upload issue comment info", + "issue_comment_id": "gitlink-" + issue_comment_id.to_s, + "issue_comment_number": 0, # 暂时不需要 + "issue_number": 0, # 暂时不需要 + "issue_id": "gitlink-" + issue_id.to_s, + "repo_id": "gitlink-" + project.id.to_s, + "parent_id": parent_id.to_s, + "reponame": identifier, + "ownername": ownername, + "username": username, + "action": action, + "content": content, + "created_at": created_at, + }.to_json + elsif issue_classify == "pull_request" + params = { + "request-type": "upload pull request comment info", + "pull_request_comment_id": "gitlink-" + issue_comment_id.to_s, + "pull_request_comment_number": 0, # 不考虑该字段 + "pull_request_number": 0, # 不考虑该字段 + "pull_request_id": "gitlink-" + issue_id.to_s, + "parent_id": parent_id.to_s, + "repo_id": "gitlink-" + project.id.to_s, + "reponame": identifier, + "ownername": ownername, + "username": username, + "action": action, + "content": content, + "created_at": created_at, + }.to_json + end + + # 调用区块链接口 + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 10 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + elsif activity_type == "pull_request_create" + # 调用区块链接口 + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return + end + + pull_request_id = model['id'] + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + action = 'opened' + + title = model['title'] + content = model['body'] + + source_branch = model['head'] + source_repo_id = model['fork_project_id'].nil? ? project_id : model['fork_project_id'] + + target_branch = model['base'] + target_repo_id = project_id + + author_id = model['user_id'] + author = User.find(author_id) + username = author['login'] + + created_at = model['created_at'] + updated_at = model['updated_at'] + + # 查询pull request对应的commit信息 + commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number']) + if commits.nil? + raise Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 + end + commit_shas = [] + commits.each do |c| + commit_shas << c["Sha"] + end + params = { + "request-type": "upload pull request info", + "pull_request_id": "gitlink-" + pull_request_id.to_s, + "pull_request_number": 0, # trustie没有该字段 + "repo_id": "gitlink-" + project_id.to_s, + "ownername": ownername, + "reponame": identifier, + "username": username, + "action": action, + "title": title, + "content": content, + "source_branch": source_branch, + "target_branch": target_branch, + "reviewers": [], # trustie没有该字段 + "commit_shas": commit_shas, + "merge_user": "", # trustie没有该字段 + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 9 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + elsif activity_type == "pull_request_merge" + # 调用区块链接口 + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return + end + + pull_request_id = model['id'] + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + action = 'merged' + + created_at = model['created_at'] + updated_at = model['updated_at'] + + # 查询pull request对应的commit信息 + commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number']) + if commits.nil? + raise Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 + end + commit_shas = [] + commits.each do |c| + commit_shas << c["Sha"] + end + + # 将pull request相关信息写入链上 + params = { + "request-type": "upload pull request info", + "pull_request_id": "gitlink-" + pull_request_id.to_s, + "pull_request_number": 0, # trustie没有该字段 + "repo_id": "gitlink-" + project_id.to_s, + "ownername": ownername, + "reponame": identifier, + "username": username, + "action": action, + "title": title, + "content": content, + "source_branch": source_branch, + "target_branch": target_branch, + "reviewers": [], # trustie没有该字段 + "commit_shas": commit_shas, + "merge_user": "", # trustie没有该字段 + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 9 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + + + # 将commit相关信息写入链上 + commit_shas.each do |commit_sha| + commit_diff = Gitea::Commit::DiffService.call(ownername, identifier, commit_sha, owner['gitea_token']) + commit = Gitea::Commit::InfoService.call(ownername, identifier, commit_sha, owner['gitea_token']) + params = { + "request-type": "upload commit info", + "commit_hash": commit_sha, + "repo_id": "gitlink-" + project_id.to_s, + "author": commit['commit']['author']['name'], + "author_email": commit['commit']['author']['email'], + "committer": commit['commit']['committer']['name'], + "committer_email": commit['commit']['committer']['email'], + "author_time": commit['commit']['author']['date'], + "committer_time": commit['commit']['committer']['date'], + "content": commit['commit']['message'], + "commit_diff": commit_diff['Files'].to_s + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 7 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + end + + elsif activity_type == "pull_request_refuse" + + # 调用区块链接口 + project_id = model['project_id'] + project = Project.find(project_id) + if project['use_blockchain'] == 0 || project['use_blockchain'] == false + # 无需执行上链操作 + return true + end + + pull_request_id = model['id'] + identifier = project['identifier'] + owner_id = project['user_id'] + owner = User.find(owner_id) + ownername = owner['login'] + + action = 'refused' + + # 将pull request相关信息写入链上 + params = { + "request-type": "upload pull request info", + "pull_request_id": "gitlink-" + pull_request_id.to_s, + "pull_request_number": 0, # trustie没有该字段 + "repo_id": "gitlink-" + project_id.to_s, + "ownername": ownername, + "reponame": identifier, + "username": username, + "action": action, + "title": title, + "content": content, + "source_branch": source_branch, + "target_branch": target_branch, + "reviewers": [], # trustie没有该字段 + "commit_shas": commit_shas, + "merge_user": "", # trustie没有该字段 + "created_at": created_at, + "updated_at": updated_at + }.to_json + resp_body = Blockchain::InvokeBlockchainApi.call(params) + if resp_body['status'] == 9 + raise Error, resp_body['message'] + elsif resp_body['status'] != 0 + raise Error, "区块链接口请求失败." + end + end + end + def phone_mail_type value value =~ /^1\d{10}$/ ? 1 : 0 end From bd855ea4ed0e2606bead899bd775a16219065b7c Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Mar 2023 17:59:36 +0800 Subject: [PATCH 106/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=85=B3=E8=81=94issue=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/index.json.jbuilder | 3 +++ app/views/pull_requests/show.json.jbuilder | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index ace52945c..9df36fae7 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -38,6 +38,9 @@ json.issues do json.version issue.version.try(:name) json.journals_count issue.get_journals_size json.issue_tags issue.get_issue_tags + json.attached_issues pr.attached_issues.each do |issue| + json.(issue, :id, :subject, :project_issues_index) + end end end diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 7aa0081e9..71f0641b6 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -52,7 +52,7 @@ json.issue do end json.attached_issues @pull_request.attached_issues.each do |issue| - json.(issue, :id,:subject) + json.(issue, :id, :subject, :project_issues_index) end json.conflict_files @pull_request.conflict_files From 9c85fdfeaf181220303b2ace8abff2ebdf8243bd Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 8 Mar 2023 18:11:26 +0800 Subject: [PATCH 107/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index c904b1743..804e2aa46 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -66,6 +66,7 @@ module ProjectsHelper jianmu_devops: jianmu_devops_code(project, user), jianmu_devops_url: jianmu_devops_url, cloud_ide_saas_url: cloud_ide_saas_url(user), + open_blockchain: Site.has_blockchain? && project.use_blockchain, ignore_id: project.ignore_id }).compact From 43cbb9cf4ff04a7d88c5db5bb1f2e0946ed339bc Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 09:23:49 +0800 Subject: [PATCH 108/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 689d8e520..9dc94caae 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -10,7 +10,7 @@ class Api::V1::IssuesController < Api::V1::BaseController @opened_issues_count = @object_result[:opened_issues_count] @closed_issues_count = @object_result[:closed_issues_count] if params[:only_name].present? - @issues = kaminary_select_paginate(@object_result[:data].pluck(:id, :subject)) + @issues = kaminary_select_paginate(@object_result[:data].select(:id, :subject, :project_issues_index)) else @issues = kaminari_paginate(@object_result[:data]) end From edf60ca0a8b9d5072267de96c6aac349a756885c Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 09:40:32 +0800 Subject: [PATCH 109/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/issues_controller.rb | 3 ++- app/services/api/v1/issues/list_service.rb | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/v1/issues_controller.rb b/app/controllers/api/v1/issues_controller.rb index 9dc94caae..d07807202 100644 --- a/app/controllers/api/v1/issues_controller.rb +++ b/app/controllers/api/v1/issues_controller.rb @@ -10,7 +10,7 @@ class Api::V1::IssuesController < Api::V1::BaseController @opened_issues_count = @object_result[:opened_issues_count] @closed_issues_count = @object_result[:closed_issues_count] if params[:only_name].present? - @issues = kaminary_select_paginate(@object_result[:data].select(:id, :subject, :project_issues_index)) + @issues = kaminary_select_paginate(@object_result[:data]) else @issues = kaminari_paginate(@object_result[:data]) end @@ -86,6 +86,7 @@ class Api::V1::IssuesController < Api::V1::BaseController def query_params params.permit( + :only_name, :category, :participant_category, :keyword, :author_id, diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 7019dc8e4..67bc84c5e 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -1,7 +1,7 @@ class Api::V1::Issues::ListService < ApplicationService include ActiveModel::Model - attr_reader :project, :category, :participant_category, :keyword, :author_id, :issue_tag_ids + attr_reader :project, :only_name, :category, :participant_category, :keyword, :author_id, :issue_tag_ids attr_reader :milestone_id, :assigner_id, :status_id, :sort_by, :sort_direction, :current_user attr_accessor :queried_issues, :total_issues_count, :closed_issues_count, :opened_issues_count @@ -13,6 +13,7 @@ class Api::V1::Issues::ListService < ApplicationService def initialize(project, params, current_user=nil) @project = project + @only_name = params[:only_name] @category = params[:category] || 'all' @participant_category = params[:participant_category] || 'all' @keyword = params[:keyword] @@ -81,9 +82,13 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.opened end - scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals) - - scope = scope.reorder("#{sort_by} #{sort_direction}").distinct + if only_name.present? + scope = issues.select(:id, :subject, :project_issues_index) + scope = scope.reorder("project_issues_index asc").distinct + else + scope = issues.includes(:priority, :issue_status, :user, :show_assigners, :show_issue_tags, :version, :comment_journals) + scope = scope.reorder("#{sort_by} #{sort_direction}").distinct + end @queried_issues = scope end From 2d7a0ef2e1c9b67795824d56ea929498ac663a33 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 09:54:24 +0800 Subject: [PATCH 110/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/journals/create_service.rb | 2 +- app/services/pull_requests/create_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb index d3daff1df..31ecc00cd 100644 --- a/app/services/api/v1/issues/journals/create_service.rb +++ b/app/services/api/v1/issues/journals/create_service.rb @@ -39,7 +39,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService @created_journal.save! @issue.save! - push_activity_2_blockchain("issue_comment_create", @created_journal) if Site.has_blockchain? && @project.use_blockchain + push_activity_2_blockchain("issue_comment_create", @created_journal) if Site.has_blockchain? && @issue.project&.use_blockchain # @信息发送 AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb index c2c6cfb22..2b4767f31 100644 --- a/app/services/pull_requests/create_service.rb +++ b/app/services/pull_requests/create_service.rb @@ -122,7 +122,7 @@ class PullRequests::CreateService < ApplicationService end end - def issue_tag_ids + def attached_issue_ids Array(@params[:attached_issue_ids]) end From 7fc373e25967df5f57133f165aaf51f474f348c0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 10:35:07 +0800 Subject: [PATCH 111/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E7=BC=96=E8=BE=91=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=85=B3=E8=81=94issue=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pull_requests/edit.json.jbuilder | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/pull_requests/edit.json.jbuilder b/app/views/pull_requests/edit.json.jbuilder index 683b1961c..08cefcb91 100644 --- a/app/views/pull_requests/edit.json.jbuilder +++ b/app/views/pull_requests/edit.json.jbuilder @@ -12,4 +12,7 @@ json.issue_tag_ids @issue&.issue_tags_value&.split(",") json.commits_count @pull_request.commits_count json.files_count @pull_request.files_count json.comments_count @pull_request.comments_count -json.reviewers @pull_request.reviewers.pluck(:login) \ No newline at end of file +json.reviewers @pull_request.reviewers.pluck(:login) +json.attached_issues @pull_request.attached_issues.each do |issue| + json.(issue, :id, :subject, :project_issues_index) +end From 16df3c409c77e720c97431d5d93f1d60de524dc7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 11:41:54 +0800 Subject: [PATCH 112/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E8=B4=A1?= =?UTF-8?q?=E7=8C=AE=E5=8D=A0=E6=AF=94=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_contributor.json.jbuilder | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder index ed8a581a6..e18173a19 100644 --- a/app/views/repositories/_contributor.json.jbuilder +++ b/app/views/repositories/_contributor.json.jbuilder @@ -13,8 +13,6 @@ else json.type user["type"] json.name user["name"] json.image_url user["avatar_url"] - if project.use_blockchain - db_user = User.find_by_id(user["id"]) - json.blockchain_perc db_user.contribution_perc(project) - end + db_user = User.find_by_id(user["id"]) + json.blockchain_perc db_user.contribution_perc(project) end From c5ad8ff33f001ec1e860775dc7936511501e8b2d Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 11:43:02 +0800 Subject: [PATCH 113/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_contributor.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder index e18173a19..d2caa53cd 100644 --- a/app/views/repositories/_contributor.json.jbuilder +++ b/app/views/repositories/_contributor.json.jbuilder @@ -14,5 +14,5 @@ else json.name user["name"] json.image_url user["avatar_url"] db_user = User.find_by_id(user["id"]) - json.blockchain_perc db_user.contribution_perc(project) + json.contribution_perc db_user.contribution_perc(project) end From d7c1ce759583cf0cfc92eea1ef39198f4669b341 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 14:58:32 +0800 Subject: [PATCH 114/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 4 ++-- app/services/api/v1/issues/list_service.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 6a10df87c..4db9394f8 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -60,8 +60,8 @@ class Api::V1::Issues::CreateService < ApplicationService @created_issue.issue_tags_value = @issue_tags.order("id asc").pluck(:id).join(",") unless issue_tag_ids.blank? @created_issue.save! - if Site.has_blockchain? && @project.use_blockchain - if @created_issue.blockchain_token_num > 0 + if Site.has_blockchain? && @project.use_blockchain + if @created_issue.blockchain_token_num.present? && @created_issue.blockchain_token_num > 0 Blockchain::CreateIssue.call({user_id: @created_issue.author_id, project_id: @created_issue.project_id, token_num: @created_issue.blockchain_token_num}) end diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 67bc84c5e..faf1c1c31 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -69,7 +69,7 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.where(status_id: status_id) if status_id.present? # keyword - issues = issues.ransack(id_eq: params[:keyword]).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present? + issues = issues.ransack(id_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present? @total_issues_count = issues.distinct.size @closed_issues_count = issues.closed.distinct.size From 00eda17c2c42144b73b2e4517196cfbb825de31a Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 15:37:38 +0800 Subject: [PATCH 115/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=AF=B7?= =?UTF-8?q?=E6=B1=82gitea=E6=8E=A5=E5=8F=A3=E9=9C=80=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f98c3c456..31d56f9e3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -880,9 +880,9 @@ class ApplicationController < ActionController::Base }.to_json resp_body = Blockchain::InvokeBlockchainApi.call(params) if resp_body['status'] == 10 - raise Error, resp_body['message'] + raise ApplicationService::Error, resp_body['message'] elsif resp_body['status'] != 0 - raise Error, "区块链接口请求失败." + raise ApplicationService::Error, "区块链接口请求失败." end elsif activity_type == "issue_comment_create" @@ -951,9 +951,9 @@ class ApplicationController < ActionController::Base # 调用区块链接口 resp_body = Blockchain::InvokeBlockchainApi.call(params) if resp_body['status'] == 10 - raise Error, resp_body['message'] + raise ApplicationService::Error, resp_body['message'] elsif resp_body['status'] != 0 - raise Error, "区块链接口请求失败." + raise ApplicationService::Error, "区块链接口请求失败." end elsif activity_type == "pull_request_create" # 调用区块链接口 @@ -989,9 +989,9 @@ class ApplicationController < ActionController::Base updated_at = model['updated_at'] # 查询pull request对应的commit信息 - commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number']) + commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number'], current_user&.gitea_token) if commits.nil? - raise Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 + raise ApplicationService::Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 end commit_shas = [] commits.each do |c| @@ -1018,9 +1018,9 @@ class ApplicationController < ActionController::Base }.to_json resp_body = Blockchain::InvokeBlockchainApi.call(params) if resp_body['status'] == 9 - raise Error, resp_body['message'] + raise ApplicationService::Error, resp_body['message'] elsif resp_body['status'] != 0 - raise Error, "区块链接口请求失败." + raise ApplicationService::Error, "区块链接口请求失败." end elsif activity_type == "pull_request_merge" # 调用区块链接口 @@ -1043,9 +1043,9 @@ class ApplicationController < ActionController::Base updated_at = model['updated_at'] # 查询pull request对应的commit信息 - commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number']) + commits = Gitea::PullRequest::CommitsService.call(ownername, identifier, model['gitea_number'], current_user&.gitea_token) if commits.nil? - raise Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 + raise ApplicationService::Error, "区块链接口请求失败" # 获取pr中变更的commit信息失败 end commit_shas = [] commits.each do |c| @@ -1074,16 +1074,16 @@ class ApplicationController < ActionController::Base }.to_json resp_body = Blockchain::InvokeBlockchainApi.call(params) if resp_body['status'] == 9 - raise Error, resp_body['message'] + raise ApplicationService::Error, resp_body['message'] elsif resp_body['status'] != 0 - raise Error, "区块链接口请求失败." + raise ApplicationService::Error, "区块链接口请求失败." end # 将commit相关信息写入链上 commit_shas.each do |commit_sha| - commit_diff = Gitea::Commit::DiffService.call(ownername, identifier, commit_sha, owner['gitea_token']) - commit = Gitea::Commit::InfoService.call(ownername, identifier, commit_sha, owner['gitea_token']) + commit_diff = Gitea::Commit::DiffService.call(ownername, identifier, commit_sha, owner['gitea_token'], current_user&.gitea_token) + commit = Gitea::Commit::InfoService.call(ownername, identifier, commit_sha, owner['gitea_token'], current_user&.gitea_token) params = { "request-type": "upload commit info", "commit_hash": commit_sha, @@ -1099,9 +1099,9 @@ class ApplicationController < ActionController::Base }.to_json resp_body = Blockchain::InvokeBlockchainApi.call(params) if resp_body['status'] == 7 - raise Error, resp_body['message'] + raise ApplicationService::Error, resp_body['message'] elsif resp_body['status'] != 0 - raise Error, "区块链接口请求失败." + raise ApplicationService::Error, "区块链接口请求失败." end end @@ -1145,9 +1145,9 @@ class ApplicationController < ActionController::Base }.to_json resp_body = Blockchain::InvokeBlockchainApi.call(params) if resp_body['status'] == 9 - raise Error, resp_body['message'] + raise ApplicationService::Error, resp_body['message'] elsif resp_body['status'] != 0 - raise Error, "区块链接口请求失败." + raise ApplicationService::Error, "区块链接口请求失败." end end end From 2600eacb348e573fcd8e8c9d52adaa7c86d6707d Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 16:10:23 +0800 Subject: [PATCH 116/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B7=B7?= =?UTF-8?q?=E5=90=88=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=94=B9=E4=BB=A5=E5=8F=8Agitea=20service?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/gitea/commit/diff_service.rb | 40 +++++++++++++++++++ app/services/gitea/commit/info_service.rb | 39 ++++++++++++++++++ ...9080338_change_user_mixin_field_collate.rb | 6 +++ 3 files changed, 85 insertions(+) create mode 100644 app/services/gitea/commit/diff_service.rb create mode 100644 app/services/gitea/commit/info_service.rb create mode 100644 db/migrate/20230309080338_change_user_mixin_field_collate.rb diff --git a/app/services/gitea/commit/diff_service.rb b/app/services/gitea/commit/diff_service.rb new file mode 100644 index 000000000..712302505 --- /dev/null +++ b/app/services/gitea/commit/diff_service.rb @@ -0,0 +1,40 @@ +# get the diff info for the commit +class Gitea::Commit::DiffService < Gitea::ClientService + attr_reader :owner, :repo, :sha, :token + + # GET /repos/{owner}/{repo}/commits/{sha}/diff + # owner: 用户 + # repo: 仓库名称/标识 + # sha: commit唯一标识 + # eg: + # Gitea::Commit::DiffService.call('jasder', 'repo_identifier', 'sha value') + def initialize(owner, repo, sha, token=nil) + @owner = owner + @repo = repo + @sha = sha + @token = token + end + + def call + response = get(url, params) + render_result(response) + end + + private + def params + Hash.new.merge(token: token) + end + + def url + "/repos/#{owner}/#{repo}/commits/#{sha}/diff".freeze + end + + def render_result(response) + case response.status + when 200 + JSON.parse(response.body) + else + nil + end + end +end diff --git a/app/services/gitea/commit/info_service.rb b/app/services/gitea/commit/info_service.rb new file mode 100644 index 000000000..d337071e8 --- /dev/null +++ b/app/services/gitea/commit/info_service.rb @@ -0,0 +1,39 @@ +class Gitea::Commit::InfoService < Gitea::ClientService + attr_reader :owner, :repo, :sha, :token + + # GET /repos/{owner}/{repo}/commits/{sha}/diff + # owner: 用户 + # repo: 仓库名称/标识 + # sha: commit唯一标识 + # eg: + # Gitea::Commit::InfoService.call('jasder', 'repo_identifier', 'sha value', token='gitea token') + def initialize(owner, repo, sha, token=nil) + @owner = owner + @repo = repo + @sha = sha + @token = token + end + + def call + response = get(url, params) + render_result(response) + end + + private + def params + Hash.new.merge(token: token) + end + + def url + "/repos/#{owner}/#{repo}/git/commits/#{sha}".freeze + end + + def render_result(response) + case response.status + when 200 + JSON.parse(response.body) + else + nil + end + end +end \ No newline at end of file diff --git a/db/migrate/20230309080338_change_user_mixin_field_collate.rb b/db/migrate/20230309080338_change_user_mixin_field_collate.rb new file mode 100644 index 000000000..1899d43fe --- /dev/null +++ b/db/migrate/20230309080338_change_user_mixin_field_collate.rb @@ -0,0 +1,6 @@ +class ChangeUserMixinFieldCollate < ActiveRecord::Migration[5.2] + def change + execute("ALTER TABLE `users` MODIFY `login` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") + execute("ALTER TABLE `users` MODIFY `mail` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") + end +end From b869226f512f2ae5c4a01605b25f5c24d619ff58 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 16:16:49 +0800 Subject: [PATCH 117/133] =?UTF-8?q?=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20230309080338_change_user_mixin_field_collate.rb | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 db/migrate/20230309080338_change_user_mixin_field_collate.rb diff --git a/db/migrate/20230309080338_change_user_mixin_field_collate.rb b/db/migrate/20230309080338_change_user_mixin_field_collate.rb deleted file mode 100644 index 1899d43fe..000000000 --- a/db/migrate/20230309080338_change_user_mixin_field_collate.rb +++ /dev/null @@ -1,6 +0,0 @@ -class ChangeUserMixinFieldCollate < ActiveRecord::Migration[5.2] - def change - execute("ALTER TABLE `users` MODIFY `login` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") - execute("ALTER TABLE `users` MODIFY `mail` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") - end -end From a7e493b8213ac80773a6a3d1e407e25dbc06ea07 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 16:18:56 +0800 Subject: [PATCH 118/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 31d56f9e3..ac99c30f5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1082,8 +1082,8 @@ class ApplicationController < ActionController::Base # 将commit相关信息写入链上 commit_shas.each do |commit_sha| - commit_diff = Gitea::Commit::DiffService.call(ownername, identifier, commit_sha, owner['gitea_token'], current_user&.gitea_token) - commit = Gitea::Commit::InfoService.call(ownername, identifier, commit_sha, owner['gitea_token'], current_user&.gitea_token) + commit_diff = Gitea::Commit::DiffService.call(ownername, identifier, commit_sha, owner['gitea_token']) + commit = Gitea::Commit::InfoService.call(ownername, identifier, commit_sha, owner['gitea_token']) params = { "request-type": "upload commit info", "commit_hash": commit_sha, From d240797c2503bbc93d2415e590604be8fae79ece Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 17:03:15 +0800 Subject: [PATCH 119/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=96=91?= =?UTF-8?q?=E4=BF=AE=E6=82=AC=E8=B5=8F=E9=87=91=E9=A2=9D=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 2 +- app/services/api/v1/issues/concerns/checkable.rb | 5 +++++ app/services/api/v1/issues/create_service.rb | 1 + app/services/api/v1/issues/update_service.rb | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index d095a02fa..e9db3a487 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -231,7 +231,7 @@ class PullRequestsController < ApplicationController token_num = token_num.nil? ? 0 : token_num author_id = @pull_request.user_id if token_num > 0 - Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: project.id.to_s, token_num: token_num}) if Site.has_blockchain? && @project.use_blockchain + Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: @project.id.to_s, token_num: token_num}) if Site.has_blockchain? && @project.use_blockchain end # update issue to state 5 issue.update(status_id: 5) diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb index d013c3033..411b1b7ff 100644 --- a/app/services/api/v1/issues/concerns/checkable.rb +++ b/app/services/api/v1/issues/concerns/checkable.rb @@ -45,4 +45,9 @@ module Api::V1::Issues::Concerns::Checkable def check_parent_journal(parent_id) raise ApplicationService::Error, "ParentJournal不存在！" unless Journal.find_by_id(parent_id).present? end + + def check_blockchain_token_num(user_id, project_id, blockchain_token_num) + left_blockchain_token_num = Blockchain::BalanceQueryOneProject.call({"user_id": user_id, "project_id": project_id}) rescue 0 + raise ApplicationService::Error, "项目Token不足。" if blockchain_token_num > left_blockchain_token_num + end end diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 4db9394f8..91007fbea 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -41,6 +41,7 @@ class Api::V1::Issues::CreateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.blank? check_attachments(attachment_ids) unless attachment_ids.blank? check_atme_receivers(receivers_login) unless receivers_login.blank? + check_blockchain_token_num(project.user_id, project.id, blockchain_token_num) if blockchain_token_num.present? load_assigners(assigner_ids) unless assigner_ids.blank? load_attachments(attachment_ids) unless attachment_ids.blank? load_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index ddbd67d82..3c2600bf3 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -42,6 +42,7 @@ class Api::V1::Issues::UpdateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.nil? check_attachments(attachment_ids) unless attachment_ids.nil? check_atme_receivers(receivers_login) unless receivers_login.nil? + check_blockchain_token_num(project.user_id, project.id, blockchain_token_num) if blockchain_token_num.present? load_assigners(assigner_ids) load_attachments(attachment_ids) load_issue_tags(issue_tag_ids) From 6c71994e3309406e58da0e9fcbfcb82001aedabd Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 18:11:10 +0800 Subject: [PATCH 120/133] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=82=AC?= =?UTF-8?q?=E8=B5=8F=E9=87=91=E9=A2=9D=E5=8F=98=E6=9B=B4=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=87=B3=E9=93=BE=E4=B8=8A=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=96=91=E4=BF=AE=E6=96=B0=E5=A2=9E=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E6=98=AF=E5=90=A6=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 2 ++ app/models/pull_attached_issue.rb | 1 + app/services/api/v1/issues/concerns/checkable.rb | 4 ++-- app/services/api/v1/issues/update_service.rb | 10 +++++++++- ...20230309095515_add_fixed_to_pull_attached_issues.rb | 5 +++++ 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20230309095515_add_fixed_to_pull_attached_issues.rb diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index e9db3a487..47e55af15 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -227,11 +227,13 @@ class PullRequestsController < ApplicationController # 查看是否fix了相关issue，如果fix就转账 @pull_request.attached_issues.each do |issue| + next if PullAttachedIssue.exist?(issue_id: issue.id, fixed: true) token_num = issue.blockchain_token_num token_num = token_num.nil? ? 0 : token_num author_id = @pull_request.user_id if token_num > 0 Blockchain::FixIssue.call({user_id: author_id.to_s, project_id: @project.id.to_s, token_num: token_num}) if Site.has_blockchain? && @project.use_blockchain + PullAttachedIssue.find_by(issue_id: issue.id, pull_request_id: @pull_request.id).update(fixed: true) end # update issue to state 5 issue.update(status_id: 5) diff --git a/app/models/pull_attached_issue.rb b/app/models/pull_attached_issue.rb index c93a95d65..abc6c3448 100644 --- a/app/models/pull_attached_issue.rb +++ b/app/models/pull_attached_issue.rb @@ -7,6 +7,7 @@ # issue_id :integer # created_at :datetime not null # updated_at :datetime not null +# fixed :boolean default("0") # # Indexes # diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb index 411b1b7ff..cda01ba25 100644 --- a/app/services/api/v1/issues/concerns/checkable.rb +++ b/app/services/api/v1/issues/concerns/checkable.rb @@ -46,8 +46,8 @@ module Api::V1::Issues::Concerns::Checkable raise ApplicationService::Error, "ParentJournal不存在！" unless Journal.find_by_id(parent_id).present? end - def check_blockchain_token_num(user_id, project_id, blockchain_token_num) + def check_blockchain_token_num(user_id, project_id, blockchain_token_num, now_blockchain_token_num=0) left_blockchain_token_num = Blockchain::BalanceQueryOneProject.call({"user_id": user_id, "project_id": project_id}) rescue 0 - raise ApplicationService::Error, "项目Token不足。" if blockchain_token_num > left_blockchain_token_num + raise ApplicationService::Error, "项目Token不足。" if blockchain_token_num.to_i > (left_blockchain_token_num+now_blockchain_token_num).to_i end end diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 3c2600bf3..85190fe95 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -42,7 +42,7 @@ class Api::V1::Issues::UpdateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.nil? check_attachments(attachment_ids) unless attachment_ids.nil? check_atme_receivers(receivers_login) unless receivers_login.nil? - check_blockchain_token_num(project.user_id, project.id, blockchain_token_num) if blockchain_token_num.present? + check_blockchain_token_num(project.user_id, project.id, blockchain_token_num, @issue.blockchain_token_num) if blockchain_token_num.present? load_assigners(assigner_ids) load_attachments(attachment_ids) load_issue_tags(issue_tag_ids) @@ -71,6 +71,7 @@ class Api::V1::Issues::UpdateService < ApplicationService build_after_issue_journal_details if @updated_issue.previous_changes.present? # 操作记录 build_previous_issue_changes + build_cirle_blockchain_token if blockchain_token_num.present? # @信息发送 AtmeService.call(current_user, @atme_receivers, @issue) unless receivers_login.blank? @@ -134,6 +135,13 @@ class Api::V1::Issues::UpdateService < ApplicationService end end + def build_cirle_blockchain_token + if @updated_issue.previous_changes["blockchain_token_num"].present? + unlock_balance_on_blockchain(@updated_issue.project&.user_id, @updated_issue.project_id, @updated_issue.previous_changes["blockchain_token_num"][0]) + lock_balance_on_blockchain(@updated_issue.project&.user_id, @updated_issue.project_id, @updated_issue.previous_changes["blockchain_token_num"][1]) + end + end + def build_issue_project_trends if @updated_issue.previous_changes["status_id"].present? && @updated_issue.previous_changes["status_id"][1] == 5 @updated_issue.project_trends.new({user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE}) diff --git a/db/migrate/20230309095515_add_fixed_to_pull_attached_issues.rb b/db/migrate/20230309095515_add_fixed_to_pull_attached_issues.rb new file mode 100644 index 000000000..9f9952121 --- /dev/null +++ b/db/migrate/20230309095515_add_fixed_to_pull_attached_issues.rb @@ -0,0 +1,5 @@ +class AddFixedToPullAttachedIssues < ActiveRecord::Migration[5.2] + def change + add_column :pull_attached_issues, :fixed, :boolean, default: false + end +end From 8f680fd7c3b066ae0fff24c0b7d89553b1a392a0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 9 Mar 2023 18:37:08 +0800 Subject: [PATCH 121/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 2 +- app/services/api/v1/issues/update_service.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 47e55af15..12e67ccc2 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -227,7 +227,7 @@ class PullRequestsController < ApplicationController # 查看是否fix了相关issue，如果fix就转账 @pull_request.attached_issues.each do |issue| - next if PullAttachedIssue.exist?(issue_id: issue.id, fixed: true) + next if PullAttachedIssue.exists?(issue_id: issue.id, fixed: true) token_num = issue.blockchain_token_num token_num = token_num.nil? ? 0 : token_num author_id = @pull_request.user_id diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 85190fe95..04db49177 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -42,7 +42,7 @@ class Api::V1::Issues::UpdateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.nil? check_attachments(attachment_ids) unless attachment_ids.nil? check_atme_receivers(receivers_login) unless receivers_login.nil? - check_blockchain_token_num(project.user_id, project.id, blockchain_token_num, @issue.blockchain_token_num) if blockchain_token_num.present? + check_blockchain_token_num(project.user_id, project.id, blockchain_token_num, (@issue.blockchain_token_num || 0)) if blockchain_token_num.present? load_assigners(assigner_ids) load_attachments(attachment_ids) load_issue_tags(issue_tag_ids) @@ -137,8 +137,8 @@ class Api::V1::Issues::UpdateService < ApplicationService def build_cirle_blockchain_token if @updated_issue.previous_changes["blockchain_token_num"].present? - unlock_balance_on_blockchain(@updated_issue.project&.user_id, @updated_issue.project_id, @updated_issue.previous_changes["blockchain_token_num"][0]) - lock_balance_on_blockchain(@updated_issue.project&.user_id, @updated_issue.project_id, @updated_issue.previous_changes["blockchain_token_num"][1]) + unlock_balance_on_blockchain(@updated_issue.project&.user_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][0].to_i) if @updated_issue.previous_changes["blockchain_token_num"][0].present? + lock_balance_on_blockchain(@updated_issue.project&.user_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][1].to_i) if @updated_issue.previous_changes["blockchain_token_num"][1].present? end end From 841126c0fc238d0becf4dd2f1eb73b6a164c0488 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 09:22:13 +0800 Subject: [PATCH 122/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Atoken?= =?UTF-8?q?=E8=BD=AC=E8=B4=A6=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/queries/application_query.rb | 10 ++++++---- app/queries/blockchain/balance_query.rb | 4 ++-- app/queries/projects/list_my_query.rb | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1b51e3b12..35f44b4e2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -416,7 +416,7 @@ class UsersController < ApplicationController is_current_admin_user = true results = Blockchain::BalanceQuery.call(params, is_current_admin_user) if results[:status] == 0 - @total_count = results[:projects].size + @total_count = results[:total_count] @projects = results[:projects] else @total_count = -1 diff --git a/app/queries/application_query.rb b/app/queries/application_query.rb index fdef1b71d..e2d7c446f 100644 --- a/app/queries/application_query.rb +++ b/app/queries/application_query.rb @@ -8,17 +8,19 @@ class ApplicationQuery end # find all the repos that a user has tokens - def find_repo_with_token(user_id) + def find_repo_with_token(user_id, page=1, limit=10) params = { - "request-type": "query user balance of all repos", - "username": user_id.to_s + "request-type": "query user balance of all repos by page", + "username": user_id.to_s, + "page": page.to_i, + "page_num": limit.to_i }.to_json resp_body = Blockchain::InvokeBlockchainApi.call(params) if resp_body['status'] != 0 raise "区块链接口请求失败." else token_list = resp_body['UserBalanceList'].nil? ? [] : resp_body['UserBalanceList'] - return token_list + return token_list, resp_body['total_count'] end end diff --git a/app/queries/blockchain/balance_query.rb b/app/queries/blockchain/balance_query.rb index a1bb76eea..52a2fa525 100644 --- a/app/queries/blockchain/balance_query.rb +++ b/app/queries/blockchain/balance_query.rb @@ -9,7 +9,7 @@ class Blockchain::BalanceQuery < ApplicationQuery def call if is_current_admin_user - token_list = find_repo_with_token(params["user_id"]) + token_list, total_count = find_repo_with_token(params["user_id"], (params["page"]), (params["limit"])) result_list = [] token_list.each do |t| project = Project.find_by(id: t['token_name'].to_i) @@ -23,7 +23,7 @@ class Blockchain::BalanceQuery < ApplicationQuery result_list << {project: project, balance: balance} end end - results = {"status": 0, "projects": result_list} + results = {"status": 0, "projects": result_list, "total_count": total_count} else results = {"status": 1} # query failed end diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 734956b98..31c17846a 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -39,7 +39,7 @@ class Projects::ListMyQuery < ApplicationQuery # elsif params[:category].to_s == "private" # projects = projects.is_private.joins(:members).where(members: { user_id: user.id }) elsif params[:category].to_s == "blockchain_token" # 所有钱包中有token的项目有哪些 - token_list = find_repo_with_token(user.id) + token_list, total_count = find_repo_with_token(user.id) project_names = token_list.map { |x| x['token_name'] } projects = projects.where(name: project_names) tokens = token_list.map { |x| x['balance'] } From b8decd92a4aa2e1d4c48d711cc48d9356951b6bc Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 09:34:22 +0800 Subject: [PATCH 123/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/blockchain/balance_query.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/queries/blockchain/balance_query.rb b/app/queries/blockchain/balance_query.rb index 52a2fa525..65fe96224 100644 --- a/app/queries/blockchain/balance_query.rb +++ b/app/queries/blockchain/balance_query.rb @@ -9,7 +9,7 @@ class Blockchain::BalanceQuery < ApplicationQuery def call if is_current_admin_user - token_list, total_count = find_repo_with_token(params["user_id"], (params["page"]), (params["limit"])) + token_list, total_count = find_repo_with_token(params["user_id"], (params["page"] || 1), (params["limit"] || 10)) result_list = [] token_list.each do |t| project = Project.find_by(id: t['token_name'].to_i) From 2d0020003675f8a7c8e50a0cc968f828a81396ca Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 10:01:35 +0800 Subject: [PATCH 124/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/blockchain/balance_query.rb | 1 + app/views/users/blockchain_balance.json.jbuilder | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/queries/blockchain/balance_query.rb b/app/queries/blockchain/balance_query.rb index 65fe96224..f2c39c003 100644 --- a/app/queries/blockchain/balance_query.rb +++ b/app/queries/blockchain/balance_query.rb @@ -14,6 +14,7 @@ class Blockchain::BalanceQuery < ApplicationQuery token_list.each do |t| project = Project.find_by(id: t['token_name'].to_i) if project.nil? + result_list << {project: nil, balance: t['balance']} next end owner = User.find_by(id: project.user_id) diff --git a/app/views/users/blockchain_balance.json.jbuilder b/app/views/users/blockchain_balance.json.jbuilder index 83293cf09..9216733c2 100644 --- a/app/views/users/blockchain_balance.json.jbuilder +++ b/app/views/users/blockchain_balance.json.jbuilder @@ -1,5 +1,7 @@ json.total_count @total_count json.projects @projects.each do |p| - json.partial! 'projects/detail', locals: { project: p[:project] } + if p[:project].present? + json.partial! 'projects/detail', locals: { project: p[:project] } + end json.balance p[:balance] end \ No newline at end of file From 633b0ff08042be6c170adc676383a189654c40c4 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 11:15:16 +0800 Subject: [PATCH 125/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=96=91=E4=BF=AE=E9=9C=80=E8=A6=81=E4=B8=8A=E9=93=BE?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=94=A8=E6=88=B7=E5=88=9D=E5=A7=8Btoken?= =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8=E7=99=BE=E5=88=86=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/delete_service.rb | 4 ++++ app/services/application_service.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/delete_service.rb b/app/services/api/v1/issues/delete_service.rb index a34fdced6..4c4a4b828 100644 --- a/app/services/api/v1/issues/delete_service.rb +++ b/app/services/api/v1/issues/delete_service.rb @@ -19,6 +19,10 @@ class Api::V1::Issues::DeleteService < ApplicationService project.incre_project_issue_cache_delete_count + if Site.has_blockchain? && @project.use_blockchain + unlock_balance_on_blockchain(@project.user_id.to_s, @project.id.to_s, @issue.blockchain_token_num.to_i) + end + if Site.has_notice_menu? SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigners.pluck(:id), @issue.author_id) end diff --git a/app/services/application_service.rb b/app/services/application_service.rb index 259a720fc..de9842f9d 100644 --- a/app/services/application_service.rb +++ b/app/services/application_service.rb @@ -33,7 +33,7 @@ class ApplicationService username = params['user_id'].to_s token_name = project.id.to_s total_supply = params['blockchain_token_all'].to_i - token_balance = [[username, (total_supply * params['blockchain_init_token'].to_i / 100).to_i]] + token_balance = [[username, params['blockchain_init_token'].to_i]] params = { "request-type": "create repo", From d4dab409a70e11ecf325dca30cd883575ad1d0fe Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 11:15:43 +0800 Subject: [PATCH 126/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/delete_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/delete_service.rb b/app/services/api/v1/issues/delete_service.rb index 4c4a4b828..56fbc3edb 100644 --- a/app/services/api/v1/issues/delete_service.rb +++ b/app/services/api/v1/issues/delete_service.rb @@ -20,7 +20,7 @@ class Api::V1::Issues::DeleteService < ApplicationService project.incre_project_issue_cache_delete_count if Site.has_blockchain? && @project.use_blockchain - unlock_balance_on_blockchain(@project.user_id.to_s, @project.id.to_s, @issue.blockchain_token_num.to_i) + unlock_balance_on_blockchain(@project.user_id.to_s, @project.id.to_s, @issue.blockchain_token_num.to_i) if @issue.blockchain_token_num.present? end if Site.has_notice_menu? From 582f364b16b18beb1347fbdd0959db3440a55ef4 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 11:40:33 +0800 Subject: [PATCH 127/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/forms/base_form.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/forms/base_form.rb b/app/forms/base_form.rb index db745e8d8..44b5109c3 100644 --- a/app/forms/base_form.rb +++ b/app/forms/base_form.rb @@ -35,7 +35,7 @@ class BaseForm end def check_blockchain_init_token(blockchain_init_token) - raise "请正确填写项目创始人token占比." if (Float(blockchain_init_token) rescue false) == false or blockchain_init_token.to_i < 0 or blockchain_init_token.to_i > 100 or Float(blockchain_init_token) != blockchain_init_token.to_i + raise "请正确填写项目创始人token占比." if (Float(blockchain_init_token) rescue false) == false or blockchain_init_token.to_i < 0 or Float(blockchain_init_token) != blockchain_init_token.to_i end def check_reversed_keyword(repository_name) From 92c4f87d5ba6b66a7b888f0e7b91f9ccf17d19ae Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 11:50:47 +0800 Subject: [PATCH 128/133] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=85=B3=E8=81=94=E7=96=91=E4=BF=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 12e67ccc2..5401c96f0 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -236,6 +236,9 @@ class PullRequestsController < ApplicationController PullAttachedIssue.find_by(issue_id: issue.id, pull_request_id: @pull_request.id).update(fixed: true) end # update issue to state 5 + issue.issue_participants.create!({participant_type: "edited", participant_id: current_user.id}) unless issue.issue_participants.exists?(participant_type: "edited", participant_id: current_user.id) + journal = issue.journals.create!({user_id: current_user.id}) + journal.journal_details.create!({property: "attr", prop_key: "status_id", old_value: issue.status_id, value: 5}) issue.update(status_id: 5) end From dae37155948937d65a00b47c6ff1558a2085835a Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 14:48:37 +0800 Subject: [PATCH 129/133] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/create_service.rb | 2 +- app/services/api/v1/issues/update_service.rb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 91007fbea..821ad2787 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -63,7 +63,7 @@ class Api::V1::Issues::CreateService < ApplicationService if Site.has_blockchain? && @project.use_blockchain if @created_issue.blockchain_token_num.present? && @created_issue.blockchain_token_num > 0 - Blockchain::CreateIssue.call({user_id: @created_issue.author_id, project_id: @created_issue.project_id, token_num: @created_issue.blockchain_token_num}) + Blockchain::CreateIssue.call({user_id: current_user.id, project_id: @created_issue.project_id, token_num: @created_issue.blockchain_token_num}) end push_activity_2_blockchain("issue_create", @created_issue) diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 04db49177..2a377d4fb 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -90,6 +90,9 @@ class Api::V1::Issues::UpdateService < ApplicationService private def issue_load_attributes + if current_user.id == @updated_issue.author_id && !PullAttachedIssue.exists?(issue_id: @updated_issue, fixed: true) + @updated_issue.blockchain_token_num = blockchain_token_num unless blockchain_token_num.nil? + end @updated_issue.status_id = status_id if status_id.present? @updated_issue.priority_id = priority_id if priority_id.present? @updated_issue.fixed_version_id = milestone_id unless milestone_id.nil? @@ -98,7 +101,6 @@ class Api::V1::Issues::UpdateService < ApplicationService @updated_issue.due_date = due_date unless due_date.nil? @updated_issue.subject = subject if subject.present? @updated_issue.description = description unless description.nil? - @updated_issue.blockchain_token_num = blockchain_token_num unless blockchain_token_num.nil? end def build_assigner_participants @@ -137,8 +139,8 @@ class Api::V1::Issues::UpdateService < ApplicationService def build_cirle_blockchain_token if @updated_issue.previous_changes["blockchain_token_num"].present? - unlock_balance_on_blockchain(@updated_issue.project&.user_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][0].to_i) if @updated_issue.previous_changes["blockchain_token_num"][0].present? - lock_balance_on_blockchain(@updated_issue.project&.user_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][1].to_i) if @updated_issue.previous_changes["blockchain_token_num"][1].present? + unlock_balance_on_blockchain(@updated_issue&.author_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][0].to_i) if @updated_issue.previous_changes["blockchain_token_num"][0].present? + lock_balance_on_blockchain(@updated_issue&.author_id.to_s, @updated_issue.project_id.to_s, @updated_issue.previous_changes["blockchain_token_num"][1].to_i) if @updated_issue.previous_changes["blockchain_token_num"][1].present? end end From 9a8bbc2d03221c499ca8ac106e47031b6102a633 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 14:58:16 +0800 Subject: [PATCH 130/133] fix --- app/services/api/v1/issues/create_service.rb | 2 +- app/services/api/v1/issues/update_service.rb | 2 +- app/views/api/v1/issues/_detail.json.jbuilder | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/services/api/v1/issues/create_service.rb b/app/services/api/v1/issues/create_service.rb index 821ad2787..41b8ff64f 100644 --- a/app/services/api/v1/issues/create_service.rb +++ b/app/services/api/v1/issues/create_service.rb @@ -41,7 +41,7 @@ class Api::V1::Issues::CreateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.blank? check_attachments(attachment_ids) unless attachment_ids.blank? check_atme_receivers(receivers_login) unless receivers_login.blank? - check_blockchain_token_num(project.user_id, project.id, blockchain_token_num) if blockchain_token_num.present? + check_blockchain_token_num(current_user.id, project.id, blockchain_token_num) if blockchain_token_num.present? load_assigners(assigner_ids) unless assigner_ids.blank? load_attachments(attachment_ids) unless attachment_ids.blank? load_issue_tags(issue_tag_ids) unless issue_tag_ids.blank? diff --git a/app/services/api/v1/issues/update_service.rb b/app/services/api/v1/issues/update_service.rb index 2a377d4fb..8a89bcf4f 100644 --- a/app/services/api/v1/issues/update_service.rb +++ b/app/services/api/v1/issues/update_service.rb @@ -42,7 +42,7 @@ class Api::V1::Issues::UpdateService < ApplicationService check_assigners(assigner_ids) unless assigner_ids.nil? check_attachments(attachment_ids) unless attachment_ids.nil? check_atme_receivers(receivers_login) unless receivers_login.nil? - check_blockchain_token_num(project.user_id, project.id, blockchain_token_num, (@issue.blockchain_token_num || 0)) if blockchain_token_num.present? + check_blockchain_token_num(issue.author_id, project.id, blockchain_token_num, (@issue.blockchain_token_num || 0)) if blockchain_token_num.present? && current_user.id == @issue.author_id && !PullAttachedIssue.exists?(issue_id: @issue, fixed: true) load_assigners(assigner_ids) load_attachments(attachment_ids) load_issue_tags(issue_tag_ids) diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index 83e83d981..265591ff1 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -43,4 +43,5 @@ json.comment_journals_count issue.comment_journals.size json.operate_journals_count issue.operate_journals.size json.attachments issue.attachments.each do |attachment| json.partial! "api/v1/attachments/simple_detail", locals: {attachment: attachment} -end \ No newline at end of file +end +json.pull_fixed issue.pull_attached_issues.fixed.present? \ No newline at end of file From 3858d9c482d2b26371d032c8a226c4e8e3051f07 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 15:08:05 +0800 Subject: [PATCH 131/133] fix --- app/services/api/v1/issues/delete_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/delete_service.rb b/app/services/api/v1/issues/delete_service.rb index 56fbc3edb..b62733181 100644 --- a/app/services/api/v1/issues/delete_service.rb +++ b/app/services/api/v1/issues/delete_service.rb @@ -20,7 +20,7 @@ class Api::V1::Issues::DeleteService < ApplicationService project.incre_project_issue_cache_delete_count if Site.has_blockchain? && @project.use_blockchain - unlock_balance_on_blockchain(@project.user_id.to_s, @project.id.to_s, @issue.blockchain_token_num.to_i) if @issue.blockchain_token_num.present? + unlock_balance_on_blockchain(@issue.author_id.to_s, @project.id.to_s, @issue.blockchain_token_num.to_i) if @issue.blockchain_token_num.present? end if Site.has_notice_menu? From 01b80619e479b810a716032432913bb6c35a362d Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 15:48:41 +0800 Subject: [PATCH 132/133] fix --- app/services/api/v1/issues/concerns/checkable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/concerns/checkable.rb b/app/services/api/v1/issues/concerns/checkable.rb index cda01ba25..b19c245ed 100644 --- a/app/services/api/v1/issues/concerns/checkable.rb +++ b/app/services/api/v1/issues/concerns/checkable.rb @@ -48,6 +48,6 @@ module Api::V1::Issues::Concerns::Checkable def check_blockchain_token_num(user_id, project_id, blockchain_token_num, now_blockchain_token_num=0) left_blockchain_token_num = Blockchain::BalanceQueryOneProject.call({"user_id": user_id, "project_id": project_id}) rescue 0 - raise ApplicationService::Error, "项目Token不足。" if blockchain_token_num.to_i > (left_blockchain_token_num+now_blockchain_token_num).to_i + raise ApplicationService::Error, "用户Token不足。" if blockchain_token_num.to_i > (left_blockchain_token_num+now_blockchain_token_num).to_i end end From e9e970ca20e1d40bc7a461f536b566bea5f00368 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Mar 2023 16:02:54 +0800 Subject: [PATCH 133/133] fix --- app/views/api/v1/issues/_detail.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index 265591ff1..712e7a960 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -44,4 +44,4 @@ json.operate_journals_count issue.operate_journals.size json.attachments issue.attachments.each do |attachment| json.partial! "api/v1/attachments/simple_detail", locals: {attachment: attachment} end -json.pull_fixed issue.pull_attached_issues.fixed.present? \ No newline at end of file +json.pull_fixed issue.pull_attached_issues.where(fixed: true).present? \ No newline at end of file