N21-2180 Fix date for synchronized courses (#3524)

hpi-schul-cloud · Sep 12, 2024 · 8621572 · 8621572
1 parent db6538b
commit 8621572
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/controllers/courses.js b/controllers/courses.js
@@ -65,8 +65,12 @@ const getSyncedElements = 	(
 	res,
 	syncedWithGroup,
 ) => {
-	const startDate = course.startDate ? timesHelper.formatDate(course.startDate, 'DD.MM.YYYY') : undefined;
-	const untilDate = course.untilDate ? timesHelper.formatDate(course.untilDate, 'DD.MM.YYYY') : undefined;
+	const startDate = course.startDate
+		? timesHelper.formatDate(course.startDate, timesHelper.FORMAT.dateTime)
+		: undefined;
+	const untilDate = course.untilDate
+		? timesHelper.formatDate(course.untilDate, timesHelper.FORMAT.dateTime)
+		: undefined;
 
 	const selectedElements = {
 		teachersSelected: selectedElementIdsToString(markSelected(teachers, course.teacherIds)),
@@ -303,6 +307,11 @@ const editCourseHandler = (req, res, next) => {
 			course.name = group.name;
 			course.teacherIds = getUserIdsByRole(group.users, 'teacher');
 			course.userIds = getUserIdsByRole(group.users, 'student');
+
+			if (group.validPeriod) {
+				course.startDate = timesHelper.fromUTC(group.validPeriod.from);
+				course.untilDate = timesHelper.fromUTC(group.validPeriod.until);
+			}
 		}
 
 		const syncedElements = (course.syncedWithGroup || syncedGroupId) ? getSyncedElements(
@@ -837,8 +846,8 @@ router.patch('/:courseId', async (req, res, next) => {
 		const keys = ['teacherIds', 'substitutionIds', 'classIds', 'userIds'];
 		req.body = strToPropsArray(req.body, keys);
 
-		const startDate = timesHelper.dateStringToMoment(req.body.startDate);
-		const untilDate = timesHelper.dateStringToMoment(req.body.untilDate);
+		const startDate = timesHelper.dateTimeStringToMoment(req.body.startDate).utc();
+		const untilDate = timesHelper.dateTimeStringToMoment(req.body.untilDate).utc();
 
 		delete req.body.startDate;
 		if (startDate.isValid()) {