Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

query performance improvements

Browse source
This commit is contained in:
wvengen 2014-05-21 21:44:35 +02:00
parent 647b7f0430
commit 8473f16091
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/models/article.rb
View file

@ -100,9 +100,10 @@ class Article < ActiveRecord::Base
# unequal attributes will returned in array # unequal attributes will returned in array
# if only the timestamps differ and the attributes are equal, # if only the timestamps differ and the attributes are equal,
# false will returned and self.shared_updated_on will be updated # false will returned and self.shared_updated_on will be updated
def shared_article_changed? def shared_article_changed?(supplier = self.supplier)
# skip early if the timestamp hasn't changed # skip early if the timestamp hasn't changed
unless self.shared_article.nil? or self.shared_updated_on == self.shared_article.updated_on shared_article = self.shared_article(supplier)
unless shared_article.nil? or self.shared_updated_on == shared_article.updated_on
# try to convert units # try to convert units
# convert supplier's price and unit_quantity into fc-size # convert supplier's price and unit_quantity into fc-size
@ -110,27 +111,27 @@ class Article < ActiveRecord::Base
new_unit = self.unit new_unit = self.unit
unless new_price and new_unit_quantity unless new_price and new_unit_quantity
# if convertion isn't possible, take shared_article-price/unit_quantity # if convertion isn't possible, take shared_article-price/unit_quantity
new_price, new_unit_quantity, new_unit = self.shared_article.price, self.shared_article.unit_quantity, self.shared_article.unit new_price, new_unit_quantity, new_unit = shared_article.price, shared_article.unit_quantity, shared_article.unit
end end
# check if all attributes differ # check if all attributes differ
unequal_attributes = Article.compare_attributes( unequal_attributes = Article.compare_attributes(
{ {
:name => [self.name, self.shared_article.name], :name => [self.name, shared_article.name],
:manufacturer => [self.manufacturer, self.shared_article.manufacturer.to_s], :manufacturer => [self.manufacturer, shared_article.manufacturer.to_s],
:origin => [self.origin, self.shared_article.origin], :origin => [self.origin, shared_article.origin],
:unit => [self.unit, new_unit], :unit => [self.unit, new_unit],
:price => [self.price.to_f.round(2), new_price.to_f.round(2)], :price => [self.price.to_f.round(2), new_price.to_f.round(2)],
:tax => [self.tax, self.shared_article.tax], :tax => [self.tax, shared_article.tax],
:deposit => [self.deposit.to_f.round(2), self.shared_article.deposit.to_f.round(2)], :deposit => [self.deposit.to_f.round(2), shared_article.deposit.to_f.round(2)],
# take care of different num-objects. # take care of different num-objects.
:unit_quantity => [self.unit_quantity.to_s.to_f, new_unit_quantity.to_s.to_f], :unit_quantity => [self.unit_quantity.to_s.to_f, new_unit_quantity.to_s.to_f],
:note => [self.note.to_s, self.shared_article.note.to_s] :note => [self.note.to_s, shared_article.note.to_s]
} }
) )
if unequal_attributes.empty? if unequal_attributes.empty?
# when attributes not changed, update timestamp of article # when attributes not changed, update timestamp of article
self.update_attribute(:shared_updated_on, self.shared_article.updated_on) self.update_attribute(:shared_updated_on, shared_article.updated_on)
false false
else else
unequal_attributes unequal_attributes
@ -146,9 +147,9 @@ class Article < ActiveRecord::Base
end end
# to get the correspondent shared article # to get the correspondent shared article
def shared_article def shared_article(supplier = self.supplier)
self.order_number.blank? and return nil self.order_number.blank? and return nil
@shared_article ||= self.supplier.shared_supplier.shared_articles.find_by_number(self.order_number) rescue nil @shared_article ||= supplier.shared_supplier.shared_articles.find_by_number(self.order_number) rescue nil
end end
# convert units in foodcoop-size # convert units in foodcoop-size

4
app/models/supplier.rb
View file

@ -30,11 +30,11 @@ class Supplier < ActiveRecord::Base
new_articles = Array.new new_articles = Array.new
for article in articles.undeleted for article in articles.undeleted
# try to find the associated shared_article # try to find the associated shared_article
shared_article = article.shared_article shared_article = article.shared_article(self)
if shared_article # article will be updated if shared_article # article will be updated
unequal_attributes = article.shared_article_changed? unequal_attributes = article.shared_article_changed?(self)
unless unequal_attributes.blank? # skip if shared_article has not been changed unless unequal_attributes.blank? # skip if shared_article has not been changed
# try to convert different units # try to convert different units