Improved getting count and queue name

Author: palPalani

src/Sqs/Queue.php

@@ -48,11 +48,11 @@ private function getClass($queue = null): string
             return Config::get('sqs-queue-reader.default-handler');
         }
 
-        $queueArray = explode('/', $queue);
-        $queue = end($queueArray);
+        $queueId = explode('/', $queue);
+        $queueId = array_pop($queueId);
 
-        return (array_key_exists($queue, Config::get('sqs-queue-reader.handlers')))
-            ? Config::get('sqs-queue-reader.handlers')[$queue]['class']
+        return (array_key_exists($queueId, Config::get('sqs-queue-reader.handlers')))
+            ? Config::get('sqs-queue-reader.handlers')[$queueId]['class']
             : Config::get('sqs-queue-reader.default-handler')['class'];
     }
 
@@ -65,6 +65,10 @@ private function getClass($queue = null): string
     public function pop($queue = null)
     {
         $queue = $this->getQueue($queue);
+
+        $queueId = explode('/', $queue);
+        $queueId = array_pop($queueId);
+
         $count = (array_key_exists($queue, Config::get('sqs-queue-reader.handlers')))
             ? Config::get('sqs-queue-reader.handlers')[$queue]['count']
             : Config::get('sqs-queue-reader.default-handler')['count'];
@@ -79,9 +83,6 @@ public function pop($queue = null)
 
             if (isset($response['Messages']) && count($response['Messages']) > 0) {
                 Log::debug('Messages==', [$response['Messages']]);
-                $queueId = explode('/', $queue);
-                $queueId = array_pop($queueId);
-
                 $class = (array_key_exists($queueId, $this->container['config']->get('sqs-queue-reader.handlers')))
                     ? $this->container['config']->get('sqs-queue-reader.handlers')[$queueId]['class']
                     : $this->container['config']->get('sqs-queue-reader.default-handler')['class'];
@@ -138,17 +139,6 @@ private function modifyMultiplePayload($payload, $class)
             $payload = json_decode($payload, true);
         }
 
-        /*
-        $body = json_decode($payload['Body'], true);
-
-        $body = [
-            'job' => $class . '@handle',
-            'data' => isset($body['data']) ? $body['data'] : $body,
-        ];
-
-        $payload['Body'] = json_encode($body);
-        */
-
         $body = [];
         $attributes = [];
         $batchIds = [];

src/SqsQueueReaderServiceProvider.php

@@ -20,8 +20,12 @@ public function boot(): void
 
             Queue::after(static function (JobProcessed $event) {
                 $queue = $event->job->getQueue();
-                $count = (array_key_exists($queue, Config::get('sqs-queue-reader.handlers')))
-                    ? Config::get('sqs-queue-reader.handlers')[$queue]['count']
+
+                $queueId = explode('/', $queue);
+                $queueId = array_pop($queueId);
+
+                $count = (array_key_exists($queueId, Config::get('sqs-queue-reader.handlers')))
+                    ? Config::get('sqs-queue-reader.handlers')[$queueId]['count']
                     : Config::get('sqs-queue-reader.default-handler')['count'];
 
                 if ($count === 1) {
@@ -41,7 +45,7 @@ public function boot(): void
                             'QueueUrl' => $queue,
                         ]);
 
-                        if ($result['Failed']) {
+                        if (isset($result['Failed'])) {
                             $msg = '';
                             foreach ($result['Failed'] as $failed) {
                                 $msg .= sprintf("Deleting message failed, code = %s, id = %s, msg = %s, senderfault = %s", $failed['Code'], $failed['Id'], $failed['Message'], $failed['SenderFault']);
@@ -50,6 +54,7 @@ public function boot(): void
 
                             throw new \RuntimeException("Cannot delete some messages, consult log for more info!");
                         }
+                        Log::info('Message remove report:', [$result]);
                     }
                 }
             });