[aphrodite] Use scope on /status

hhba · Jan 31, 2015 · b645467 · b645467
1 parent 9667de2
commit b645467
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/aphrodite/app/controllers/api/v2/date_entities_controller.rb b/aphrodite/app/controllers/api/v2/date_entities_controller.rb
@@ -1,7 +1,7 @@
 class Api::V2::DateEntitiesController < Api::V2::BaseController
   def index
     @entities = EntitiesProvider.new(current_user, :date_entities).for(get_document_ids)
-    @documents = current_user.documents.to_a
+    @documents = current_user.documents.minimal.to_a
     render 'api/v2/shared/entities'
   end
 

diff --git a/aphrodite/app/controllers/api/v2/documents_controller.rb b/aphrodite/app/controllers/api/v2/documents_controller.rb
@@ -63,7 +63,7 @@ def destroy
   end
 
   def status
-    @documents = current_user.documents.listing
+    @documents = current_user.documents.minimal
   end
 
   def show

diff --git a/aphrodite/app/controllers/api/v2/organizations_controller.rb b/aphrodite/app/controllers/api/v2/organizations_controller.rb
@@ -1,7 +1,7 @@
 class Api::V2::OrganizationsController < Api::V2::BaseController
   def index
     @entities = EntitiesProvider.new(current_user, :organizations).for(get_document_ids)
-    @documents = current_user.documents.to_a
+    @documents = current_user.documents.minimal.to_a
     render 'api/v2/shared/entities'
   end
 

diff --git a/aphrodite/app/controllers/api/v2/people_controller.rb b/aphrodite/app/controllers/api/v2/people_controller.rb
@@ -1,7 +1,7 @@
 class Api::V2::PeopleController < Api::V2::BaseController
   def index
     @entities = EntitiesProvider.new(current_user, :people).for(get_document_ids)
-    @documents = current_user.documents.to_a
+    @documents = current_user.documents.minimal.to_a
     render 'api/v2/shared/entities'
   end
 

diff --git a/aphrodite/app/controllers/api/v2/places_controller.rb b/aphrodite/app/controllers/api/v2/places_controller.rb
@@ -3,7 +3,7 @@ def index
     @places = EntitiesProvider.new(current_user, :places).for(get_document_ids)
     @addresses = EntitiesProvider.new(current_user, :addresses).for(get_document_ids)
     @entities = @places + @addresses
-    @documents = current_user.documents.to_a
+    @documents = current_user.documents.minimal.to_a
     render 'api/v2/shared/entities'
   end
 

diff --git a/chaos/lib/mapa76/core/model/document.rb b/chaos/lib/mapa76/core/model/document.rb
@@ -45,7 +45,13 @@ class Document
   scope :private_for, ->(user){ where(:user_id => user.id, :public => false) }
   scope :listing, -> { without([
     :processed_text, :named_entity_ids, :person_ids,
-    :organization_ids, :place_ids, :date_entity_ids]) }
+    :organization_ids, :place_ids, :date_entity_ids,
+    :process_attemps, :status_history, :tasks, :public]) }
+  scope :minimal, -> { without([
+    :processed_text, :named_entity_ids, :person_ids,
+    :organization_ids, :place_ids, :date_entity_ids,
+    :url, :original_filename, :context_cache, :process_attemps,
+    :status_history, :tasks, :public]) }
 
   index({ created_at: -1, user_id: 1}, { unique: true })