feat: keep questionnaires until submitted, remind teamers daily and take bus feedback per leg

This commit is contained in:
fromme committed 2026-11-10 16:38:51 +01:00
1 parent abf9c1be0b
commit e72616fdbf
37 files changed
+1119 -238

No files matched your search

+22 -16
View File
@@ -159,7 +159,7 @@ class DispositionVoterTest extends TestCase
$this->assertSame(
$expected ? VoterInterface::ACCESS_GRANTED : VoterInterface::ACCESS_DENIED,
(new DispositionVoter($this->security, 30))->vote($token, $disposition, [DispositionVoter::MANAGE_RECEIPTS]),
(new DispositionVoter($this->security, '2026-01-01'))->vote($token, $disposition, [DispositionVoter::MANAGE_RECEIPTS]),
);
}
@@ -217,20 +217,19 @@ class DispositionVoterTest extends TestCase
{
return [
'assignment not over yet' => [static fn (Disposition $d) => $d->getAssignment()->getDestination()->setDateTo(new \DateTimeImmutable('tomorrow'))],
'ended before the window' => [static fn (Disposition $d) => $d->getAssignment()->getDestination()->setDateTo(new \DateTimeImmutable('today -31 days'))],
'ended before go-live' => [static fn (Disposition $d) => $d->getAssignment()->getDestination()->setDateTo(new \DateTimeImmutable('2025-12-31'))],
'skip formalities' => [static fn (Disposition $d) => $d->getAssignment()->setSkipFormalities(true)],
'called off' => [static fn (Disposition $d) => $d->setStatus(Disposition::STATUS_CALLED_OFF)],
];
}
public function testTheQuestionnaireIsStillOfferedOnTheWindowsLastDay(): void
/**
* An unfinished questionnaire stays open however long ago the trip ended - only go-live and
* submitting end it.
*/
public function testTheQuestionnaireStaysOpenLongAfterTheTrip(): void
{
$this->assertQuestionnaire(true, $this->escortDisposition(dateTo: 'today -30 days'));
}
public function testTheWindowIsConfigurable(): void
{
$this->assertQuestionnaire(false, $this->escortDisposition(dateTo: 'today -8 days'), windowDays: 7);
$this->assertQuestionnaire(true, $this->escortDisposition(dateTo: '2026-01-01'));
}
public function testAnotherTeamerMayNotFillInTheQuestionnaire(): void
@@ -252,11 +251,18 @@ class DispositionVoterTest extends TestCase
$this->assertSame(
VoterInterface::ACCESS_DENIED,
$this->questionnaireVote($disposition, (new User())->setTeamer($disposition->getTeamer()), 30),
$this->questionnaireVote($disposition, (new User())->setTeamer($disposition->getTeamer()), '2026-01-01'),
);
}
private function assertQuestionnaire(bool $expected, Disposition $disposition, int $windowDays = 30, ?User $user = null): void
public function testAMalformedGoLiveDateFailsLoudly(): void
{
$this->expectException(\InvalidArgumentException::class);
new DispositionVoter($this->security, '01.01.2026');
}
private function assertQuestionnaire(bool $expected, Disposition $disposition, string $goLive = '2026-01-01', ?User $user = null): void
{
$this->security
->method('isGranted')
@@ -265,20 +271,20 @@ class DispositionVoterTest extends TestCase
$this->assertSame(
$expected ? VoterInterface::ACCESS_GRANTED : VoterInterface::ACCESS_DENIED,
$this->questionnaireVote($disposition, $user ?? (new User())->setTeamer($disposition->getTeamer()), $windowDays),
$this->questionnaireVote($disposition, $user ?? (new User())->setTeamer($disposition->getTeamer()), $goLive),
);
}
private function questionnaireVote(Disposition $disposition, User $user, int $windowDays): int
private function questionnaireVote(Disposition $disposition, User $user, string $goLive): int
{
$token = $this->createStub(TokenInterface::class);
$token->method('getUser')->willReturn($user);
return (new DispositionVoter($this->security, $windowDays))->vote($token, $disposition, [DispositionVoter::QUESTIONNAIRE]);
return (new DispositionVoter($this->security, $goLive))->vote($token, $disposition, [DispositionVoter::QUESTIONNAIRE]);
}
/**
* A bus escort that ended yesterday, well within the 30-day window the tests use.
* A bus escort that ended yesterday, after the go-live date the tests use.
*/
private function escortDisposition(string $dateTo = 'yesterday'): Disposition
{
@@ -294,7 +300,7 @@ class DispositionVoterTest extends TestCase
private function vote(string $attribute, Disposition $disposition): int
{
return (new DispositionVoter($this->security, 30))->vote(
return (new DispositionVoter($this->security, '2026-01-01'))->vote(
$this->createStub(TokenInterface::class),
$disposition,
[$attribute],