From 14b2079b350143e94e7e39e42f247294d2706d7c Mon Sep 17 00:00:00 2001
From: Marco Zille <marco.zille@gmail.com>
Date: Tue, 31 May 2022 08:49:25 +0200
Subject: [PATCH] Fixed rubocop errors
---
app/finders/crm/contacts_finder.rb | 2 +-
app/finders/crm/organizations_finder.rb | 5 ++---
app/models/customer_relations/contact.rb | 2 +-
app/models/customer_relations/organization.rb | 6 +++++-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/finders/crm/contacts_finder.rb b/app/finders/crm/contacts_finder.rb
index 841dcbcb6e19d..f4f6f90f1d21e 100644
--- a/app/finders/crm/contacts_finder.rb
+++ b/app/finders/crm/contacts_finder.rb
@@ -25,7 +25,7 @@ def execute
contacts = root_group.contacts
contacts = by_state(contacts)
contacts = by_search(contacts)
- contacts.sort_by_name()
+ contacts.sort_by_name
end
private
diff --git a/app/finders/crm/organizations_finder.rb b/app/finders/crm/organizations_finder.rb
index b83585235d41f..86f3409aff11a 100644
--- a/app/finders/crm/organizations_finder.rb
+++ b/app/finders/crm/organizations_finder.rb
@@ -25,7 +25,7 @@ def execute
organizations = root_group.organizations
organizations = by_search(organizations)
organizations = by_state(organizations)
- organizations.sort_by_name()
+ organizations.sort_by_name
end
private
@@ -42,7 +42,6 @@ def root_group
def by_search(organizations)
return organizations unless search?
- return organizations.none if params[:search].blank?
organizations.search(params[:search])
end
@@ -50,7 +49,7 @@ def by_search(organizations)
def by_state(organizations)
return organizations unless state?
- organizations.where(state: params[:state])
+ organizations.search_by_state(params[:state])
end
def search?
diff --git a/app/models/customer_relations/contact.rb b/app/models/customer_relations/contact.rb
index 5e6b625dbbbe0..261081f5ae120 100644
--- a/app/models/customer_relations/contact.rb
+++ b/app/models/customer_relations/contact.rb
@@ -56,7 +56,7 @@ def self.search_by_state(state)
where(state: state)
end
- def self.sort_by_name()
+ def self.sort_by_name
order("first_name ASC, last_name ASC")
end
diff --git a/app/models/customer_relations/organization.rb b/app/models/customer_relations/organization.rb
index 7f73e41f28896..89be0187a00c7 100644
--- a/app/models/customer_relations/organization.rb
+++ b/app/models/customer_relations/organization.rb
@@ -34,7 +34,11 @@ def self.search(query)
fuzzy_search(query, [:name], use_minimum_char_limit: false)
end
- def self.sort_by_name()
+ def self.search_by_state(state)
+ where(state: state)
+ end
+
+ def self.sort_by_name
order(name: :asc)
end
--
GitLab