Fix sort inconsistency

pull/304/head
Chocobozzz 2018-02-19 09:41:03 +01:00
parent 2519d9fec6
commit 3bb6c52645
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
9 changed files with 20 additions and 20 deletions

View File

@ -197,7 +197,7 @@ export class AccountModel extends Model<AccountModel> {
const query = {
offset: start,
limit: count,
order: [ getSort(sort) ]
order: getSort(sort),
}
return AccountModel.findAndCountAll(query)

View File

@ -125,7 +125,7 @@ export class UserModel extends Model<UserModel> {
const query = {
offset: start,
limit: count,
order: [ getSort(sort) ]
order: getSort(sort),
}
return UserModel.findAndCountAll(query)

View File

@ -215,7 +215,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
distinct: true,
offset: start,
limit: count,
order: [ getSort(sort) ],
order: getSort(sort),
include: [
{
model: ActorModel,
@ -248,7 +248,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
distinct: true,
offset: start,
limit: count,
order: [ getSort(sort) ],
order: getSort(sort),
include: [
{
model: ActorModel,

View File

@ -1,5 +1,5 @@
// Translate for example "-name" to [ 'name', 'DESC' ]
function getSort (value: string) {
// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
function getSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let field: string
let direction: 'ASC' | 'DESC'
@ -11,14 +11,14 @@ function getSort (value: string) {
field = value
}
return [ field, direction ]
return [ [ field, direction ], lastSort ]
}
function getSortOnModel (model: any, value: string) {
let sort = getSort(value)
function getSortOnModel (model: any, value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let [ firstSort ] = getSort(value)
if (model) return [ model, sort[0], sort[1] ]
return sort
if (model) return [ [ model, firstSort[0], firstSort[1] ], lastSort ]
return [ firstSort, lastSort ]
}
function throwIfNotValid (value: any, validator: (value: any) => boolean, fieldName = 'value') {

View File

@ -64,7 +64,7 @@ export class VideoAbuseModel extends Model<VideoAbuseModel> {
const query = {
offset: start,
limit: count,
order: [ getSort(sort) ],
order: getSort(sort),
include: [
{
model: AccountModel,

View File

@ -36,7 +36,7 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
const query = {
offset: start,
limit: count,
order: [ getSortOnModel(sort.sortModel, sort.sortValue) ],
order: getSortOnModel(sort.sortModel, sort.sortValue),
include: [ { model: VideoModel } ]
}

View File

@ -151,7 +151,7 @@ export class VideoChannelModel extends Model<VideoChannelModel> {
const query = {
offset: start,
limit: count,
order: [ getSort(sort) ]
order: getSort(sort)
}
return VideoChannelModel
@ -164,7 +164,7 @@ export class VideoChannelModel extends Model<VideoChannelModel> {
static listByAccount (accountId: number) {
const query = {
order: [ getSort('createdAt') ],
order: getSort('createdAt'),
include: [
{
model: AccountModel,

View File

@ -268,7 +268,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
const query = {
offset: start,
limit: count,
order: [ getSort(sort) ],
order: getSort(sort),
where: {
videoId,
inReplyToCommentId: null

View File

@ -493,7 +493,7 @@ export class VideoModel extends Model<VideoModel> {
distinct: true,
offset: start,
limit: count,
order: [ getSort('createdAt'), [ 'Tags', 'name', 'ASC' ] ],
order: getSort('createdAt', [ 'Tags', 'name', 'ASC' ]),
where: {
id: {
[Sequelize.Op.in]: Sequelize.literal('(' + rawQuery + ')')
@ -607,7 +607,7 @@ export class VideoModel extends Model<VideoModel> {
const query = {
offset: start,
limit: count,
order: [ getSort(sort) ],
order: getSort(sort),
include: [
{
model: VideoChannelModel,
@ -637,7 +637,7 @@ export class VideoModel extends Model<VideoModel> {
const query = {
offset: start,
limit: count,
order: [ getSort(sort) ]
order: getSort(sort),
}
const serverActor = await getServerActor()
@ -656,7 +656,7 @@ export class VideoModel extends Model<VideoModel> {
const query: IFindOptions<VideoModel> = {
offset: start,
limit: count,
order: [ getSort(sort) ],
order: getSort(sort),
where: {
name: {
[Sequelize.Op.iLike]: '%' + value + '%'