src/models/calendar/events/event.interface.ts

@@ -9,8 +9,7 @@ export interface Event {
 	createdDate: Date;
 	location: string;
 	createdBy?: string;
-	createdById: number;
+	createdById: number,
 	url: string;
 	wholeDay: boolean;
-	status?: string;
 }

src/models/calendar/events/events.router.ts

@@ -53,22 +53,13 @@ eventsRouter.get('/:calendar/json', async (req: Request, res: Response) => {
 
 		let calendarId: number = calendarNames.get(calendarName)!.id;
 
-		let user = await UserService.checkSession(sessionId, sessionKey, ip);
+		if (! await CredentialService.hasAccess(calendarName, sessionId, sessionKey, password, ip)) {
-
+			res.status(403).send({'message': 'You do not have access to the specified calendar.'});
-		if(user === null || !user.isActive) {
+			return;
-			if (! await CredentialService.hasAccess(calendarName, sessionId, sessionKey, password, ip)) {
-				res.status(403).send({'message': 'You do not have access to the specified calendar.'});
-				return;
-			}
 		}
 
-		let events: Event[];
+		// Get events
-
+		let events = await EventService.getAllEvents(calendarId);
-		if(user.isActive) {
-			events = await EventService.getAllEventsAdmin(calendarId);
-		} else {
-			events = await EventService.getAllEvents(calendarId);
-		}
 
 		// Send the events back
 		res.status(200).send(events);
@@ -161,8 +152,7 @@ eventsRouter.post('/', async (req: Request, res: Response) => {
 			location: req.body.location ?? '',
 			createdById: user.userId ?? -1,
 			url: req.body.url ?? '',
-			wholeDay: req.body.wholeDay ?? false,
+			wholeDay: req.body.wholeDay ?? false
-			status: req.body.status ?? 'PUBLIC'
 		};
 
 		let eventId = await EventService.createEvent(event);
@@ -220,8 +210,7 @@ eventsRouter.put('/:eventId', async (req: Request, res: Response) => {
 			createdBy: req.body.createdBy ?? '',
 			createdById: user.userId ?? -1,
 			url: req.body.url ?? '',
-			wholeDay: req.body.wholeDay ?? false,
+			wholeDay: req.body.wholeDay ?? false
-			status: req.body.status ?? 'PUBLIC'
 		};
 
 		let successRows = await EventService.updateEvent(event);
@@ -276,10 +265,9 @@ eventsRouter.delete('/:eventId', async (req: Request, res: Response) => {
 			createdDate: new Date(),
 			location: '',
 			createdBy: '',
-			createdById: user.userId ?? -1,
+			createdById: -1,
 			url: '',
-			wholeDay: false,
+			wholeDay: false
-			status: 'DELETED'
 		};
 
 		let success = await EventService.deleteEvent(event);

src/models/calendar/events/events.service.ts

@@ -14,19 +14,7 @@ export const getAllEvents = async (calendarId: number): Promise<Event[]> => {
 	let conn = await NachklangCalendarDB.getConnection();
 	let eventRows: Event[] = [];
 	try {
-		const eventsQuery = `
+		const eventsQuery = 'SELECT e.*, u.full_name FROM events e LEFT OUTER JOIN users u ON e.created_by_id = u.user_id WHERE calendar_id = ? AND status=\'PUBLIC\'';
-		SELECT e.calendar_id, u.full_name, v.* FROM events e
-			INNER JOIN (
-  				SELECT event_id, MAX(event_version_id) AS latest_version
-			  	FROM event_versions
-			  	GROUP BY event_id
-			) latest_versions
-			ON e.event_id = latest_versions.event_id
-			INNER JOIN event_versions v
-			ON v.event_id = latest_versions.event_id AND v.event_version_id = latest_versions.latest_version
-			LEFT OUTER JOIN users u ON u.user_id = e.created_by_id
-			WHERE e.calendar_id = ? AND v.status = 'PUBLIC'
-			ORDER BY e.event_id`;
 		const eventsRes = await conn.query(eventsQuery, calendarId);
 
 		for (let row of eventsRes) {
@@ -56,53 +44,6 @@ export const getAllEvents = async (calendarId: number): Promise<Event[]> => {
 	}
 };
 
-export const getAllEventsAdmin = async (calendarId: number): Promise<Event[]> => {
-	let conn = await NachklangCalendarDB.getConnection();
-	let eventRows: Event[] = [];
-	try {
-		const eventsQuery = `
-		SELECT e.calendar_id, u.full_name, v.* FROM events e
-			INNER JOIN (
-  				SELECT event_id, MAX(event_version_id) AS latest_version
-			  	FROM event_versions
-			  	GROUP BY event_id
-			) latest_versions
-			ON e.event_id = latest_versions.event_id
-			INNER JOIN event_versions v
-			ON v.event_id = latest_versions.event_id AND v.event_version_id = latest_versions.latest_version
-			LEFT OUTER JOIN users u ON u.user_id = e.created_by_id
-			WHERE e.calendar_id = ?
-			ORDER BY e.event_id`;
-		const eventsRes = await conn.query(eventsQuery, calendarId);
-
-		for (let row of eventsRes) {
-			eventRows.push({
-				eventId: row.event_id,
-				calendarId: row.calendar_id,
-				uuid: row.uuid,
-				name: row.name,
-				description: row.description,
-				startDateTime: row.start_datetime,
-				endDateTime: row.end_datetime,
-				createdDate: row.created_date,
-				location: row.location,
-				createdBy: row.full_name,
-				createdById: row.created_by_id,
-				url: row.url,
-				wholeDay: row.whole_day,
-				status: row.status
-			});
-		}
-
-		return eventRows;
-	} catch (err) {
-		throw err;
-	} finally {
-		// Return connection
-		await conn.end();
-	}
-};
-
 /**
  * Create the given event in the database
  * @param event The event to create
@@ -111,13 +52,8 @@ export const createEvent = async (event: Event): Promise<number> => {
 	let conn = await NachklangCalendarDB.getConnection();
 	try {
 		let eventUUID = Guid.create().toString();
-		const eventsQuery = 'INSERT INTO events (calendar_id, uuid, created_by_id) VALUES (?,?,?) RETURNING event_id';
+		const eventsQuery = 'INSERT INTO events (calendar_id, uuid, name, description, start_datetime, end_datetime, location, created_by_id, url, whole_day, status) VALUES (?,?,?,?,?,?,?,?,?,?, \'PUBLIC\') RETURNING event_id';
-		const eventsRes = await conn.execute(eventsQuery, [event.calendarId, eventUUID, event.createdById]);
+		const eventsRes = await conn.execute(eventsQuery, [event.calendarId, eventUUID, event.name, event.description, event.startDateTime, event.endDateTime, event.location, event.createdById, event.url, event.wholeDay]);
-
-		const versionQuery = 'INSERT INTO event_versions (event_id, name, description, start_datetime, end_datetime, whole_day, location, url, status, version_created_by_id) VALUES (?,?,?,?,?,?,?,?,?,?);'
-		const versionRes = await conn.execute(versionQuery, [eventsRes[0].event_id, event.name, event.description, event.startDateTime, event.endDateTime, event.wholeDay, event.location, event.url, event.status, event.createdById]);
-
-		await conn.commit();
 
 		return eventsRes[0].event_id;
 	} catch (err) {
@@ -137,12 +73,10 @@ export const createEvent = async (event: Event): Promise<number> => {
 export const updateEvent = async (event: Event): Promise<number> => {
 	let conn = await NachklangCalendarDB.getConnection();
 	try {
-		const versionQuery = 'INSERT INTO event_versions (event_id, name, description, start_datetime, end_datetime, whole_day, location, url, status, version_created_by_id) VALUES (?,?,?,?,?,?,?,?,?,?);'
+		const eventsQuery = 'UPDATE events SET name = ?, description = ?, start_datetime = ?, end_datetime = ?, location = ?, created_by_id = ?, url = ?, whole_day = ? WHERE event_id = ?';
-		const versionRes = await conn.execute(versionQuery, [event.eventId, event.name, event.description, event.startDateTime, event.endDateTime, event.wholeDay, event.location, event.url, event.status, event.createdById]);
+		const eventsRes = await conn.execute(eventsQuery, [event.name, event.description, event.startDateTime, event.endDateTime, event.location, event.createdById, event.url, event.wholeDay, event.eventId]);
 
-		await conn.commit();
+		return eventsRes.affectedRows;
-
-		return versionRes.affectedRows;
 	} catch (err) {
 		await conn.rollback();
 		throw err;
@@ -160,12 +94,10 @@ export const updateEvent = async (event: Event): Promise<number> => {
 export const deleteEvent = async (event: Event): Promise<boolean> => {
 	let conn = await NachklangCalendarDB.getConnection();
 	try {
-		const versionQuery = 'INSERT INTO event_versions (event_id, status, version_created_by_id) VALUES (?,?,?);'
+		const eventsQuery = 'UPDATE events SET status=\'DELETED\' WHERE event_id = ?';
-		const versionRes = await conn.execute(versionQuery, [event.eventId, 'DELETED', event.createdById]);
+		const eventsRes = await conn.execute(eventsQuery, [event.eventId]);
 
-		await conn.commit();
+		return eventsRes.affectedRows === 1;
-
-		return versionRes.affectedRows === 1;
 	} catch (err) {
 		await conn.rollback();
 		throw err;