From f5c74b364d4fa687d20ec056b722a7461a8090c8 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 26 Mar 2024 12:28:10 +0100 Subject: [PATCH] fixtures remove old document files, sales summary only users with sales --- src/DataFixtures/AppFixtures.php | 8 ++++++++ src/State/SaleSummaryStateProvider.php | 21 ++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/DataFixtures/AppFixtures.php b/src/DataFixtures/AppFixtures.php index 190dd2b..0348a6e 100644 --- a/src/DataFixtures/AppFixtures.php +++ b/src/DataFixtures/AppFixtures.php @@ -44,6 +44,14 @@ class AppFixtures extends Fixture } } + $documentPath = $projectRoot . '/public/media/'; + $files = glob($documentPath . '*'); + foreach ($files as $file) { + if (is_file($file)) { + unlink($file); + } + } + MediaObjectUserFactory::createMany(20); $adminD = UserFactory::createOne( [ diff --git a/src/State/SaleSummaryStateProvider.php b/src/State/SaleSummaryStateProvider.php index 0b664c7..ee69b38 100644 --- a/src/State/SaleSummaryStateProvider.php +++ b/src/State/SaleSummaryStateProvider.php @@ -51,16 +51,19 @@ class SaleSummaryStateProvider implements ProviderInterface /** @var User $user */ foreach ($users as $user) { $sales = $user->getSales(); - $salesSummary = new SaleSummary(); - $salesSummary->owner = $this->microMapper->map($user, UserApi::class); - $salesSummary->ownerName = $user->getFirstName() . ' ' . $user->getLastName(); - $salesSummary->turnover = 0; - $salesSummary->profit = 0; - foreach ($sales as $sale) { - $salesSummary->turnover += $sale->getTurnover(); - $salesSummary->profit += $sale->getProfit(); + if (count($sales) > 0) { + $salesSummary = new SaleSummary(); + $salesSummary->owner = $this->microMapper->map($user, UserApi::class); + $salesSummary->ownerName = $user->getFirstName() . ' ' . $user->getLastName(); + $salesSummary->turnover = 0; + $salesSummary->profit = 0; + foreach ($sales as $sale) { + $salesSummary->turnover += $sale->getTurnover(); + $salesSummary->profit += $sale->getProfit(); + } + $salesSummaries[] = $salesSummary; } - $salesSummaries[] = $salesSummary; + } return $salesSummaries; }