diff --git a/backend/services/diaryDateActivityService.js b/backend/services/diaryDateActivityService.js index 3751d1b5..8c6f6d75 100644 --- a/backend/services/diaryDateActivityService.js +++ b/backend/services/diaryDateActivityService.js @@ -64,11 +64,17 @@ class DiaryDateActivityService { } } - const maxOrderId = await DiaryDateActivity.max('orderId', { - where: { + const maxOrderWhere = restData.groupId + ? { diaryDateId: data.diaryDateId, groupId: restData.groupId } + : { + // Globale Aktivitäten bei "Alle" sollen am Ende des gesamten Tagesplans landen. + diaryDateId: data.diaryDateId + }; + const maxOrderId = await DiaryDateActivity.max('orderId', { + where: maxOrderWhere }); const newOrderId = maxOrderId !== null ? maxOrderId + 1 : 1; restData.orderId = newOrderId;