Zmskvr 670 tagessperre gesamtuebersicht #1420
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <?php | ||
|
|
||
| namespace BO\Zmsadmin; | ||
|
|
||
| use Psr\Http\Message\RequestInterface; | ||
| use Psr\Http\Message\ResponseInterface; | ||
|
|
||
| class OverallCalendarClosureLoadData extends BaseController | ||
| { | ||
| public function readResponse( | ||
| RequestInterface $request, | ||
| ResponseInterface $response, | ||
| array $args | ||
| ) { | ||
| $scopeIds = $_GET['scopeIds'] ?? null; | ||
| $dateFrom = $_GET['dateFrom'] ?? null; | ||
| $dateUntil = $_GET['dateUntil'] ?? null; | ||
|
|
||
| if ($scopeIds === null && $dateFrom === null && $dateUntil === null) { | ||
| $response->getBody()->write(json_encode([])); | ||
| return $response->withHeader('Content-Type', 'application/json'); | ||
| } | ||
|
|
||
| if (!$scopeIds || !$dateFrom || !$dateUntil) { | ||
| $error = [ | ||
| 'error' => true, | ||
| 'message' => 'Missing required parameters: scopeIds, dateFrom, dateUntil', | ||
| ]; | ||
| $response->getBody()->write(json_encode($error)); | ||
| return $response | ||
| ->withStatus(400) | ||
| ->withHeader('Content-Type', 'application/json'); | ||
| } | ||
|
|
||
| $params = [ | ||
| 'scopeIds' => $scopeIds, | ||
| 'dateFrom' => $dateFrom, | ||
| 'dateUntil' => $dateUntil, | ||
| ]; | ||
|
|
||
| $apiResult = \App::$http->readGetResult('/closure/', $params); | ||
| $apiResponse = $apiResult->getResponse(); | ||
|
|
||
| $lastMod = $apiResponse->getHeaderLine('Last-Modified'); | ||
| if ($lastMod !== '') { | ||
| $response = $response->withHeader('Last-Modified', $lastMod); | ||
| } | ||
|
|
||
| $contentType = $apiResponse->getHeaderLine('Content-Type'); | ||
| $response = $response->withHeader( | ||
| 'Content-Type', | ||
| $contentType !== '' ? $contentType : 'application/json' | ||
| ); | ||
|
|
||
| $bodyStream = $apiResponse->getBody(); | ||
| if ($bodyStream->isSeekable()) { | ||
| $bodyStream->rewind(); | ||
| } | ||
| $rawBody = (string) $bodyStream; | ||
|
|
||
| $response->getBody()->write($rawBody); | ||
|
|
||
| return $response->withStatus($apiResponse->getStatusCode()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| <?php | ||
|
|
||
| namespace BO\Zmsadmin\Tests; | ||
|
|
||
| class OverallCalendarClosureLoadDataTest extends Base | ||
| { | ||
| protected $arguments = []; | ||
| protected $parameters = []; | ||
| protected $classname = "OverallCalendarClosureLoadData"; | ||
|
|
||
| public function testRenderingWithoutParameters() | ||
| { | ||
| $_SERVER['HTTP_AUTHORIZATION'] = 'Bearer validtoken'; | ||
| $_GET = []; | ||
|
|
||
| $response = $this->render([], [], []); | ||
|
|
||
| $this->assertEquals(200, $response->getStatusCode()); | ||
| $this->assertEquals('application/json', $response->getHeaderLine('Content-Type')); | ||
| $body = json_decode((string)$response->getBody(), true); | ||
| $this->assertIsArray($body); | ||
| $this->assertEmpty($body); | ||
| } | ||
|
|
||
| public function testMissingParamsReturnsError() | ||
| { | ||
| $_SERVER['HTTP_AUTHORIZATION'] = 'Bearer validtoken'; | ||
| $_GET = [ | ||
| 'scopeIds' => '58,59' | ||
| ]; | ||
|
|
||
| $response = $this->render([], [], []); | ||
|
|
||
| $this->assertEquals(400, $response->getStatusCode()); | ||
| $this->assertEquals('application/json', $response->getHeaderLine('Content-Type')); | ||
|
|
||
| $body = json_decode((string)$response->getBody(), true); | ||
| $this->assertIsArray($body); | ||
| $this->assertArrayHasKey('error', $body); | ||
| $this->assertTrue($body['error']); | ||
| $this->assertStringContainsString('dateFrom', $body['message']); | ||
| $this->assertStringContainsString('dateUntil', $body['message']); | ||
| } | ||
|
|
||
|
|
||
| public function testRendering() | ||
| { | ||
| $_SERVER['HTTP_AUTHORIZATION'] = 'Bearer validtoken'; | ||
| $_GET = [ | ||
| 'scopeIds' => '58,59', | ||
| 'dateFrom' => '2025-09-02', | ||
| 'dateUntil' => '2025-09-05', | ||
| ]; | ||
|
|
||
| $this->setApiCalls([ | ||
| [ | ||
| 'function' => 'readGetResult', | ||
| 'url' => '/closure/', | ||
| 'parameters' => [ | ||
| 'scopeIds' => '58,59', | ||
| 'dateFrom' => '2025-09-02', | ||
| 'dateUntil' => '2025-09-05', | ||
| ], | ||
| 'response' => $this->readFixture('GET_Closure_Data.json'), | ||
| ], | ||
| ]); | ||
|
|
||
| $response = $this->render([], [], []); | ||
|
|
||
| $this->assertEquals(200, $response->getStatusCode()); | ||
| $this->assertEquals('application/json', $response->getHeaderLine('Content-Type')); | ||
|
|
||
| $body = json_decode((string)$response->getBody(), true); | ||
| $this->assertIsArray($body); | ||
| $this->assertArrayHasKey('data', $body); | ||
| $this->assertArrayHasKey('items', $body['data']); | ||
| $this->assertIsArray($body['data']['items']); | ||
| $this->assertNotEmpty($body['data']['items']); | ||
|
|
||
| $first = $body['data']['items'][0]; | ||
| $this->assertArrayHasKey('scopeId', $first); | ||
| $this->assertArrayHasKey('date', $first); | ||
| } | ||
|
|
||
| public function testResponseStructure() | ||
| { | ||
| $_SERVER['HTTP_AUTHORIZATION'] = 'Bearer validtoken'; | ||
| $_GET = [ | ||
| 'scopeIds' => '58,59', | ||
| 'dateFrom' => '2025-09-02', | ||
| 'dateUntil' => '2025-09-05', | ||
| ]; | ||
|
|
||
| $this->setApiCalls([ | ||
| [ | ||
| 'function' => 'readGetResult', | ||
| 'url' => '/closure/', | ||
| 'parameters' => [ | ||
| 'scopeIds' => '58,59', | ||
| 'dateFrom' => '2025-09-02', | ||
| 'dateUntil' => '2025-09-05', | ||
| ], | ||
| 'response' => $this->readFixture('GET_Closure_Data.json'), | ||
| ], | ||
| ]); | ||
|
|
||
| $response = $this->render([], [], []); | ||
| $this->assertEquals('application/json', $response->getHeaderLine('Content-Type')); | ||
|
|
||
| $body = json_decode((string)$response->getBody(), true); | ||
| $this->assertArrayHasKey('$schema', $body); | ||
| $this->assertArrayHasKey('meta', $body); | ||
| $this->assertArrayHasKey('data', $body); | ||
| $this->assertArrayHasKey('items', $body['data']); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Prevent overlapping auto-refresh calls.
Auto-refresh every 60s can overlap on slow networks. Add an in-flight guard with try/finally.
async function fetchIncrementalUpdate() { - if (!currentRequest || !lastUpdateAfter) return; + if (!currentRequest || !lastUpdateAfter || incrementalRefreshInFlight) return; + incrementalRefreshInFlight = true; const { scopeIds, dateFrom, dateUntil } = currentRequest; - const res = await fetch(`overallcalendarData/?${new URLSearchParams({ - scopeIds: scopeIds.join(','), - dateFrom, - dateUntil, - updateAfter: lastUpdateAfter - })}`); - if (res.ok) { - lastUpdateAfter = toMysql(res.headers.get('Last-Modified') || new Date()); - const json = await res.json(); - mergeDelta(json.data.days); - } - - await fetchClosures({ scopeIds, dateFrom, dateUntil }); - renderMultiDayCalendar(calendarCache); + try { + const res = await fetch(`overallcalendarData/?${new URLSearchParams({ + scopeIds: scopeIds.join(','), + dateFrom, + dateUntil, + updateAfter: lastUpdateAfter + })}`); + if (res.ok) { + lastUpdateAfter = toMysql(res.headers.get('Last-Modified') || new Date()); + const json = await res.json(); + mergeDelta(json.data.days); + } + await fetchClosures({ scopeIds, dateFrom, dateUntil }); + renderMultiDayCalendar(calendarCache); + } finally { + incrementalRefreshInFlight = false; + } }Add once near the top with other module-level vars:
🤖 Prompt for AI Agents