Add action to update blocking all notifications flag

This commit is contained in:
Jonas L 2019-03-04 00:00:00 +00:00
parent f7500d19a3
commit a2b07e7b95
6 changed files with 123 additions and 0 deletions

View file

@ -49,6 +49,7 @@ export { SetUserDisableLimitsUntilAction } from './setuserdisablelimitsuntil'
export { SetUserTimezoneAction } from './setusertimezone' export { SetUserTimezoneAction } from './setusertimezone'
export { SignOutAtDeviceAction } from './signoutatdevice' export { SignOutAtDeviceAction } from './signoutatdevice'
export { TriedDisablingDeviceAdminAction } from './trieddisablingdeviceadmin' export { TriedDisablingDeviceAdminAction } from './trieddisablingdeviceadmin'
export { UpdateCategoryBlockAllNotificationsAction } from './updatecategoryblockallnotifications'
export { UpdateCategoryBlockedTimesAction } from './updatecategoryblockedtimes' export { UpdateCategoryBlockedTimesAction } from './updatecategoryblockedtimes'
export { UpdateCategoryTemporarilyBlockedAction } from './updatecategorytemporarilyblocked' export { UpdateCategoryTemporarilyBlockedAction } from './updatecategorytemporarilyblocked'
export { UpdateCategoryTitleAction } from './updatecategorytitle' export { UpdateCategoryTitleAction } from './updatecategorytitle'

View file

@ -41,6 +41,7 @@ import { SerializedSetRelaxPrimaryDeviceAction, SetRelaxPrimaryDeviceAction } fr
import { SerializedSetSendDeviceConnected, SetSendDeviceConnected } from '../setsenddeviceconnected' import { SerializedSetSendDeviceConnected, SetSendDeviceConnected } from '../setsenddeviceconnected'
import { SerializedSetUserDisableLimitsUntilAction, SetUserDisableLimitsUntilAction } from '../setuserdisablelimitsuntil' import { SerializedSetUserDisableLimitsUntilAction, SetUserDisableLimitsUntilAction } from '../setuserdisablelimitsuntil'
import { SerializedSetUserTimezoneAction, SetUserTimezoneAction } from '../setusertimezone' import { SerializedSetUserTimezoneAction, SetUserTimezoneAction } from '../setusertimezone'
import { SerializedUpdateCategoryBlockAllNotificationsAction, UpdateCategoryBlockAllNotificationsAction } from '../updatecategoryblockallnotifications'
import { SerializedUpdateCategoryBlockedTimesAction, UpdateCategoryBlockedTimesAction } from '../updatecategoryblockedtimes' import { SerializedUpdateCategoryBlockedTimesAction, UpdateCategoryBlockedTimesAction } from '../updatecategoryblockedtimes'
import { SerializedUpdateCategoryTemporarilyBlockedAction, UpdateCategoryTemporarilyBlockedAction } from '../updatecategorytemporarilyblocked' import { SerializedUpdateCategoryTemporarilyBlockedAction, UpdateCategoryTemporarilyBlockedAction } from '../updatecategorytemporarilyblocked'
import { SerializedUpdateCategoryTitleAction, UpdateCategoryTitleAction } from '../updatecategorytitle' import { SerializedUpdateCategoryTitleAction, UpdateCategoryTitleAction } from '../updatecategorytitle'
@ -75,6 +76,7 @@ export type SerializedParentAction =
SerializedSetSendDeviceConnected | SerializedSetSendDeviceConnected |
SerializedSetUserDisableLimitsUntilAction | SerializedSetUserDisableLimitsUntilAction |
SerializedSetUserTimezoneAction | SerializedSetUserTimezoneAction |
SerializedUpdateCategoryBlockAllNotificationsAction |
SerializedUpdateCategoryBlockedTimesAction | SerializedUpdateCategoryBlockedTimesAction |
SerializedUpdateCategoryTemporarilyBlockedAction | SerializedUpdateCategoryTemporarilyBlockedAction |
SerializedUpdateCategoryTitleAction | SerializedUpdateCategoryTitleAction |
@ -134,6 +136,8 @@ export const parseParentAction = (action: SerializedParentAction): ParentAction
return SetUserDisableLimitsUntilAction.parse(action) return SetUserDisableLimitsUntilAction.parse(action)
} else if (action.type === 'SET_USER_TIMEZONE') { } else if (action.type === 'SET_USER_TIMEZONE') {
return SetUserTimezoneAction.parse(action) return SetUserTimezoneAction.parse(action)
} else if (action.type === 'UPDATE_CATEGORY_BLOCK_ALL_NOTIFICATIONS') {
return UpdateCategoryBlockAllNotificationsAction.parse(action)
} else if (action.type === 'UPDATE_CATEGORY_BLOCKED_TIMES') { } else if (action.type === 'UPDATE_CATEGORY_BLOCKED_TIMES') {
return UpdateCategoryBlockedTimesAction.parse(action) return UpdateCategoryBlockedTimesAction.parse(action)
} else if (action.type === 'UPDATE_CATEGORY_TITLE') { } else if (action.type === 'UPDATE_CATEGORY_TITLE') {

View file

@ -0,0 +1,49 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { assertIdWithinFamily } from '../util/token'
import { ParentAction } from './basetypes'
export class UpdateCategoryBlockAllNotificationsAction extends ParentAction {
readonly categoryId: string
readonly blocked: boolean
constructor ({ categoryId, blocked }: {categoryId: string, blocked: boolean}) {
super()
assertIdWithinFamily(categoryId)
this.categoryId = categoryId
this.blocked = blocked
}
serialize = (): SerializedUpdateCategoryBlockAllNotificationsAction => ({
type: 'UPDATE_CATEGORY_BLOCK_ALL_NOTIFICATIONS',
categoryId: this.categoryId,
blocked: this.blocked
})
static parse = ({ categoryId, blocked }: SerializedUpdateCategoryBlockAllNotificationsAction) => (
new UpdateCategoryBlockAllNotificationsAction({ categoryId, blocked })
)
}
export interface SerializedUpdateCategoryBlockAllNotificationsAction {
type: 'UPDATE_CATEGORY_BLOCK_ALL_NOTIFICATIONS'
categoryId: string
blocked: boolean
}

View file

@ -740,6 +740,29 @@ const definitions = {
"userId" "userId"
] ]
}, },
"SerializedUpdateCategoryBlockAllNotificationsAction": {
"type": "object",
"properties": {
"type": {
"type": "string",
"enum": [
"UPDATE_CATEGORY_BLOCK_ALL_NOTIFICATIONS"
]
},
"categoryId": {
"type": "string"
},
"blocked": {
"type": "boolean"
}
},
"additionalProperties": false,
"required": [
"blocked",
"categoryId",
"type"
]
},
"SerializedUpdateCategoryBlockedTimesAction": { "SerializedUpdateCategoryBlockedTimesAction": {
"type": "object", "type": "object",
"properties": { "properties": {
@ -1424,6 +1447,9 @@ export const isSerializedParentAction: (value: object) => value is SerializedPar
{ {
"$ref": "#/definitions/SerializedSetUserTimezoneAction" "$ref": "#/definitions/SerializedSetUserTimezoneAction"
}, },
{
"$ref": "#/definitions/SerializedUpdateCategoryBlockAllNotificationsAction"
},
{ {
"$ref": "#/definitions/SerializedUpdateCategoryBlockedTimesAction" "$ref": "#/definitions/SerializedUpdateCategoryBlockedTimesAction"
}, },

View file

@ -42,6 +42,7 @@ import {
SetSendDeviceConnected, SetSendDeviceConnected,
SetUserDisableLimitsUntilAction, SetUserDisableLimitsUntilAction,
SetUserTimezoneAction, SetUserTimezoneAction,
UpdateCategoryBlockAllNotificationsAction,
UpdateCategoryBlockedTimesAction, UpdateCategoryBlockedTimesAction,
UpdateCategoryTemporarilyBlockedAction, UpdateCategoryTemporarilyBlockedAction,
UpdateCategoryTitleAction, UpdateCategoryTitleAction,
@ -76,6 +77,7 @@ import { dispatchSetRelaxPrimaryDevice } from './setrelaxprimarydevice'
import { dispatchSetSendDeviceConnected } from './setsenddeviceconnected' import { dispatchSetSendDeviceConnected } from './setsenddeviceconnected'
import { dispatchUserSetDisableLimitsUntil } from './setuserdisablelmitsuntil' import { dispatchUserSetDisableLimitsUntil } from './setuserdisablelmitsuntil'
import { dispatchSetUserTimezone } from './setusertimezone' import { dispatchSetUserTimezone } from './setusertimezone'
import { dispatchUpdateCategoryBlockAllNotifications } from './updatecategoryblockallnotifications'
import { dispatchUpdateCategoryBlockedTimes } from './updatecategoryblockedtimes' import { dispatchUpdateCategoryBlockedTimes } from './updatecategoryblockedtimes'
import { dispatchUpdateCategoryTemporarilyBlocked } from './updatecategorytemporarilyblocked' import { dispatchUpdateCategoryTemporarilyBlocked } from './updatecategorytemporarilyblocked'
import { dispatchUpdateCategoryTitle } from './updatecategorytitle' import { dispatchUpdateCategoryTitle } from './updatecategorytitle'
@ -130,6 +132,8 @@ export const dispatchParentAction = async ({ action, cache, parentUserId, source
await dispatchUserSetDisableLimitsUntil({ action, cache }) await dispatchUserSetDisableLimitsUntil({ action, cache })
} else if (action instanceof SetUserTimezoneAction) { } else if (action instanceof SetUserTimezoneAction) {
await dispatchSetUserTimezone({ action, cache }) await dispatchSetUserTimezone({ action, cache })
} else if (action instanceof UpdateCategoryBlockAllNotificationsAction) {
await dispatchUpdateCategoryBlockAllNotifications({ action, cache })
} else if (action instanceof UpdateCategoryBlockedTimesAction) { } else if (action instanceof UpdateCategoryBlockedTimesAction) {
await dispatchUpdateCategoryBlockedTimes({ action, cache }) await dispatchUpdateCategoryBlockedTimes({ action, cache })
} else if (action instanceof IncrementCategoryExtraTimeAction) { } else if (action instanceof IncrementCategoryExtraTimeAction) {

View file

@ -0,0 +1,39 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 Jonas Lochmann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { UpdateCategoryBlockAllNotificationsAction } from '../../../../action'
import { Cache } from '../cache'
export async function dispatchUpdateCategoryBlockAllNotifications ({ action, cache }: {
action: UpdateCategoryBlockAllNotificationsAction
cache: Cache
}) {
const [affectedRows] = await cache.database.category.update({
blockAllNotifications: action.blocked
}, {
where: {
familyId: cache.familyId,
categoryId: action.categoryId
},
transaction: cache.transaction
})
if (affectedRows !== 0) {
cache.categoriesWithModifiedBaseData.push(action.categoryId)
cache.areChangesImportant = true
}
}