From e0458efddb3b9a71edf9dd4aa834a410a9145118 Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Mon, 18 Jan 2016 16:47:21 -0200
Subject: [PATCH] remove build_hash methods of repositories
---
app/repositories/orient_db/base.rb | 8 +-------
.../orient_db/collection_repository.rb | 6 ------
.../orient_db/learning_object_repository.rb | 19 +------------------
.../orient_db/subject_repository.rb | 6 ------
4 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/app/repositories/orient_db/base.rb b/app/repositories/orient_db/base.rb
index 586ab504..4c664312 100644
--- a/app/repositories/orient_db/base.rb
+++ b/app/repositories/orient_db/base.rb
@@ -31,7 +31,7 @@ class OrientDb::Base
def create(object)
if object.valid?
- hash = build_hash(object)
+ hash = object.to_orientdb_hash
result = connection.create_document(hash)
object.id = result["@rid"]
end
@@ -46,12 +46,6 @@ class OrientDb::Base
protected
- # Take the object and make a hash in the OrientDB format.
- # Used to create a document.
- def build_hash(object)
- object.to_orientdb_hash
- end
-
def build_objects(hash=[])
objects = []
hash.each do |h|
diff --git a/app/repositories/orient_db/collection_repository.rb b/app/repositories/orient_db/collection_repository.rb
index 780733a8..8c81a4cf 100644
--- a/app/repositories/orient_db/collection_repository.rb
+++ b/app/repositories/orient_db/collection_repository.rb
@@ -70,12 +70,6 @@ module OrientDb
end
end
- def build_hash(object)
- hash = super(object)
- hash.delete("owner") # delete owner, because it represents an edge in schema
- hash.merge('name' => object.name) # forces name property for bookmarks
- end
-
# return owner of collection rid
def owner(collection)
collection_id = collection
diff --git a/app/repositories/orient_db/learning_object_repository.rb b/app/repositories/orient_db/learning_object_repository.rb
index 2dc9cb19..8311af5b 100644
--- a/app/repositories/orient_db/learning_object_repository.rb
+++ b/app/repositories/orient_db/learning_object_repository.rb
@@ -7,12 +7,7 @@ module OrientDb
#get the ten most visualised. It's probably making too many useless accesses to orientDB...
def get_most_visualised
- result = connection.query("SELECT FROM (SELECT name, @rid,in('Views').size() AS views FROM LearningObject) ORDER BY views DESC LIMIT 10")
- #most_visualised = []
- #result.each do |result|
- # most_visualised.push(get_by_rid(result["rid"]))
- #end
- #build_objects most_visualised
+ connection.query("SELECT FROM (SELECT name, @rid,in('Views').size() AS views FROM LearningObject) ORDER BY views DESC LIMIT 10")
end
def get_publisher(learning_object)
@@ -85,17 +80,5 @@ module OrientDb
end
end
- def build_hash(object)
- hash = super(object)
- # Remove relation attributes
- hash.delete("likes")
- hash.delete("views")
- hash.delete("downloads")
- hash.delete("subjects")
- hash.delete("attributes")
- hash.delete("publisher")
- hash
- end
-
end
end
diff --git a/app/repositories/orient_db/subject_repository.rb b/app/repositories/orient_db/subject_repository.rb
index 4aa84973..02f48992 100644
--- a/app/repositories/orient_db/subject_repository.rb
+++ b/app/repositories/orient_db/subject_repository.rb
@@ -47,11 +47,5 @@ module OrientDb
OrientDb::Subject::RelationsChain.new(subject, connection).create
end
- def build_hash(object)
- hash = super(object)
- hash.delete("learning_objects")
- hash
- end
-
end
end
--
GitLab