From e8b36f33edbc9c0cacf8a0e9cc953ebfddbac59c Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 18 Oct 2023 15:24:39 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20issue=E8=AF=84=E8=AE=BA=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E9=99=84=E4=BB=B6=E8=A7=A3=E6=9E=90=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E9=99=84=E4=BB=B6=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journal.rb                              | 14 ++++++++++++++
 .../api/v1/issues/journals/index.json.jbuilder     |  1 +
 2 files changed, 15 insertions(+)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index ce69c1f3a..3229ae886 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -53,10 +53,24 @@ class Journal < ApplicationRecord
 
   enum state: {opened: 0, resolved: 1, disabled: 2}
 
+  after_save :associate_attachment_container
+
   def is_journal_detail?
     self.notes.blank? && self.journal_details.present?
   end
 
+  # 关附件到功能
+  def associate_attachment_container
+    att_ids = []
+    # 附件的格式为（/api/attachments/ + 附件id）的形式，提取出id进行附件属性关联，做附件访问权限控制
+    att_ids += self.notes.to_s.scan(/\(\/api\/attachments\/.+\)/).map{|s|s.match(/\d+/)[0]}
+    att_ids += self.notes.to_s.scan(/\/api\/attachments\/.+\"/).map{|s|s.match(/\d+/)[0]}
+    att_ids += self.notes.to_s.scan(/\/api\/attachments\/\d+/).map{|s|s.match(/\d+/)[0]}
+    if att_ids.present?
+      Attachment.where(id: att_ids).where(container_type: nil).update_all(container_id: self.id, container_type: self.class.name)
+    end
+  end
+
   def operate_content 
     content = ""
     detail = self.journal_details.take
diff --git a/app/views/api/v1/issues/journals/index.json.jbuilder b/app/views/api/v1/issues/journals/index.json.jbuilder
index 49f94aa37..453c39c59 100644
--- a/app/views/api/v1/issues/journals/index.json.jbuilder
+++ b/app/views/api/v1/issues/journals/index.json.jbuilder
@@ -3,5 +3,6 @@ json.total_operate_journals_count @total_operate_journals_count
 json.total_comment_journals_count @total_comment_journals_count
 json.total_count @journals.total_count 
 json.journals @journals do |journal|
+  journal.associate_attachment_container
   json.partial! "detail", journal: journal 
 end
\ No newline at end of file