Skip to content

Add isPublic field for query performance #8274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2025
Merged

Add isPublic field for query performance #8274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a54618b
Add isPublic field for query performance
carlobeltrame Oct 4, 2025
4bad327
Adapt ACL to combined isPublic column
carlobeltrame Oct 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/fixtures/camps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ App\Entity\Camp:
addressCity: <city()>
owner: '@admin'
creator: '@admin'
isPublic: true
isPrototype: true
isShared: false
sharedBy: null
Expand All @@ -69,6 +70,7 @@ App\Entity\Camp:
addressCity: <city()>
owner: '@admin'
creator: '@admin'
isPublic: true
isPrototype: false
isShared: true
sharedBy: '@admin'
Expand Down
58 changes: 58 additions & 0 deletions api/migrations/schema/Version20251004093025.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20251004093025 extends AbstractMigration {
public function getDescription(): string {
return '';
}

public function up(Schema $schema): void {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE camp ADD isPublic BOOLEAN DEFAULT false NOT NULL');
$this->addSql('UPDATE camp SET isPublic = (isShared OR isPrototype)');
$this->addSql('ALTER TABLE camp ADD CONSTRAINT enforce_public_flag CHECK (isPublic = (isShared OR isPrototype))');
$this->addSql('CREATE INDEX IDX_C1944230FADC24C7 ON camp (isPublic)');
$this->addSql(
<<<'EOF'
CREATE OR REPLACE VIEW public.view_user_camps
AS
SELECT CONCAT(u.id, c.id) id, u.id userid, c.id campid
from camp c, "user" u
where c.ispublic = TRUE
union all
select cc.id, cc.userid, cc.campid
from camp_collaboration cc
where cc.status = 'established'
EOF
);
}

public function down(Schema $schema): void {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql(
<<<'EOF'
CREATE OR REPLACE VIEW public.view_user_camps
AS
SELECT CONCAT(u.id, c.id) id, u.id userid, c.id campid
from camp c, "user" u
where c.isprototype = TRUE or c.isshared = TRUE
union all
select cc.id, cc.userid, cc.campid
from camp_collaboration cc
where cc.status = 'established'
EOF
);
$this->addSql('DROP INDEX IDX_C1944230FADC24C7');
$this->addSql('ALTER TABLE camp DROP CONSTRAINT enforce_public_flag');
$this->addSql('ALTER TABLE camp DROP isPublic');
}
}
6 changes: 2 additions & 4 deletions api/src/Entity/Activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
new Get(
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
Expand All @@ -56,8 +55,7 @@
toProperty: 'camp',
fromClass: Camp::class,
security: 'is_granted("CAMP_COLLABORATOR", camp) or
is_granted("CAMP_IS_SHARED", camp) or
is_granted("CAMP_IS_PROTOTYPE", camp)'
is_granted("CAMP_IS_PUBLIC", camp)'
),
],
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
Expand Down
6 changes: 2 additions & 4 deletions api/src/Entity/ActivityProgressLabel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
new Get(
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
Expand All @@ -53,8 +52,7 @@
toProperty: 'camp',
fromClass: Camp::class,
security: 'is_granted("CAMP_COLLABORATOR", camp) or
is_granted("CAMP_IS_SHARED", camp) or
is_granted("CAMP_IS_PROTOTYPE", camp)'
is_granted("CAMP_IS_PUBLIC", camp)'
),
],
security: 'is_fully_authenticated()',
Expand Down
2 changes: 1 addition & 1 deletion api/src/Entity/ActivityResponsible.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#[ApiResource(
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_SHARED", object) or is_granted("CAMP_IS_PROTOTYPE", object)'
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PUBLIC", object)'
),
new Delete(
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
Expand Down
12 changes: 10 additions & 2 deletions api/src/Entity/Camp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)',
is_granted("CAMP_IS_PUBLIC", object)',
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
),
new Patch(
Expand Down Expand Up @@ -69,6 +68,7 @@
#[ORM\Entity(repositoryClass: CampRepository::class)]
#[ORM\Index(columns: ['isPrototype'])]
#[ORM\Index(columns: ['isShared'])]
#[ORM\Index(columns: ['isPublic'])]
#[ORM\Index(columns: ['updateTime'])] // TODO unclear why this is necessary, but doctrine forgot about this index from BaseEntity...
class Camp extends BaseEntity implements BelongsToCampInterface, CopyFromPrototypeInterface {
public const ITEM_NORMALIZATION_CONTEXT = [
Expand Down Expand Up @@ -228,6 +228,14 @@ class Camp extends BaseEntity implements BelongsToCampInterface, CopyFromPrototy
#[ORM\Column(type: 'boolean')]
public bool $isPrototype = false;

/**
* Automatically set to the value (isShared || isPrototype). Used for more efficient
* database filtering operations, since OR queries are very expensive to compute.
* This is only used in the database, and therefore not available on the API.
*/
#[ORM\Column(type: 'boolean', nullable: false, options: ['default' => false])]
public bool $isPublic = false;

/**
* An optional short title for the camp. Can be used in the UI where space is tight. If
* not present, frontends may auto-shorten the title if the shortTitle is not set.
Expand Down
5 changes: 2 additions & 3 deletions api/src/Entity/CampCollaboration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
operations: [
new Get(
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_SHARED", object) or is_granted("CAMP_IS_PROTOTYPE", object)'
security: 'is_granted("CAMP_COLLABORATOR", object) or is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: CampCollaborationUpdateProcessor::class,
Expand Down Expand Up @@ -68,8 +68,7 @@
toProperty: 'camp',
fromClass: Camp::class,
security: 'is_granted("CAMP_COLLABORATOR", camp) or
is_granted("CAMP_IS_SHARED", camp) or
is_granted("CAMP_IS_PROTOTYPE", camp)'
is_granted("CAMP_IS_PUBLIC", camp)'
),
],
security: 'is_fully_authenticated()',
Expand Down
6 changes: 2 additions & 4 deletions api/src/Entity/Category.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
new Get(
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
denormalizationContext: ['groups' => ['write', 'update']],
Expand Down Expand Up @@ -66,8 +65,7 @@
fromClass: Camp::class,
toProperty: 'camp',
security: 'is_granted("CAMP_COLLABORATOR", camp) or
is_granted("CAMP_IS_SHARED", camp) or
is_granted("CAMP_IS_PROTOTYPE", camp)'
is_granted("CAMP_IS_PUBLIC", camp)'
),
],
extraProperties: [
Expand Down
6 changes: 2 additions & 4 deletions api/src/Entity/Checklist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
operations: [
new Get(
security: 'is_granted("CHECKLIST_IS_PROTOTYPE", object) or
is_granted("CAMP_IS_PROTOTYPE", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PUBLIC", object) or
is_granted("CAMP_COLLABORATOR", object)
'
),
Expand Down Expand Up @@ -64,8 +63,7 @@
toProperty: 'camp',
fromClass: Camp::class,
security: 'is_granted("CAMP_COLLABORATOR", camp) or
is_granted("CAMP_IS_SHARED", camp) or
is_granted("CAMP_IS_PROTOTYPE", camp)'
is_granted("CAMP_IS_PUBLIC", camp)'
),
],
extraProperties: [
Expand Down
6 changes: 2 additions & 4 deletions api/src/Entity/ChecklistItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
operations: [
new Get(
security: 'is_granted("CHECKLIST_IS_PROTOTYPE", object) or
is_granted("CAMP_IS_PROTOTYPE", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PUBLIC", object) or
is_granted("CAMP_COLLABORATOR", object)
'
),
Expand Down Expand Up @@ -65,8 +64,7 @@
fromClass: Checklist::class,
toProperty: 'checklist',
security: 'is_granted("CHECKLIST_IS_PROTOTYPE", checklist) or
is_granted("CAMP_IS_PROTOTYPE", checklist) or
is_granted("CAMP_IS_SHARED", checklist) or
is_granted("CAMP_IS_PUBLIC", checklist) or
is_granted("CAMP_COLLABORATOR", checklist)'
),
],
Expand Down
6 changes: 2 additions & 4 deletions api/src/Entity/Comment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object) or
is_granted("CAMP_IS_PUBLIC", object) or
object.author === user',
),
new Delete(
Expand All @@ -49,8 +48,7 @@
toProperty: 'activity',
fromClass: Activity::class,
security: 'is_granted("CAMP_COLLABORATOR", activity) or
is_granted("CAMP_IS_SHARED", activity) or
is_granted("CAMP_IS_PROTOTYPE", activity)',
is_granted("CAMP_IS_PUBLIC", activity)',
),
],
security: 'is_fully_authenticated()',
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/ContentNode/ChecklistNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: ChecklistNodePersistProcessor::class,
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/ContentNode/ColumnLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: ContentNodePersistProcessor::class,
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/ContentNode/MaterialNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: ContentNodePersistProcessor::class,
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/ContentNode/MultiSelect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: ContentNodePersistProcessor::class,
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/ContentNode/ResponsiveLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: ContentNodePersistProcessor::class,
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/ContentNode/SingleText.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: SingleTextPersistProcessor::class,
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/ContentNode/Storyboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
processor: StoryboardPersistProcessor::class,
Expand Down
6 changes: 2 additions & 4 deletions api/src/Entity/Day.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
new Get(
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new GetCollection(
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
Expand All @@ -43,8 +42,7 @@
toProperty: 'period',
fromClass: Period::class,
security: 'is_granted("CAMP_COLLABORATOR", period) or
is_granted("CAMP_IS_SHARED", period) or
is_granted("CAMP_IS_PROTOTYPE", period)'
is_granted("CAMP_IS_PUBLIC", period)'
),
],
normalizationContext: self::COLLECTION_NORMALIZATION_CONTEXT,
Expand Down
6 changes: 2 additions & 4 deletions api/src/Entity/DayResponsible.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Delete(
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
Expand All @@ -41,8 +40,7 @@
toProperty: 'day',
fromClass: Day::class,
security: 'is_granted("CAMP_COLLABORATOR", day) or
is_granted("CAMP_IS_SHARED", day) or
is_granted("CAMP_IS_PROTOTYPE", day)'
is_granted("CAMP_IS_PUBLIC", day)'
),
],
extraProperties: [
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/MaterialItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
validationContext: ['groups' => MaterialItemUpdateGroupSequence::class],
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/MaterialList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)'
is_granted("CAMP_IS_PUBLIC", object)'
),
new Patch(
security: 'is_granted("CAMP_MEMBER", object) or is_granted("CAMP_MANAGER", object)'
Expand Down
3 changes: 1 addition & 2 deletions api/src/Entity/Period.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
operations: [
new Get(
security: 'is_granted("CAMP_COLLABORATOR", object) or
is_granted("CAMP_IS_SHARED", object) or
is_granted("CAMP_IS_PROTOTYPE", object)',
is_granted("CAMP_IS_PUBLIC", object)',
normalizationContext: self::ITEM_NORMALIZATION_CONTEXT,
),
new Patch(
Expand Down
Loading
Loading