From 620641d0e1932a4c9edf72e624d785bcdf8ce407 Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Fri, 4 Dec 2015 09:47:00 -0200
Subject: [PATCH] fix builders
---
app/builders/builder.rb | 12 ++++--------
app/builders/complaint_builder.rb | 2 +-
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/app/builders/builder.rb b/app/builders/builder.rb
index 875c4956..280eebdb 100644
--- a/app/builders/builder.rb
+++ b/app/builders/builder.rb
@@ -8,8 +8,8 @@ class Builder
objects.each do |object|
next if object[id].blank?
- if cache
- o = Rails.cache.fetch(cache_key(object[id], object[last_modified])) unless object[last_modified].blank?
+ if cache && !object[last_modified].blank?
+ o = Rails.cache.fetch(cache_key(object[id], object[last_modified]))
end
o = repository.find object[id] if o.nil?
@@ -18,16 +18,12 @@ class Builder
array
end
- def self.build_from_orientdb(args = {}, cache = true)
+ def self.build_from_orientdb(args = {})
object = nil
unless args.nil? || !block_given?
# cache object when build
- if cache
- object = Rails.cache.fetch(cache_key(args['@rid'], args['last_modified']), expires_in: 12.hours) { yield }
- else
- object = yield
- end
+ object = Rails.cache.fetch(cache_key(args['@rid'], args['last_modified']), expires_in: 12.hours) { yield }
end
object
diff --git a/app/builders/complaint_builder.rb b/app/builders/complaint_builder.rb
index c04de38c..3dc987fa 100644
--- a/app/builders/complaint_builder.rb
+++ b/app/builders/complaint_builder.rb
@@ -9,7 +9,7 @@ class ComplaintBuilder < Builder
end
def self.build_from_orientdb(args = {})
- super(args, false) do
+ unless args.blank?
created = DateTime.now.strftime("%Y-%m-%d %H:%M:%S")
created = DateTime.strptime(args['created_at'], "%Y-%m-%d %H:%M:%S") unless args['created_at'].blank?
--
GitLab