From b452cf0027e30f93937ffa548a222d7e3456fb91 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 18 May 2023 19:22:58 +0800
Subject: [PATCH] recalculate wallet balance

---
 .../ControllersLogic/CallbackBillplzLogic.php | 21 +++------------
 .../Wallets/Services/UpdatesWalletBalance.php | 27 ++++++++++++++-----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index bcaa57a7..186ef3b6 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -98,32 +98,17 @@ class CallbackBillplzLogic
         }
 
         if($transaction->status !== ApprovalStatus::COMPLETED && $transaction->status !== ApprovalStatus::APPROVED){
-
-            if($transaction->owner instanceof Wallet && $transaction->status !== ApprovalStatus::APPROVED && $status === ApprovalStatus::APPROVED) {
-                $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-            }
             $this->updatesTransactionStatus->execute($transaction, $status);
+        }
 
+        if($transaction->owner instanceof Wallet) {
+            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
         }
 
 //        if ($transaction->type == TransactionType::PAYMENT) {
 //            $cash_back_transaction = $this->createCashBackTransactionProcessor->execute($transaction);
 //        }
 
-
-        $wallet = null; 
-        if ($transaction->owner instanceof Wallet) {
-            $wallet = $transaction->owner;
-        } else if ($transaction->owner->company->wallets()->first() instanceof Wallet) {
-            $wallet = $transaction->owner->company->wallets()->first();
-        } 
-
-        if ($wallet != null) {
-            $walletBalance = $this->recalculatesWalletBalance->execute($wallet);
-
-            $this->updatesWalletBalance->execute($wallet, $walletBalance);
-        }
-
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
diff --git a/app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php b/app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php
index a724cf24..5b384272 100644
--- a/app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php
+++ b/app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php
@@ -3,10 +3,10 @@
 namespace App\Classes\Modules\Wallets\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Wallet;
-use App\Models\Company;
+use Illuminate\Support\Facades\Log;
 
 class UpdatesWalletBalance extends AbstractUpdateRecord
 {
@@ -16,10 +16,25 @@ class UpdatesWalletBalance extends AbstractUpdateRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Wallet $model, $amount) {
+    public function execute(Wallet $model, $amount)
+    {
+        $i = 0;
+        $topups = 0;
+        $credit = 0;
+        $payments = 0;
+        $debit = 0;
 
-        $model->amount = $model->amount + $amount;
+        foreach ($model->transactions as $transaction) {
+            Log::debug($transaction);
+            if (!in_array((int) $transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) continue;
+            if ((int) $transaction->type === TransactionType::TOP_UP)       $topups     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::CREDIT_NOTE)  $credit     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::PAYMENT)      $payments   += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::DEBIT_NOTE)   $debit      += (float) $transaction->amount;
+        }
+        $auditBalance = ($topups + $credit) - ($payments + $debit);
+
+        $model->amount = $auditBalance;
         return $this->handler($model);
-
     }
 }