|
| 1 | +import { LeaderboardEntry } from "@monkeytype/contracts/schemas/leaderboards"; |
| 2 | +import { PersonalBest } from "@monkeytype/contracts/schemas/shared"; |
| 3 | +import { MonkeyMail, UserStreak } from "@monkeytype/contracts/schemas/users"; |
| 4 | +import { FirebaseError } from "firebase-admin"; |
| 5 | +import _ from "lodash"; |
| 6 | +import { ObjectId } from "mongodb"; |
| 7 | +import { randomUUID } from "node:crypto"; |
1 | 8 | import request from "supertest";
|
2 |
| -import app from "../../../src/app"; |
3 |
| -import * as Configuration from "../../../src/init/configuration"; |
4 | 9 | import { generateCurrentTestActivity } from "../../../src/api/controllers/user";
|
5 |
| -import * as UserDal from "../../../src/dal/user"; |
6 |
| -import * as AuthUtils from "../../../src/utils/auth"; |
7 |
| -import * as BlocklistDal from "../../../src/dal/blocklist"; |
| 10 | +import app from "../../../src/app"; |
8 | 11 | import * as ApeKeys from "../../../src/dal/ape-keys";
|
9 |
| -import * as PresetDal from "../../../src/dal/preset"; |
| 12 | +import * as ApeKeysDal from "../../../src/dal/ape-keys"; |
| 13 | +import * as BlocklistDal from "../../../src/dal/blocklist"; |
10 | 14 | import * as ConfigDal from "../../../src/dal/config";
|
11 |
| -import * as ResultDal from "../../../src/dal/result"; |
12 |
| -import * as ReportDal from "../../../src/dal/report"; |
13 |
| -import * as DailyLeaderboards from "../../../src/utils/daily-leaderboards"; |
14 | 15 | import * as LeaderboardDal from "../../../src/dal/leaderboards";
|
| 16 | +import * as LogDal from "../../../src/dal/logs"; |
| 17 | +import * as PresetDal from "../../../src/dal/preset"; |
| 18 | +import * as ReportDal from "../../../src/dal/report"; |
| 19 | +import * as ResultDal from "../../../src/dal/result"; |
| 20 | +import * as UserDal from "../../../src/dal/user"; |
| 21 | +import * as Configuration from "../../../src/init/configuration"; |
| 22 | +import * as FirebaseAdmin from "../../../src/init/firebase-admin"; |
15 | 23 | import GeorgeQueue from "../../../src/queues/george-queue";
|
16 |
| -import * as DiscordUtils from "../../../src/utils/discord"; |
| 24 | +import * as WeeklyXpLeaderboard from "../../../src/services/weekly-xp-leaderboard"; |
| 25 | +import * as AuthUtils from "../../../src/utils/auth"; |
17 | 26 | import * as Captcha from "../../../src/utils/captcha";
|
18 |
| -import * as FirebaseAdmin from "../../../src/init/firebase-admin"; |
19 |
| -import { FirebaseError } from "firebase-admin"; |
20 |
| -import * as ApeKeysDal from "../../../src/dal/ape-keys"; |
21 |
| -import * as LogDal from "../../../src/dal/logs"; |
22 |
| -import { ObjectId } from "mongodb"; |
23 |
| -import { PersonalBest } from "@monkeytype/contracts/schemas/shared"; |
24 |
| -import { pb } from "../../dal/leaderboards.spec"; |
| 27 | +import * as DailyLeaderboards from "../../../src/utils/daily-leaderboards"; |
| 28 | +import * as DiscordUtils from "../../../src/utils/discord"; |
| 29 | +import MonkeyError, { isFirebaseError } from "../../../src/utils/error"; |
25 | 30 | import {
|
26 | 31 | mockAuthenticateWithApeKey,
|
27 | 32 | mockBearerAuthentication,
|
28 | 33 | } from "../../__testData__/auth";
|
29 |
| -import { randomUUID } from "node:crypto"; |
30 |
| -import _ from "lodash"; |
31 |
| -import { MonkeyMail, UserStreak } from "@monkeytype/contracts/schemas/users"; |
32 |
| -import MonkeyError, { isFirebaseError } from "../../../src/utils/error"; |
33 |
| -import { LeaderboardEntry } from "@monkeytype/contracts/schemas/leaderboards"; |
34 |
| -import * as WeeklyXpLeaderboard from "../../../src/services/weekly-xp-leaderboard"; |
| 34 | +import { pb } from "../../dal/leaderboards.spec"; |
35 | 35 |
|
36 | 36 | const mockApp = request(app);
|
37 | 37 | const configuration = Configuration.getCachedConfiguration();
|
@@ -1917,6 +1917,7 @@ describe("user controller test", () => {
|
1917 | 1917 | tags: {
|
1918 | 1918 | none: false,
|
1919 | 1919 | },
|
| 1920 | + tagsFilterMode: "or", |
1920 | 1921 | language: {
|
1921 | 1922 | english: true,
|
1922 | 1923 | },
|
@@ -1981,6 +1982,7 @@ describe("user controller test", () => {
|
1981 | 1982 | '"numbers" Required',
|
1982 | 1983 | '"date" Required',
|
1983 | 1984 | '"tags" Required',
|
| 1985 | + '"tagsFilterMode" Required', |
1984 | 1986 | '"language" Required',
|
1985 | 1987 | '"funbox" Required',
|
1986 | 1988 | ],
|
|
0 commit comments