Skip to content

Commit 283acc2

Browse files
committed
fix: get all groups endpoint and filter engine update
Signed-off-by: romanetar <roman_ag@hotmail.com>
1 parent 8b3e3ff commit 283acc2

4 files changed

Lines changed: 16 additions & 17 deletions

File tree

app/libs/Auth/Models/IGroupSlugs.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interface IGroupSlugs
2626
public const RawUsersGroup = 'raw-users';
2727
public const ChatQAGroup = 'chat-qa';
2828
public const ChatHelpGroup = 'chat-help';
29-
public const SponsorServicesGroup = 'sponsor-services';
30-
public const SponsorsGroup = 'sponsors';
31-
public const ExternalSponsorUsersGroup = 'external-sponsor-users';
29+
public const SponsorServicesGroup = 'sponsors-services';
30+
public const SponsorUsersGroup = 'sponsors';
31+
public const SponsorExternalUsersGroup = 'sponsors-external-users';
3232
}

database/migrations/Version20250731141145.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
use App\libs\Auth\Models\IGroupSlugs;
1616
use App\libs\OAuth2\IGroupScopes;
17-
use App\libs\OAuth2\IUserScopes;
1817
use Auth\Group;
1918
use Database\Seeders\SeedUtils;
2019
use Doctrine\Migrations\AbstractMigration;
@@ -31,33 +30,33 @@ class Version20250731141145 extends AbstractMigration
3130
*/
3231
public function up(Schema $schema):void
3332
{
34-
$group = EntityManager::getRepository(Group::class)->findOneBy(['name' => 'sponsor services']);
33+
$group = EntityManager::getRepository(Group::class)->findOneBy(['slug' => IGroupSlugs::SponsorServicesGroup]);
3534
if(is_null($group)){
3635
$group = new Group();
37-
$group->setName('sponsor services');
36+
$group->setName('Sponsor Services');
3837
$group->setSlug(IGroupSlugs::SponsorServicesGroup);
3938
$group->setDefault(false);
4039
$group->setActive(true);
4140
EntityManager::persist($group);
4241
EntityManager::flush();
4342
}
4443

45-
$group = EntityManager::getRepository(Group::class)->findOneBy(['name' => 'sponsors']);
44+
$group = EntityManager::getRepository(Group::class)->findOneBy(['slug' => IGroupSlugs::SponsorUsersGroup]);
4645
if(is_null($group)){
4746
$group = new Group();
48-
$group->setName('sponsors');
49-
$group->setSlug(IGroupSlugs::SponsorsGroup);
47+
$group->setName('Sponsor Users');
48+
$group->setSlug(IGroupSlugs::SponsorUsersGroup);
5049
$group->setDefault(false);
5150
$group->setActive(true);
5251
EntityManager::persist($group);
5352
EntityManager::flush();
5453
}
5554

56-
$group = EntityManager::getRepository(Group::class)->findOneBy(['name' => 'external sponsor users']);
55+
$group = EntityManager::getRepository(Group::class)->findOneBy(['slug' => IGroupSlugs::SponsorExternalUsersGroup]);
5756
if(is_null($group)){
5857
$group = new Group();
59-
$group->setName('external sponsor users');
60-
$group->setSlug(IGroupSlugs::ExternalSponsorUsersGroup);
58+
$group->setName('Sponsor External Users');
59+
$group->setSlug(IGroupSlugs::SponsorExternalUsersGroup);
6160
$group->setDefault(false);
6261
$group->setActive(true);
6362
EntityManager::persist($group);

database/seeds/TestSeeder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ private function createTestGroups(){
218218
'slug' => IGroupSlugs::SponsorServicesGroup,
219219
],
220220
[
221-
'name' => IGroupSlugs::SponsorsGroup,
222-
'slug' => IGroupSlugs::SponsorsGroup,
221+
'name' => IGroupSlugs::SponsorUsersGroup,
222+
'slug' => IGroupSlugs::SponsorUsersGroup,
223223
],
224224
[
225-
'name' => IGroupSlugs::ExternalSponsorUsersGroup,
226-
'slug' => IGroupSlugs::ExternalSponsorUsersGroup,
225+
'name' => IGroupSlugs::SponsorExternalUsersGroup,
226+
'slug' => IGroupSlugs::SponsorExternalUsersGroup,
227227
]
228228
];
229229

tests/OAuth2GroupApiTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class OAuth2GroupApiTest extends OAuth2ProtectedApiTestCase
2323
{
2424
public function testGetAll(){
2525
$params = [
26-
'filter' => 'slug==sponsor-services||sponsors||external-sponsor-users',
26+
'filter' => 'slug==sponsors-services||sponsors||sponsors-external-users',
2727
'order' => '-slug'
2828
];
2929

0 commit comments

Comments
 (0)