mirror of
https://codeberg.org/timelimit/timelimit-server.git
synced 2026-08-31 19:03:45 +02:00
Add column for block all notifications
This commit is contained in:
@@ -38,7 +38,12 @@ export interface CategoryAttributesVersion2 {
|
||||
parentCategoryId: string
|
||||
}
|
||||
|
||||
export type CategoryAttributes = CategoryAttributesVersion1 & CategoryAttributesVersion2
|
||||
export interface CategoryAttributesVersion3 {
|
||||
blockAllNotifications: boolean
|
||||
}
|
||||
|
||||
export type CategoryAttributes = CategoryAttributesVersion1 & CategoryAttributesVersion2 &
|
||||
CategoryAttributesVersion3
|
||||
|
||||
export type CategoryInstance = Sequelize.Instance<CategoryAttributes> & CategoryAttributes
|
||||
export type CategoryModel = Sequelize.Model<CategoryInstance, CategoryAttributes>
|
||||
@@ -82,9 +87,17 @@ export const attributesVersion2: SequelizeAttributes<CategoryAttributesVersion2>
|
||||
}
|
||||
}
|
||||
|
||||
export const attributesVersion3: SequelizeAttributes<CategoryAttributesVersion3> = {
|
||||
blockAllNotifications: {
|
||||
...booleanColumn,
|
||||
defaultValue: false
|
||||
}
|
||||
}
|
||||
|
||||
export const attributes: SequelizeAttributes<CategoryAttributes> = {
|
||||
...attributesVersion1,
|
||||
...attributesVersion2
|
||||
...attributesVersion2,
|
||||
...attributesVersion3
|
||||
}
|
||||
|
||||
export const createCategoryModel = (sequelize: Sequelize.Sequelize): CategoryModel => sequelize.define<CategoryInstance, CategoryAttributes>('Category', attributes)
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* 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 { QueryInterface, Sequelize } from 'sequelize'
|
||||
import { attributesVersion3 as categoryAttributes } from '../../category'
|
||||
|
||||
export async function up (queryInterface: QueryInterface, sequelize: Sequelize) {
|
||||
await sequelize.transaction({
|
||||
type: 'EXCLUSIVE'
|
||||
}, async (transaction) => {
|
||||
await queryInterface.addColumn('Categories', 'blockAllNotifications', {
|
||||
...categoryAttributes.blockAllNotifications
|
||||
}, { transaction })
|
||||
})
|
||||
}
|
||||
|
||||
export async function down (queryInterface: QueryInterface, sequelize: Sequelize) {
|
||||
await sequelize.transaction({
|
||||
type: 'EXCLUSIVE'
|
||||
}, async (transaction) => {
|
||||
await queryInterface.removeColumn('Categories', 'blockAllNotifications', { transaction })
|
||||
})
|
||||
}
|
||||
@@ -50,7 +50,8 @@ export async function dispatchCreateCategory ({ action, cache }: {
|
||||
baseVersion: generateVersionId(),
|
||||
assignedAppsVersion: generateVersionId(),
|
||||
usedTimesVersion: generateVersionId(),
|
||||
parentCategoryId: ''
|
||||
parentCategoryId: '',
|
||||
blockAllNotifications: false
|
||||
}, { transaction: cache.transaction })
|
||||
|
||||
// update the cache
|
||||
|
||||
@@ -299,7 +299,8 @@ export const generateServerDataStatus = async ({ database, clientStatus, familyI
|
||||
'extraTimeInMillis',
|
||||
'temporarilyBlocked',
|
||||
'baseVersion',
|
||||
'parentCategoryId'
|
||||
'parentCategoryId',
|
||||
'blockAllNotifications'
|
||||
],
|
||||
transaction
|
||||
})).map((item) => ({
|
||||
@@ -310,7 +311,8 @@ export const generateServerDataStatus = async ({ database, clientStatus, familyI
|
||||
extraTimeInMillis: item.extraTimeInMillis,
|
||||
temporarilyBlocked: item.temporarilyBlocked,
|
||||
baseVersion: item.baseVersion,
|
||||
parentCategoryId: item.parentCategoryId
|
||||
parentCategoryId: item.parentCategoryId,
|
||||
blockAllNotifications: item.blockAllNotifications
|
||||
}))
|
||||
|
||||
result.categoryBase = dataForSyncing.map((item): ServerUpdatedCategoryBaseData => ({
|
||||
@@ -321,7 +323,8 @@ export const generateServerDataStatus = async ({ database, clientStatus, familyI
|
||||
extraTime: item.extraTimeInMillis,
|
||||
tempBlocked: item.temporarilyBlocked,
|
||||
version: item.baseVersion,
|
||||
parentCategoryId: item.parentCategoryId
|
||||
parentCategoryId: item.parentCategoryId,
|
||||
blockAllNotifications: item.blockAllNotifications
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
@@ -93,6 +93,7 @@ export interface ServerUpdatedCategoryBaseData {
|
||||
tempBlocked: boolean
|
||||
version: string
|
||||
parentCategoryId: string
|
||||
blockAllNotifications: boolean
|
||||
}
|
||||
|
||||
export interface ServerUpdatedCategoryAssignedApps {
|
||||
|
||||
Reference in New Issue
Block a user