feat: Permettre la création et modification de l'emploi du temps des classes
Some checks failed
CI / Backend Tests (push) Has been cancelled
CI / Frontend Tests (push) Has been cancelled
CI / E2E Tests (push) Has been cancelled
CI / Naming Conventions (push) Has been cancelled
CI / Build Check (push) Has been cancelled

L'administration a besoin de construire et maintenir les emplois du temps
hebdomadaires pour chaque classe, en s'assurant que les enseignants ne sont
pas en conflit (même créneau, classes différentes) et que les affectations
enseignant-matière-classe sont respectées.

Cette implémentation couvre le CRUD complet des créneaux (ScheduleSlot),
la détection de conflits (classe, enseignant, salle) avec possibilité de
forcer, la validation des affectations côté serveur (AC2), l'intégration
calendrier pour les jours bloqués, une vue mobile-first avec onglets jour
par jour, et le drag-and-drop pour réorganiser les créneaux sur desktop.
This commit is contained in:
2026-03-03 13:54:53 +01:00
parent 1db8a7a0b2
commit d103b34023
53 changed files with 6382 additions and 1 deletions

View File

@@ -0,0 +1,196 @@
<?php
declare(strict_types=1);
namespace App\Tests\Unit\Scolarite\Application\Command\CreateScheduleSlot;
use App\Administration\Domain\Model\SchoolClass\ClassId;
use App\Administration\Domain\Model\Subject\SubjectId;
use App\Administration\Domain\Model\User\UserId;
use App\Scolarite\Application\Command\CreateScheduleSlot\CreateScheduleSlotCommand;
use App\Scolarite\Application\Command\CreateScheduleSlot\CreateScheduleSlotHandler;
use App\Scolarite\Application\Port\EnseignantAffectationChecker;
use App\Scolarite\Domain\Exception\EnseignantNonAffecteException;
use App\Scolarite\Domain\Model\Schedule\DayOfWeek;
use App\Scolarite\Domain\Model\Schedule\ScheduleSlot;
use App\Scolarite\Domain\Service\ScheduleConflictDetector;
use App\Scolarite\Infrastructure\Persistence\InMemory\InMemoryScheduleSlotRepository;
use App\Shared\Domain\Clock;
use App\Shared\Domain\Tenant\TenantId;
use DateTimeImmutable;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;
final class CreateScheduleSlotHandlerTest extends TestCase
{
private const string TENANT_ID = '550e8400-e29b-41d4-a716-446655440001';
private const string CLASS_ID = '550e8400-e29b-41d4-a716-446655440020';
private const string SUBJECT_ID = '550e8400-e29b-41d4-a716-446655440030';
private const string TEACHER_ID = '550e8400-e29b-41d4-a716-446655440010';
private InMemoryScheduleSlotRepository $repository;
private CreateScheduleSlotHandler $handler;
protected function setUp(): void
{
$this->repository = new InMemoryScheduleSlotRepository();
$clock = new class implements Clock {
public function now(): DateTimeImmutable
{
return new DateTimeImmutable('2026-03-02 10:00:00');
}
};
$this->handler = new CreateScheduleSlotHandler(
$this->repository,
new ScheduleConflictDetector($this->repository),
$this->createAlwaysAssignedChecker(),
$clock,
);
}
#[Test]
public function createsSlotSuccessfully(): void
{
$result = ($this->handler)($this->createCommand());
/** @var ScheduleSlot $slot */
$slot = $result['slot'];
self::assertTrue($slot->classId->equals(ClassId::fromString(self::CLASS_ID)));
self::assertSame(DayOfWeek::MONDAY, $slot->dayOfWeek);
self::assertSame('08:00', $slot->timeSlot->startTime);
self::assertSame('09:00', $slot->timeSlot->endTime);
self::assertEmpty($result['conflicts']);
}
#[Test]
public function savesSlotToRepository(): void
{
$result = ($this->handler)($this->createCommand());
/** @var ScheduleSlot $slot */
$slot = $result['slot'];
$found = $this->repository->findById($slot->id, TenantId::fromString(self::TENANT_ID));
self::assertNotNull($found);
self::assertTrue($found->id->equals($slot->id));
}
#[Test]
public function detectsConflictsWithoutSaving(): void
{
// Créer un slot existant
($this->handler)($this->createCommand());
// Même enseignant, même créneau, classe différente
$result = ($this->handler)(new CreateScheduleSlotCommand(
tenantId: self::TENANT_ID,
classId: '550e8400-e29b-41d4-a716-446655440021',
subjectId: self::SUBJECT_ID,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::MONDAY->value,
startTime: '08:30',
endTime: '09:30',
room: null,
));
self::assertNotEmpty($result['conflicts']);
// Le slot conflictuel ne devrait PAS être sauvegardé
$allSlots = $this->repository->findByTeacher(
UserId::fromString(self::TEACHER_ID),
TenantId::fromString(self::TENANT_ID),
);
self::assertCount(1, $allSlots);
}
#[Test]
public function forceSavesSlotWithConflicts(): void
{
($this->handler)($this->createCommand());
$result = ($this->handler)(new CreateScheduleSlotCommand(
tenantId: self::TENANT_ID,
classId: '550e8400-e29b-41d4-a716-446655440021',
subjectId: self::SUBJECT_ID,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::MONDAY->value,
startTime: '08:30',
endTime: '09:30',
room: null,
forceConflicts: true,
));
self::assertNotEmpty($result['conflicts']);
// Malgré les conflits, le slot est sauvegardé
$allSlots = $this->repository->findByTeacher(
UserId::fromString(self::TEACHER_ID),
TenantId::fromString(self::TENANT_ID),
);
self::assertCount(2, $allSlots);
}
#[Test]
public function rejectsUnassignedTeacher(): void
{
$clock = new class implements Clock {
public function now(): DateTimeImmutable
{
return new DateTimeImmutable('2026-03-02 10:00:00');
}
};
$handler = new CreateScheduleSlotHandler(
$this->repository,
new ScheduleConflictDetector($this->repository),
$this->createNeverAssignedChecker(),
$clock,
);
$this->expectException(EnseignantNonAffecteException::class);
($handler)($this->createCommand());
}
private function createCommand(): CreateScheduleSlotCommand
{
return new CreateScheduleSlotCommand(
tenantId: self::TENANT_ID,
classId: self::CLASS_ID,
subjectId: self::SUBJECT_ID,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::MONDAY->value,
startTime: '08:00',
endTime: '09:00',
room: null,
);
}
private function createAlwaysAssignedChecker(): EnseignantAffectationChecker
{
return new class implements EnseignantAffectationChecker {
public function estAffecte(
UserId $teacherId,
ClassId $classId,
SubjectId $subjectId,
TenantId $tenantId,
): bool {
return true;
}
};
}
private function createNeverAssignedChecker(): EnseignantAffectationChecker
{
return new class implements EnseignantAffectationChecker {
public function estAffecte(
UserId $teacherId,
ClassId $classId,
SubjectId $subjectId,
TenantId $tenantId,
): bool {
return false;
}
};
}
}

View File

@@ -0,0 +1,105 @@
<?php
declare(strict_types=1);
namespace App\Tests\Unit\Scolarite\Application\Command\DeleteScheduleSlot;
use App\Administration\Domain\Model\SchoolClass\ClassId;
use App\Administration\Domain\Model\Subject\SubjectId;
use App\Administration\Domain\Model\User\UserId;
use App\Scolarite\Application\Command\DeleteScheduleSlot\DeleteScheduleSlotCommand;
use App\Scolarite\Application\Command\DeleteScheduleSlot\DeleteScheduleSlotHandler;
use App\Scolarite\Domain\Event\CoursSupprime;
use App\Scolarite\Domain\Exception\ScheduleSlotNotFoundException;
use App\Scolarite\Domain\Model\Schedule\DayOfWeek;
use App\Scolarite\Domain\Model\Schedule\ScheduleSlot;
use App\Scolarite\Domain\Model\Schedule\TimeSlot;
use App\Scolarite\Infrastructure\Persistence\InMemory\InMemoryScheduleSlotRepository;
use App\Shared\Domain\Clock;
use App\Shared\Domain\Tenant\TenantId;
use DateTimeImmutable;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;
final class DeleteScheduleSlotHandlerTest extends TestCase
{
private const string TENANT_ID = '550e8400-e29b-41d4-a716-446655440001';
private const string CLASS_ID = '550e8400-e29b-41d4-a716-446655440020';
private const string SUBJECT_ID = '550e8400-e29b-41d4-a716-446655440030';
private const string TEACHER_ID = '550e8400-e29b-41d4-a716-446655440010';
private InMemoryScheduleSlotRepository $repository;
private DeleteScheduleSlotHandler $handler;
protected function setUp(): void
{
$this->repository = new InMemoryScheduleSlotRepository();
$clock = new class implements Clock {
public function now(): DateTimeImmutable
{
return new DateTimeImmutable('2026-03-02 15:00:00');
}
};
$this->handler = new DeleteScheduleSlotHandler($this->repository, $clock);
}
#[Test]
public function deletesSlotFromRepository(): void
{
$slot = $this->createAndSaveSlot();
$tenantId = TenantId::fromString(self::TENANT_ID);
($this->handler)(new DeleteScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: (string) $slot->id,
));
self::assertNull($this->repository->findById($slot->id, $tenantId));
}
#[Test]
public function returnsSlotWithCoursSupprime(): void
{
$slot = $this->createAndSaveSlot();
$slot->pullDomainEvents(); // Clear creation event
$deletedSlot = ($this->handler)(new DeleteScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: (string) $slot->id,
));
$events = $deletedSlot->pullDomainEvents();
self::assertCount(1, $events);
self::assertInstanceOf(CoursSupprime::class, $events[0]);
}
#[Test]
public function throwsWhenSlotNotFound(): void
{
$this->expectException(ScheduleSlotNotFoundException::class);
($this->handler)(new DeleteScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: '550e8400-e29b-41d4-a716-446655440099',
));
}
private function createAndSaveSlot(): ScheduleSlot
{
$slot = ScheduleSlot::creer(
tenantId: TenantId::fromString(self::TENANT_ID),
classId: ClassId::fromString(self::CLASS_ID),
subjectId: SubjectId::fromString(self::SUBJECT_ID),
teacherId: UserId::fromString(self::TEACHER_ID),
dayOfWeek: DayOfWeek::MONDAY,
timeSlot: new TimeSlot('08:00', '09:00'),
room: null,
isRecurring: true,
now: new DateTimeImmutable('2026-03-01 10:00:00'),
);
$this->repository->save($slot);
return $slot;
}
}

View File

@@ -0,0 +1,221 @@
<?php
declare(strict_types=1);
namespace App\Tests\Unit\Scolarite\Application\Command\UpdateScheduleSlot;
use App\Administration\Domain\Model\SchoolClass\ClassId;
use App\Administration\Domain\Model\Subject\SubjectId;
use App\Administration\Domain\Model\User\UserId;
use App\Scolarite\Application\Command\UpdateScheduleSlot\UpdateScheduleSlotCommand;
use App\Scolarite\Application\Command\UpdateScheduleSlot\UpdateScheduleSlotHandler;
use App\Scolarite\Application\Port\EnseignantAffectationChecker;
use App\Scolarite\Domain\Exception\EnseignantNonAffecteException;
use App\Scolarite\Domain\Model\Schedule\DayOfWeek;
use App\Scolarite\Domain\Model\Schedule\ScheduleSlot;
use App\Scolarite\Domain\Model\Schedule\TimeSlot;
use App\Scolarite\Domain\Service\ScheduleConflictDetector;
use App\Scolarite\Infrastructure\Persistence\InMemory\InMemoryScheduleSlotRepository;
use App\Shared\Domain\Clock;
use App\Shared\Domain\Tenant\TenantId;
use DateTimeImmutable;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;
final class UpdateScheduleSlotHandlerTest extends TestCase
{
private const string TENANT_ID = '550e8400-e29b-41d4-a716-446655440001';
private const string CLASS_ID = '550e8400-e29b-41d4-a716-446655440020';
private const string OTHER_CLASS_ID = '550e8400-e29b-41d4-a716-446655440021';
private const string SUBJECT_ID = '550e8400-e29b-41d4-a716-446655440030';
private const string TEACHER_ID = '550e8400-e29b-41d4-a716-446655440010';
private InMemoryScheduleSlotRepository $repository;
private UpdateScheduleSlotHandler $handler;
private Clock $clock;
protected function setUp(): void
{
$this->repository = new InMemoryScheduleSlotRepository();
$this->clock = new class implements Clock {
public function now(): DateTimeImmutable
{
return new DateTimeImmutable('2026-03-02 15:00:00');
}
};
$this->handler = new UpdateScheduleSlotHandler(
$this->repository,
new ScheduleConflictDetector($this->repository),
$this->createAlwaysAssignedChecker(),
$this->clock,
);
}
#[Test]
public function updatesSlotProperties(): void
{
$slot = $this->createAndSaveSlot();
$newSubjectId = '550e8400-e29b-41d4-a716-446655440031';
$result = ($this->handler)(new UpdateScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: (string) $slot->id,
classId: self::CLASS_ID,
subjectId: $newSubjectId,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::WEDNESDAY->value,
startTime: '10:00',
endTime: '11:00',
room: 'Salle 301',
));
/** @var ScheduleSlot $updated */
$updated = $result['slot'];
self::assertTrue($updated->subjectId->equals(SubjectId::fromString($newSubjectId)));
self::assertSame(DayOfWeek::WEDNESDAY, $updated->dayOfWeek);
self::assertSame('10:00', $updated->timeSlot->startTime);
self::assertSame('Salle 301', $updated->room);
self::assertEmpty($result['conflicts']);
}
#[Test]
public function updatesClassId(): void
{
$slot = $this->createAndSaveSlot();
$result = ($this->handler)(new UpdateScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: (string) $slot->id,
classId: self::OTHER_CLASS_ID,
subjectId: self::SUBJECT_ID,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::MONDAY->value,
startTime: '08:00',
endTime: '09:00',
room: null,
));
/** @var ScheduleSlot $updated */
$updated = $result['slot'];
self::assertTrue($updated->classId->equals(ClassId::fromString(self::OTHER_CLASS_ID)));
self::assertFalse($updated->classId->equals(ClassId::fromString(self::CLASS_ID)));
}
#[Test]
public function persistsClassIdChange(): void
{
$slot = $this->createAndSaveSlot();
($this->handler)(new UpdateScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: (string) $slot->id,
classId: self::OTHER_CLASS_ID,
subjectId: self::SUBJECT_ID,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::MONDAY->value,
startTime: '08:00',
endTime: '09:00',
room: null,
));
$persisted = $this->repository->get($slot->id, TenantId::fromString(self::TENANT_ID));
self::assertTrue($persisted->classId->equals(ClassId::fromString(self::OTHER_CLASS_ID)));
}
#[Test]
public function excludesSelfFromConflictDetection(): void
{
$slot = $this->createAndSaveSlot();
// Modifier le slot sans changer le créneau → pas de conflit avec lui-même
$result = ($this->handler)(new UpdateScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: (string) $slot->id,
classId: self::CLASS_ID,
subjectId: self::SUBJECT_ID,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::MONDAY->value,
startTime: '08:00',
endTime: '09:00',
room: 'Salle 101',
));
self::assertEmpty($result['conflicts']);
}
#[Test]
public function rejectsUnassignedTeacher(): void
{
$slot = $this->createAndSaveSlot();
$handler = new UpdateScheduleSlotHandler(
$this->repository,
new ScheduleConflictDetector($this->repository),
$this->createNeverAssignedChecker(),
$this->clock,
);
$this->expectException(EnseignantNonAffecteException::class);
($handler)(new UpdateScheduleSlotCommand(
tenantId: self::TENANT_ID,
slotId: (string) $slot->id,
classId: self::CLASS_ID,
subjectId: self::SUBJECT_ID,
teacherId: self::TEACHER_ID,
dayOfWeek: DayOfWeek::MONDAY->value,
startTime: '08:00',
endTime: '09:00',
room: null,
));
}
private function createAndSaveSlot(): ScheduleSlot
{
$slot = ScheduleSlot::creer(
tenantId: TenantId::fromString(self::TENANT_ID),
classId: ClassId::fromString(self::CLASS_ID),
subjectId: SubjectId::fromString(self::SUBJECT_ID),
teacherId: UserId::fromString(self::TEACHER_ID),
dayOfWeek: DayOfWeek::MONDAY,
timeSlot: new TimeSlot('08:00', '09:00'),
room: null,
isRecurring: true,
now: new DateTimeImmutable('2026-03-01 10:00:00'),
);
$this->repository->save($slot);
return $slot;
}
private function createAlwaysAssignedChecker(): EnseignantAffectationChecker
{
return new class implements EnseignantAffectationChecker {
public function estAffecte(
UserId $teacherId,
ClassId $classId,
SubjectId $subjectId,
TenantId $tenantId,
): bool {
return true;
}
};
}
private function createNeverAssignedChecker(): EnseignantAffectationChecker
{
return new class implements EnseignantAffectationChecker {
public function estAffecte(
UserId $teacherId,
ClassId $classId,
SubjectId $subjectId,
TenantId $tenantId,
): bool {
return false;
}
};
}
}