fix(overriderules): allows every user to be added to the override rules (#1333)

* fix: allows every user to be added to the override rules

* chore: code cleanup

* fix(overriderules): displaying more than ten users at a time

* fix(overriderules): pageSize unaffected by duplicate includeIds

Co-authored-by: Gauthier <mail@gauthierth.fr>

* fix: allows every user to be added to the override rules

* chore(overriderules): readding override rules after rebase

* chore(overriderules): removing empty file

* chore(overriderules): fixing bad merge

---------

Co-authored-by: Gauthier <mail@gauthierth.fr>
This commit is contained in:
RankWeis
2025-03-09 07:37:47 -07:00
committed by GitHub
parent dcc13080bc
commit af8d6b475c
4 changed files with 34 additions and 14 deletions

View File

@@ -32,7 +32,14 @@ const router = Router();
router.get('/', async (req, res, next) => {
try {
const pageSize = req.query.take ? Number(req.query.take) : 10;
const includeIds = [
...new Set(
req.query.includeIds ? req.query.includeIds.toString().split(',') : []
),
];
const pageSize = req.query.take
? Number(req.query.take)
: Math.max(10, includeIds.length);
const skip = req.query.skip ? Number(req.query.skip) : 0;
const q = req.query.q ? req.query.q.toString().toLowerCase() : '';
let query = getRepository(User).createQueryBuilder('user');
@@ -44,6 +51,10 @@ router.get('/', async (req, res, next) => {
);
}
if (includeIds.length > 0) {
query.andWhereInIds(includeIds);
}
switch (req.query.sort) {
case 'updated':
query = query.orderBy('user.updatedAt', 'DESC');
@@ -84,6 +95,7 @@ router.get('/', async (req, res, next) => {
const [users, userCount] = await query
.take(pageSize)
.skip(skip)
.distinct(true)
.getManyAndCount();
return res.status(200).json({