graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 07:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

/antennas/notes API で日付による絞り込みができるようにする (#8015)

Browse source
This commit is contained in:
xianon 2021-11-28 13:45:17 +09:00 committed by GitHub
parent 0d21083c9a
commit 335e4bd213
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/server/api/endpoints/antennas/notes.ts
View file

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