Timon/SmartCane
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Changed GetFileDownloadsFor and all the functions called inside

Browse source
This commit is contained in:
guillaume91 2024-06-18 16:31:35 +02:00
parent 3b98d0e364
commit 5153228758
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
laravel_app/app/Models/Project.php
View file

@ -319,7 +319,7 @@ public function scheduleReport($year = null, $week = null)
$year = $year ?? now()->year; $year = $year ?? now()->year;
$week = $week ?? now()->weekOfYear; $week = $week ?? now()->weekOfYear;
// TODO change to period
Bus::chain([ Bus::chain([
Bus::batch($this->getFileDownloadsFor($year, $week)), Bus::batch($this->getFileDownloadsFor($year, $week)),
Bus::batch($this->getMosaicsFor($year, $week)), Bus::batch($this->getMosaicsFor($year, $week)),
@ -341,12 +341,10 @@ public function getReportFor($year, $week, $sendMail = false)
return (new ProjectReportGeneratorJob($report, $sendMail)); return (new ProjectReportGeneratorJob($report, $sendMail));
} }
public function getFileDownloadsFor($year, $startWeekNumber):array public function getFileDownloadsFor(Carbon $endDate, $offset):array
{ {
$endOfRange = now()->setISODate($year, $startWeekNumber)->endOfWeek(); $startOfRange = (clone $endDate)->subdays(4*$offset-1);
$startOfRange = (clone $endOfRange)->subWeeks(3)->startOfWeek(); $dateRange = CarbonPeriod::create($startOfRange, $endDate);
$dateRange = CarbonPeriod::create($startOfRange, $endOfRange);
return collect($dateRange) return collect($dateRange)
->map(fn($date) => ProjectDownloadTiffJob::handleForDate($this, $date)) ->map(fn($date) => ProjectDownloadTiffJob::handleForDate($this, $date))

4
laravel_app/tests/Unit/Models/ProjectTest.php
View file

@ -162,8 +162,8 @@ public function when_getFileDownloadsFor_is_called_it_returns_a_collection_of_se
'download_path' => 'project_download_path', 'download_path' => 'project_download_path',
]); ]);
$downloads = $project->getFileDownloadsFor(2023, 22); $downloads = $project->getFileDownloadsFor(new Carbon('2024-06-18'),20);
$this->assertCount(4 * 7, $downloads); $this->assertCount(60, $downloads);
collect($downloads)->each(fn($job) => $this->assertInstanceOf(ProjectDownloadTiffJob::class, $job)); collect($downloads)->each(fn($job) => $this->assertInstanceOf(ProjectDownloadTiffJob::class, $job));
} }