Skip to content
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

Staging #1984

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Staging #1984

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a18cbd
feat: added all events and releated guest API changes
navneethkrish Nov 15, 2024
f3cb1b7
fix: fixed issue in irl fetch guests by location api
navneethkrish Nov 15, 2024
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
14 changes: 10 additions & 4 deletions apps/web-api/src/pl-events/pl-event-guests.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ export class PLEventGuestsService {
const { type, filteredEvents } = query;
if (type === "upcoming") {
events = await this.eventLocationsService.getUpcomingEventsByLocation(locationUid);
} else {
} else if (type === "past") {
events = await this.eventLocationsService.getPastEventsByLocation(locationUid);
} else {
events = (await this.eventLocationsService.getPLEventLocationByUid(locationUid)).events;
}
events = await this.filterEventsByAttendanceAndAdminStatus(filteredEvents, events, member);
if (events.length === 0)
Expand Down Expand Up @@ -181,7 +183,7 @@ export class PLEventGuestsService {
query: Prisma.PLEventGuestFindManyArgs
) {
try {
const events = await this.eventLocationsService.getUpcomingEventsByLocation(locationUid);
const events = (await this.eventLocationsService.getPLEventLocationByUid(locationUid)).events;
return await this.prisma.pLEventGuest.findMany({
where: {
eventUid: {
Expand Down Expand Up @@ -657,8 +659,10 @@ export class PLEventGuestsService {
let events;
if (type === "upcoming") {
events = await this.eventLocationsService.getUpcomingEventsByLocation(locationUid);
} else {
} else if (type === "past") {
events = await this.eventLocationsService.getPastEventsByLocation(locationUid);
} else {
events = (await this.eventLocationsService.getPLEventLocationByUid(locationUid)).events;
}
let uniqueTopics = await this.prisma.pLEventGuest.findMany({
where: {
Expand Down Expand Up @@ -714,8 +718,10 @@ export class PLEventGuestsService {
let events;
if (type === "upcoming") {
events = await this.eventLocationsService.getUpcomingEventsByLocation(locationUid);
} else {
} else if (type === "past") {
events = await this.eventLocationsService.getPastEventsByLocation(locationUid);
} else {
events = (await this.eventLocationsService.getPLEventLocationByUid(locationUid)).events;
}
const result = await this.prisma.pLEventGuest.findMany({
where: {
Expand Down
Loading