Merge branch 'create-learningobject-relations' into fix-welcome-controller

app/models/subject.rb

@@ -4,6 +4,10 @@ class Subject
   attr_accessor :id, :date_creation, :description, :highlights, :name,
                 :learning_objects
 
+  def highlights
+    @highlights ||= subject_repository.get_highlights(self)
+  end
+
   def learning_objects
     @learning_objects ||= subject_repository.get_learning_objects(self)
   end

app/repositories/orient_db/subject_repository.rb

@@ -21,6 +21,11 @@ module OrientDb
       Portalmec::Application.repository.for(:learning_object).build_objects(result)
     end
 
+    def get_highlights(subject)
+      result = connection.query "SELECT expand(highlights) FROM #{subject.id}"
+      Portalmec::Application.repository.for(:learning_object).build_objects(result)
+    end
+
     def build_hash
       hash = super
       hash.delete("learning_objects")