add createdAtBefore and createdAtAfter

package-lock.json

@@ -20,7 +20,6 @@
         "class-validator": "^0.14.1",
         "crypto-random-string": "3.3.1",
         "lodash": "^4.17.21",
-        "moment": "^2.30.1",
         "nesties": "^1.1.1",
         "nestjs-mycard": "^4.0.2",
         "nicot": "^1.1.11",
@@ -8929,15 +8928,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

package.json

@@ -31,7 +31,6 @@
     "class-validator": "^0.14.1",
     "crypto-random-string": "3.3.1",
     "lodash": "^4.17.21",
-    "moment": "^2.30.1",
     "nesties": "^1.1.1",
     "nestjs-mycard": "^4.0.2",
     "nicot": "^1.1.11",

src/tournament/entities/Tournament.entity.ts

@@ -26,13 +26,20 @@ import {
   Participant,
   ParticipantScore,
 } from '../../participant/entities/participant.entity';
-import { IsArray, IsInt, IsOptional, IsPositive } from 'class-validator';
+import {
+  IsArray,
+  IsDate,
+  IsInt,
+  IsOptional,
+  IsPositive,
+} from 'class-validator';
 import { ApiProperty, PartialType } from '@nestjs/swagger';
 import { Match } from '../../match/entities/match.entity';
 import { TournamentRules } from '../../tournament-rules/rule-map';
 import _ from 'lodash';
 import { RenameClass } from 'nicot/dist/src/utility/rename-class';
 import { QuerySinceDaysAgo } from '../../utility/query-since-days-ago';
+import { QueryOperator } from '../../utility/query-operator';
 
 export enum TournamentRule {
   SingleElimination = 'SingleElimination',
@@ -130,14 +137,23 @@ export class Tournament extends DescBase {
 
   @NotWritable()
   @NotInResult()
-  @IsInt()
-  @IsPositive()
-  @QuerySinceDaysAgo('createdAt')
+  @IsDate()
+  @QueryOperator('createdAt', '<=')
+  @ApiProperty({
+    description: '查询创建时间在什么时候之前的比赛',
+    required: false,
+  })
+  createdAtBefore: Date;
+
+  @NotWritable()
+  @NotInResult()
+  @IsDate()
+  @QueryOperator('createdAt', '>=')
   @ApiProperty({
-    description: '查询最多创建时间在多少天前的比赛',
+    description: '查询创建时间在什么时候之后的比赛',
     required: false,
   })
-  createdAtSinceDaysAgo: number;
+  createAtAfter: Date;
 
   @NotColumn()
   @OneToMany(() => Participant, (participant) => participant.tournament)

src/utility/query-operator.ts

+import { QueryCondition } from 'nicot';
+
+export const QueryOperator = (dateField: string, operator: string) =>
+  QueryCondition((obj, qb, entityName, key) => {
+    if (!obj[key]) return;
+    const typeormKey = `operator_${entityName}_${dateField}_${key}`;
+    qb.andWhere(`${entityName}.${dateField} ${operator} :${typeormKey}`, {
+      [typeormKey]: obj[key],
+    });
+  });

src/utility/query-since-days-ago.ts

-import { QueryCondition } from 'nicot';
-import moment from 'moment';
-
-export const QuerySinceDaysAgo = (dateField: string) =>
-  QueryCondition((obj, qb, entityName, key) => {
-    if (!obj[key]) return;
-    const since = moment().subtract(obj[key], 'days').toDate();
-    const typeormKey = `since_${entityName}_${dateField}_${key}`;
-    qb.andWhere(`${entityName}.${dateField} > :${typeormKey}`, {
-      [typeormKey]: since,
-    });
-  });