Incentive (E1): Gleichstand nach "zuerst erreicht", Neupartner zaehlen im Monat der Zahlung
- Rangliste: bei gleichen Punkten bestaetigte Teilnahme vor anonym, danach wer den Stand zuerst erreicht hat (letzter zaehlender Neupartner bzw. Neuabo laut Tracking-Tabellen), zuletzt die Teilnehmer-ID. Vorher entschied bei Gleichstand die Datenbankreihenfolge (Teilnahmebedingungen Recruiting-Challenge, Punkt 6). - Neupartner zaehlen fuer Incentives ab ihrer ersten Kontozahlung (users.partner_paid_at), wie in der Statistik (Kundenentscheid 16.09.2026), nicht ab dem Bestelldatum: Live-Tracking, naechtliche Reparatur und Neuaufbau nutzen dieselbe Regel (IncentiveTracker::newPartnerCountedAt). Wer am 29.09. bestellt und am 01.10. zahlt, zaehlt in der Challenge. Montenegro ist abgeschlossen; gegen die Live-Kopie tauschen dort nur Plaetze ab 81, und der naechtliche Lauf entfernt keine bestehenden Trackings. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
a50be6fd51
commit
1885402a6c
5 changed files with 207 additions and 29 deletions
|
|
@ -47,7 +47,13 @@ function repairTestCreateUser(?int $sponsorId = null, ?string $createdAt = null)
|
|||
return $user->fresh();
|
||||
}
|
||||
|
||||
function repairTestCreateStarterKitOrder(User $registrant, User $shopOwner, ?string $orderCreatedAt = null): ShoppingOrder
|
||||
/**
|
||||
* Bezahlte Registrierung mit Starterpaket. Wie im Zahlungspfad bekommt der Partner
|
||||
* dabei seine erste Kontozahlung (`partner_paid_at`) — standardmaessig zum
|
||||
* Bestellzeitpunkt, mit `$paidAt` spaeter (Bestellung Ende Monat, Zahlung Anfang
|
||||
* Folgemonat).
|
||||
*/
|
||||
function repairTestCreateStarterKitOrder(User $registrant, User $shopOwner, ?string $orderCreatedAt = null, ?string $paidAt = null): ShoppingOrder
|
||||
{
|
||||
$country = Country::firstOrCreate(['code' => 'DE'], [
|
||||
'phone' => '49',
|
||||
|
|
@ -64,7 +70,7 @@ function repairTestCreateStarterKitOrder(User $registrant, User $shopOwner, ?str
|
|||
|
||||
$userShop = UserShop::create([
|
||||
'user_id' => $shopOwner->id,
|
||||
'name' => 'T'.substr(uniqid('', true), 0, 6),
|
||||
'name' => 'T'.bin2hex(random_bytes(4)),
|
||||
'slug' => 't-'.uniqid(),
|
||||
'active' => true,
|
||||
]);
|
||||
|
|
@ -112,6 +118,10 @@ function repairTestCreateStarterKitOrder(User $registrant, User $shopOwner, ?str
|
|||
$order->save();
|
||||
}
|
||||
|
||||
if ($registrant->fresh()->partner_paid_at === null) {
|
||||
$registrant->forceFill(['partner_paid_at' => Carbon::parse($paidAt ?? $orderCreatedAt ?? now())])->save();
|
||||
}
|
||||
|
||||
return $order->fresh(['shopping_order_items.product']);
|
||||
}
|
||||
|
||||
|
|
@ -127,7 +137,7 @@ function repairTestCreateIncentive(): Incentive
|
|||
]);
|
||||
}
|
||||
|
||||
it('syncMissingTrackingPartners zaehlt Bestandskunden, die im Zeitraum zum Berater upgraden (Bestelldatum zaehlt)', function () {
|
||||
it('syncMissingTrackingPartners zaehlt Bestandskunden, die im Zeitraum zum Berater upgraden (Zahlungsdatum zaehlt)', function () {
|
||||
$incentive = repairTestCreateIncentive();
|
||||
$sponsor = repairTestCreateUser();
|
||||
$participant = IncentiveParticipant::factory()->create([
|
||||
|
|
@ -425,3 +435,34 @@ it('removeStaleSponsorTrackings laesst korrekte Trackings unangetastet', functio
|
|||
expect($removed)->toBe(0);
|
||||
expect(IncentiveNewPartner::where('participant_id', $participant->id)->exists())->toBeTrue();
|
||||
});
|
||||
|
||||
it('zaehlt Neupartner im Monat der Zahlung, nicht der Bestellung (Kundenentscheid 16.09.2026)', function () {
|
||||
Carbon::setTestNow(Carbon::parse('2026-04-01 06:49:35'));
|
||||
|
||||
$incentive = repairTestCreateIncentive();
|
||||
$sponsor = repairTestCreateUser();
|
||||
$participant = IncentiveParticipant::factory()->create([
|
||||
'incentive_id' => $incentive->id,
|
||||
'user_id' => $sponsor->id,
|
||||
]);
|
||||
|
||||
// Bestellt vor dem Start, bezahlt am ersten Tag: zaehlt.
|
||||
$paidOnStart = repairTestCreateUser($sponsor->id);
|
||||
$order = repairTestCreateStarterKitOrder($paidOnStart, $sponsor, '2026-03-30 18:00:00', '2026-04-01 06:49:35');
|
||||
IncentiveTracker::trackNewPartner($order);
|
||||
|
||||
// Bestellt am letzten Tag, bezahlt erst danach: zaehlt nicht.
|
||||
$paidAfterEnd = repairTestCreateUser($sponsor->id);
|
||||
repairTestCreateStarterKitOrder($paidAfterEnd, $sponsor, '2026-07-31 20:00:00', '2026-08-01 09:00:00');
|
||||
|
||||
Carbon::setTestNow(Carbon::parse('2026-08-02 05:00:00'));
|
||||
app(IncentivePointsLogRepairService::class)->syncMissingTrackingPartners($participant);
|
||||
|
||||
$tracked = IncentiveNewPartner::where('participant_id', $participant->id)->get();
|
||||
expect($tracked->pluck('user_id')->all())->toBe([$paidOnStart->id])
|
||||
->and($tracked->first()->registered_at->toDateTimeString())->toBe('2026-04-01 06:49:35');
|
||||
|
||||
// Kompletter Neuaufbau kommt zum selben Ergebnis.
|
||||
$participant->fresh()->rebuildFromSourceTables()->save();
|
||||
expect(IncentiveNewPartner::where('participant_id', $participant->id)->pluck('user_id')->all())->toBe([$paidOnStart->id]);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use App\Models\Incentive;
|
||||
use App\Models\IncentiveNewPartner;
|
||||
use App\Models\IncentiveParticipant;
|
||||
use App\Services\Incentive\IncentiveTracker;
|
||||
use App\User;
|
||||
|
|
@ -132,3 +133,84 @@ it('stimmt mit der Leaderboard-Anzeigereihenfolge ueberein', function () use ($m
|
|||
|
||||
expect($displayOrder)->toBe([1, 2, 3, 4]);
|
||||
});
|
||||
|
||||
describe('Gleichstand: wer den Stand zuerst erreicht hat (Recruiting-Challenge, Punkt 6)', function () use ($makeIncentiveRankingUser) {
|
||||
$challengeWithTie = function () use ($makeIncentiveRankingUser): array {
|
||||
$incentive = Incentive::factory()->create([
|
||||
'points_partner_onetime' => 1,
|
||||
'points_abo_onetime' => 0,
|
||||
'min_direct_partners' => 0,
|
||||
'min_customer_abos' => 0,
|
||||
]);
|
||||
|
||||
$participant = function (array $registrations) use ($incentive, $makeIncentiveRankingUser): IncentiveParticipant {
|
||||
$participant = IncentiveParticipant::factory()->qualified()->create([
|
||||
'incentive_id' => $incentive->id,
|
||||
'user_id' => $makeIncentiveRankingUser()->id,
|
||||
'accepted_terms_at' => now(),
|
||||
'total_points' => count($registrations),
|
||||
]);
|
||||
foreach ($registrations as $registeredAt) {
|
||||
IncentiveNewPartner::create([
|
||||
'participant_id' => $participant->id,
|
||||
'user_id' => $makeIncentiveRankingUser()->id,
|
||||
'registered_at' => $registeredAt,
|
||||
]);
|
||||
}
|
||||
|
||||
return $participant;
|
||||
};
|
||||
|
||||
return [$incentive, $participant];
|
||||
};
|
||||
|
||||
it('setzt bei gleicher Anzahl den vor, dessen letzter Neupartner frueher kam', function () use ($challengeWithTie) {
|
||||
[$incentive, $participant] = $challengeWithTie();
|
||||
|
||||
// Beide haben 2 Neupartner; der spaeter angelegte hat die Anzahl frueher erreicht.
|
||||
$reachedLater = $participant(['2026-10-02 10:00:00', '2026-11-20 09:00:00']);
|
||||
$reachedEarlier = $participant(['2026-10-05 10:00:00', '2026-10-30 18:00:00']);
|
||||
|
||||
IncentiveTracker::updateRanking($incentive);
|
||||
|
||||
expect($reachedEarlier->refresh()->rank)->toBe(1)
|
||||
->and($reachedLater->refresh()->rank)->toBe(2);
|
||||
});
|
||||
|
||||
it('laesst die Anzahl vor dem Zeitpunkt entscheiden', function () use ($challengeWithTie) {
|
||||
[$incentive, $participant] = $challengeWithTie();
|
||||
|
||||
$fewerButEarly = $participant(['2026-10-01 08:00:00']);
|
||||
$moreButLate = $participant(['2026-12-01 08:00:00', '2027-01-30 08:00:00']);
|
||||
|
||||
IncentiveTracker::updateRanking($incentive);
|
||||
|
||||
expect($moreButLate->refresh()->rank)->toBe(1)
|
||||
->and($fewerButEarly->refresh()->rank)->toBe(2);
|
||||
});
|
||||
|
||||
it('haelt bestaetigte Teilnahme weiterhin vor dem Zeitpunkt', function () use ($challengeWithTie) {
|
||||
[$incentive, $participant] = $challengeWithTie();
|
||||
|
||||
$anonymousEarly = $participant(['2026-10-01 08:00:00']);
|
||||
$anonymousEarly->update(['accepted_terms_at' => null]);
|
||||
$confirmedLate = $participant(['2026-12-01 08:00:00']);
|
||||
|
||||
IncentiveTracker::updateRanking($incentive);
|
||||
|
||||
expect($confirmedLate->refresh()->rank)->toBe(1)
|
||||
->and($anonymousEarly->refresh()->rank)->toBe(2);
|
||||
});
|
||||
|
||||
it('vergibt bei vollstaendigem Gleichstand stabil nach Teilnehmer-ID', function () use ($challengeWithTie) {
|
||||
[$incentive, $participant] = $challengeWithTie();
|
||||
|
||||
$first = $participant(['2026-10-10 10:00:00']);
|
||||
$second = $participant(['2026-10-10 10:00:00']);
|
||||
|
||||
IncentiveTracker::updateRanking($incentive);
|
||||
|
||||
expect($first->refresh()->rank)->toBe(1)
|
||||
->and($second->refresh()->rank)->toBe(2);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue