Skip to content

Commit 2d28380

Browse files
mmarchoismmarchois
committed
new fixtures
1 parent 01c23f9 commit 2d28380

File tree

45 files changed

+248
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+248
-265
lines changed

‎src/Infrastructure/Persistence/Doctrine/Fixtures/InvitationFixture.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function load(ObjectManager $manager): void
2626
role: OrganizationRolesEnum::ROLE_ORGA_CONTRIBUTOR->value,
2727
createdAt: new \DateTimeImmutable('2025-02-12'),
2828
owner: $this->getReference('otherOrgUser', User::class),
29-
organization: $this->getReference('otherOrg', Organization::class),
29+
organization: $this->getReference('regionIdfOrg', Organization::class),
3030
);
3131

3232
$invitationAlreadyJoined = new Invitation(
@@ -35,8 +35,8 @@ public function load(ObjectManager $manager): void
3535
email: '[email protected]',
3636
role: OrganizationRolesEnum::ROLE_ORGA_CONTRIBUTOR->value,
3737
createdAt: new \DateTimeImmutable('2025-02-12'),
38-
owner: $this->getReference('mainOrgAdmin', User::class),
39-
organization: $this->getReference('mainOrg', Organization::class),
38+
owner: $this->getReference('department93Admin', User::class),
39+
organization: $this->getReference('seineSaintDenisOrg', Organization::class),
4040
);
4141

4242
$manager->persist($invitation);

‎src/Infrastructure/Persistence/Doctrine/Fixtures/LocationFixture.php

Lines changed: 42 additions & 46 deletions
Large diffs are not rendered by default.

‎src/Infrastructure/Persistence/Doctrine/Fixtures/OrganizationFixture.php

Lines changed: 20 additions & 54 deletions
Large diffs are not rendered by default.

‎src/Infrastructure/Persistence/Doctrine/Fixtures/RegulationOrderRecordFixture.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function load(ObjectManager $manager): void
4949
RegulationOrderRecordStatusEnum::DRAFT->value,
5050
$this->getReference('typicalRegulationOrder', RegulationOrder::class),
5151
new \DateTime('2022-01-10'),
52-
$this->getReference('mainOrg', Organization::class),
52+
$this->getReference('seineSaintDenisOrg', Organization::class),
5353
);
5454

5555
$publishedRegulationOrderRecord = new RegulationOrderRecord(
@@ -58,7 +58,7 @@ public function load(ObjectManager $manager): void
5858
RegulationOrderRecordStatusEnum::PUBLISHED->value,
5959
$this->getReference('publishedRegulationOrder', RegulationOrder::class),
6060
new \DateTime('2022-01-10'),
61-
$this->getReference('mainOrg', Organization::class),
61+
$this->getReference('seineSaintDenisOrg', Organization::class),
6262
);
6363

6464
$regulationOrderRecordPermanent = new RegulationOrderRecord(
@@ -67,7 +67,7 @@ public function load(ObjectManager $manager): void
6767
RegulationOrderRecordStatusEnum::DRAFT->value,
6868
$this->getReference('regulationOrderPermanent', RegulationOrder::class),
6969
new \DateTime('2022-01-11'),
70-
$this->getReference('mainOrg', Organization::class),
70+
$this->getReference('seineSaintDenisOrg', Organization::class),
7171
);
7272

7373
$fullCityRegulationOrderRecord = new RegulationOrderRecord(
@@ -76,7 +76,7 @@ public function load(ObjectManager $manager): void
7676
RegulationOrderRecordStatusEnum::DRAFT->value,
7777
$this->getReference('fullCityRegulationOrder', RegulationOrder::class),
7878
new \DateTime('2022-01-11'),
79-
$this->getReference('mainOrg', Organization::class),
79+
$this->getReference('seineSaintDenisOrg', Organization::class),
8080
);
8181

8282
$regulationOrderRecordNoLocations = new RegulationOrderRecord(
@@ -85,7 +85,7 @@ public function load(ObjectManager $manager): void
8585
RegulationOrderRecordStatusEnum::DRAFT->value,
8686
$this->getReference('regulationOrderNoLocations', RegulationOrder::class),
8787
new \DateTime('2022-01-10'),
88-
$this->getReference('mainOrg', Organization::class),
88+
$this->getReference('seineSaintDenisOrg', Organization::class),
8989
);
9090

9191
$regulationOrderRecordNoMeasures = new RegulationOrderRecord(
@@ -94,7 +94,7 @@ public function load(ObjectManager $manager): void
9494
RegulationOrderRecordStatusEnum::DRAFT->value,
9595
$this->getReference('regulationOrderNoMeasures', RegulationOrder::class),
9696
new \DateTime('2022-01-10'),
97-
$this->getReference('mainOrg', Organization::class),
97+
$this->getReference('seineSaintDenisOrg', Organization::class),
9898
);
9999

100100
$regulationOrderRecordCifs = new RegulationOrderRecord(
@@ -103,7 +103,7 @@ public function load(ObjectManager $manager): void
103103
RegulationOrderRecordStatusEnum::PUBLISHED->value,
104104
$this->getReference('regulationOrderCifs', RegulationOrder::class),
105105
new \DateTime('2023-09-06'),
106-
$this->getReference('mainOrg', Organization::class),
106+
$this->getReference('seineSaintDenisOrg', Organization::class),
107107
);
108108

109109
$outDatedRegulationOrderRecordCifs = new RegulationOrderRecord(
@@ -112,7 +112,7 @@ public function load(ObjectManager $manager): void
112112
RegulationOrderRecordStatusEnum::PUBLISHED->value,
113113
$this->getReference('outDatedRegulationOrderCifs', RegulationOrder::class),
114114
new \DateTime('2021-11-02'),
115-
$this->getReference('otherOrg', Organization::class),
115+
$this->getReference('regionIdfOrg', Organization::class),
116116
);
117117

118118
$rawGeoJSONRegulationOrderRecord = new RegulationOrderRecord(
@@ -121,7 +121,7 @@ public function load(ObjectManager $manager): void
121121
RegulationOrderRecordStatusEnum::DRAFT->value,
122122
$this->getReference('rawGeoJSONRegulationOrder', RegulationOrder::class),
123123
new \DateTime('2020-06-05'),
124-
$this->getReference('mainOrg', Organization::class),
124+
$this->getReference('seineSaintDenisOrg', Organization::class),
125125
);
126126

127127
$litteralisRegulationOrderRecord = new RegulationOrderRecord(
@@ -130,7 +130,7 @@ public function load(ObjectManager $manager): void
130130
RegulationOrderRecordStatusEnum::PUBLISHED->value,
131131
$this->getReference('litteralisRegulationOrder', RegulationOrder::class),
132132
new \DateTime('2024-09-05'),
133-
$this->getReference('mainOrg', Organization::class),
133+
$this->getReference('seineSaintDenisOrg', Organization::class),
134134
);
135135

136136
$winterMaintenanceRegulationOrderRecord = new RegulationOrderRecord(
@@ -139,7 +139,7 @@ public function load(ObjectManager $manager): void
139139
RegulationOrderRecordStatusEnum::DRAFT->value,
140140
$this->getReference('winterMaintenanceRegulationOrder', RegulationOrder::class),
141141
new \DateTime('2025-01-08'),
142-
$this->getReference('mainOrg', Organization::class),
142+
$this->getReference('seineSaintDenisOrg', Organization::class),
143143
);
144144

145145
$manager->persist($typicalRegulationOrderRecord);

‎src/Infrastructure/Persistence/Doctrine/Fixtures/SigningAuthorityFixture.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function load(ObjectManager $manager): void
1919
name: 'Monsieur le maire de Savenay',
2020
placeOfSignature: 'Savenay',
2121
signatoryName: 'Monsieur X, Maire de Savenay',
22-
organization: $this->getReference('mainOrg', Organization::class),
22+
organization: $this->getReference('seineSaintDenisOrg', Organization::class),
2323
roadName: '3 rue de la Concertation',
2424
cityCode: '75018',
2525
cityLabel: 'Paris',

‎src/Infrastructure/Persistence/Doctrine/Fixtures/TokenFixture.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ public function load(ObjectManager $manager): void
3535
'8edb17c6-9346-4e64-8a0d-bf1e4762802c',
3636
'forgotPasswordToken',
3737
TokenTypeEnum::FORGOT_PASSWORD->value,
38-
$this->getReference('mainOrgUser', User::class),
38+
$this->getReference('department93User', User::class),
3939
new \DateTime('2025-08-26 09:00:00'),
4040
);
4141

4242
$expiredForgotPasswordToken = new Token(
4343
'57b8d6cc-1b7b-4204-8a38-da30359a936e',
4444
'expiredForgotPasswordToken',
4545
TokenTypeEnum::FORGOT_PASSWORD->value,
46-
$this->getReference('mainOrgUser', User::class),
46+
$this->getReference('department93User', User::class),
4747
new \DateTime('2023-01-01 19:00:00'),
4848
);
4949

‎src/Infrastructure/Persistence/Doctrine/Fixtures/UserFixture.php

Lines changed: 51 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,92 @@
44

55
namespace App\Infrastructure\Persistence\Doctrine\Fixtures;
66

7+
use App\Domain\User\Enum\OrganizationRolesEnum;
78
use App\Domain\User\Enum\UserRolesEnum;
9+
use App\Domain\User\Organization;
10+
use App\Domain\User\OrganizationUser;
811
use App\Domain\User\PasswordUser;
912
use App\Domain\User\User;
1013
use Doctrine\Bundle\FixturesBundle\Fixture;
14+
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
1115
use Doctrine\Persistence\ObjectManager;
1216

13-
final class UserFixture extends Fixture
17+
final class UserFixture extends Fixture implements DependentFixtureInterface
1418
{
15-
public const MAIN_ORG_USER_EMAIL = '[email protected]';
16-
public const MAIN_ORG_ADMIN_EMAIL = '[email protected]';
19+
public const DEPARTMENT_93_USER_EMAIL = '[email protected]';
20+
public const DEPARTMENT_93_ADMIN_EMAIL = '[email protected]';
1721
public const OTHER_ORG_USER_EMAIL = '[email protected]';
1822
public const PASSWORD = 'password';
1923

2024
public function load(ObjectManager $manager): void
2125
{
22-
$mainOrgUser = (new User('0b507871-8b5e-4575-b297-a630310fc06e'))
26+
$department93User = (new User('0b507871-8b5e-4575-b297-a630310fc06e'))
2327
->setFullName('Mathieu MARCHOIS')
24-
->setEmail(self::MAIN_ORG_USER_EMAIL)
28+
->setEmail(self::DEPARTMENT_93_USER_EMAIL)
2529
->setRoles([UserRolesEnum::ROLE_USER->value])
2630
->setRegistrationDate(new \DateTimeImmutable('2024-03-01'))
2731
->setLastActiveAt(new \DateTimeImmutable('2024-06-07'))
2832
->setVerified();
33+
$department93UserPassword = new PasswordUser('e06f9972-6add-403d-82d9-bd7370b7668f', self::PASSWORD, $department93User);
2934

30-
$mainOrgPasswordUser = new PasswordUser(
31-
'e06f9972-6add-403d-82d9-bd7370b7668f',
32-
self::PASSWORD,
33-
$mainOrgUser,
34-
);
35-
36-
$mainOtherAdmin = (new User('5bc831a3-7a09-44e9-aefa-5ce3588dac33'))
35+
$department93Admin = (new User('5bc831a3-7a09-44e9-aefa-5ce3588dac33'))
3736
->setFullName('Mathieu FERNANDEZ')
38-
->setEmail(self::MAIN_ORG_ADMIN_EMAIL)
37+
->setEmail(self::DEPARTMENT_93_ADMIN_EMAIL)
3938
->setRoles([UserRolesEnum::ROLE_SUPER_ADMIN->value])
4039
->setRegistrationDate(new \DateTimeImmutable('2024-04-02'))
4140
->setLastActiveAt(new \DateTimeImmutable('2024-06-08'))
4241
->setVerified();
43-
44-
$mainOtherPasswordAdmin = new PasswordUser(
45-
'437dd344-0b78-4aa6-ba79-112cb6827516',
46-
self::PASSWORD,
47-
$mainOtherAdmin,
48-
);
42+
$department93AdminPassword = new PasswordUser('437dd344-0b78-4aa6-ba79-112cb6827516', self::PASSWORD, $department93Admin);
4943

5044
$otherOrgUser = (new User('d47badd9-989e-472b-a80e-9df642e93880'))
5145
->setFullName('Florimond MANCA')
5246
->setEmail(self::OTHER_ORG_USER_EMAIL)
5347
->setRoles([UserRolesEnum::ROLE_USER->value])
5448
->setRegistrationDate(new \DateTimeImmutable('2024-05-07'));
5549

56-
$otherOrgPasswordUser = new PasswordUser(
57-
'7eb26f55-3029-4a61-b88b-30e2a97806ea',
58-
self::PASSWORD,
59-
$otherOrgUser,
60-
);
50+
$otherOrgPasswordUser = new PasswordUser('7eb26f55-3029-4a61-b88b-30e2a97806ea', self::PASSWORD, $otherOrgUser);
51+
52+
$organizationUser1 = new OrganizationUser('53aede0c-1ff3-4873-9e3d-132950dfb893');
53+
$organizationUser1->setUser($department93User);
54+
$organizationUser1->setOrganization($this->getReference('seineSaintDenisOrg', Organization::class));
55+
$organizationUser1->setRoles(OrganizationRolesEnum::ROLE_ORGA_CONTRIBUTOR->value);
56+
57+
$organizationUser2 = new OrganizationUser('cf72ca91-3446-410f-b563-74085516180d');
58+
$organizationUser2->setUser($department93Admin);
59+
$organizationUser2->setOrganization($this->getReference('seineSaintDenisOrg', Organization::class));
60+
$organizationUser2->setRoles(OrganizationRolesEnum::ROLE_ORGA_ADMIN->value);
61+
62+
$organizationUser3 = new OrganizationUser('890615e1-bcb0-4623-a2fa-362435109030');
63+
$organizationUser3->setUser($otherOrgUser);
64+
$organizationUser3->setOrganization($this->getReference('regionIdfOrg', Organization::class));
65+
$organizationUser3->setRoles(OrganizationRolesEnum::ROLE_ORGA_CONTRIBUTOR->value);
6166

62-
$manager->persist($mainOrgUser);
63-
$manager->persist($mainOtherAdmin);
67+
$organizationUser4 = new OrganizationUser('5d054f87-f55b-49fa-8761-e52e37a44ac0');
68+
$organizationUser4->setUser($otherOrgUser);
69+
$organizationUser4->setOrganization($this->getReference('saintOuenOrg', Organization::class));
70+
$organizationUser4->setRoles(OrganizationRolesEnum::ROLE_ORGA_ADMIN->value);
71+
72+
$manager->persist($department93User);
73+
$manager->persist($department93Admin);
6474
$manager->persist($otherOrgUser);
65-
$manager->persist($mainOrgPasswordUser);
66-
$manager->persist($mainOtherPasswordAdmin);
75+
$manager->persist($department93UserPassword);
76+
$manager->persist($department93AdminPassword);
6777
$manager->persist($otherOrgPasswordUser);
78+
$manager->persist($organizationUser1);
79+
$manager->persist($organizationUser2);
80+
$manager->persist($organizationUser3);
81+
$manager->persist($organizationUser4);
6882
$manager->flush();
6983

70-
$this->addReference('mainOrgUser', $mainOrgUser);
71-
$this->addReference('mainOrgAdmin', $mainOtherAdmin);
84+
$this->addReference('department93User', $department93User);
85+
$this->addReference('department93Admin', $department93Admin);
7286
$this->addReference('otherOrgUser', $otherOrgUser);
7387
}
88+
89+
public function getDependencies(): array
90+
{
91+
return [
92+
OrganizationFixture::class,
93+
];
94+
}
7495
}

‎src/Infrastructure/Persistence/Doctrine/Fixtures/VisaModelFixture.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function load(ObjectManager $manager): void
2222
$visa1 = (new VisaModel('65c12316-e210-445d-9169-0298b13b3b30'))
2323
->setName('Interdiction de circulation')
2424
->setDescription('Interdiction pour tous les véhicules')
25-
->setOrganization($this->getReference('mainOrg', Organization::class))
25+
->setOrganization($this->getReference('seineSaintDenisOrg', Organization::class))
2626
->setVisas(['vu que 3']);
2727

2828
$manager->persist($genericVisa);

‎tests/Integration/Infrastructure/Controller/AbstractWebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
abstract class AbstractWebTestCase extends WebTestCase
1414
{
15-
protected function login(string $email = UserFixture::MAIN_ORG_USER_EMAIL): KernelBrowser
15+
protected function login(string $email = UserFixture::DEPARTMENT_93_USER_EMAIL): KernelBrowser
1616
{
1717
$client = static::createClient();
1818

‎tests/Integration/Infrastructure/Controller/Admin/DashboardControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ final class DashboardControllerTest extends AbstractWebTestCase
1111
{
1212
public function testDashboard(): void
1313
{
14-
$client = $this->login(UserFixture::MAIN_ORG_ADMIN_EMAIL);
14+
$client = $this->login(UserFixture::DEPARTMENT_93_ADMIN_EMAIL);
1515
$crawler = $client->request('GET', '/admin');
1616

1717
$this->assertResponseStatusCodeSame(200);

0 commit comments

Comments
 (0)