From 0479b1abbd75e017b67b91219ffbcf09e031275d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 9 Feb 2023 12:10:08 +1100
Subject: [PATCH 1/2] Fixes for job middleware

---
 app/Jobs/Util/Import.php                  | 12 +++++++-----
 app/Services/Bank/BankMatchingService.php | 11 +++--------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 9af4997318f4..cf94a277657c 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -106,6 +106,7 @@ class Import implements ShouldQueue
     use CleanLineItems;
     use Uploadable;
     use SavesDocuments;
+
     /**
      * @var array
      */
@@ -188,10 +189,10 @@ class Import implements ShouldQueue
         $this->resources = $resources;
     }
 
-    // public function middleware()
-    // {
-    //     return [new WithoutOverlapping("only_one_migration_at_a_time_ever")];
-    // }
+    public function middleware()
+    {   
+        return [(new WithoutOverlapping($this->user->account_id))];
+    }
 
     /**
      * Execute the job.
@@ -1897,6 +1898,8 @@ class Import implements ShouldQueue
     {
         info('the job failed');
 
+        config(['queue.failed.driver' => null]);
+
         $job_failure = new MigrationFailure();
         $job_failure->string_metric5 = get_class($this);
         $job_failure->string_metric6 = $exception->getMessage();
@@ -1951,7 +1954,6 @@ class Import implements ShouldQueue
 
     }
 
-
     /* In V4 we use negative invoices (credits) and add then into the client balance. In V5, these sit off ledger and are applied later.
      This next section will check for credit balances and reduce the client balance so that the V5 balances are correct
     */
diff --git a/app/Services/Bank/BankMatchingService.php b/app/Services/Bank/BankMatchingService.php
index 25c8cbf48025..663e7204114a 100644
--- a/app/Services/Bank/BankMatchingService.php
+++ b/app/Services/Bank/BankMatchingService.php
@@ -52,14 +52,9 @@ class BankMatchingService implements ShouldQueue
     
     }
 
-    /**
-     * The unique ID of the job.
-     *
-     * @return string
-     */
-    public function uniqueId()
-    {
-        return (string)$this->company_id;
+    public function middleware()
+    {   
+        return [(new WithoutOverlapping($this->company_id))];
     }
 
 }

From f1b80adcd2827fa7dd9bd281f84d8755ff2298d9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 9 Feb 2023 12:22:40 +1100
Subject: [PATCH 2/2] v5.5.80

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 81733607d8da..f4a6c6023301 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.69
\ No newline at end of file
+5.5.70
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index b151fe78510f..7896e4f4da64 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.69',
-    'app_tag' => '5.5.69',
+    'app_version' => '5.5.70',
+    'app_tag' => '5.5.70',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),