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

Remove manual database lock usage

Browse Source
This commit is contained in:
Jonas Lochmann
2021-03-08 01:00:00 +01:00
parent 8665e614b5
commit f6cc231202
8 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/function/child/set-primary-device.ts
+1 -3
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -16,7 +16,6 @@
*/
import { Conflict, InternalServerError, Unauthorized } from 'http-errors'
import * as Sequelize from 'sequelize'
import { config } from '../../config'
import { Database } from '../../database'
import { generateVersionId } from '../../util/token'
@@ -60,7 +59,6 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
userId: deviceEntry.currentUserId
},
transaction,
lock: Sequelize.Transaction.LOCK.UPDATE,
attributes: ['currentDevice']
})
src/function/parent/link-mail-address.ts
+2 -4
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -16,7 +16,6 @@
*/
import { Conflict, Unauthorized } from 'http-errors'
import * as Sequelize from 'sequelize'
import { Database } from '../../database'
import { generateVersionId } from '../../util/token'
import { WebsocketApi } from '../../websocket'
@@ -65,8 +64,7 @@ export const linkMailAddress = async ({ mailAuthToken, deviceAuthToken, parentUs
familyId,
userId: parentUserId
},
transaction,
lock: Sequelize.Transaction.LOCK.UPDATE
transaction
})
if (!parentEntry) {
src/function/purchase/add-purchase.ts
+2 -4
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -16,7 +16,6 @@
*/
import { Conflict } from 'http-errors'
import * as Sequelize from 'sequelize'
import { Database, Transaction } from '../../database'
import { notifyClientsAboutChangesDelayed } from '../../function/websocket'
import { WebsocketApi } from '../../websocket'
@@ -51,8 +50,7 @@ export const addPurchase = async ({ database, familyId, type, transactionId, web
where: {
familyId
},
transaction,
lock: Sequelize.Transaction.LOCK.UPDATE
transaction
})
if (!familyEntry) {
src/function/sync/apply-actions/dispatch-child-action/childchangepassword.ts
+2 -4
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -15,7 +15,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import * as Sequelize from 'sequelize'
import { ChildChangePasswordAction } from '../../../../action'
import { Cache } from '../cache'
import { SourceUserNotFoundException } from '../exception/illegal-state'
@@ -31,8 +30,7 @@ export const dispatchChildChangePassword = async ({ action, childUserId, cache }
userId: childUserId,
type: 'child'
},
transaction: cache.transaction,
lock: Sequelize.Transaction.LOCK.UPDATE
transaction: cache.transaction
})
if (!childEntry) {
src/function/sync/apply-actions/dispatch-parent-action/changeparentpassword.ts
+2 -4
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -15,7 +15,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import * as Sequelize from 'sequelize'
import { ChangeParentPasswordAction, InvalidChangeParentPasswordIntegrityException } from '../../../../action/changeparentpassword'
import { Cache } from '../cache'
import { ApplyActionException } from '../exception/index'
@@ -31,8 +30,7 @@ export async function dispatchChangeParentPassword ({ action, cache }: {
userId: action.parentUserId,
type: 'parent'
},
transaction: cache.transaction,
lock: Sequelize.Transaction.LOCK.UPDATE
transaction: cache.transaction
})
if (!parentEntry) {
src/function/sync/apply-actions/dispatch-parent-action/removeuser.ts
+2 -3
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -106,8 +106,7 @@ export async function dispatchRemoveUser ({ action, cache, parentUserId }: {
familyId: cache.familyId,
childId: action.userId
},
transaction: cache.transaction,
lock: Sequelize.Transaction.LOCK.UPDATE
transaction: cache.transaction
})
await cache.database.categoryApp.destroy({
src/function/sync/apply-actions/dispatch-parent-action/setchildpassword.ts
+2 -4
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -15,7 +15,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import * as Sequelize from 'sequelize'
import { SetChildPasswordAction } from '../../../../action'
import { Cache } from '../cache'
import { MissingUserException } from '../exception/missing-item'
@@ -30,8 +29,7 @@ export async function dispatchSetChildPassword ({ action, cache }: {
userId: action.childUserId,
type: 'child'
},
transaction: cache.transaction,
lock: Sequelize.Transaction.LOCK.UPDATE
transaction: cache.transaction
})
if (!childEntry) {
src/worker/delete-deprecated-purchases.ts
+1 -2
View File
@@ -1,6 +1,6 @@
/*
* server component for the TimeLimit App
* Copyright (C) 2019 - 2020 Jonas Lochmann
* Copyright (C) 2019 - 2021 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
@@ -53,7 +53,6 @@ async function deleteDeprecatedPurchases ({ database, websocket }: {
},
attributes: ['familyId'],
transaction,
lock: Sequelize.Transaction.LOCK.UPDATE,
limit: 100
})).map((item) => item.familyId)