Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactoring:

Browse source 
- Changed behavior to use symbol as parameter to reduce memory coast.
- Removed code duplication.
- Added tests.
This commit is contained in:
Thorsten Eckel 2017-03-27 16:06:18 +02:00
parent f6c449327a
commit 57e7b9e987
11 changed files with 73 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/tickets_controller.rb
View file

@ -274,7 +274,7 @@ class TicketsController < ApplicationController
ticket_lists = Ticket
.where(
customer_id: ticket.customer_id,
state_id: Ticket::State.by_category('open')
state_id: Ticket::State.by_category(:open)
)
.where(access_condition)
.where('id != ?', [ ticket.id ])
@ -287,7 +287,7 @@ class TicketsController < ApplicationController
.where(
customer_id: ticket.customer_id,
).where.not(
state_id: Ticket::State.by_category('merged')
state_id: Ticket::State.by_category(:merged)
)
.where(access_condition)
.where('id != ?', [ ticket.id ])
@ -503,7 +503,7 @@ class TicketsController < ApplicationController
condition = {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('open').map(&:id),
value: Ticket::State.by_category(:open).pluck(:id),
},
'ticket.customer_id' => {
operator: 'is',
@ -521,7 +521,7 @@ class TicketsController < ApplicationController
condition = {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('closed').map(&:id),
value: Ticket::State.by_category(:closed).pluck(:id),
},
'ticket.customer_id' => {
operator: 'is',
@ -577,7 +577,7 @@ class TicketsController < ApplicationController
condition = {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('open').map(&:id),
value: Ticket::State.by_category(:open).pluck(:id),
},
'ticket.organization_id' => {
operator: 'is',
@ -595,7 +595,7 @@ class TicketsController < ApplicationController
condition = {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('closed').map(&:id),
value: Ticket::State.by_category(:closed).pluck(:id),
},
'ticket.organization_id' => {
operator: 'is',

2
app/models/channel/filter/monitoring_base.rb
View file

@ -46,7 +46,7 @@ class Channel::Filter::MonitoringBase
customer = User.lookup(id: session_user_id)
# follow up detection by meta data
open_states = Ticket::State.by_category('open')
open_states = Ticket::State.by_category(:open)
Ticket.where(state: open_states).each { |ticket|
next if !ticket.preferences
next if !ticket.preferences['integration']

4
app/models/observer/ticket/user_ticket_counter/background_job.rb
View file

@ -7,14 +7,14 @@ class Observer::Ticket::UserTicketCounter::BackgroundJob
def perform
# open ticket count
state_open = Ticket::State.by_category('open')
state_open = Ticket::State.by_category(:open)
tickets_open = Ticket.where(
customer_id: @customer_id,
state_id: state_open,
).count()
# closed ticket count
state_closed = Ticket::State.by_category('closed')
state_closed = Ticket::State.by_category(:closed)
tickets_closed = Ticket.where(
customer_id: @customer_id,
state_id: state_closed,

2
app/models/ticket/escalation.rb
View file

@ -14,7 +14,7 @@ returns
=end
def self.rebuild_all
state_list_open = Ticket::State.by_category('open')
state_list_open = Ticket::State.by_category(:open)
ticket_ids = Ticket.where(state_id: state_list_open).pluck(:id)
ticket_ids.each { |ticket_id|

4
app/models/ticket/screen_options.rb
View file

@ -126,8 +126,8 @@ returns
def self.list_by_customer(data)
# get closed/open states
state_list_open = Ticket::State.by_category( 'open' )
state_list_closed = Ticket::State.by_category( 'closed' )
state_list_open = Ticket::State.by_category(:open)
state_list_closed = Ticket::State.by_category(:closed)
# get tickets
tickets_open = Ticket.where(

63
app/models/ticket/state.rb
View file

@ -14,51 +14,42 @@ class Ticket::State < ApplicationModel
=begin
list tickets by customer
looks up states for a given category
states = Ticket::State.by_category('open') # open|closed|work_on|work_on_all|viewable|pending_reminder|pending_action|merged
states = Ticket::State.by_category(:open) # :open|:closed|:work_on|:work_on_all|:viewable|:pending_reminder|:pending_action|:merged
returns:
state objects
state object list
=end
def self.by_category(category)
if category == 'open'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: ['new', 'open', 'pending reminder', 'pending action'])
)
elsif category == 'pending_reminder'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: ['pending reminder'])
)
elsif category == 'pending_action'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: ['pending action'])
)
elsif category == 'work_on'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: %w(new open))
)
elsif category == 'work_on_all'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: ['new', 'open', 'pending reminder'])
)
elsif category == 'viewable'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: ['new', 'open', 'pending reminder', 'pending action', 'closed', 'removed'])
)
elsif category == 'closed'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: %w(closed))
)
elsif category == 'merged'
return Ticket::State.where(
state_type_id: Ticket::StateType.where(name: %w(merged))
)
case category.to_sym
when :open
state_types = ['new', 'open', 'pending reminder', 'pending action']
when :pending_reminder
state_types = ['pending reminder']
when :pending_action
state_types = ['pending action']
when :work_on
state_types = %w(new open)
when :work_on_all
state_types = ['new', 'open', 'pending reminder']
when :viewable
state_types = ['new', 'open', 'pending reminder', 'pending action', 'closed', 'removed']
when :closed
state_types = %w(closed)
when :merged
state_types = %w(merged)
end
raise "Unknown category '#{category}'"
raise "Unknown category '#{category}'" if state_types.blank?
Ticket::State.where(
state_type_id: Ticket::StateType.where(name: state_types)
)
end
=begin

14
db/seeds.rb
View file

@ -3311,7 +3311,7 @@ Overview.create_if_not_exists(
condition: {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('open').pluck(:id),
value: Ticket::State.by_category(:open).pluck(:id),
},
'ticket.owner_id' => {
operator: 'is',
@ -3338,7 +3338,7 @@ Overview.create_if_not_exists(
condition: {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('work_on_all').pluck(:id),
value: Ticket::State.by_category(:work_on_all).pluck(:id),
},
'ticket.owner_id' => {
operator: 'is',
@ -3365,7 +3365,7 @@ Overview.create_if_not_exists(
condition: {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('pending_reminder').pluck(:id),
value: Ticket::State.by_category(:pending_reminder).pluck(:id),
},
'ticket.owner_id' => {
operator: 'is',
@ -3397,7 +3397,7 @@ Overview.create_if_not_exists(
condition: {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('work_on_all').pluck(:id),
value: Ticket::State.by_category(:work_on_all).pluck(:id),
},
},
order: {
@ -3420,7 +3420,7 @@ Overview.create_if_not_exists(
condition: {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('pending_reminder').pluck(:id),
value: Ticket::State.by_category(:pending_reminder).pluck(:id),
},
'ticket.pending_time' => {
operator: 'within next (relative)',
@ -3473,7 +3473,7 @@ Overview.create_if_not_exists(
condition: {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('viewable').pluck(:id),
value: Ticket::State.by_category(:viewable).pluck(:id),
},
'ticket.customer_id' => {
operator: 'is',
@ -3500,7 +3500,7 @@ Overview.create_if_not_exists(
condition: {
'ticket.state_id' => {
operator: 'is',
value: Ticket::State.by_category('viewable').pluck(:id),
value: Ticket::State.by_category(:viewable).pluck(:id),
},
'ticket.organization_id' => {
operator: 'is',

2
lib/stats/ticket_escalation.rb
View file

@ -4,7 +4,7 @@ class Stats::TicketEscalation
def self.generate(user)
open_state_ids = Ticket::State.by_category('open').map(&:id)
open_state_ids = Ticket::State.by_category(:open).pluck(:id)
# get users groups
group_ids = user.groups.map(&:id)

14
lib/stats/ticket_in_process.rb
View file

@ -5,26 +5,26 @@ class Stats::TicketInProcess
def self.generate(user)
# get own tickets which are "workable"
open_state_ids = Ticket::State.by_category('work_on').map(&:id)
pending_state_ids = Ticket::State.by_category('pending_reminder').map(&:id)
open_state_ids = Ticket::State.by_category(:work_on).pluck(:id)
pending_state_ids = Ticket::State.by_category(:pending_reminder).pluck(:id)
own_ticket_ids = Ticket.select('id').where(
'owner_id = ? AND (state_id IN (?) OR (state_id IN (?) AND pending_time < ?))',
user.id, open_state_ids, pending_state_ids, Time.zone.now
).limit(1000).map(&:id)
).limit(1000).pluck(:id)
# get all tickets where I worked on today (owner & closed today)
closed_state_ids = Ticket::State.by_category('closed').map(&:id)
closed_state_ids = Ticket::State.by_category(:closed).pluck(:id)
closed_ticket_ids = Ticket.select('id').where(
'owner_id = ? AND state_id IN (?) AND close_at > ?',
user.id, closed_state_ids, Time.zone.now - 1.day
).limit(100).map(&:id)
).limit(100).pluck(:id)
# get all tickets which I changed to pending action
pending_action_state_ids = Ticket::State.by_category('pending_action').map(&:id)
pending_action_state_ids = Ticket::State.by_category(:pending_action).pluck(:id)
pending_action_ticket_ids = Ticket.select('id').where(
'owner_id = ? AND state_id IN (?) AND updated_at > ?',
user.id, pending_action_state_ids, Time.zone.now - 1.day
).limit(100).map(&:id)
).limit(100).pluck(:id)
all_ticket_ids = own_ticket_ids.concat(closed_ticket_ids).concat(pending_action_ticket_ids).uniq

2
lib/stats/ticket_load_measure.rb
View file

@ -4,7 +4,7 @@ class Stats::TicketLoadMeasure
def self.generate(user)
open_state_ids = Ticket::State.by_category('open').map(&:id)
open_state_ids = Ticket::State.by_category(:open).pluck(:id)
# owned tickets
count = Ticket.where(owner_id: user.id, state_id: open_state_ids).count

18
spec/models/ticket/state_spec.rb Normal file
View file

@ -0,0 +1,18 @@
require 'rails_helper'
RSpec.describe Ticket::State do
context '.by_category' do
it 'looks up states by category' do
result = described_class.by_category(:open)
expect(result).to be_an(ActiveRecord::Relation)
expect(result).to_not be_empty
expect(result.first).to be_a(Ticket::State)
end
it 'raises RuntimeError for invalid category' do
expect { described_class.by_category(:invalidcategoryname) }.to raise_error(RuntimeError)
end
end
end