Merge branch 'bugs' into 'master'

#215: added deleted_at for collection_items; destroy all collection_items when collection is deleted

See merge request !423

app/controllers/v1/collections_controller.rb

@@ -56,6 +56,10 @@ class V1::CollectionsController < ApplicationController
   # DELETE /v1/collections/1
   # DELETE /v1/collections/1.json
   def destroy
+    items = @collection.collection_items.select(:id)
+    if !items.blank?
+      @collection.delete_items(items)
+    end
     @collection.destroy
     render status: :ok
   end

app/models/collection.rb

@@ -36,6 +36,8 @@ class Collection < ApplicationRecord
   include Highlights
   include Complainable
 
+  acts_as_paranoid
+
   has_many :collection_items, -> { order("position ASC") }, as: :collectionable, dependent: :destroy
   has_many :collections, through: :collection_items, source: :collectionable, source_type: 'Collection'
   has_many :learning_objects, through: :collection_items, source: :collectionable, source_type: 'LearningObject'
@@ -50,7 +52,6 @@ class Collection < ApplicationRecord
 
   searchkick language: 'brazilian', match: :word_start, searchable: [:name, :description, :author], callbacks: :async
 
-  acts_as_paranoid
   has_paper_trail
 
   def search_data

app/models/collection_item.rb

@@ -21,6 +21,8 @@ class CollectionItem < ApplicationRecord
   validates :collection, :collectionable, presence: true
   acts_as_list scope: :collection
 
+  acts_as_paranoid
+
   def recipient
     collection
   end

db/migrate/20170516111857_add_deleted_at_to_collection_items.rb

+class AddDeletedAtToCollectionItems < ActiveRecord::Migration[5.0]
+  def change
+    add_column :collection_items, :deleted_at, :datetime
+    add_index :collection_items, :deleted_at
+  end
+end
\ No newline at end of file