Add shouldSkipProcessingNotification()

To check if notification processing should be skipped
Add log if notification should be skipped

Model/Cron.php

@@ -331,24 +331,16 @@ class Cron
         }
     }
 
-    public function execute()
+    /**
+     * @param $notification
+     * @return bool
+     */
+    private function shouldSkipProcessingNotification($notification)
     {
-        // needed for Magento < 2.2.0 https://github.com/magento/magento2/pull/8413
-        $renderer = Phrase::getRenderer();
-        if ($renderer instanceof Placeholder) {
-            $this->_areaList->getArea(Area::AREA_CRONTAB)->load(Area::PART_TRANSLATE);
-        }
-
-        $this->_order = null;
-
-        $notifications = $this->_notificationFactory->create();
-        $notifications->notificationsToProcessFilter();
-
         // OFFER_CLOSED notifications needs to be at least 10 minutes old to be processed
         $offerClosedMinDate = new \DateTime();
         $offerClosedMinDate->modify('-10 minutes');
 
-        foreach ($notifications as $notification) {
         // Remove OFFER_CLOSED notifications arrived in the last 10 minutes from the list to process to ensure it
         // won't close any order which has an AUTHORISED notification arrived a bit later than the OFFER_CLOSED one.
         $createdAt = \DateTime::createFromFormat('Y-m-d H:i:s', $notification['created_at']);
@@ -360,11 +352,36 @@ class Cron
                 sprintf('OFFER_CLOSED notification %s skipped! Wait %s minute(s) before processing.',
                     $notification->getEntityId(), $minutesUntilProcessing)
             );
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public function execute()
+    {
+        // needed for Magento < 2.2.0 https://github.com/magento/magento2/pull/8413
+        $renderer = Phrase::getRenderer();
+        if ($renderer instanceof Placeholder) {
+            $this->_areaList->getArea(Area::AREA_CRONTAB)->load(Area::PART_TRANSLATE);
+        }
+
+        $this->_order = null;
+
+        $notifications = $this->_notificationFactory->create();
+        $notifications->notificationsToProcessFilter();
+
+        // Loop thorugh notifications to set processing to true if notifiaction should not be skipped
+        foreach ($notifications as $notification) {
+            // Check if notification should be processed or not
+            if ($this->shouldSkipProcessingNotification($notification)) {
+                // Remove notification from collection which will be processed
                 $notifications->removeItemByKey($notification->getId());
                 continue;
             }
 
-            // set Cron processing to true
+            // set notification processing to true
             $this->_updateNotification($notification, true, false);
         }