lagdo / tontine

src/Validation/Meeting/LoanValidator.php

Spacing +5 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
             'interest' => 'required|regex:/^\d+(\.\d{1,2})?$/',
         ]);
         $validator->after(function($validator) use($values) {
-            if((float)$values['principal'] <= 0)
+            if ((float) $values['principal'] <= 0)
             {
                 $validator->errors()->add('principal', trans('validation.gt.numeric', [
                     'attribute' => trans('meeting.loan.labels.principal'),
@@ -39,19 +39,18 @@ 
                 ]));
             }
         });
-        if($validator->fails())
+        if ($validator->fails())
         {
             throw new ValidationException($validator);
         }
 
         $validated = $validator->validated();
-        $validated['principal'] = $this->localeService->convertMoneyToInt((float)$validated['principal']);
+        $validated['principal'] = $this->localeService->convertMoneyToInt((float) $validated['principal']);
         // Interest rates must be saved as int, so the value is multiplied by 100.
         $validated['interest_rate'] = $validated['interest_type'] === 'f' ?
-            0 : (int)(100 * $validated['interest']);
+            0 : (int) (100 * $validated['interest']);
         $validated['interest'] = $validated['interest_type'] === 'f' ?
-            $this->localeService->convertMoneyToInt((float)$validated['interest']) :
-            (int)($validated['principal'] * $validated['interest'] / 100);
+            $this->localeService->convertMoneyToInt((float) $validated['interest']) : (int) ($validated['principal'] * $validated['interest'] / 100);
 
         return $validated;
     }

src/Model/Fund.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     protected static function booted()
     {
         // Scope for user defined funds. Always applied by default.
-        static::addGlobalScope('user', function (Builder $builder) {
+        static::addGlobalScope('user', function(Builder $builder) {
             $builder->where('title', '<>', '');
         });
     }

src/Validation/Tontine/FundValidator.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             'notes' => 'nullable|string',
         ]);
 
-        if($validator->fails())
+        if ($validator->fails())
         {
             throw new ValidationException($validator);
         }

src/Service/BalanceCalculator.php

Spacing +4 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function getReceivableAmount(Receivable $receivable): int
     {
-        if($receivable->subscription->pool->deposit_fixed)
+        if ($receivable->subscription->pool->deposit_fixed)
         {
             return $receivable->subscription->pool->amount;
         }
@@ -88,8 +88,7 @@ 
             ->where('receivables.session_id', $session->id)
             ->where('subscriptions.pool_id', $pool->id);
 
-        return !$pool->deposit_fixed ? $query->sum('deposits.amount') :
-            $pool->amount * $query->count();
+        return !$pool->deposit_fixed ? $query->sum('deposits.amount') : $pool->amount * $query->count();
     }
 
     /**
@@ -100,7 +99,7 @@ 
      */
     public function getPayableAmount(Pool $pool, Session $session): int
     {
-        if(!$pool->deposit_fixed)
+        if (!$pool->deposit_fixed)
         {
             // Sum the amounts for all deposits
             return $this->getPoolDepositAmount($pool, $session);
@@ -124,7 +123,7 @@ 
      */
     public function getPoolRemitmentAmount(Pool $pool, Session $session): int
     {
-        if(!$pool->deposit_fixed)
+        if (!$pool->deposit_fixed)
         {
             // Sum the amounts for all deposits
             return $this->getPoolDepositAmount($pool, $session);

src/Service/Tontine/FundService.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
      */
     public function getFund(int $fundId, bool $onlyActive = false, bool $withDefault = false): ?Fund
     {
-        if($withDefault && $fundId === $this->tenantService->tontine()->default_fund->id)
+        if ($withDefault && $fundId === $this->tenantService->tontine()->default_fund->id)
         {
             return $this->getDefaultFund();
         }
@@ -164,7 +164,7 @@ 
      *
      * @return Builder|Relation
      */
-    private function getFundSessionsQuery(Session $currentSession, Fund $fund): Builder|Relation
+    private function getFundSessionsQuery(Session $currentSession, Fund $fund): Builder | Relation
     {
         // Will return all the tontine sessions,
         // or all those after the last closing, if there's any.
@@ -175,12 +175,12 @@ 
         // The closing sessions before te current session.
         $closingSessions = $this->tenantService->tontine()->sessions()
             ->whereDate('start_at', '<', $lastSessionDate)
-            ->whereHas('closings', function(Builder|Relation $query) use($fund) {
+            ->whereHas('closings', function(Builder | Relation $query) use($fund) {
                 $query->round()->where('fund_id', $fund->id);
             })
             ->orderByDesc('start_at')
             ->get();
-        if($closingSessions->count() === 0)
+        if ($closingSessions->count() === 0)
         {
             // All the closing sessions are after the current session.
             return $sessionsQuery;

src/Service/Meeting/Credit/DebtCalculator.php

Spacing +12 added lines, -14 removed lines

@@ -60,10 +60,10 @@ 
     private function getRefundFilter(Session $current, bool $withCurrent): Closure
     {
         return $withCurrent ?
-            function(PartialRefund|Refund $refund) use($current) {
+            function(PartialRefund | Refund $refund) use($current) {
                 return $refund->session->start_at <= $current->start_at;
             } :
-            function(PartialRefund|Refund $refund) use($current) {
+            function(PartialRefund | Refund $refund) use($current) {
                 return $refund->session->start_at < $current->start_at;
             };
     }
@@ -121,10 +121,10 @@ 
         // Take refunds before the end session and sort by session date.
         $partialRefunds = $this->getPartialRefunds($principalDebt, $endSession, false)
             ->sortBy('session.start_at');
-        foreach($partialRefunds as $refund)
+        foreach ($partialRefunds as $refund)
         {
             $sessionCount = $this->getSessionCount($startSession, $refund->session);
-            $interestAmount += (int)($loanAmount * $interestRate * $sessionCount);
+            $interestAmount += (int) ($loanAmount * $interestRate * $sessionCount);
             // For the next loop
             $loanAmount -= $refund->amount;
             $startSession = $refund->session;
@@ -133,7 +133,7 @@ 
         $lastSession = $this->getLastSession($principalDebt, $endSession);
         $sessionCount = $this->getSessionCount($startSession, $lastSession);
 
-        return $interestAmount + (int)($loanAmount * $interestRate * $sessionCount);
+        return $interestAmount + (int) ($loanAmount * $interestRate * $sessionCount);
     }
 
     /**
@@ -158,10 +158,10 @@ 
         // Take refunds before the current session and sort by session date.
         $partialRefunds = $this->getPartialRefunds($principalDebt, $endSession, false)
             ->sortBy('session.start_at');
-        foreach($partialRefunds as $refund)
+        foreach ($partialRefunds as $refund)
         {
             $sessionCount = $this->getSessionCount($startSession, $refund->session);
-            $interestAmount += (int)($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1));
+            $interestAmount += (int) ($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1));
             // For the next loop
             $loanAmount -= $refund->amount - $interestAmount;
             $startSession = $refund->session;
@@ -170,7 +170,7 @@ 
         $lastSession = $this->getLastSession($principalDebt, $endSession);
         $sessionCount = $this->getSessionCount($startSession, $lastSession);
 
-        return $interestAmount + (int)($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1));
+        return $interestAmount + (int) ($loanAmount * (pow(1 + $interestRate, $sessionCount) - 1));
     }
 
     /**
@@ -183,14 +183,13 @@ 
      */
     public function getDebtTotalAmount(Debt $debt, Session $session): int
     {
-        if($debt->is_principal || $debt->refund || $debt->loan->fixed_interest)
+        if ($debt->is_principal || $debt->refund || $debt->loan->fixed_interest)
         {
             return $debt->amount;
         }
 
         return $debt->loan->simple_interest ?
-            $this->getSimpleInterestAmount($debt, $session) :
-            $this->getCompoundInterestAmount($debt, $session);
+            $this->getSimpleInterestAmount($debt, $session) : $this->getCompoundInterestAmount($debt, $session);
     }
 
     /**
@@ -203,8 +202,7 @@ 
      */
     public function getDebtPaidAmount(Debt $debt, Session $session): int
     {
-        return $debt->refund !== null ? $debt->amount :
-            $this->getPartialRefunds($debt, $session, true)->sum('amount');
+        return $debt->refund !== null ? $debt->amount : $this->getPartialRefunds($debt, $session, true)->sum('amount');
     }
 
     /**
@@ -233,7 +231,7 @@ 
     public function getDebtDueAmount(Debt $debt, Session $session, bool $withCurrent): int
     {
         $refundFilter = $this->getRefundFilter($session, $withCurrent);
-        if($debt->refund !== null && $refundFilter($debt->refund))
+        if ($debt->refund !== null && $refundFilter($debt->refund))
         {
             return 0; // The debt was refunded before the current session.
         }

src/Service/Meeting/Credit/LoanService.php

Spacing +4 added lines, -4 removed lines

@@ -144,11 +144,11 @@ 
             $principal = $values['principal'];
             $interest = $values['interest'];
             // Create an entry for each type of debt
-            if($principal > 0)
+            if ($principal > 0)
             {
                 $loan->debts()->create(['type' => Debt::TYPE_PRINCIPAL, 'amount' => $principal]);
             }
-            if($interest > 0)
+            if ($interest > 0)
             {
                 $loan->debts()->create(['type' => Debt::TYPE_INTEREST, 'amount' => $interest]);
             }
@@ -178,7 +178,7 @@ 
             $interest = $values['interest'];
             $loan->debts()->principal()->update(['amount' => $principal]);
             // The interest debt may need to be created or deleted.
-            if($interest <= 0)
+            if ($interest <= 0)
             {
                 $loan->debts()->where('type', Debt::TYPE_INTEREST)->delete();
                 return;
@@ -197,7 +197,7 @@ 
      */
     public function deleteLoan(Session $session, int $loanId): void
     {
-        if(($loan = $session->loans()->find($loanId)) !== null)
+        if (($loan = $session->loans()->find($loanId)) !== null)
         {
             DB::transaction(function() use($loan) {
                 $loan->refunds()->delete();

src/Service/Meeting/Credit/RefundService.php

Spacing +15 added lines, -15 removed lines

@@ -45,7 +45,7 @@ 
      *
      * @return Builder|Relation
      */
-    private function getDebtsQuery(Session $session, Fund $fund, ?bool $onlyPaid): Builder|Relation
+    private function getDebtsQuery(Session $session, Fund $fund, ?bool $onlyPaid): Builder | Relation
     {
         $prevSessions = $this->fundService->getFundSessionIds($session, $fund)
             ->filter(fn(int $sessionId) => $sessionId !== $session->id);
@@ -66,7 +66,7 @@ 
                         $query->where('session_id', $session->id);
                     });
                 });
-                if($prevSessions->count() === 0)
+                if ($prevSessions->count() === 0)
                 {
                     return;
                 }
@@ -168,13 +168,13 @@ 
     {
         // Already refunded
         // Cannot refund the principal debt in the same session.
-        if(!$session->opened || $debt->refund !== null ||
+        if (!$session->opened || $debt->refund !== null ||
             $debt->is_principal && $debt->loan->session->id === $session->id)
         {
             return false;
         }
         // Cannot refund the interest debt before the principal.
-        if($debt->is_interest && !$debt->loan->fixed_interest)
+        if ($debt->is_interest && !$debt->loan->fixed_interest)
         {
             return $debt->loan->principal_debt->refund !== null;
         }
@@ -194,7 +194,7 @@ 
      */
     public function createRefund(Debt $debt, Session $session): void
     {
-        if(!$this->canCreateRefund($debt, $session))
+        if (!$this->canCreateRefund($debt, $session))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_refund'));
         }
@@ -205,7 +205,7 @@ 
         DB::transaction(function() use($debt, $session, $refund) {
             $refund->save();
             // For simple or compound interest, also save the final amount.
-            if($debt->is_interest && !$debt->loan->fixed_interest)
+            if ($debt->is_interest && !$debt->loan->fixed_interest)
             {
                 $debt->amount = $this->debtCalculator->getDebtDueAmount($debt, $session, true);
                 $debt->save();
@@ -222,7 +222,7 @@ 
     private function canDeleteRefund(Debt $debt, Session $session): bool
     {
         // A refund can only be deleted in the same session it was created.
-        if(!$session->opened || !$debt->refund || $debt->refund->session_id !== $session->id)
+        if (!$session->opened || !$debt->refund || $debt->refund->session_id !== $session->id)
         {
             return false;
         }
@@ -240,11 +240,11 @@ 
      */
     public function deleteRefund(Debt $debt, Session $session): void
     {
-        if(!$this->canDeleteRefund($debt, $session))
+        if (!$this->canDeleteRefund($debt, $session))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_refund'));
         }
-        if(!$this->paymentService->isEditable($debt->refund))
+        if (!$this->paymentService->isEditable($debt->refund))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_delete'));
         }
@@ -307,7 +307,7 @@ 
     private function canCreatePartialRefund(Debt $debt, Session $session): bool
     {
         // Cannot refund the principal debt in the same session.
-        if(!$session->opened || $debt->refund !== null ||
+        if (!$session->opened || $debt->refund !== null ||
             ($debt->is_principal && $debt->loan->session->id === $session->id))
         {
             return false;
@@ -360,12 +360,12 @@ 
      */
     public function createPartialRefund(Debt $debt, Session $session, int $amount): void
     {
-        if(!$this->canCreatePartialRefund($debt, $session))
+        if (!$this->canCreatePartialRefund($debt, $session))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_delete'));
         }
         // A partial refund must not totally refund a debt
-        if($amount >= $this->debtCalculator->getDebtDueAmount($debt, $session, true))
+        if ($amount >= $this->debtCalculator->getDebtDueAmount($debt, $session, true))
         {
             throw new MessageException(trans('meeting.refund.errors.pr_amount'));
         }
@@ -386,7 +386,7 @@ 
     private function canDeletePartialRefund(PartialRefund $refund, Session $session): bool
     {
         // A partial refund cannot be deleted if the debt is already refunded.
-        if(!$session->opened || $refund->debt->refund !== null)
+        if (!$session->opened || $refund->debt->refund !== null)
         {
             return false;
         }
@@ -406,11 +406,11 @@ 
     {
         $refund = PartialRefund::where('session_id', $session->id)
             ->with(['debt.refund'])->find($refundId);
-        if(!$refund)
+        if (!$refund)
         {
             throw new MessageException(trans('meeting.refund.errors.not_found'));
         }
-        if($refund->debt->refund !== null || !$this->paymentService->isEditable($refund))
+        if ($refund->debt->refund !== null || !$this->paymentService->isEditable($refund))
         {
             throw new MessageException(trans('meeting.refund.errors.cannot_delete'));
         }

src/Service/Meeting/Saving/ProfitService.php

Spacing +11 added lines, -11 removed lines

@@ -51,31 +51,31 @@ 
         int $profitAmount): Collection
     {
         // Set savings durations and distributions
-        foreach($savings as $saving)
+        foreach ($savings as $saving)
         {
             $saving->duration = $this->getSavingDuration($sessions, $saving);
             $saving->distribution = $saving->amount * $saving->duration;
             $saving->profit = 0;
         }
         // Reduce the distributions
-        $distributionGcd = (int)$savings->reduce(function($gcd, $saving) {
-            if($gcd === 0)
+        $distributionGcd = (int) $savings->reduce(function($gcd, $saving) {
+            if ($gcd === 0)
             {
                 return $saving->distribution;
             }
-            if($saving->duration === 0)
+            if ($saving->duration === 0)
             {
                 return $gcd;
             }
             return gmp_gcd($gcd, $saving->distribution);
         }, $savings->first()->distribution);
-        if($distributionGcd > 0)
+        if ($distributionGcd > 0)
         {
-            $sum = (int)($savings->sum('distribution') / $distributionGcd);
-            foreach($savings as $saving)
+            $sum = (int) ($savings->sum('distribution') / $distributionGcd);
+            foreach ($savings as $saving)
             {
                 $saving->distribution /= $distributionGcd;
-                $saving->profit = (int)($profitAmount * $saving->distribution / $sum);
+                $saving->profit = (int) ($profitAmount * $saving->distribution / $sum);
             }
         }
 
@@ -104,7 +104,7 @@ 
             ->orderBy('sessions.start_at', 'asc')
             ->with(['session', 'member'])
             ->get();
-        if($savings->count() === 0)
+        if ($savings->count() === 0)
         {
             return $savings;
         }
@@ -124,13 +124,13 @@ 
         // The part value makes sense only iwhen there is more than 2 savings
         // with distribution greater than 0.
         $savings = $savings->filter(fn($saving) => $saving->distribution > 0);
-        if($savings->count() < 2)
+        if ($savings->count() < 2)
         {
             return 0;
         }
 
         $saving = $savings->first();
-        return (int)($saving->amount * $saving->duration / $saving->distribution);
+        return (int) ($saving->amount * $saving->duration / $saving->distribution);
     }
 
     /**