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

Revert "Refactoring: Use .pluck(:id) over .id for ActiveRecord lookups." - Don't use .pluck on find_by results.

Browse source 
This reverts commit e3a856c9ea.
This commit is contained in:
Thorsten Eckel 2017-04-25 09:31:54 +02:00
parent e3a856c9ea
commit 762f52d52a
1 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
db/seeds.rb
View file

@ -3278,45 +3278,45 @@ Ticket::StateType.create_if_not_exists(id: 7, name: 'removed')
Ticket::State.create_if_not_exists( Ticket::State.create_if_not_exists(
id: 1, id: 1,
name: 'new', name: 'new',
state_type_id: Ticket::StateType.find_by(name: 'new').pluck(:id), state_type_id: Ticket::StateType.find_by(name: 'new').id,
default_create: true, default_create: true,
) )
Ticket::State.create_if_not_exists( Ticket::State.create_if_not_exists(
id: 2, id: 2,
name: 'open', name: 'open',
state_type_id: Ticket::StateType.find_by(name: 'open').pluck(:id), state_type_id: Ticket::StateType.find_by(name: 'open').id,
default_follow_up: true, default_follow_up: true,
) )
Ticket::State.create_if_not_exists( Ticket::State.create_if_not_exists(
id: 3, id: 3,
name: 'pending reminder', name: 'pending reminder',
state_type_id: Ticket::StateType.find_by(name: 'pending reminder').pluck(:id), state_type_id: Ticket::StateType.find_by(name: 'pending reminder').id,
ignore_escalation: true, ignore_escalation: true,
) )
Ticket::State.create_if_not_exists( Ticket::State.create_if_not_exists(
id: 4, id: 4,
name: 'closed', name: 'closed',
state_type_id: Ticket::StateType.find_by(name: 'closed').pluck(:id), state_type_id: Ticket::StateType.find_by(name: 'closed').id,
ignore_escalation: true, ignore_escalation: true,
) )
Ticket::State.create_if_not_exists( Ticket::State.create_if_not_exists(
id: 5, id: 5,
name: 'merged', name: 'merged',
state_type_id: Ticket::StateType.find_by(name: 'merged').pluck(:id), state_type_id: Ticket::StateType.find_by(name: 'merged').id,
ignore_escalation: true, ignore_escalation: true,
) )
Ticket::State.create_if_not_exists( Ticket::State.create_if_not_exists(
id: 6, id: 6,
name: 'removed', name: 'removed',
state_type_id: Ticket::StateType.find_by(name: 'removed').pluck(:id), state_type_id: Ticket::StateType.find_by(name: 'removed').id,
active: false, active: false,
ignore_escalation: true, ignore_escalation: true,
) )
Ticket::State.create_if_not_exists( Ticket::State.create_if_not_exists(
id: 7, id: 7,
name: 'pending close', name: 'pending close',
state_type_id: Ticket::StateType.find_by(name: 'pending action').pluck(:id), state_type_id: Ticket::StateType.find_by(name: 'pending action').id,
next_state_id: Ticket::State.find_by(name: 'closed').pluck(:id), next_state_id: Ticket::State.find_by(name: 'closed').id,
ignore_escalation: true, ignore_escalation: true,
) )
@ -3345,7 +3345,7 @@ Macro.create_if_not_exists(
name: 'Close & Tag as Spam', name: 'Close & Tag as Spam',
perform: { perform: {
'ticket.state_id' => { 'ticket.state_id' => {
value: Ticket::State.find_by(name: 'closed').pluck(:id), value: Ticket::State.find_by(name: 'closed').id,
}, },
'ticket.tags' => { 'ticket.tags' => {
operator: 'add', operator: 'add',
@ -3362,16 +3362,16 @@ Macro.create_if_not_exists(
UserInfo.current_user_id = user_community.id UserInfo.current_user_id = user_community.id
ticket = Ticket.create( ticket = Ticket.create(
group_id: Group.find_by(name: 'Users').pluck(:id), group_id: Group.find_by(name: 'Users').id,
customer_id: User.find_by(login: 'nicole.braun@zammad.org').pluck(:id), customer_id: User.find_by(login: 'nicole.braun@zammad.org').id,
title: 'Welcome to Zammad!', title: 'Welcome to Zammad!',
state_id: Ticket::State.find_by(name: 'new').pluck(:id), state_id: Ticket::State.find_by(name: 'new').id,
priority_id: Ticket::Priority.find_by(name: '2 normal').pluck(:id), priority_id: Ticket::Priority.find_by(name: '2 normal').id,
) )
Ticket::Article.create( Ticket::Article.create(
ticket_id: ticket.id, ticket_id: ticket.id,
type_id: Ticket::Article::Type.find_by(name: 'phone').pluck(:id), type_id: Ticket::Article::Type.find_by(name: 'phone').id,
sender_id: Ticket::Article::Sender.find_by(name: 'Customer').pluck(:id), sender_id: Ticket::Article::Sender.find_by(name: 'Customer').id,
from: 'Zammad Feedback <feedback@zammad.org>', from: 'Zammad Feedback <feedback@zammad.org>',
body: 'Welcome! body: 'Welcome!
@ -3687,8 +3687,8 @@ Network::Category.create_if_not_exists(
id: 1, id: 1,
name: 'Announcements', name: 'Announcements',
network_id: network.id, network_id: network.id,
network_category_type_id: Network::Category::Type.find_by(name: 'Announcement').pluck(:id), network_category_type_id: Network::Category::Type.find_by(name: 'Announcement').id,
network_privacy_id: Network::Privacy.find_by(name: 'logged in and moderator').pluck(:id), network_privacy_id: Network::Privacy.find_by(name: 'logged in and moderator').id,
allow_comments: true, allow_comments: true,
) )
Network::Category.create_if_not_exists( Network::Category.create_if_not_exists(
@ -3696,29 +3696,29 @@ Network::Category.create_if_not_exists(
name: 'Questions', name: 'Questions',
network_id: network.id, network_id: network.id,
allow_comments: true, allow_comments: true,
network_category_type_id: Network::Category::Type.find_by(name: 'Question').pluck(:id), network_category_type_id: Network::Category::Type.find_by(name: 'Question').id,
network_privacy_id: Network::Privacy.find_by(name: 'logged in').pluck(:id), network_privacy_id: Network::Privacy.find_by(name: 'logged in').id,
) )
Network::Category.create_if_not_exists( Network::Category.create_if_not_exists(
id: 3, id: 3,
name: 'Ideas', name: 'Ideas',
network_id: network.id, network_id: network.id,
network_category_type_id: Network::Category::Type.find_by(name: 'Idea').pluck(:id), network_category_type_id: Network::Category::Type.find_by(name: 'Idea').id,
network_privacy_id: Network::Privacy.find_by(name: 'logged in').pluck(:id), network_privacy_id: Network::Privacy.find_by(name: 'logged in').id,
allow_comments: true, allow_comments: true,
) )
Network::Category.create_if_not_exists( Network::Category.create_if_not_exists(
id: 4, id: 4,
name: 'Bug Reports', name: 'Bug Reports',
network_id: network.id, network_id: network.id,
network_category_type_id: Network::Category::Type.find_by(name: 'Bug Report').pluck(:id), network_category_type_id: Network::Category::Type.find_by(name: 'Bug Report').id,
network_privacy_id: Network::Privacy.find_by(name: 'logged in').pluck(:id), network_privacy_id: Network::Privacy.find_by(name: 'logged in').id,
allow_comments: true, allow_comments: true,
) )
item = Network::Item.create( item = Network::Item.create(
title: 'Example Announcement', title: 'Example Announcement',
body: 'Some announcement....', body: 'Some announcement....',
network_category_id: Network::Category.find_by(name: 'Announcements').pluck(:id), network_category_id: Network::Category.find_by(name: 'Announcements').id,
) )
Network::Item::Comment.create( Network::Item::Comment.create(
network_item_id: item.id, network_item_id: item.id,
@ -3727,7 +3727,7 @@ Network::Item::Comment.create(
item = Network::Item.create( item = Network::Item.create(
title: 'Example Question?', title: 'Example Question?',
body: 'Some questions....', body: 'Some questions....',
network_category_id: Network::Category.find_by(name: 'Questions').pluck(:id), network_category_id: Network::Category.find_by(name: 'Questions').id,
) )
Network::Item::Comment.create( Network::Item::Comment.create(
network_item_id: item.id, network_item_id: item.id,
@ -3736,7 +3736,7 @@ Network::Item::Comment.create(
item = Network::Item.create( item = Network::Item.create(
title: 'Example Idea', title: 'Example Idea',
body: 'Some idea....', body: 'Some idea....',
network_category_id: Network::Category.find_by(name: 'Ideas').pluck(:id), network_category_id: Network::Category.find_by(name: 'Ideas').id,
) )
Network::Item::Comment.create( Network::Item::Comment.create(
network_item_id: item.id, network_item_id: item.id,
@ -3745,7 +3745,7 @@ Network::Item::Comment.create(
item = Network::Item.create( item = Network::Item.create(
title: 'Example Bug Report', title: 'Example Bug Report',
body: 'Some bug....', body: 'Some bug....',
network_category_id: Network::Category.find_by(name: 'Bug Reports').pluck(:id), network_category_id: Network::Category.find_by(name: 'Bug Reports').id,
) )
Network::Item::Comment.create( Network::Item::Comment.create(
network_item_id: item.id, network_item_id: item.id,
@ -3935,7 +3935,7 @@ ObjectManager::Attribute.add(
nulloption: true, nulloption: true,
multiple: false, multiple: false,
null: false, null: false,
default: Ticket::State.find_by(name: 'open').pluck(:id), default: Ticket::State.find_by(name: 'open').id,
translate: true, translate: true,
filter: Ticket::State.by_category(:viewable).pluck(:id), filter: Ticket::State.by_category(:viewable).pluck(:id),
}, },
@ -3953,7 +3953,7 @@ ObjectManager::Attribute.add(
nulloption: false, nulloption: false,
null: true, null: true,
filter: Ticket::State.by_category(:viewable_customer_new).pluck(:id), filter: Ticket::State.by_category(:viewable_customer_new).pluck(:id),
default: Ticket::State.find_by(name: 'new').pluck(:id), default: Ticket::State.find_by(name: 'new').id,
}, },
}, },
edit: { edit: {
@ -3966,7 +3966,7 @@ ObjectManager::Attribute.add(
nulloption: false, nulloption: false,
null: true, null: true,
filter: Ticket::State.by_category(:viewable_customer_edit).pluck(:id), filter: Ticket::State.by_category(:viewable_customer_edit).pluck(:id),
default: Ticket::State.find_by(name: 'open').pluck(:id), default: Ticket::State.find_by(name: 'open').id,
}, },
}, },
}, },
@ -4025,7 +4025,7 @@ ObjectManager::Attribute.add(
nulloption: false, nulloption: false,
multiple: false, multiple: false,
null: false, null: false,
default: Ticket::Priority.find_by(name: '2 normal').pluck(:id), default: Ticket::Priority.find_by(name: '2 normal').id,
translate: true, translate: true,
}, },
editable: false, editable: false,
@ -4087,7 +4087,7 @@ ObjectManager::Attribute.add(
nulloption: false, nulloption: false,
multiple: false, multiple: false,
null: false, null: false,
default: Ticket::Article::Type.lookup(name: 'note').pluck(:id), default: Ticket::Article::Type.lookup(name: 'note').id,
translate: true, translate: true,
}, },
editable: false, editable: false,
@ -4880,7 +4880,7 @@ ObjectManager::Attribute.add(
invite_agent: { invite_agent: {
'-all-' => { '-all-' => {
null: false, null: false,
default: [Role.lookup(name: 'Agent').pluck(:id)], default: [Role.lookup(name: 'Agent').id],
}, },
}, },
invite_customer: {}, invite_customer: {},
@ -5597,19 +5597,19 @@ Trigger.create_or_update(
}, },
'ticket.state_id' => { 'ticket.state_id' => {
'operator' => 'is not', 'operator' => 'is not',
'value' => Ticket::State.lookup(name: 'closed').pluck(:id), 'value' => Ticket::State.lookup(name: 'closed').id,
}, },
'article.type_id' => { 'article.type_id' => {
'operator' => 'is', 'operator' => 'is',
'value' => [ 'value' => [
Ticket::Article::Type.lookup(name: 'email').pluck(:id), Ticket::Article::Type.lookup(name: 'email').id,
Ticket::Article::Type.lookup(name: 'phone').pluck(:id), Ticket::Article::Type.lookup(name: 'phone').id,
Ticket::Article::Type.lookup(name: 'web').pluck(:id), Ticket::Article::Type.lookup(name: 'web').id,
], ],
}, },
'article.sender_id' => { 'article.sender_id' => {
'operator' => 'is', 'operator' => 'is',
'value' => Ticket::Article::Sender.lookup(name: 'Customer').pluck(:id), 'value' => Ticket::Article::Sender.lookup(name: 'Customer').id,
}, },
}, },
perform: { perform: {
@ -5640,14 +5640,14 @@ Trigger.create_or_update(
}, },
'article.sender_id' => { 'article.sender_id' => {
'operator' => 'is', 'operator' => 'is',
'value' => Ticket::Article::Sender.lookup(name: 'Customer').pluck(:id), 'value' => Ticket::Article::Sender.lookup(name: 'Customer').id,
}, },
'article.type_id' => { 'article.type_id' => {
'operator' => 'is', 'operator' => 'is',
'value' => [ 'value' => [
Ticket::Article::Type.lookup(name: 'email').pluck(:id), Ticket::Article::Type.lookup(name: 'email').id,
Ticket::Article::Type.lookup(name: 'phone').pluck(:id), Ticket::Article::Type.lookup(name: 'phone').id,
Ticket::Article::Type.lookup(name: 'web').pluck(:id), Ticket::Article::Type.lookup(name: 'web').id,
], ],
}, },
}, },