Merge pull request #81 from digirati-co-uk/feature/ELPP-1815

feature/ELPP- 1815
elifesciences · Feb 8, 2017 · ecc6159 · ecc6159
2 parents 254af9a + b0f3b41
commit ecc6159
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/src/modules/jcms_article/src/ArticleCrud.php b/src/modules/jcms_article/src/ArticleCrud.php
@@ -182,7 +182,11 @@ public function createParagraph(EntityInterface $node, ArticleVersions $articleV
    */
   public function deleteArticle(ArticleVersions $articleVersions) {
     $node_id = $this->getNodeIdByArticleId($articleVersions->getId());
-    return $this->entityTypeManager->getStorage('node')->delete([$node_id]);
+    $node = $this->entityTypeManager->getStorage('node')->load($node_id);
+    if (!$node) {
+      return NULL;
+    }
+    return $this->entityTypeManager->getStorage('node')->delete([$node]);
   }
 
   /**

diff --git a/src/modules/jcms_notifications/drush/jcms_notifications.drush.inc b/src/modules/jcms_notifications/drush/jcms_notifications.drush.inc
@@ -110,28 +110,26 @@ function drush_jcms_notifications_article_import($lrp = FALSE) {
     if ($message !== NULL) {
       drush_print(dt('Received message !message', ['!message' => var_export($message, TRUE)]));
       $id = $message->getId();
-      if ($id) {
-        try {
-          $articleVersions = $fetch_service->getArticleVersions($id);
-          $crud_service->crudArticle($articleVersions);
-          drush_print(dt('Processed message !message_id', ['!message_id' => $message->getMessageId()]));
-        }
-        catch (Exception $e) {
-          $e_message = "Message: {$e->getMessage()}\n";
-          $e_line = "Line: {$e->getLine()}\n";
-          $e_trace = "Trace: {$e->getTraceAsString()}\n";
-          $error = $e_message . $e_line . $e_trace;
-          error_log($error);
-          if (!$e instanceof RequestException) {
-            throw $e;
-          }
-        }
-        finally {
-          $queue_service->deleteMessage($message);
-          drush_print(dt('Deleted from the queue message !message_id', ['!message_id' => $message->getMessageId()]));
-          $count++;
+      try {
+        $articleVersions = $fetch_service->getArticleVersions($id);
+        $crud_service->crudArticle($articleVersions);
+        drush_print(dt('Processed message !message_id', ['!message_id' => $message->getMessageId()]));
+      }
+      catch (Exception $e) {
+        $e_message = "Message: {$e->getMessage()}\n";
+        $e_line = "Line: {$e->getLine()}\n";
+        $e_trace = "Trace: {$e->getTraceAsString()}\n";
+        $error = $e_message . $e_line . $e_trace;
+        error_log($error);
+        if (!$e instanceof RequestException) {
+          throw $e;
         }
       }
+      finally {
+        $queue_service->deleteMessage($message);
+        drush_print(dt('Deleted message !message_id from the queue', ['!message_id' => $message->getMessageId()]));
+        $count++;
+      }
     }
   }
   drush_print(dt('Imported !count articles.', ['!count' => $count]));

diff --git a/src/modules/jcms_notifications/src/Queue/SqsMessage.php b/src/modules/jcms_notifications/src/Queue/SqsMessage.php
@@ -49,4 +49,5 @@ public function getType() : string {
   public function getReceipt() : string {
     return $this->receipt;
   }
+
 }
diff --git a/src/modules/jcms_notifications/src/QueueService.php b/src/modules/jcms_notifications/src/QueueService.php
@@ -110,7 +110,7 @@ protected function mapSqsMessage(array $message) : SqsMessage {
       $id = $body['id'] ?? 0;
       $type = 'article';
       $receipt = $message['ReceiptHandle'] ?? '';
-      if ($message_id && $id && $receipt) {
+      if ($message_id && $receipt) {
         return new SqsMessage($message_id, $id, $type, $receipt);
       }
     }