Skip to content

Commit

Permalink
made ps.confirmed_on optional
Browse files Browse the repository at this point in the history
  • Loading branch information
michellelin1 committed May 1, 2024
1 parent 05553e7 commit 1bd80e6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions routes/publishedSchedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ publishedScheduleRouter.get('/recently-added', async (req, res) => {
PS.created_on
FROM published_schedule PS
LEFT JOIN catalog C ON PS.event_id = C.id
WHERE PS.created_on = PS.confirmed_on AND PS.created_on > current_date - 7 AND confirmed = true
WHERE PS.created_on > current_date - 7 AND confirmed = true
ORDER BY created_on DESC;
`,
);
Expand Down Expand Up @@ -237,7 +237,7 @@ publishedScheduleRouter.get('/stats', async (req, res) => {
FROM all_event_types aet
CROSS JOIN all_subjects asu
)
SELECT
SELECT
COALESCE(ap.event_type::text, 'Total') AS event_type,
COALESCE(ap.subject::text, 'Total') AS subject,
COALESCE(COUNT(c.catalog_id), 0) AS total_count
Expand Down Expand Up @@ -406,7 +406,7 @@ publishedScheduleRouter.post('/', async (req, res) => {
eventId,
dayId,
confirmed,
new Date(),
null,
startTime,
endTime,
calculateYear(eventDate, cohort),
Expand Down
4 changes: 2 additions & 2 deletions server/schema/published_schedule.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS published_schedule (
event_id integer NOT NULL,
day_id integer NOT NULL,
confirmed boolean NOT NULL,
confirmed_on date NOT NULL,
confirmed_on date,
start_time time NOT NULL,
end_time time NOT NULL,
cohort varchar[] NOT NULL,
Expand All @@ -16,4 +16,4 @@ CREATE TABLE IF NOT EXISTS published_schedule (
REFERENCES day (id) ON DELETE CASCADE
);

CREATE INDEX idx_day_id ON published_schedule (day_id);
CREATE INDEX idx_day_id ON published_schedule (day_id);

0 comments on commit 1bd80e6

Please sign in to comment.