test level based scheduling
This commit is contained in:
parent
99e1ba051c
commit
a64df64b76
GPG key ID:
0FA60884F75520A9
7 changed files with 415 additions and 94 deletions
|
|
@ -6,6 +6,7 @@ use App\Auth\PasswordHasher;
|
|||
use App\Element\Element;
|
||||
use App\Element\ElementRepository;
|
||||
use App\Set\SetRepository;
|
||||
use App\Set\SetLevelRepository;
|
||||
use App\Shared\ValueObject\EmailAddress;
|
||||
use App\User\UserRepository;
|
||||
use Database\Seeders\UserSeeder;
|
||||
|
|
@ -70,6 +71,12 @@ class DatabaseSeederTest extends TestCase
|
|||
|
||||
$sets = app(SetRepository::class)->all();
|
||||
$elementRepository = app(ElementRepository::class);
|
||||
$setLevelRepository = app(SetLevelRepository::class);
|
||||
$expectedLevels = [
|
||||
'Bible' => ['book', 'portion', 'chapter'],
|
||||
'Course' => ['module', 'lesson'],
|
||||
'Fitness Program' => ['phase', 'workout', 'exercise'],
|
||||
];
|
||||
$expectedElements = [
|
||||
'Bible' => [
|
||||
'Chapter 1:chapter:Creation',
|
||||
|
|
@ -100,9 +107,16 @@ class DatabaseSeederTest extends TestCase
|
|||
],
|
||||
];
|
||||
|
||||
$this->assertDatabaseCount('set_levels', 8);
|
||||
$this->assertDatabaseCount('elements', 21);
|
||||
|
||||
foreach ($sets as $set) {
|
||||
$this->assertSame(
|
||||
$expectedLevels[$set->getName()],
|
||||
array_map(function ($level): string {
|
||||
return $level->getKind();
|
||||
}, $setLevelRepository->findBySet($set)),
|
||||
);
|
||||
$signatures = array_map(function (Element $element): string {
|
||||
$parentName = $element->getParentElement()?->getName()
|
||||
?? 'root';
|
||||
|
|
|
|||
|
|
@ -9,7 +9,11 @@ use App\Element\ElementModel;
|
|||
use App\Element\ElementRepository;
|
||||
use App\Http\Middleware\AuthMiddleware;
|
||||
use App\Set\CreateSetDto;
|
||||
use App\Set\CreateSetLevelDto;
|
||||
use App\Set\Set;
|
||||
use App\Set\SetLevel;
|
||||
use App\Set\SetLevelModel;
|
||||
use App\Set\SetLevelRepository;
|
||||
use App\Set\SetModel;
|
||||
use App\Set\SetRepository;
|
||||
use App\Shared\ValueObject\EmailAddress;
|
||||
|
|
@ -32,42 +36,45 @@ class ScheduleEndpointTest extends TestCase
|
|||
$user = $this->createUser('reader@example.com');
|
||||
$creator = $this->createUser('creator@example.com');
|
||||
$set = $this->createSet($creator, 'Bible');
|
||||
$bookLevel = $this->createLevel($set, 'book');
|
||||
$portionLevel = $this->createLevel($set, 'portion');
|
||||
$chapterLevel = $this->createLevel($set, 'chapter');
|
||||
$repository = app(ElementRepository::class);
|
||||
$genesis = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Genesis',
|
||||
kind: 'book',
|
||||
level: $bookLevel,
|
||||
parentElement: null,
|
||||
));
|
||||
$creation = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Creation',
|
||||
kind: 'portion',
|
||||
level: $portionLevel,
|
||||
parentElement: $genesis,
|
||||
));
|
||||
$chapterOne = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
$repository->create(new CreateElementDto(
|
||||
name: 'Chapter 1',
|
||||
kind: 'chapter',
|
||||
level: $chapterLevel,
|
||||
parentElement: $creation,
|
||||
));
|
||||
$exodus = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Exodus',
|
||||
kind: 'book',
|
||||
level: $bookLevel,
|
||||
parentElement: null,
|
||||
));
|
||||
$chapterTwo = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Chapter 1',
|
||||
kind: 'chapter',
|
||||
$shemot = $repository->create(new CreateElementDto(
|
||||
name: 'Shemot',
|
||||
level: $portionLevel,
|
||||
parentElement: $exodus,
|
||||
));
|
||||
$repository->create(new CreateElementDto(
|
||||
name: 'Chapter 1',
|
||||
level: $chapterLevel,
|
||||
parentElement: $shemot,
|
||||
));
|
||||
$this->createSession($user, 'valid-token');
|
||||
|
||||
$response = $this->credentialedPost('/api/schedules', [
|
||||
'setId' => $set->getId(),
|
||||
'elementKind' => 'chapter',
|
||||
'levelId' => $chapterLevel->getId(),
|
||||
'startDate' => '2026-08-10',
|
||||
'targetDate' => '2026-08-12',
|
||||
]);
|
||||
|
|
@ -114,6 +121,7 @@ class ScheduleEndpointTest extends TestCase
|
|||
'kind' => 'chapter',
|
||||
'path' => [
|
||||
'Exodus',
|
||||
'Shemot',
|
||||
'Chapter 1',
|
||||
],
|
||||
],
|
||||
|
|
@ -144,6 +152,7 @@ class ScheduleEndpointTest extends TestCase
|
|||
]);
|
||||
$this->assertDatabaseCount('schedule_assignments', 2);
|
||||
$this->assertFalse(Schema::hasColumn('schedules', 'set_id'));
|
||||
$this->assertFalse(Schema::hasColumn('schedules', 'set_level_id'));
|
||||
$this->assertFalse(Schema::hasColumn(
|
||||
'schedule_assignments',
|
||||
'element_id',
|
||||
|
|
@ -159,10 +168,10 @@ class ScheduleEndpointTest extends TestCase
|
|||
$user = $this->createUser('reader@example.com');
|
||||
$otherUser = $this->createUser('other@example.com');
|
||||
$set = $this->createSet($user, 'Course');
|
||||
$lessonLevel = $this->createLevel($set, 'lesson');
|
||||
app(ElementRepository::class)->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Welcome',
|
||||
kind: 'lesson',
|
||||
level: $lessonLevel,
|
||||
parentElement: null,
|
||||
));
|
||||
$this->createSession($user, 'valid-token');
|
||||
|
|
@ -170,13 +179,13 @@ class ScheduleEndpointTest extends TestCase
|
|||
|
||||
$this->credentialedPost('/api/schedules', [
|
||||
'setId' => $set->getId(),
|
||||
'elementKind' => 'lesson',
|
||||
'levelId' => $lessonLevel->getId(),
|
||||
'startDate' => '2026-08-01',
|
||||
'targetDate' => '2026-08-01',
|
||||
])->assertCreated();
|
||||
$this->credentialedPost('/api/schedules', [
|
||||
'setId' => $set->getId(),
|
||||
'elementKind' => 'lesson',
|
||||
'levelId' => $lessonLevel->getId(),
|
||||
'startDate' => '2026-09-01',
|
||||
'targetDate' => '2026-09-01',
|
||||
])->assertCreated();
|
||||
|
|
@ -186,7 +195,7 @@ class ScheduleEndpointTest extends TestCase
|
|||
'other-token',
|
||||
)->postJson('/api/schedules', [
|
||||
'setId' => $set->getId(),
|
||||
'elementKind' => 'lesson',
|
||||
'levelId' => $lessonLevel->getId(),
|
||||
'startDate' => '2026-10-01',
|
||||
'targetDate' => '2026-10-01',
|
||||
])->assertCreated();
|
||||
|
|
@ -223,23 +232,23 @@ class ScheduleEndpointTest extends TestCase
|
|||
{
|
||||
$user = $this->createUser('reader@example.com');
|
||||
$set = $this->createSet($user, 'Original set');
|
||||
$groupLevel = $this->createLevel($set, 'group');
|
||||
$taskLevel = $this->createLevel($set, 'task');
|
||||
$repository = app(ElementRepository::class);
|
||||
$parent = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Original parent',
|
||||
kind: 'group',
|
||||
level: $groupLevel,
|
||||
parentElement: null,
|
||||
));
|
||||
$element = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Original item',
|
||||
kind: 'task',
|
||||
level: $taskLevel,
|
||||
parentElement: $parent,
|
||||
));
|
||||
$this->createSession($user, 'valid-token');
|
||||
$createdResponse = $this->credentialedPost('/api/schedules', [
|
||||
'setId' => $set->getId(),
|
||||
'elementKind' => 'task',
|
||||
'levelId' => $taskLevel->getId(),
|
||||
'startDate' => '2026-08-10',
|
||||
'targetDate' => '2026-08-10',
|
||||
])->assertCreated();
|
||||
|
|
@ -247,12 +256,14 @@ class ScheduleEndpointTest extends TestCase
|
|||
SetModel::query()->whereKey($set->getId())->update([
|
||||
'name' => 'Changed set',
|
||||
]);
|
||||
SetLevelModel::query()->whereKey($taskLevel->getId())->update([
|
||||
'kind' => 'changed-kind',
|
||||
]);
|
||||
ElementModel::query()->whereKey($parent->getId())->update([
|
||||
'name' => 'Changed parent',
|
||||
]);
|
||||
ElementModel::query()->whereKey($element->getId())->update([
|
||||
'name' => 'Changed item',
|
||||
'kind' => 'changed-kind',
|
||||
]);
|
||||
|
||||
$this->credentialedGet('/api/schedules/1')
|
||||
|
|
@ -273,10 +284,10 @@ class ScheduleEndpointTest extends TestCase
|
|||
$owner = $this->createUser('owner@example.com');
|
||||
$viewer = $this->createUser('viewer@example.com');
|
||||
$set = $this->createSet($owner, 'Course');
|
||||
$lessonLevel = $this->createLevel($set, 'lesson');
|
||||
app(ElementRepository::class)->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Welcome',
|
||||
kind: 'lesson',
|
||||
level: $lessonLevel,
|
||||
parentElement: null,
|
||||
));
|
||||
$this->createSession($owner, 'owner-token');
|
||||
|
|
@ -288,7 +299,7 @@ class ScheduleEndpointTest extends TestCase
|
|||
'owner-token',
|
||||
)->postJson('/api/schedules', [
|
||||
'setId' => $set->getId(),
|
||||
'elementKind' => 'lesson',
|
||||
'levelId' => $lessonLevel->getId(),
|
||||
'startDate' => '2026-08-01',
|
||||
'targetDate' => '2026-08-01',
|
||||
])->assertCreated();
|
||||
|
|
@ -309,7 +320,7 @@ class ScheduleEndpointTest extends TestCase
|
|||
|
||||
$this->credentialedPost('/api/schedules', [
|
||||
'setId' => 999,
|
||||
'elementKind' => 'chapter',
|
||||
'levelId' => 1,
|
||||
'startDate' => '2026-08-12',
|
||||
'targetDate' => '2026-08-10',
|
||||
])->assertNotFound()->assertExactJson([
|
||||
|
|
@ -340,6 +351,14 @@ class ScheduleEndpointTest extends TestCase
|
|||
));
|
||||
}
|
||||
|
||||
private function createLevel(Set $set, string $kind): SetLevel
|
||||
{
|
||||
return app(SetLevelRepository::class)->create(new CreateSetLevelDto(
|
||||
set: $set,
|
||||
kind: $kind,
|
||||
));
|
||||
}
|
||||
|
||||
private function createSession(User $user, string $token): void
|
||||
{
|
||||
$createdAt = new DateTimeImmutable(
|
||||
|
|
|
|||
|
|
@ -8,7 +8,10 @@ use App\Element\CreateElementDto;
|
|||
use App\Element\ElementRepository;
|
||||
use App\Http\Middleware\AuthMiddleware;
|
||||
use App\Set\CreateSetDto;
|
||||
use App\Set\CreateSetLevelDto;
|
||||
use App\Set\Set;
|
||||
use App\Set\SetLevel;
|
||||
use App\Set\SetLevelRepository;
|
||||
use App\Set\SetRepository;
|
||||
use App\Shared\ValueObject\EmailAddress;
|
||||
use App\User\CreateUserDto;
|
||||
|
|
@ -29,28 +32,27 @@ class GetSetLayoutEndpointTest extends TestCase
|
|||
$user = $this->createUser();
|
||||
$set = $this->createSet($user, 'Bible');
|
||||
$repository = app(ElementRepository::class);
|
||||
$bookLevel = $this->createLevel($set, 'book');
|
||||
$portionLevel = $this->createLevel($set, 'portion');
|
||||
$chapterLevel = $this->createLevel($set, 'chapter');
|
||||
$genesis = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Genesis',
|
||||
kind: 'book',
|
||||
level: $bookLevel,
|
||||
parentElement: null,
|
||||
));
|
||||
$repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Exodus',
|
||||
kind: 'book',
|
||||
level: $bookLevel,
|
||||
parentElement: null,
|
||||
));
|
||||
$creation = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Creation',
|
||||
kind: 'portion',
|
||||
level: $portionLevel,
|
||||
parentElement: $genesis,
|
||||
));
|
||||
$chapter = $repository->create(new CreateElementDto(
|
||||
set: $set,
|
||||
name: 'Chapter 1',
|
||||
kind: 'chapter',
|
||||
level: $chapterLevel,
|
||||
parentElement: $creation,
|
||||
));
|
||||
$this->createSession($user);
|
||||
|
|
@ -62,21 +64,44 @@ class GetSetLayoutEndpointTest extends TestCase
|
|||
'id' => $set->getId(),
|
||||
'name' => 'Bible',
|
||||
],
|
||||
'levels' => [
|
||||
[
|
||||
'id' => $bookLevel->getId(),
|
||||
'kind' => 'book',
|
||||
'depth' => 0,
|
||||
'elementCount' => 2,
|
||||
],
|
||||
[
|
||||
'id' => $portionLevel->getId(),
|
||||
'kind' => 'portion',
|
||||
'depth' => 1,
|
||||
'elementCount' => 1,
|
||||
],
|
||||
[
|
||||
'id' => $chapterLevel->getId(),
|
||||
'kind' => 'chapter',
|
||||
'depth' => 2,
|
||||
'elementCount' => 1,
|
||||
],
|
||||
],
|
||||
'elements' => [
|
||||
[
|
||||
'id' => $genesis->getId(),
|
||||
'name' => 'Genesis',
|
||||
'kind' => 'book',
|
||||
'levelId' => $bookLevel->getId(),
|
||||
'children' => [
|
||||
[
|
||||
'id' => $creation->getId(),
|
||||
'name' => 'Creation',
|
||||
'kind' => 'portion',
|
||||
'levelId' => $portionLevel->getId(),
|
||||
'children' => [
|
||||
[
|
||||
'id' => $chapter->getId(),
|
||||
'name' => 'Chapter 1',
|
||||
'kind' => 'chapter',
|
||||
'levelId' => $chapterLevel->getId(),
|
||||
'children' => [],
|
||||
],
|
||||
],
|
||||
|
|
@ -87,6 +112,7 @@ class GetSetLayoutEndpointTest extends TestCase
|
|||
'id' => $genesis->getId() + 1,
|
||||
'name' => 'Exodus',
|
||||
'kind' => 'book',
|
||||
'levelId' => $bookLevel->getId(),
|
||||
'children' => [],
|
||||
],
|
||||
],
|
||||
|
|
@ -97,6 +123,7 @@ class GetSetLayoutEndpointTest extends TestCase
|
|||
{
|
||||
$user = $this->createUser();
|
||||
$set = $this->createSet($user, 'Empty set');
|
||||
$taskLevel = $this->createLevel($set, 'task');
|
||||
$this->createSession($user);
|
||||
|
||||
$response = $this->credentialedGet("/api/sets/{$set->getId()}");
|
||||
|
|
@ -106,6 +133,12 @@ class GetSetLayoutEndpointTest extends TestCase
|
|||
'id' => $set->getId(),
|
||||
'name' => 'Empty set',
|
||||
],
|
||||
'levels' => [[
|
||||
'id' => $taskLevel->getId(),
|
||||
'kind' => 'task',
|
||||
'depth' => 0,
|
||||
'elementCount' => 0,
|
||||
]],
|
||||
'elements' => [],
|
||||
]);
|
||||
}
|
||||
|
|
@ -147,6 +180,14 @@ class GetSetLayoutEndpointTest extends TestCase
|
|||
));
|
||||
}
|
||||
|
||||
private function createLevel(Set $set, string $kind): SetLevel
|
||||
{
|
||||
return app(SetLevelRepository::class)->create(new CreateSetLevelDto(
|
||||
set: $set,
|
||||
kind: $kind,
|
||||
));
|
||||
}
|
||||
|
||||
private function createSession(User $user): void
|
||||
{
|
||||
$createdAt = new DateTimeImmutable(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue