From d59c92219f285dc0aa2c73c4919676d881591b6f Mon Sep 17 00:00:00 2001
From: Fabian Posenau <fabian.p99@gmx.de>
Date: Sun, 9 Apr 2023 13:53:51 +0200
Subject: [PATCH] Fix/events enpoint (#329)

---
 apps/client/src/common/api/apiConstants.ts       |  2 +-
 apps/server/src/app.ts                           |  2 +-
 apps/server/src/controllers/rundownController.js | 14 +++++++-------
 apps/server/src/routes/rundownRouter.js          | 16 ++++++++--------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/client/src/common/api/apiConstants.ts b/apps/client/src/common/api/apiConstants.ts
index d8596c714..0e9028703 100644
--- a/apps/client/src/common/api/apiConstants.ts
+++ b/apps/client/src/common/api/apiConstants.ts
@@ -25,7 +25,7 @@ export const serverURL = calculateServer();
 export const websocketUrl = `ws://${window.location.hostname}:${STATIC_PORT}/ws`;
 
 export const eventURL = `${serverURL}/eventdata`;
-export const rundownURL = `${serverURL}/eventlist`;
+export const rundownURL = `${serverURL}/events`;
 export const ontimeURL = `${serverURL}/ontime`;
 
 export const stylesPath = 'external/styles/override.css';
diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts
index 355bae986..a12d924cf 100644
--- a/apps/server/src/app.ts
+++ b/apps/server/src/app.ts
@@ -56,7 +56,7 @@ app.use(express.urlencoded({ extended: true }));
 app.use(express.json({ limit: '1mb' }));
 
 // Implement route endpoints
-app.use('/eventlist', rundownRouter);
+app.use('/events', rundownRouter);
 app.use('/eventdata', eventDataRouter);
 app.use('/ontime', ontimeRouter);
 app.use('/playback', playbackRouter);
diff --git a/apps/server/src/controllers/rundownController.js b/apps/server/src/controllers/rundownController.js
index 24c652572..77f746367 100644
--- a/apps/server/src/controllers/rundownController.js
+++ b/apps/server/src/controllers/rundownController.js
@@ -9,19 +9,19 @@ import {
   reorderEvent,
 } from '../services/RundownService.ts';
 
-// Create controller for GET request to '/eventlist'
+// Create controller for GET request to '/events'
 // Returns -
 export const rundownGetAll = async (req, res) => {
   res.json(DataProvider.getRundown());
 };
 
-// Create controller for GET request to '/eventlist/:eventId'
+// Create controller for GET request to '/events/:eventId'
 // Returns -
 export const getEventById = async (req, res) => {
   res.json(DataProvider.getEventById(req.params?.eventId));
 };
 
-// Create controller for POST request to '/eventlist/'
+// Create controller for POST request to '/events/'
 // Returns -
 export const rundownPost = async (req, res) => {
   if (failEmptyObjects(req.body, res)) {
@@ -36,7 +36,7 @@ export const rundownPost = async (req, res) => {
   }
 };
 
-// Create controller for PUT request to '/eventlist/'
+// Create controller for PUT request to '/events/'
 // Returns -
 export const rundownPut = async (req, res) => {
   if (failEmptyObjects(req.body, res)) {
@@ -65,7 +65,7 @@ export const rundownReorder = async (req, res) => {
   }
 };
 
-// Create controller for PATCH request to '/eventlist/applydelay/:eventId'
+// Create controller for PATCH request to '/events/applydelay/:eventId'
 // Returns -
 export const rundownApplyDelay = async (req, res) => {
   try {
@@ -76,7 +76,7 @@ export const rundownApplyDelay = async (req, res) => {
   }
 };
 
-// Create controller for DELETE request to '/eventlist/:eventId'
+// Create controller for DELETE request to '/events/:eventId'
 // Returns -
 export const deleteEventById = async (req, res) => {
   try {
@@ -87,7 +87,7 @@ export const deleteEventById = async (req, res) => {
   }
 };
 
-// Create controller for DELETE request to '/eventlist/'
+// Create controller for DELETE request to '/events/'
 // Returns -
 export const rundownDelete = async (req, res) => {
   try {
diff --git a/apps/server/src/routes/rundownRouter.js b/apps/server/src/routes/rundownRouter.js
index b3d7120c1..4191d88ea 100644
--- a/apps/server/src/routes/rundownRouter.js
+++ b/apps/server/src/routes/rundownRouter.js
@@ -18,26 +18,26 @@ import {
 
 export const router = express.Router();
 
-// create route between controller and '/eventlist/' endpoint
+// create route between controller and '/events/' endpoint
 router.get('/', rundownGetAll);
 
-// create route between controller and '/eventlist/:eventId' endpoint
+// create route between controller and '/events/:eventId' endpoint
 router.get('/:eventId', paramsMustHaveEventId, getEventById);
 
-// create route between controller and '/eventlist/' endpoint
+// create route between controller and '/events/' endpoint
 router.post('/', rundownPostValidator, rundownPost);
 
-// create route between controller and '/eventlist/' endpoint
+// create route between controller and '/events/' endpoint
 router.put('/', rundownPutValidator, rundownPut);
 
-// create route between controller and '/eventlist/reorder' endpoint
+// create route between controller and '/events/reorder' endpoint
 router.patch('/reorder/', rundownReorderValidator, rundownReorder);
 
-// create route between controller and '/eventlist/applydelay/:eventId' endpoint
+// create route between controller and '/events/applydelay/:eventId' endpoint
 router.patch('/applydelay/:eventId', paramsMustHaveEventId, rundownApplyDelay);
 
-// create route between controller and '/eventlist/all' endpoint
+// create route between controller and '/events/all' endpoint
 router.delete('/all', rundownDelete);
 
-// create route between controller and '/eventlist/:eventId' endpoint
+// create route between controller and '/events/:eventId' endpoint
 router.delete('/:eventId', paramsMustHaveEventId, deleteEventById);