Merge branch 'master' of git.mycard.moe:nanahira/wenyuanwall-api

src/entities/whitelist-account.entity.ts

@@ -32,7 +32,6 @@ export class WhitelistAccount extends IdBase() {
   @NotQueryable()
   @StringColumn(255, {
     description: 'Twitter ID',
-    required: true,
   })
   twitter: string;
 
@@ -64,8 +63,8 @@ export class WhitelistAccount extends IdBase() {
   @QueryColumn()
   @QueryCondition((obj, qb, entityName, key) => {
     if (obj[key] === 1) {
-      qb.orderBy('RANDOM()')
-        .andWhere(`${entityName}.enabled = TRUE`);
+      qb.andWhere(`${entityName}.enabled = TRUE`)
+        .orderBy('RANDOM()');
     }
   })
   random: number;

src/whitelist-account/whitelist-account.service.ts

@@ -6,11 +6,7 @@ import {
 import { InjectRepository } from '@nestjs/typeorm';
 
 @Injectable()
-export class WhitelistAccountService extends WhitelistAccountFactory.crudService(
-  {
-    // extraGetQuery: (qb) => qb.andWhere('whitelistAccount.enabled = TRUE'),
-  },
-) {
+export class WhitelistAccountService extends WhitelistAccountFactory.crudService() {
   constructor(@InjectRepository(WhitelistAccount) repo) {
     super(repo);
   }