Add support for temporarily blocking with end time

src/database/category.ts

@@ -17,7 +17,7 @@
 
 import * as Sequelize from 'sequelize'
 import { serializedBitmaskRegex } from '../util/bitmask'
-import { booleanColumn, familyIdColumn, idWithinFamilyColumn, labelColumn, optionalIdWithinFamilyColumn, versionColumn } from './columns'
+import { booleanColumn, familyIdColumn, idWithinFamilyColumn, labelColumn, optionalIdWithinFamilyColumn, timestampColumn, versionColumn } from './columns'
 import { SequelizeAttributes } from './types'
 
 export const allowedTimeWarningFlags = 1 | 2 | 4 | 8 | 16
@@ -53,8 +53,13 @@ export interface CategoryAttributesVersion5 {
   minBatteryMobile: number
 }
 
+export interface CategoryAttributesVersion6 {
+  temporarilyBlockedEndTime: number
+}
+
 export type CategoryAttributes = CategoryAttributesVersion1 & CategoryAttributesVersion2 &
-  CategoryAttributesVersion3 & CategoryAttributesVersion4 & CategoryAttributesVersion5
+  CategoryAttributesVersion3 & CategoryAttributesVersion4 & CategoryAttributesVersion5 &
+  CategoryAttributesVersion6
 
 export type CategoryModel = Sequelize.Model & CategoryAttributes
 export type CategoryModelStatic = typeof Sequelize.Model & {
@@ -145,12 +150,20 @@ export const attributesVersion5: SequelizeAttributes<CategoryAttributesVersion5>
   }
 }
 
+export const attributesVersion6: SequelizeAttributes<CategoryAttributesVersion6> = {
+  temporarilyBlockedEndTime: {
+    ...timestampColumn,
+    defaultValue: 0
+  }
+}
+
 export const attributes: SequelizeAttributes<CategoryAttributes> = {
   ...attributesVersion1,
   ...attributesVersion2,
   ...attributesVersion3,
   ...attributesVersion4,
-  ...attributesVersion5
+  ...attributesVersion5,
+  ...attributesVersion6
 }
 
 export const createCategoryModel = (sequelize: Sequelize.Sequelize): CategoryModelStatic => sequelize.define('Category', attributes) as CategoryModelStatic

src/database/migration/migrations/20200203-add-temporarily-blocked-end-time.ts

@@ -0,0 +1,39 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2020 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, Transaction } from 'sequelize'
+import { attributesVersion6 as categoryAttributes } from '../../category'
+
+export async function up (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.addColumn('Categories', 'temporarilyBlockedEndTime', {
+      ...categoryAttributes.temporarilyBlockedEndTime
+    }, {
+      transaction
+    })
+  })
+}
+
+export async function down (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.removeColumn('Categories', 'temporarilyBlockedEndTime', { transaction })
+  })
+}