Merge pull request mautic#1999 from acquia/MAUT-9959

MAUT-9959 : decision's negative path actions aren't triggering as expected

app/bundles/CampaignBundle/Executioner/Scheduler/Mode/Interval.php

@@ -136,7 +136,8 @@ public function groupContactsByDate(Event $event, ArrayCollection $contacts, \Da
      */
     public function isContactSpecificExecutionDateRequired(Event $event): bool
     {
-        if (!$this->isTriggerModeInterval($event) || $this->isRestrictedToDailyScheduling($event) || $this->hasTimeRelatedRestrictions($event)) {
+        if (!$this->isTriggerModeInterval($event) || $this->hasTimeRelatedRestrictions($event)
+            || $this->isRestrictedToDailyScheduling($event) || $this->isNegativePath($event)) {
             return false;
         }
 
@@ -161,6 +162,15 @@ private function hasTimeRelatedRestrictions(Event $event): bool
             && empty($event->getTriggerRestrictedDaysOfWeek());
     }
 
+    private function isNegativePath(Event $event): bool
+    {
+        if ($event->getParent()) {
+            return Event::TYPE_DECISION === $event->getParent()->getEventType() && Event::TYPE_ACTION === $event->getEventType() && Event::PATH_INACTION === $event->getDecisionPath();
+        }
+
+        return false;
+    }
+
     /**
      * @return \DateTimeInterface
      */

app/bundles/CampaignBundle/Tests/Executioner/Scheduler/Mode/IntervalTest.php

@@ -583,4 +583,34 @@ public function testValidateExecutionDateTimeWhenForExactHour(): void
 
         Assert::assertEquals($expectedDateTime->format('Y-m-d H:i'), $interval->validateExecutionDateTime($log, $compareFromDateTime)->format('Y-m-d H:i'));
     }
+
+    public function testIsContactSpecificExecutionDateRequiredShouldReturnFalseForNegativePathAction(): void
+    {
+        $parentEvent = $this->createMock(Event::class);
+        $parentEvent->method('getEventType')
+            ->willReturn(Event::TYPE_DECISION);
+        $event = $this->createMock(Event::class);
+        $event->method('getId')
+            ->willReturn(1);
+        $event->method('getTriggerMode')
+            ->willReturn(Event::TRIGGER_MODE_INTERVAL);
+        $event->method('getTriggerIntervalUnit')
+            ->willReturn('i');
+        $event->method('getTriggerInterval')
+            ->willReturn(5);
+        $event->method('getDecisionPath')
+            ->willReturn(Event::PATH_INACTION);
+        $event->method('getEventType')
+            ->willReturn(Event::TYPE_ACTION);
+        $event->method('getTriggerHour')
+            ->willReturn(new \DateTime('now'));
+        $event->method('getTriggerRestrictedDaysOfWeek')
+            ->willReturn([]);
+        $event->method('getParent')
+            ->willReturn($parentEvent);
+
+        $interval = $this->getInterval();
+
+        Assert::assertFalse($interval->isContactSpecificExecutionDateRequired($event));
+    }
 }