Skip to content

Commit dc15953

Browse files
rez1dent3rez1dent3
authored
Merge pull request #987 from bavix/unit-wallets.walletTransactions
[11.2] Improvements to confirm
2 parents 7806d59 + 7a4dc4b commit dc15953

File tree

4 files changed

+123
-12
lines changed

4 files changed

+123
-12
lines changed

‎phpstan.src.baseline.neon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ parameters:
196196
path: src/Models/Transaction.php
197197

198198
-
199-
message: "#^Property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$table \\(string\\) does not accept mixed\\.$#"
199+
message: "#^Property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$table \\(string\\|null\\) does not accept mixed\\.$#"
200200
count: 1
201201
path: src/Models/Transaction.php
202202

@@ -231,7 +231,7 @@ parameters:
231231
path: src/Models/Transfer.php
232232

233233
-
234-
message: "#^Property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$table \\(string\\) does not accept mixed\\.$#"
234+
message: "#^Property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$table \\(string\\|null\\) does not accept mixed\\.$#"
235235
count: 1
236236
path: src/Models/Transfer.php
237237

@@ -271,7 +271,7 @@ parameters:
271271
path: src/Models/Wallet.php
272272

273273
-
274-
message: "#^Property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$table \\(string\\) does not accept mixed\\.$#"
274+
message: "#^Property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$table \\(string\\|null\\) does not accept mixed\\.$#"
275275
count: 1
276276
path: src/Models/Wallet.php
277277

‎src/Traits/CanConfirm.php‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,33 @@ trait CanConfirm
4545
*/
4646
public function confirm(Transaction $transaction): bool
4747
{
48-
// Check if the wallet has enough money
48+
// Execute the confirmation process within an atomic block to ensure data consistency.
4949
return app(AtomicServiceInterface::class)->block($this, function () use ($transaction): bool {
50+
// Check if the transaction is already confirmed.
51+
// If it is, throw an exception.
52+
if ($transaction->confirmed) {
53+
// Why is there a check here without calling refresh?
54+
// It's because this check can be performed in force confirm again.
55+
throw new ConfirmedInvalid(
56+
// Get the error message from the translator service.
57+
app(TranslatorServiceInterface::class)->get('wallet::errors.confirmed_invalid'),
58+
// Set the error code to CONFIRMED_INVALID.
59+
ExceptionInterface::CONFIRMED_INVALID
60+
);
61+
}
62+
63+
// Check if the transaction type is withdrawal.
5064
if ($transaction->type === Transaction::TYPE_WITHDRAW) {
51-
// Check if the wallet has enough money
65+
// Check if the wallet has enough money to cover the withdrawal amount.
5266
app(ConsistencyServiceInterface::class)->checkPotential(
53-
// Get the wallet
67+
// Get the wallet.
5468
app(CastServiceInterface::class)->getWallet($this),
55-
// Negative amount
69+
// Negate the withdrawal amount to check for sufficient funds.
5670
app(MathServiceInterface::class)->negative($transaction->amount)
5771
);
5872
}
5973

60-
// Force confirm the transaction
74+
// Force confirm the transaction.
6175
return $this->forceConfirm($transaction);
6276
});
6377
}
@@ -118,7 +132,7 @@ public function resetConfirm(Transaction $transaction): bool
118132
// Reset the confirmation of the transaction in a single database transaction
119133
return app(AtomicServiceInterface::class)->block($this, function () use ($transaction) {
120134
// Check if the transaction is already confirmed
121-
if (! $transaction->confirmed) {
135+
if (! $transaction->refresh()->confirmed) {
122136
throw new UnconfirmedInvalid(
123137
// If the transaction is not confirmed, throw an `UnconfirmedInvalid` exception
124138
app(TranslatorServiceInterface::class)->get('wallet::errors.unconfirmed_invalid'),
@@ -195,7 +209,7 @@ public function forceConfirm(Transaction $transaction): bool
195209
// Attempt to confirm the transaction in a single database transaction
196210
return app(AtomicServiceInterface::class)->block($this, function () use ($transaction) {
197211
// Check if the transaction is already confirmed
198-
if ($transaction->confirmed) {
212+
if ($transaction->refresh()->confirmed) {
199213
throw new ConfirmedInvalid(
200214
app(TranslatorServiceInterface::class)->get('wallet::errors.confirmed_invalid'),
201215
ExceptionInterface::CONFIRMED_INVALID

‎tests/Units/Domain/ConfirmTest.php‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,27 @@ public function testSafe(): void
6767
self::assertFalse($transaction->confirmed);
6868
}
6969

70+
public function testSafeConfirmedInvalid(): void
71+
{
72+
/** @var Buyer $buyer */
73+
$buyer = BuyerFactory::new()->create();
74+
$wallet = $buyer->wallet;
75+
76+
self::assertSame(0, $wallet->balanceInt);
77+
78+
$transaction = $wallet->forceWithdraw(1000, [
79+
'desc' => 'confirmed',
80+
]);
81+
82+
self::assertSame(-1000, $wallet->balanceInt);
83+
self::assertTrue($transaction->confirmed);
84+
self::assertTrue($transaction->getKey() > 0);
85+
86+
self::assertTrue($wallet->safeConfirm($transaction));
87+
self::assertSame(-1000, $wallet->balanceInt);
88+
self::assertTrue($transaction->confirmed);
89+
}
90+
7091
public function testSafeResetConfirm(): void
7192
{
7293
/** @var Buyer $buyer */
@@ -127,6 +148,25 @@ public function testForce(): void
127148
self::assertTrue($transaction->confirmed);
128149
}
129150

151+
public function testForceConfirmedInvalid(): void
152+
{
153+
$this->expectException(ConfirmedInvalid::class);
154+
$this->expectExceptionCode(ExceptionInterface::CONFIRMED_INVALID);
155+
$this->expectExceptionMessageStrict(trans('wallet::errors.confirmed_invalid'));
156+
157+
/** @var Buyer $buyer */
158+
$buyer = BuyerFactory::new()->create();
159+
$wallet = $buyer->wallet;
160+
161+
self::assertSame(0, $wallet->balanceInt);
162+
163+
$transaction = $wallet->forceWithdraw(1000);
164+
self::assertSame(-1000, $wallet->balanceInt);
165+
self::assertTrue($transaction->confirmed);
166+
167+
$wallet->forceConfirm($transaction);
168+
}
169+
130170
public function testUnconfirmed(): void
131171
{
132172
/** @var Buyer $buyer */
@@ -198,6 +238,31 @@ public function testSafeUnconfirmed(): void
198238
self::assertTrue($wallet->safeResetConfirm($transaction));
199239
}
200240

241+
public function testSafeUnconfirmedWalletOwnerInvalid(): void
242+
{
243+
/**
244+
* @var Buyer $buyer1
245+
* @var Buyer $buyer2
246+
**/
247+
[$buyer1, $buyer2] = BuyerFactory::times(2)->create();
248+
$wallet1 = $buyer1->wallet;
249+
$wallet2 = $buyer2->wallet;
250+
251+
self::assertTrue($wallet1->saveOrFail());
252+
self::assertTrue($wallet2->saveOrFail());
253+
254+
self::assertSame(0, $wallet1->balanceInt);
255+
self::assertSame(0, $wallet2->balanceInt);
256+
257+
$transaction1 = $wallet1->deposit(1000, null, true);
258+
self::assertSame(1000, $wallet1->balanceInt);
259+
self::assertTrue($transaction1->confirmed);
260+
261+
self::assertFalse($wallet2->safeResetConfirm($transaction1));
262+
self::assertSame(1000, $wallet1->balanceInt);
263+
self::assertTrue($transaction1->confirmed);
264+
}
265+
201266
public function testWalletOwnerInvalid(): void
202267
{
203268
$this->expectException(WalletOwnerInvalid::class);
@@ -223,6 +288,31 @@ public function testWalletOwnerInvalid(): void
223288
$secondWallet->confirm($transaction);
224289
}
225290

291+
public function testForceWalletOwnerInvalid(): void
292+
{
293+
$this->expectException(WalletOwnerInvalid::class);
294+
$this->expectExceptionCode(ExceptionInterface::WALLET_OWNER_INVALID);
295+
$this->expectExceptionMessageStrict(trans('wallet::errors.owner_invalid'));
296+
297+
/**
298+
* @var Buyer $first
299+
* @var Buyer $second
300+
*/
301+
[$first, $second] = BuyerFactory::times(2)->create();
302+
$firstWallet = $first->wallet;
303+
$secondWallet = $second->wallet;
304+
305+
self::assertSame(0, $firstWallet->balanceInt);
306+
307+
$transaction = $firstWallet->deposit(1000, [
308+
'desc' => 'unconfirmed',
309+
], false);
310+
self::assertSame(0, $firstWallet->balanceInt);
311+
self::assertFalse($transaction->confirmed);
312+
313+
$secondWallet->forceConfirm($transaction);
314+
}
315+
226316
public function testUserConfirm(): void
227317
{
228318
/** @var UserConfirm $userConfirm */

‎tests/Units/Domain/EagerLoadingTest.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testUuidDuplicate(): void
3333
}
3434

3535
/** @var Collection<int, Buyer> $buyers */
36-
$buyers = Buyer::with('wallet')
36+
$buyers = Buyer::with('wallet.walletTransactions')
3737
->whereIn('id', $buyerTimes->pluck('id')->toArray())
3838
->paginate(10);
3939

@@ -42,6 +42,7 @@ public function testUuidDuplicate(): void
4242
foreach ($buyers as $buyer) {
4343
self::assertTrue($buyer->relationLoaded('wallet'));
4444
self::assertTrue($buyer->wallet->relationLoaded('holder'));
45+
self::assertTrue($buyer->wallet->relationLoaded('walletTransactions'));
4546

4647
$uuids[] = $buyer->wallet->uuid;
4748
$balances[] = $buyer->wallet->balanceInt;
@@ -85,8 +86,14 @@ public function testMultiWallets(): void
8586
]);
8687

8788
/** @var UserMulti $user */
88-
$user = UserMulti::with('wallets')->find($multi->getKey());
89+
$user = UserMulti::with('wallets.walletTransactions')->find($multi->getKey());
8990
self::assertTrue($user->relationLoaded('wallets'));
91+
self::assertNotEmpty($user->wallets);
92+
93+
foreach ($user->wallets as $wallet) {
94+
self::assertTrue($wallet->relationLoaded('walletTransactions'));
95+
}
96+
9097
self::assertNotNull($user->getWallet('hello'));
9198
self::assertNotNull($user->getWallet('world'));
9299
self::assertTrue($user->getWallet('hello')->relationLoaded('holder'));

0 commit comments

Comments
 (0)