Skip to content

Commit

Permalink
Fixed issue #214 - Delete tickets.
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfschmidt committed May 5, 2017
1 parent 7b1a379 commit c826229
Show file tree
Hide file tree
Showing 12 changed files with 360 additions and 40 deletions.
14 changes: 14 additions & 0 deletions .rubocop.yml
Expand Up @@ -210,3 +210,17 @@ Performance/Casecmp:
Description: 'Use `casecmp` rather than `downcase ==`.'
Reference: 'https://github.com/JuanitoFatas/fast-ruby#stringcasecmp-vs-stringdowncase---code'
Enabled: false

# RSpec tests
Style/NumericPredicate:
Description: >-
Checks for the use of predicate- or comparison methods for
numeric comparisons.
StyleGuide: '#predicate-methods'
# This will change to a new method call which isn't guaranteed to be on the
# object. Switching these methods has to be done with knowledge of the types
# of the variables which rubocop doesn't have.
AutoCorrect: false
Enabled: true
Exclude:
- "**/*_spec.rb"
Expand Up @@ -32,6 +32,16 @@ class App.UiElement.ticket_perform_action
config.operator = ['add', 'remove']
elements["#{groupKey}.#{config.name}"] = config

# add ticket deletion action
elements['ticket.action'] =
name: 'action'
display: 'Action'
tag: 'select'
null: false
translate: true
options:
delete: 'delete'

[defaults, groups, elements]

@render: (attribute, params = {}) ->
Expand Down
21 changes: 21 additions & 0 deletions app/models/concerns/has_karma_activity_log.rb
@@ -0,0 +1,21 @@
# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
module HasKarmaActivityLog
extend ActiveSupport::Concern

included do
before_destroy :karma_activity_log_destroy
end

=begin
delete object online notification list, will be executed automatically
model = Model.find(123)
model.karma_activity_log_destroy
=end

def karma_activity_log_destroy
Karma::ActivityLog.remove(self.class.to_s, id)
end
end
24 changes: 24 additions & 0 deletions app/models/concerns/has_links.rb
@@ -0,0 +1,24 @@
# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
module HasLinks
extend ActiveSupport::Concern

included do
before_destroy :links_destroy
end

=begin
delete object link list, will be executed automatically
model = Model.find(123)
model.links_destroy
=end

def links_destroy
Link.remove_all(
link_object: self.class.to_s,
link_object_value: id,
)
end
end
21 changes: 21 additions & 0 deletions app/models/concerns/has_online_notifications.rb
@@ -0,0 +1,21 @@
# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
module HasOnlineNotifications
extend ActiveSupport::Concern

included do
before_destroy :online_notification_destroy
end

=begin
delete object online notification list, will be executed automatically
model = Model.find(123)
model.online_notification_destroy
=end

def online_notification_destroy
OnlineNotification.remove(self.class.to_s, id)
end
end
24 changes: 24 additions & 0 deletions app/models/karma/activity_log.rb
Expand Up @@ -5,6 +5,14 @@ class Karma::ActivityLog < ApplicationModel

self.table_name = 'karma_activity_logs'

=begin
add karma activity log of an object
Karma::ActivityLog.add('ticket create', User.find(1), 'Ticket', 123)
=end

def self.add(action, user, object, o_id, force = false)
activity = Karma::Activity.lookup(name: action)

Expand Down Expand Up @@ -47,6 +55,22 @@ def self.add(action, user, object, o_id, force = false)
true
end

=begin
remove whole karma activity log of an object
Karma::ActivityLog.remove('Ticket', 123)
=end

def self.remove(object_name, o_id)
object_id = ObjectLookup.by_name(object_name)
Karma::ActivityLog.where(
object_lookup_id: object_id,
o_id: o_id,
).destroy_all
end

def self.latest(user, limit = 12)
result = []
logs = Karma::ActivityLog.where(user_id: user.id).order(id: :desc).limit(limit)
Expand Down
73 changes: 44 additions & 29 deletions app/models/link.rb
Expand Up @@ -4,6 +4,8 @@ class Link < ApplicationModel
belongs_to :link_type, class_name: 'Link::Type'
belongs_to :link_object, class_name: 'Link::Object'

after_destroy :touch_link_references

@map = {
'normal' => 'normal',
'parent' => 'child',
Expand Down Expand Up @@ -131,52 +133,65 @@ def self.remove(data)
linktype = link_type_get(name: data[:link_type])
data[:link_type_id] = linktype.id
end
links = Link.where(
Link.where(
link_type_id: data[:link_type_id],
link_object_source_id: data[:link_object_source_id],
link_object_source_value: data[:link_object_source_value],
link_object_target_id: data[:link_object_target_id],
link_object_target_value: data[:link_object_target_value]
)

# touch references
links.each { |link|
link.destroy
touch_reference_by_params(
object: Link::Object.lookup(id: link.link_object_source_id).name,
o_id: link.link_object_source_value,
)
touch_reference_by_params(
object: Link::Object.lookup(id: link.link_object_target_id).name,
o_id: link.link_object_target_value,
)
}
).destroy_all

# from the other site
if data.key?(:link_type)
linktype = link_type_get(name: @map[ data[:link_type] ])
data[:link_type_id] = linktype.id
end
links = Link.where(

Link.where(
link_type_id: data[:link_type_id],
link_object_target_id: data[:link_object_source_id],
link_object_target_value: data[:link_object_source_value],
link_object_source_id: data[:link_object_target_id],
link_object_source_value: data[:link_object_target_value]
)
).destroy_all
end

# touch references
links.each { |link|
link.destroy
touch_reference_by_params(
object: Link::Object.lookup(id: link.link_object_source_id).name,
o_id: link.link_object_source_value,
)
touch_reference_by_params(
object: Link::Object.lookup(id: link.link_object_target_id).name,
o_id: link.link_object_target_value,
)
}
=begin
Link.remove_all(
link_object: 'Ticket',
link_object_value: 6,
)
=end

def self.remove_all(data)
if data.key?(:link_object)
linkobject = link_object_get(name: data[:link_object])
data[:link_object_id] = linkobject.id
end

Link.where(
link_object_target_id: data[:link_object_id],
link_object_target_value: data[:link_object_value],
).destroy_all
Link.where(
link_object_source_id: data[:link_object_id],
link_object_source_value: data[:link_object_value],
).destroy_all

true
end

def touch_link_references
Link.touch_reference_by_params(
object: Link::Object.lookup(id: link_object_source_id).name,
o_id: link_object_source_value,
)
Link.touch_reference_by_params(
object: Link::Object.lookup(id: link_object_target_id).name,
o_id: link_object_target_value,
)
end

def self.link_type_get(data)
Expand Down
38 changes: 27 additions & 11 deletions app/models/ticket.rb
Expand Up @@ -7,6 +7,9 @@ class Ticket < ApplicationModel
include HasHistory
include HasTags
include HasSearchIndexBackend
include HasOnlineNotifications
include HasKarmaActivityLog
include HasLinks

include Ticket::Escalation
include Ticket::Subject
Expand All @@ -23,7 +26,6 @@ class Ticket < ApplicationModel
after_create :check_escalation_update
before_update :check_defaults, :check_title, :reset_pending_time
after_update :check_escalation_update
before_destroy :destroy_dependencies

validates :group_id, presence: true

Expand Down Expand Up @@ -55,7 +57,7 @@ class Ticket < ApplicationModel
:preferences

belongs_to :group, class_name: 'Group'
has_many :articles, class_name: 'Ticket::Article', after_add: :cache_update, after_remove: :cache_update
has_many :articles, class_name: 'Ticket::Article', after_add: :cache_update, after_remove: :cache_update, dependent: :destroy
has_many :ticket_time_accounting, class_name: 'Ticket::TimeAccounting', dependent: :destroy
belongs_to :organization, class_name: 'Organization'
belongs_to :state, class_name: 'Ticket::State'
Expand Down Expand Up @@ -748,6 +750,19 @@ def self.selector2sql(selectors, current_user = nil)

def perform_changes(perform, perform_origin, item = nil, current_user_id = nil)
logger.debug "Perform #{perform_origin} #{perform.inspect} on Ticket.find(#{id})"

# if the configuration contains the deletion of the ticket then
# we skip all other ticket changes because they does not matter
if perform['ticket.action'].present? && perform['ticket.action']['value'] == 'delete'
perform.each do |key, _value|
(object_name, attribute) = key.split('.', 2)
next if object_name != 'ticket'
next if attribute == 'action'

perform.delete(key)
end
end

changed = false
perform.each do |key, value|
(object_name, attribute) = key.split('.', 2)
Expand Down Expand Up @@ -906,6 +921,16 @@ def perform_changes(perform, perform_origin, item = nil, current_user_id = nil)
next
end

# delete ticket
if key == 'ticket.action'
next if value['value'].blank?
next if value['value'] != 'delete'

destroy

next
end

# lookup pre_condition
if value['pre_condition']
if value['pre_condition'] =~ /^not_set/
Expand Down Expand Up @@ -1046,15 +1071,6 @@ def check_escalation_update
true
end

def destroy_dependencies

# delete articles
articles.destroy_all

# destroy online notifications
OnlineNotification.remove(self.class.to_s, id)
end

def set_default_state
return if state_id

Expand Down
12 changes: 12 additions & 0 deletions spec/factories/online_notification.rb
@@ -0,0 +1,12 @@
FactoryGirl.define do
factory :online_notification do
object_lookup_id { ObjectLookup.by_name('Ticket') }
type_lookup_id { TypeLookup.by_name('Assigned to you') }
seen false
user_id 1
created_by_id 1
updated_by_id 1
created_at Time.zone.now
updated_at Time.zone.now
end
end
7 changes: 7 additions & 0 deletions spec/factories/tag.rb
@@ -0,0 +1,7 @@
FactoryGirl.define do
factory :tag do
tag_object_id { Tag::Object.lookup_by_name_and_create('Ticket').id }
tag_item_id { Tag::Item.lookup_by_name_and_create('blub').id }
created_by_id 1
end
end
14 changes: 14 additions & 0 deletions spec/factories/ticket/article.rb
@@ -0,0 +1,14 @@
FactoryGirl.define do
factory :ticket_article, class: Ticket::Article do
from 'factory-customer-1@example.com'
to 'factory-customer-1@example.com'
subject 'factory article'
message_id 'factory@id_com_1'
body 'some message 123'
internal false
sender { Ticket::Article::Sender.find_by(name: 'Customer') }
type { Ticket::Article::Type.find_by(name: 'email') }
updated_by_id 1
created_by_id 1
end
end

0 comments on commit c826229

Please sign in to comment.