Incentive: Ticket-Fixes 2026-08-12 + Team-Struktur nach active_date sortiert
Incentive (Montenegro 2026): - Live-Tracker: whereDate() für Zeitraum-Vergleiche – Bestellungen am letzten Tag des Qualifikationszeitraums gingen verloren (DATE-Spalte vs. Datetime) - Repair/Rebuild: Neupartner-Definition auf Starterpaket-Bestelldatum im Zeitraum umgestellt (statt users.created_at) – Bestandskunden-Upgrades zählen jetzt wie im Live-Tracking (Fall Dino Portaro → Steffi Karrer) - Neu: removeStaleSponsorTrackings() – Partner-Trackings wandern nach Sponsorwechsel zum aktuellen Sponsor (Fall Anna Schall lag beim Firmenkonto) - incentive:calculate: Sponsorwechsel-Bereinigung eingebunden + Statistik Team-Struktur (/user/team/structure): - Downline sortiert nach active_date (Partner-Aktivierung) statt users.id: zentral in TreeHtmlRenderer::sortByActivation() (wirkt sofort, auch für gespeicherte Monats-Snapshots) + orderBy in beiden Downline-Queries Doku: dev/2026-08-12-intensiv-tickets/README.md (4 Kundentickets analysiert, Lücke durch verspätete Zeitraum-Verlängerung hatte sich per Nacht-Cron geheilt) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
ac3bd6e8ea
commit
841d87e161
11 changed files with 689 additions and 115 deletions
|
|
@ -2,23 +2,24 @@
|
|||
|
||||
namespace Tests\Unit\BusinessPlan;
|
||||
|
||||
use Tests\TestCase;
|
||||
use App\Services\BusinessPlan\TreeHtmlRenderer;
|
||||
use App\Services\BusinessPlan\BusinessUserItemOptimized;
|
||||
use App\Services\BusinessPlan\TreeHtmlRenderer;
|
||||
use stdClass;
|
||||
use Tests\TestCase;
|
||||
|
||||
class TreeHtmlRendererTest extends TestCase
|
||||
{
|
||||
private $renderer;
|
||||
|
||||
private $dateObj;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
||||
$this->renderer = new TreeHtmlRenderer('admin');
|
||||
|
||||
$this->dateObj = new stdClass();
|
||||
|
||||
$this->dateObj = new stdClass;
|
||||
$this->dateObj->month = 1;
|
||||
$this->dateObj->year = 2024;
|
||||
$this->dateObj->start_date = '2024-01-01 00:00:00';
|
||||
|
|
@ -30,43 +31,43 @@ class TreeHtmlRendererTest extends TestCase
|
|||
{
|
||||
$adminRenderer = new TreeHtmlRenderer('admin');
|
||||
$memberRenderer = new TreeHtmlRenderer('member');
|
||||
$defaultRenderer = new TreeHtmlRenderer();
|
||||
|
||||
$defaultRenderer = new TreeHtmlRenderer;
|
||||
|
||||
// Using reflection to access private property
|
||||
$reflection = new \ReflectionClass(TreeHtmlRenderer::class);
|
||||
$property = $reflection->getProperty('initFrom');
|
||||
$property->setAccessible(true);
|
||||
|
||||
|
||||
$this->assertEquals('admin', $property->getValue($adminRenderer));
|
||||
$this->assertEquals('member', $property->getValue($memberRenderer));
|
||||
$this->assertEquals('member', $property->getValue($defaultRenderer));
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderTree_returns_info_message_for_empty_array()
|
||||
public function render_tree_returns_info_message_for_empty_array()
|
||||
{
|
||||
$result = $this->renderer->renderTree([]);
|
||||
|
||||
|
||||
$this->assertStringContainsString('Keine Business-User gefunden', $result);
|
||||
$this->assertStringContainsString('alert-info', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderTree_generates_html_structure_for_business_users()
|
||||
public function render_tree_generates_html_structure_for_business_users()
|
||||
{
|
||||
// Create mock business user items
|
||||
$businessUsers = [
|
||||
$this->createMockBusinessUser(1, 'John', 'Doe', 'john@example.com', true),
|
||||
$this->createMockBusinessUser(2, 'Jane', 'Smith', 'jane@example.com', false)
|
||||
$this->createMockBusinessUser(2, 'Jane', 'Smith', 'jane@example.com', false),
|
||||
];
|
||||
|
||||
|
||||
$result = $this->renderer->renderTree($businessUsers);
|
||||
|
||||
|
||||
// Check basic HTML structure
|
||||
$this->assertStringContainsString('<ol class="dd-list">', $result);
|
||||
$this->assertStringContainsString('</ol>', $result);
|
||||
$this->assertStringContainsString('dd-item', $result);
|
||||
|
||||
|
||||
// Check user data is included
|
||||
$this->assertStringContainsString('John Doe', $result);
|
||||
$this->assertStringContainsString('Jane Smith', $result);
|
||||
|
|
@ -75,44 +76,44 @@ class TreeHtmlRendererTest extends TestCase
|
|||
}
|
||||
|
||||
/** @test */
|
||||
public function renderTree_includes_admin_buttons_for_admin_init()
|
||||
public function render_tree_includes_admin_buttons_for_admin_init()
|
||||
{
|
||||
$adminRenderer = new TreeHtmlRenderer('admin');
|
||||
$businessUsers = [
|
||||
$this->createMockBusinessUser(1, 'John', 'Doe', 'john@example.com', true)
|
||||
$this->createMockBusinessUser(1, 'John', 'Doe', 'john@example.com', true),
|
||||
];
|
||||
|
||||
|
||||
$result = $adminRenderer->renderTree($businessUsers);
|
||||
|
||||
|
||||
// Should include calculator button for admin
|
||||
$this->assertStringContainsString('fa-calculator', $result);
|
||||
$this->assertStringContainsString('business-user-detail', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderTree_excludes_admin_buttons_for_member_init()
|
||||
public function render_tree_excludes_admin_buttons_for_member_init()
|
||||
{
|
||||
$memberRenderer = new TreeHtmlRenderer('member');
|
||||
$businessUsers = [
|
||||
$this->createMockBusinessUser(1, 'John', 'Doe', 'john@example.com', true)
|
||||
$this->createMockBusinessUser(1, 'John', 'Doe', 'john@example.com', true),
|
||||
];
|
||||
|
||||
|
||||
$result = $memberRenderer->renderTree($businessUsers);
|
||||
|
||||
|
||||
// Should not include calculator button for regular members
|
||||
$this->assertStringNotContainsString('fa-calculator', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderTree_handles_inactive_accounts_correctly()
|
||||
public function render_tree_handles_inactive_accounts_correctly()
|
||||
{
|
||||
$businessUsers = [
|
||||
$this->createMockBusinessUser(1, 'Active', 'User', 'active@example.com', true),
|
||||
$this->createMockBusinessUser(2, 'Inactive', 'User', 'inactive@example.com', false)
|
||||
$this->createMockBusinessUser(2, 'Inactive', 'User', 'inactive@example.com', false),
|
||||
];
|
||||
|
||||
|
||||
$result = $this->renderer->renderTree($businessUsers);
|
||||
|
||||
|
||||
// Active user should have primary color icon
|
||||
$this->assertStringContainsString('text-primary', $result);
|
||||
// Inactive user should have danger/muted styling
|
||||
|
|
@ -121,82 +122,82 @@ class TreeHtmlRendererTest extends TestCase
|
|||
}
|
||||
|
||||
/** @test */
|
||||
public function renderParentless_returns_empty_message_for_empty_array()
|
||||
public function render_parentless_returns_empty_message_for_empty_array()
|
||||
{
|
||||
$result = $this->renderer->renderParentless([]);
|
||||
|
||||
|
||||
$this->assertStringContainsString('Keine parentlosen User gefunden', $result);
|
||||
$this->assertStringContainsString('alert-info', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderParentless_generates_list_for_parentless_users()
|
||||
public function render_parentless_generates_list_for_parentless_users()
|
||||
{
|
||||
$parentlessUsers = [
|
||||
$this->createMockBusinessUser(1, 'Orphan', 'User', 'orphan@example.com', true)
|
||||
$this->createMockBusinessUser(1, 'Orphan', 'User', 'orphan@example.com', true),
|
||||
];
|
||||
|
||||
|
||||
$result = $this->renderer->renderParentless($parentlessUsers);
|
||||
|
||||
|
||||
$this->assertStringContainsString('dd-item', $result);
|
||||
$this->assertStringContainsString('Orphan User', $result);
|
||||
$this->assertStringContainsString('orphan@example.com', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderSponsor_returns_no_sponsor_message_for_null()
|
||||
public function render_sponsor_returns_no_sponsor_message_for_null()
|
||||
{
|
||||
$result = $this->renderer->renderSponsor(null);
|
||||
|
||||
|
||||
$this->assertStringContainsString('alert-warning', $result);
|
||||
$this->assertStringContainsString('team.no_sponsor_assigned', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderSponsor_generates_sponsor_html()
|
||||
public function render_sponsor_generates_sponsor_html()
|
||||
{
|
||||
$sponsor = $this->createMockBusinessUser(1, 'Sponsor', 'User', 'sponsor@example.com', true);
|
||||
|
||||
|
||||
$result = $this->renderer->renderSponsor($sponsor);
|
||||
|
||||
|
||||
$this->assertStringContainsString('dd-item', $result);
|
||||
$this->assertStringContainsString('Sponsor User', $result);
|
||||
$this->assertStringContainsString('sponsor@example.com', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderSponsor_includes_admin_details_for_admin_init()
|
||||
public function render_sponsor_includes_admin_details_for_admin_init()
|
||||
{
|
||||
$adminRenderer = new TreeHtmlRenderer('admin');
|
||||
$sponsor = $this->createMockBusinessUser(1, 'Sponsor', 'User', 'sponsor@example.com', true);
|
||||
|
||||
|
||||
// Set some business data
|
||||
$sponsor->sales_volume_points_KP_sum = 1000;
|
||||
$sponsor->sales_volume_total_sum = 5000;
|
||||
|
||||
|
||||
$result = $adminRenderer->renderSponsor($sponsor);
|
||||
|
||||
|
||||
$this->assertStringContainsString('1000', $result);
|
||||
$this->assertStringContainsString('5000', $result);
|
||||
$this->assertStringContainsString('total_points', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function renderItem_handles_deep_nesting()
|
||||
public function render_item_handles_deep_nesting()
|
||||
{
|
||||
// Create business user with nested children
|
||||
$parentUser = $this->createMockBusinessUser(1, 'Parent', 'User', 'parent@example.com', true);
|
||||
$childUser = $this->createMockBusinessUser(2, 'Child', 'User', 'child@example.com', true);
|
||||
|
||||
|
||||
// Set up nesting
|
||||
$parentUser->businessUserItems = [$childUser];
|
||||
|
||||
|
||||
$result = $this->renderer->renderTree([$parentUser]);
|
||||
|
||||
|
||||
// Should contain both parent and child
|
||||
$this->assertStringContainsString('Parent User', $result);
|
||||
$this->assertStringContainsString('Child User', $result);
|
||||
|
||||
|
||||
// Should have nested structure
|
||||
$this->assertStringContainsString('<ol class="dd-list dd-nodrag">', $result);
|
||||
}
|
||||
|
|
@ -205,33 +206,88 @@ class TreeHtmlRendererTest extends TestCase
|
|||
public function html_output_is_properly_escaped()
|
||||
{
|
||||
$businessUsers = [
|
||||
$this->createMockBusinessUser(1, 'John <script>', 'Doe & Co', 'john@example.com', true)
|
||||
$this->createMockBusinessUser(1, 'John <script>', 'Doe & Co', 'john@example.com', true),
|
||||
];
|
||||
|
||||
|
||||
$result = $this->renderer->renderTree($businessUsers);
|
||||
|
||||
|
||||
// HTML should be escaped
|
||||
$this->assertStringNotContainsString('<script>', $result);
|
||||
$this->assertStringContainsString('<script>', $result);
|
||||
$this->assertStringContainsString('&', $result);
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function sort_by_activation_orders_by_active_date_then_user_id_with_nulls_last()
|
||||
{
|
||||
$make = function (int $userId, ?string $activeDate) {
|
||||
$item = new stdClass;
|
||||
$item->user_id = $userId;
|
||||
$item->active_date = $activeDate;
|
||||
|
||||
return $item;
|
||||
};
|
||||
|
||||
$items = [
|
||||
$make(10, '2026-07-31'),
|
||||
$make(11, '2024-10-07'),
|
||||
$make(12, null),
|
||||
$make(13, '2024-10-07'),
|
||||
$make(14, '2023-01-01'),
|
||||
];
|
||||
|
||||
$sorted = TreeHtmlRenderer::sortByActivation($items);
|
||||
|
||||
$this->assertEquals([14, 11, 13, 10, 12], array_column($sorted, 'user_id'));
|
||||
}
|
||||
|
||||
/** @test */
|
||||
public function sort_by_activation_works_on_business_user_items_despite_get_without_isset()
|
||||
{
|
||||
// Bestandskunde (niedrige User-ID = frühe Konto-Registrierung), aber spätes Partner-Upgrade.
|
||||
// BusinessUserItemOptimized hat __get ohne __isset - die Sortierung muss trotzdem
|
||||
// an active_date kommen (kein ??-Operator auf dem Item).
|
||||
$lateUpgrader = $this->createMockBusinessUser(2, 'Dino', 'Portaro', 'dino@example.com', true);
|
||||
$earlyPartner = $this->createMockBusinessUser(3, 'Renate', 'Hofrichter', 'renate@example.com', true);
|
||||
$this->setMockActiveDate($lateUpgrader, '2026-07-31');
|
||||
$this->setMockActiveDate($earlyPartner, '2024-11-07');
|
||||
|
||||
$sorted = TreeHtmlRenderer::sortByActivation([$lateUpgrader, $earlyPartner]);
|
||||
|
||||
$this->assertEquals(
|
||||
[3, 2],
|
||||
array_map(fn ($item) => $item->user_id, $sorted),
|
||||
'Partnerin mit früherem active_date muss vor dem späten Upgrader stehen'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper: setzt active_date auf dem gemockten b_user-Objekt
|
||||
*/
|
||||
private function setMockActiveDate($businessUser, string $activeDate): void
|
||||
{
|
||||
$reflection = new \ReflectionClass($businessUser);
|
||||
$property = $reflection->getProperty('b_user');
|
||||
$property->setAccessible(true);
|
||||
$property->getValue($businessUser)->active_date = $activeDate;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper method to create mock business user
|
||||
*/
|
||||
private function createMockBusinessUser($id, $firstName, $lastName, $email, $activeAccount)
|
||||
{
|
||||
$businessUser = new BusinessUserItemOptimized($this->dateObj);
|
||||
|
||||
|
||||
// Create a mock b_user object
|
||||
$bUser = new stdClass();
|
||||
$bUser = new stdClass;
|
||||
$bUser->user_id = $id;
|
||||
$bUser->first_name = $firstName;
|
||||
$bUser->last_name = $lastName;
|
||||
$bUser->email = $email;
|
||||
$bUser->active_account = $activeAccount;
|
||||
$bUser->user_level_name = 'Bronze';
|
||||
$bUser->m_account = 'TEST' . $id;
|
||||
$bUser->m_account = 'TEST'.$id;
|
||||
$bUser->user_birthday = '1990-01-01';
|
||||
$bUser->user_phone = '+1234567890';
|
||||
$bUser->sales_volume_points_KP_sum = 100;
|
||||
|
|
@ -242,13 +298,13 @@ class TreeHtmlRendererTest extends TestCase
|
|||
$bUser->sales_volume_total_shop = 500;
|
||||
$bUser->payment_account_date = '2024-01-15';
|
||||
$bUser->businessUserItems = [];
|
||||
|
||||
|
||||
// Use reflection to set private property
|
||||
$reflection = new \ReflectionClass($businessUser);
|
||||
$property = $reflection->getProperty('b_user');
|
||||
$property->setAccessible(true);
|
||||
$property->setValue($businessUser, $bUser);
|
||||
|
||||
|
||||
return $businessUser;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue