From 587facfb3d98fc68dfeb9320f7b5200fe63d3834 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 7 Feb 2023 17:12:43 +0800
Subject: [PATCH 01/55] =?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 <yystopf@163.com>
Date: Tue, 7 Feb 2023 17:47:28 +0800
Subject: [PATCH 02/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E5=8F=98=E6=9B=B4=E4=B8=BA=E4=B8=80=E5=AF=B9?=
 =?UTF-8?q?=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 <yystopf@163.com>
Date: Wed, 8 Feb 2023 09:49:02 +0800
Subject: [PATCH 03/55] =?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 <yystopf@163.com>
Date: Wed, 8 Feb 2023 10:15:29 +0800
Subject: [PATCH 04/55] =?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 <yystopf@163.com>
Date: Wed, 8 Feb 2023 16:55:20 +0800
Subject: [PATCH 05/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue=E5=8F=82?=
 =?UTF-8?q?=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 <yystopf@163.com>
Date: Wed, 8 Feb 2023 16:56:01 +0800
Subject: [PATCH 06/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue=E5=92=8C?=
 =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E5=88=97=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/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 <yystopf@163.com>
Date: Thu, 9 Feb 2023 09:29:02 +0800
Subject: [PATCH 07/55] =?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 <yystopf@163.com>
Date: Thu, 9 Feb 2023 10:15:59 +0800
Subject: [PATCH 08/55] =?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 <yystopf@163.com>
Date: Thu, 9 Feb 2023 16:20:16 +0800
Subject: [PATCH 09/55] =?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 <yystopf@163.com>
Date: Fri, 10 Feb 2023 11:38:51 +0800
Subject: [PATCH 10/55] =?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 <yystopf@163.com>
Date: Fri, 10 Feb 2023 15:39:09 +0800
Subject: [PATCH 11/55] =?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 <yystopf@163.com>
Date: Mon, 13 Feb 2023 09:43:26 +0800
Subject: [PATCH 12/55] =?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 <yystopf@163.com>
Date: Tue, 14 Feb 2023 23:19:17 +0800
Subject: [PATCH 13/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Aissue=E7=BC=96?=
 =?UTF-8?q?=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 <yystopf@163.com>
Date: Wed, 15 Feb 2023 09:48:56 +0800
Subject: [PATCH 14/55] =?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 <yystopf@163.com>
Date: Wed, 15 Feb 2023 17:24:36 +0800
Subject: [PATCH 15/55] =?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 <yystopf@163.com>
Date: Fri, 17 Feb 2023 16:11:39 +0800
Subject: [PATCH 16/55] =?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 "创建了<b>疑修</b>"
+    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 += "添加了<b>#{new_value}</b>附件"
+      else 
+        new_value = "无" if new_value.blank?
+        content += "将附件由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
+      end
+    when 'issue_tag'
+      old_value = IssueTag.where(id: detail.old_value.split(",")).pluck(:name, :color).map{|t| "<span style='color: #{t[1]}'>#{t[0]}</span>"}.join(" ")
+      new_value = IssueTag.where(id: detail.value.split(",")).pluck(:name, :color).map{|t| "<span style='color: #{t[1]}'>#{t[0]}</span>"}.join(" ")
+      if old_value.nil? || old_value.blank? 
+        content += "添加了<b>#{new_value}</b>标记"
+      else 
+        new_value = "无" if new_value.blank?
+        content += "将标记由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
+      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 += "添加负责人<b>#{new_value}</b>"
+      else 
+        new_value = "无" if new_value.blank?
+        content += "将负责人由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
+      end
+    when 'attr'
+      content = "将"
+      case detail.prop_key
+      when 'subject'
+        return "修改了<b>标题</b>"
+      when 'description'
+        return "修改了<b>描述</b>"
+      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 += "设置为<b>#{new_value}</b>"
+      else 
+        new_value = "无" if new_value.blank?
+        content += "由<b>#{old_value}</b>更改为<b>#{new_value}</b>"
+      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 15d71bfd24afe4e10297a8889389e993fb4d3d41 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 17 Feb 2023 17:40:09 +0800
Subject: [PATCH 17/55] =?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 <yystopf@163.com>
Date: Sat, 18 Feb 2023 23:23:33 +0800
Subject: [PATCH 18/55] =?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 <yystopf@163.com>
Date: Mon, 20 Feb 2023 11:42:22 +0800
Subject: [PATCH 19/55] =?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 <yystopf@163.com>
Date: Mon, 20 Feb 2023 13:54:00 +0800
Subject: [PATCH 20/55] =?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 <yystopf@163.com>
Date: Mon, 20 Feb 2023 16:47:19 +0800
Subject: [PATCH 21/55] =?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 <yystopf@163.com>
Date: Mon, 20 Feb 2023 17:25:07 +0800
Subject: [PATCH 22/55] =?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 <yystopf@163.com>
Date: Mon, 20 Feb 2023 18:22:14 +0800
Subject: [PATCH 23/55] =?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 <yystopf@163.com>
Date: Tue, 21 Feb 2023 13:55:40 +0800
Subject: [PATCH 24/55] =?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 311776a00414f6b7cff8da424e8744591b235e35 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 21 Feb 2023 18:30:29 +0800
Subject: [PATCH 25/55] =?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 8239f13eaa89809d429b5407ab03973fb566cfa1 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 22 Feb 2023 09:55:05 +0800
Subject: [PATCH 26/55] =?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 <yystopf@163.com>
Date: Wed, 22 Feb 2023 09:57:39 +0800
Subject: [PATCH 27/55] =?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 54a85a60fab8c4a1a712896157eb68b9c4a1e050 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Wed, 22 Feb 2023 13:56:02 +0800
Subject: [PATCH 28/55] =?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 <yystopf@163.com>
Date: Wed, 22 Feb 2023 14:42:52 +0800
Subject: [PATCH 29/55] =?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 <yystopf@163.com>
Date: Wed, 22 Feb 2023 15:56:44 +0800
Subject: [PATCH 30/55] =?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 <yystopf@163.com>
Date: Wed, 22 Feb 2023 16:05:24 +0800
Subject: [PATCH 31/55] =?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 <yystopf@163.com>
Date: Wed, 22 Feb 2023 16:25:40 +0800
Subject: [PATCH 32/55] =?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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 15:24:30 +0800
Subject: [PATCH 33/55] =?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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 15:26:30 +0800
Subject: [PATCH 34/55] =?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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 15:27:26 +0800
Subject: [PATCH 35/55] =?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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 15:31:03 +0800
Subject: [PATCH 36/55] =?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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 16:18:09 +0800
Subject: [PATCH 37/55] =?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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 17:32:55 +0800
Subject: [PATCH 38/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aissue=5Fclassi?=
 =?UTF-8?q?fy=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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 20:54:48 +0800
Subject: [PATCH 39/55] =?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 <yystopf@163.com>
Date: Thu, 23 Feb 2023 21:03:40 +0800
Subject: [PATCH 40/55] =?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 <yystopf@163.com>
Date: Fri, 24 Feb 2023 09:04:29 +0800
Subject: [PATCH 41/55] =?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 <yystopf@163.com>
Date: Fri, 24 Feb 2023 10:24:57 +0800
Subject: [PATCH 42/55] =?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 <yystopf@163.com>
Date: Fri, 24 Feb 2023 14:32:21 +0800
Subject: [PATCH 43/55] =?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 <yystopf@163.com>
Date: Fri, 24 Feb 2023 15:26:40 +0800
Subject: [PATCH 44/55] =?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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 10:46:56 +0800
Subject: [PATCH 45/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Aatme=E5=92=8Ci?=
 =?UTF-8?q?ssue=20category=20=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=90=9C?=
 =?UTF-8?q?=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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 10:55:53 +0800
Subject: [PATCH 46/55] =?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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 11:07:09 +0800
Subject: [PATCH 47/55] =?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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 11:25:37 +0800
Subject: [PATCH 48/55] =?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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 14:12:25 +0800
Subject: [PATCH 49/55] =?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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 15:04:18 +0800
Subject: [PATCH 50/55] =?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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 15:13:35 +0800
Subject: [PATCH 51/55] =?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 <yystopf@163.com>
Date: Mon, 27 Feb 2023 15:17:10 +0800
Subject: [PATCH 52/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Arake=E4=BB=BB?=
 =?UTF-8?q?=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 4091872091d8b56c4f9ee993f2786a3a50dac212 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 28 Feb 2023 14:40:27 +0800
Subject: [PATCH 53/55] =?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 ec44376e4d99fe01d9c6de41431b38673065e0ba Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 28 Feb 2023 16:57:44 +0800
Subject: [PATCH 54/55] =?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 <yystopf@163.com>
Date: Tue, 28 Feb 2023 17:05:38 +0800
Subject: [PATCH 55/55] =?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?