| @@ -24,10 +24,10 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService | |||||
| ActiveRecord::Base.transaction do | ActiveRecord::Base.transaction do | ||||
| check_parent_journal(parent_id) if parent_id.present? | check_parent_journal(parent_id) if parent_id.present? | ||||
| check_parent_journal(reply_id) if reply_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}") | try_lock("Api::V1::Issues::Journals::CreateService:#{@issue.id}") | ||||
| @created_journal = @issue.journals.new(journal_attributes) | @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.attachments = @attachments unless attachment_ids.blank? | ||||
| @created_journal.save! | @created_journal.save! | ||||
| @issue.save! | |||||
| # @信息发送 | # @信息发送 | ||||
| AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? | AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? | ||||
| @@ -20,10 +20,10 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService | |||||
| def call | def call | ||||
| raise Error, errors.full_messages.join(", ") unless valid? | raise Error, errors.full_messages.join(", ") unless valid? | ||||
| ActiveRecord::Base.transaction do | 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}") | try_lock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}") | ||||
| @updated_journal = @journal | @updated_journal = @journal | ||||
| @@ -31,9 +31,10 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService | |||||
| build_atme_participants if @atme_receivers.present? | 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! | @updated_journal.save! | ||||
| @issue.save! | |||||
| # @信息发送 | # @信息发送 | ||||
| AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? | AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank? | ||||