import { getSort } from '../utils'
import { AccountBlock } from '../../../shared/models/blocklist'
import { Op } from 'sequelize'
+import * as Bluebird from 'bluebird'
+import { MAccountBlocklist, MAccountBlocklistAccounts } from '@server/typings/models'
enum ScopeNames {
WITH_ACCOUNTS = 'WITH_ACCOUNTS'
}
-@Scopes({
+@Scopes(() => ({
[ScopeNames.WITH_ACCOUNTS]: {
include: [
{
- model: () => AccountModel,
+ model: AccountModel,
required: true,
as: 'ByAccount'
},
{
- model: () => AccountModel,
+ model: AccountModel,
required: true,
as: 'BlockedAccount'
}
]
}
-})
+}))
@Table({
tableName: 'accountBlocklist',
attributes: [ 'accountId', 'id' ],
where: {
accountId: {
- [Op.any]: accountIds
+ [Op.in]: accountIds // FIXME: sequelize ANY seems broken
},
targetAccountId
},
})
}
- static loadByAccountAndTarget (accountId: number, targetAccountId: number) {
+ static loadByAccountAndTarget (accountId: number, targetAccountId: number): Bluebird<MAccountBlocklist> {
const query = {
where: {
accountId,
return AccountBlocklistModel
.scope([ ScopeNames.WITH_ACCOUNTS ])
- .findAndCountAll(query)
+ .findAndCountAll<MAccountBlocklistAccounts>(query)
.then(({ rows, count }) => {
return { total: count, data: rows }
})