MONGOID-5110 Parent ID missing in after_destroy callback when removing via nested attribute (#5181)

* MONGOID-5110 Parent ID missing in after_destroy callback when removing via nested attribute

* MONGOID-5110 remove byebug

* MONGOID-5110 fix failing tests by using different models

Author: neilshweky

lib/mongoid/association/embedded/embeds_many/proxy.rb

@@ -136,20 +136,20 @@ def count(*args, &block)
           #
           # @return [ Document, nil ] The deleted document or nil if nothing deleted.
           def delete(document)
-            execute_callback :before_remove, document
-            doc = _target.delete_one(document)
-            if doc && !_binding?
-              _unscoped.delete_one(doc)
-              if _assigning?
-                _base.add_atomic_pull(doc)
-              else
-                doc.delete(suppress: true)
-                unbind_one(doc)
+            execute_callbacks_around(:remove, document) do
+              doc = _target.delete_one(document)
+              if doc && !_binding?
+                _unscoped.delete_one(doc)
+                if _assigning?
+                  _base.add_atomic_pull(doc)
+                else
+                  doc.delete(suppress: true)
+                  unbind_one(doc)
+                end
               end
+              reindex
+              doc
             end
-            reindex
-            execute_callback :after_remove, document
-            doc
           end
 
           # Delete all the documents in the association without running callbacks.

lib/mongoid/association/nested/many.rb

@@ -134,8 +134,9 @@ def destroy(parent, relation, doc)
         # @param [ Proxy ] relation The association proxy.
         # @param [ Document ] doc The document to delete.
         def destroy_document(relation, doc)
+          res = doc.destroy unless doc.embedded? || doc.destroyed?
           relation.delete(doc)
-          doc.destroy unless doc.embedded? || doc.destroyed?
+          res
         end
 
         # Update the document.

spec/mongoid/association/referenced/has_and_belongs_to_many_models.rb

@@ -65,3 +65,24 @@ class HabtmmAnimal
 
   has_and_belongs_to_many :trainers, inverse_of: :animals, class_name: 'HabtmmTrainer', scope: -> { where(name: 'Dave') }
 end
+
+class HabtmmSchool
+  include Mongoid::Document
+
+  has_and_belongs_to_many :students, class_name: 'HabtmmStudent'
+
+  field :after_destroy_triggered, default: false
+
+  accepts_nested_attributes_for :students, allow_destroy: true
+end
+
+class HabtmmStudent
+  include Mongoid::Document
+
+  has_and_belongs_to_many :schools, class_name: 'HabtmmSchool'
+
+  after_destroy do |doc|
+    schools.first.update_attributes!(after_destroy_triggered: true) unless schools.empty?
+  end
+end
+

spec/mongoid/attributes/nested_spec.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require_relative '../association/referenced/has_many_models'
+require_relative '../association/referenced/has_and_belongs_to_many_models'
 
 describe Mongoid::Attributes::Nested do
 
@@ -4921,4 +4923,53 @@ class BandWithAllowDestroyedRecords < Band
       end
     end
   end
+
+  context "when destroying has_many child using nested attributes" do
+    let(:school) do
+      School.create
+    end
+
+    let!(:student) do
+      school.students.create
+    end
+
+    before do
+      school.attributes = {
+        '_id': school.id,
+        'students_attributes': [{
+          '_id': student.id,
+          '_destroy': 1
+          }]
+        }
+    end
+
+    it "is able to access the parent in the after_destroy callback" do
+      expect(school.after_destroy_triggered).to eq(true)
+    end
+  end
+
+  context "when destroying has_many child using nested attributes" do
+    let(:school) do
+      HabtmmSchool.create!(students: [student])
+    end
+
+    let(:student) do
+      HabtmmStudent.create!
+    end
+
+    before do
+      student.schools << school
+      school.attributes = {
+        '_id': school.id,
+        'students_attributes': [{
+          '_id': student.id,
+          '_destroy': 1
+          }]
+        }
+    end
+
+    it "is able to access the parent in the after_destroy callback" do
+      expect(school.reload.after_destroy_triggered).to eq(true)
+    end
+  end
 end

spec/support/models/school.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class School
+  include Mongoid::Document
+
+  has_many :students
+
+  field :district, type: String
+  field :team, type: String
+
+  field :after_destroy_triggered, default: false
+
+  accepts_nested_attributes_for :students, allow_destroy: true
+end

spec/support/models/student.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Student
+  include Mongoid::Document
+
+  belongs_to :school
+
+  field :name, type: String
+  field :grade, type: Integer, default: 3
+
+  after_destroy do |doc|
+    school.after_destroy_triggered = true if school
+  end
+end