summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaichan <40626578+taichanNE30@users.noreply.github.com>2023-09-24 20:08:00 +0900
committerGitHub <noreply@github.com>2023-09-24 20:08:00 +0900
commitdc8ab01168873c4eafe79eb8002a0028b58758c0 (patch)
tree8a34777c760bb769bd192ff7b8e10e039e70ce51
parent2023.9.0 (diff)
downloadsharkey-dc8ab01168873c4eafe79eb8002a0028b58758c0.tar.gz
sharkey-dc8ab01168873c4eafe79eb8002a0028b58758c0.tar.bz2
sharkey-dc8ab01168873c4eafe79eb8002a0028b58758c0.zip
fix(backend): お知らせのページネーションが機能しない #11800 (#11890)
* fix(backend): お知らせのページネーションが機能しない #11800 * Update CHANGELOG
-rw-r--r--CHANGELOG.md10
-rw-r--r--packages/backend/src/server/api/endpoints/announcements.ts2
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b696116b7..5396962c07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,16 @@
-->
+## (unreleased)
+### General
+-
+
+### Client
+-
+
+### Server
+- Fix: お知らせのページネーションが機能しない
+
## 2023.9.0 (unreleased)
### Note
diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts
index 498afe3448..7c242dbcd5 100644
--- a/packages/backend/src/server/api/endpoints/announcements.ts
+++ b/packages/backend/src/server/api/endpoints/announcements.ts
@@ -52,7 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
) {
super(meta, paramDef, async (ps, me) => {
const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId)
- .where('announcement.isActive = :isActive', { isActive: ps.isActive })
+ .andWhere('announcement.isActive = :isActive', { isActive: ps.isActive })
.andWhere(new Brackets(qb => {
if (me) qb.orWhere('announcement.userId = :meId', { meId: me.id });
qb.orWhere('announcement.userId IS NULL');