TimeLimit.io/timelimit-server
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-server.git synced 2026-08-31 19:03:45 +02:00
Code Actions Packages Releases 6 Activity

Limit used time to the length of the day/ time slot

Browse Source
This commit is contained in:
Jonas Lochmann
2020-08-24 02:00:00 +02:00
parent 15b576a2d7
commit 9730d13b2e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/function/sync/apply-actions/dispatch-app-logic-action/addusedtime.ts
+5 -2
View File
@@ -26,6 +26,9 @@ export const getRoundedTimestamp = () => {
return now - (now % (1000 * 60 * 60 * 24 * 2 /* 2 days */))
}
const dayLengthInMinutes = MinuteOfDay.LENGTH
const dayLengthInMs = dayLengthInMinutes * 1000 * 60
export async function dispatchAddUsedTime ({ deviceId, action, cache }: {
deviceId: string
action: AddUsedTimeAction
@@ -63,7 +66,7 @@ export async function dispatchAddUsedTime ({ deviceId, action, cache }: {
if (action.timeToAdd !== 0) {
// try to update first
const [updatedRows] = await cache.database.usedTime.update({
usedTime: Sequelize.literal(`usedTime + ${action.timeToAdd}`) as any,
usedTime: Sequelize.literal(`MAX(0, MIN(usedTime + ${action.timeToAdd}, ${dayLengthInMs}))`) as any,
lastUpdate: roundedTimestamp
}, {
where: {
@@ -82,7 +85,7 @@ export async function dispatchAddUsedTime ({ deviceId, action, cache }: {
familyId: cache.familyId,
categoryId: categoryId,
dayOfEpoch: action.dayOfEpoch,
usedTime: action.timeToAdd,
usedTime: Math.min(action.timeToAdd, dayLengthInMs),
lastUpdate: roundedTimestamp,
startMinuteOfDay: MinuteOfDay.MIN,
endMinuteOfDay: MinuteOfDay.MAX