Skip to content

Commit 9b29e89

Browse files
committed
Merge branch 'mt/scrum-58-child-60-Sharing-timetable-backend' of https://github.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into mt/scrum-58-child-60-Sharing-timetable-backend
2 parents 51c8103 + 9489951 commit 9b29e89

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

course-matrix/backend/src/controllers/sharesController.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
"get_user_id_by_email",
3232
{
3333
email: shared_email,
34-
}
34+
},
3535
);
3636

3737
if (sharedError) {
@@ -109,7 +109,7 @@ export default {
109109
.schema("timetable")
110110
.from("shared")
111111
.select(
112-
"calendar_id, timetables!inner(id, user_id, timetable_title, semester, favorite)"
112+
"calendar_id, timetables!inner(id, user_id, timetable_title, semester, favorite)",
113113
)
114114
.eq("shared_id", user_id);
115115

course-matrix/backend/src/routes/timetableRouter.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ timetableRouter.put("/:id", authHandler, timetableController.updateTimetable);
3636
timetableRouter.delete(
3737
"/:id",
3838
authHandler,
39-
timetableController.deleteTimetable
39+
timetableController.deleteTimetable,
4040
);
4141

4242
/**
@@ -54,7 +54,7 @@ timetableRouter.post("/events", authHandler, eventController.createEvent);
5454
timetableRouter.get(
5555
"/events/:calendar_id",
5656
authHandler,
57-
eventController.getEvents
57+
eventController.getEvents,
5858
);
5959

6060
/**
@@ -79,7 +79,7 @@ timetableRouter.delete("/events/:id", authHandler, eventController.deleteEvent);
7979
timetableRouter.post(
8080
"/restrictions",
8181
authHandler,
82-
restrictionsController.createRestriction
82+
restrictionsController.createRestriction,
8383
);
8484

8585
/**
@@ -90,7 +90,7 @@ timetableRouter.post(
9090
timetableRouter.get(
9191
"/restrictions/:calendar_id",
9292
authHandler,
93-
restrictionsController.getRestriction
93+
restrictionsController.getRestriction,
9494
);
9595

9696
/**
@@ -101,7 +101,7 @@ timetableRouter.get(
101101
timetableRouter.put(
102102
"/restrictions/:id",
103103
authHandler,
104-
restrictionsController.updateRestriction
104+
restrictionsController.updateRestriction,
105105
);
106106

107107
/**
@@ -112,7 +112,7 @@ timetableRouter.put(
112112
timetableRouter.delete(
113113
"/restrictions/:id",
114114
authHandler,
115-
restrictionsController.deleteRestriction
115+
restrictionsController.deleteRestriction,
116116
);
117117

118118
/**
@@ -137,7 +137,7 @@ timetableRouter.get("/shared", authHandler, sharesController.getShare);
137137
timetableRouter.delete(
138138
"/shared/owner/:calendar_id",
139139
authHandler,
140-
sharesController.deleteOwnerShare
140+
sharesController.deleteOwnerShare,
141141
);
142142

143143
/**
@@ -148,5 +148,5 @@ timetableRouter.delete(
148148
timetableRouter.delete(
149149
"/shared/:calendar_id",
150150
authHandler,
151-
sharesController.deleteShare
151+
sharesController.deleteShare,
152152
);

0 commit comments

Comments
 (0)