From 45e2465a245764422804c235a80037478519157b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 5 Aug 2023 12:26:07 +1000
Subject: [PATCH] Code cleanup

---
 .../Controllers/BankTransactionController.php |  5 +++-
 .../MatchBankTransactionRequest.php           | 23 +++++++++++++------
 app/Jobs/Bank/MatchBankTransactions.php       |  2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/BankTransactionController.php b/app/Http/Controllers/BankTransactionController.php
index d8b05a3d5e33..69261d4882db 100644
--- a/app/Http/Controllers/BankTransactionController.php
+++ b/app/Http/Controllers/BankTransactionController.php
@@ -114,7 +114,10 @@ class BankTransactionController extends BaseController
 
     public function match(MatchBankTransactionRequest $request)
     {
-        $bts = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle();
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        $bts = (new MatchBankTransactions($user->company()->id, $user->company()->db, $request->all()))->handle();
 
         return $this->listResponse($bts);
     }
diff --git a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php
index 0ee23451ba6c..76f8c5ee09ec 100644
--- a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php
+++ b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php
@@ -24,26 +24,35 @@ class MatchBankTransactionRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth()->user()->isAdmin() || auth()->user()->can('create', BankTransaction::class) || auth()->user()->hasPermission('edit_bank_transaction');
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        return $user->isAdmin() || $user->can('create', BankTransaction::class) || $user->hasPermission('edit_bank_transaction');
     }
 
-    public function rules()
+    public function rules(): array
     {
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
         $rules = [
             'transactions' => 'bail|array',
             'transactions.*.invoice_ids' => 'nullable|string|sometimes',
         ];
 
-        $rules['transactions.*.ninja_category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
-        $rules['transactions.*.vendor_id'] = 'bail|nullable|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
-        $rules['transactions.*.id'] = 'bail|required|exists:bank_transactions,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
-        $rules['transactions.*.payment_id'] = 'bail|sometimes|nullable|exists:payments,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
+        $rules['transactions.*.ninja_category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.$user->company()->id.',is_deleted,0';
+        $rules['transactions.*.vendor_id'] = 'bail|nullable|sometimes|exists:vendors,id,company_id,'.$user->company()->id.',is_deleted,0';
+        $rules['transactions.*.id'] = 'bail|required|exists:bank_transactions,id,company_id,'.$user->company()->id.',is_deleted,0';
+        $rules['transactions.*.payment_id'] = 'bail|sometimes|nullable|exists:payments,id,company_id,'.$user->company()->id.',is_deleted,0';
 
         return $rules;
     }
 
     public function prepareForValidation()
     {
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
         $inputs = $this->all();
 
         foreach ($inputs['transactions'] as $key => $input) {
@@ -61,7 +70,7 @@ class MatchBankTransactionRequest extends Request
 
             if (array_key_exists('payment_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['payment_id']) >= 1) {
                 $inputs['transactions'][$key]['payment_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['payment_id']);
-                $p = Payment::withTrashed()->where('company_id', auth()->user()->company()->id)->where('id', $inputs['transactions'][$key]['payment_id'])->first();
+                $p = Payment::withTrashed()->where('company_id', $user->company()->id)->where('id', $inputs['transactions'][$key]['payment_id'])->first();
 
                 /*Ensure we don't relink an existing payment*/
                 if (!$p || is_numeric($p->transaction_id)) {
diff --git a/app/Jobs/Bank/MatchBankTransactions.php b/app/Jobs/Bank/MatchBankTransactions.php
index 4f38ff399ac9..bc3c0fc3a2d1 100644
--- a/app/Jobs/Bank/MatchBankTransactions.php
+++ b/app/Jobs/Bank/MatchBankTransactions.php
@@ -218,7 +218,7 @@ class MatchBankTransactions implements ShouldQueue
 
     private function matchInvoicePayment($input) :self
     {
-        $this->bt = BankTransaction::find($input['id']);
+        $this->bt = BankTransaction::withTrashed()->find($input['id']);
 
         if (!$this->bt || $this->bt->status_id == BankTransaction::STATUS_CONVERTED) {
             return $this;