Merge branch 'develop' into notification-read-api

This commit is contained in:
tamaina
2021-11-29 15:48:59 +09:00
89 changed files with 1898 additions and 1518 deletions

View File

@@ -33,6 +33,14 @@ export const meta = {
untilId: {
validator: $.optional.type(ID),
},
sinceDate: {
validator: $.optional.num,
},
untilDate: {
validator: $.optional.num,
},
},
errors: {
@@ -68,7 +76,8 @@ export default define(meta, async (ps, user) => {
.select('joining.noteId')
.where('joining.antennaId = :antennaId', { antennaId: antenna.id });
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
const query = makePaginationQuery(Notes.createQueryBuilder('note'),
ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere(`note.id IN (${ antennaQuery.getQuery() })`)
.innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('note.reply', 'reply')