diff --git a/backend/src/modules/event/repositories/event.repository.ts b/backend/src/modules/event/repositories/event.repository.ts index 7297fb14..609f9560 100644 --- a/backend/src/modules/event/repositories/event.repository.ts +++ b/backend/src/modules/event/repositories/event.repository.ts @@ -255,10 +255,11 @@ export class EventRepository const query = this.createSelectOpenOrganizationGoingEventsBaseSelectQuery(); query.andWhere( - '(event.endDate > :currentDate OR event.endDate IS NULL) AND v.status = :active AND v.userId = :userId', + '(event.endDate > :currentDate OR event.endDate IS NULL) AND ((v.status = :active AND v.userId = :userId) OR event.isPublic = :isPublic)', { currentDate: new Date(), active: VolunteerStatus.ACTIVE, + isPublic: true, }, );