From 56b6b59967de9de3283592b313ffd2a5ecd0c51b Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 28 Apr 2023 15:25:18 +0800
Subject: [PATCH] fix small bugs

---
 ...Transactions.php => DoesNotHaveGroups.php} |  6 ++---
 .../DataTransferObjects/GroupObject.php       | 22 +++++++++----------
 .../UpdateConstantPostcodeLogic.php           |  4 ++--
 app/Models/Transaction.php                    |  9 ++++++++
 4 files changed, 25 insertions(+), 16 deletions(-)
 rename app/Classes/General/Eloquent/Filters/{DoesNotHaveGroupTransactions.php => DoesNotHaveGroups.php} (69%)

diff --git a/app/Classes/General/Eloquent/Filters/DoesNotHaveGroupTransactions.php b/app/Classes/General/Eloquent/Filters/DoesNotHaveGroups.php
similarity index 69%
rename from app/Classes/General/Eloquent/Filters/DoesNotHaveGroupTransactions.php
rename to app/Classes/General/Eloquent/Filters/DoesNotHaveGroups.php
index 22a6b4d7..c0a2f979 100644
--- a/app/Classes/General/Eloquent/Filters/DoesNotHaveGroupTransactions.php
+++ b/app/Classes/General/Eloquent/Filters/DoesNotHaveGroups.php
@@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class DoesNotHaveGroupTransactions implements Filter
+class DoesNotHaveGroups implements Filter
 {
     /**
      * @param Builder $builder
@@ -13,6 +13,6 @@ class DoesNotHaveGroupTransactions implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->whereDoesntHave('groupTransactions');
+        return $builder->whereDoesntHave('groups');
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Groups/DataTransferObjects/GroupObject.php b/app/Classes/Modules/Groups/DataTransferObjects/GroupObject.php
index 050a8ef3..bb328364 100644
--- a/app/Classes/Modules/Groups/DataTransferObjects/GroupObject.php
+++ b/app/Classes/Modules/Groups/DataTransferObjects/GroupObject.php
@@ -61,18 +61,18 @@ class GroupObject implements DataTransferObject
      * @param int $paymentMethod
      */
     public function __construct(
-        int $issuer, 
-        int $receiver, 
-        float $amount, 
-        float $originalAmount, 
+        int $issuer,
+        int $receiver,
+        float $amount,
+        float $originalAmount,
         int $currencyId,
-        int $originalCurrencyId, 
+        int $originalCurrencyId,
         float $currencyRate,
-        float $tax, 
-        float $serviceCharge, 
-        int $paymentMethod, 
-        ?string $reference, 
-        ?int $status = ApprovalStatus::PENDING_SUBMISSION, 
+        float $tax,
+        float $serviceCharge,
+        int $paymentMethod,
+        ?string $reference,
+        ?int $status = ApprovalStatus::PENDING_SUBMISSION
     )
     {
         $this->issuer = $issuer;
@@ -184,4 +184,4 @@ class GroupObject implements DataTransferObject
     {
         return $this->paymentMethod;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
index 38c21b62..d9a71d7e 100644
--- a/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
+++ b/app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
@@ -29,7 +29,7 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      * @param UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
      */
     public function __construct(
-        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor,
+        UpdatePostcodeSegmentProcessor $updatePostcodeSegmentProcessor
     )
     {
         $this->updatePostcodeSegmentProcessor = $updatePostcodeSegmentProcessor;
@@ -48,4 +48,4 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
         return $this->resourceResponse(new ConstantResource($constant));
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index dd6556b1..a3472ed6 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -11,6 +11,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -76,6 +77,14 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $this->HasMany(TransactionDetail::class, 'transaction_id', 'id');
     }
 
+    /**
+     * @return BelongsToMany
+     */
+    public function groups(): BelongsToMany
+    {
+        return $this->BelongsToMany(Group::class, GroupTransaction::class, 'transaction_id');
+    }
+
     public function convert_original_amount()
     {
         if($this->booking()->first()->fix_currency_id !== 1) {