From 2a76008b00d4c59f6023518f8b0f321adb9e817c Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 17:41:10 +0100 Subject: [PATCH 01/19] Move Mongo and Redis to src/external --- server/src/api/auth/auth.ts | 2 +- server/src/api/import/import.test.ts | 2 +- server/src/api/ir/barbatos/barbatos.test.ts | 2 +- server/src/api/ir/chunitachi/chunitachi.test.ts | 2 +- server/src/api/ir/direct-manual/direct-manual.test.ts | 2 +- server/src/api/ir/fervidex/fervidex.test.ts | 2 +- server/src/api/ir/usc/common.test.ts | 2 +- server/src/api/ir/usc/common.ts | 2 +- server/src/api/ir/usc/usc.test.ts | 2 +- server/src/api/ir/usc/usc.ts | 2 +- server/src/common/auth.test.ts | 2 +- server/src/common/auth.ts | 2 +- server/src/common/class.ts | 2 +- server/src/common/database-lookup/chart.ts | 2 +- server/src/common/database-lookup/song.ts | 2 +- server/src/common/db.test.ts | 2 +- server/src/common/db.ts | 2 +- server/src/common/folder.test.ts | 2 +- server/src/common/folder.ts | 2 +- server/src/common/goal.test.ts | 2 +- server/src/common/goal.ts | 2 +- server/src/common/logger.test.ts | 2 +- server/src/common/scores.ts | 2 +- server/src/common/session.test.ts | 2 +- server/src/common/session.ts | 2 +- server/src/common/tierlist.ts | 2 +- server/src/common/user.test.ts | 4 ++-- server/src/common/user.ts | 2 +- server/src/{db => external/mongo}/db.ts | 2 +- server/src/{db => external/mongo}/schemas.ts | 0 server/src/{ => external}/redis/redis-store.ts | 2 +- .../framework/calculated-data/calculated-data.test.ts | 2 +- .../framework/calculated-data/game-specific-stats.test.ts | 2 +- .../framework/calculated-data/game-specific-stats.ts | 2 +- .../framework/calculated-data/game-specific.test.ts | 2 +- .../score-import/framework/calculated-data/game-specific.ts | 2 +- .../src/score-import/framework/common/import-logger.test.ts | 2 +- server/src/score-import/framework/goals/goals.test.ts | 2 +- server/src/score-import/framework/goals/goals.ts | 2 +- .../src/score-import/framework/milestones/milestones.test.ts | 2 +- server/src/score-import/framework/milestones/milestones.ts | 2 +- server/src/score-import/framework/pb/create-pb-doc.test.ts | 2 +- server/src/score-import/framework/pb/create-pb-doc.ts | 2 +- server/src/score-import/framework/pb/game-specific-merge.ts | 2 +- server/src/score-import/framework/pb/process-pbs.test.ts | 2 +- server/src/score-import/framework/pb/process-pbs.ts | 2 +- server/src/score-import/framework/score-import-main.ts | 2 +- .../framework/score-importing/insert-score.test.ts | 2 +- .../score-import/framework/score-importing/insert-score.ts | 2 +- .../score-import/framework/score-importing/score-id.test.ts | 2 +- server/src/score-import/framework/score-importing/score-id.ts | 2 +- .../score-import/framework/score-importing/score-importing.ts | 2 +- server/src/score-import/framework/sessions/sessions.ts | 2 +- .../score-import/framework/user-game-stats/classes.test.ts | 2 +- .../src/score-import/framework/user-game-stats/rating.test.ts | 2 +- server/src/score-import/framework/user-game-stats/rating.ts | 2 +- .../score-import/framework/user-game-stats/update-ugs.test.ts | 2 +- .../src/score-import/framework/user-game-stats/update-ugs.ts | 2 +- .../import-types/common/batch-manual/converter.test.ts | 2 +- .../import-types/common/batch-manual/parser.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/converter.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/parser.test.ts | 2 +- .../import-types/file/solid-state-squad/converter.test.ts | 2 +- .../import-types/file/solid-state-squad/parser.test.ts | 2 +- .../score-import/import-types/ir/fervidex/converter.test.ts | 2 +- server/src/server.ts | 2 +- server/src/test-utils/close-connections.ts | 4 ++-- server/src/test-utils/reset-db-state.ts | 2 +- server/src/test-utils/test-data.ts | 2 +- 71 files changed, 72 insertions(+), 72 deletions(-) rename server/src/{db => external/mongo}/db.ts (96%) rename server/src/{db => external/mongo}/schemas.ts (100%) rename server/src/{ => external}/redis/redis-store.ts (93%) diff --git a/server/src/api/auth/auth.ts b/server/src/api/auth/auth.ts index 5b3e01aad..977d91b38 100644 --- a/server/src/api/auth/auth.ts +++ b/server/src/api/auth/auth.ts @@ -14,7 +14,7 @@ import { PRIVATEINFO_GetUserCaseInsensitive, } from "../../common/user"; -import db from "../../db/db"; +import db from "../../external/mongo/db"; import CreateLogCtx from "../../common/logger"; import prValidate from "../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../middleware/require-logged-in"; diff --git a/server/src/api/import/import.test.ts b/server/src/api/import/import.test.ts index 54ad36872..2f45e3546 100644 --- a/server/src/api/import/import.test.ts +++ b/server/src/api/import/import.test.ts @@ -10,7 +10,7 @@ import { CloseAllConnections } from "../../test-utils/close-connections"; import { RequireNeutralAuthentication } from "../../test-utils/api-common"; import { CreateFakeAuthCookie } from "../../test-utils/fake-session"; import ResetDBState from "../../test-utils/reset-db-state"; -import db from "../../db/db"; +import db from "../../external/mongo/db"; // reset DB handles the post-stuff diff --git a/server/src/api/ir/barbatos/barbatos.test.ts b/server/src/api/ir/barbatos/barbatos.test.ts index 7bc496e05..ceb6cda89 100644 --- a/server/src/api/ir/barbatos/barbatos.test.ts +++ b/server/src/api/ir/barbatos/barbatos.test.ts @@ -5,7 +5,7 @@ import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; import ResetDBState from "../../../test-utils/reset-db-state"; import mockApi from "../../../test-utils/mock-api"; import { TestingBarbatosScore } from "../../../test-utils/test-data"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; t.test("POST /api/ir/barbatos/score/submit", async (t) => { const cookie = await CreateFakeAuthCookie(mockApi); diff --git a/server/src/api/ir/chunitachi/chunitachi.test.ts b/server/src/api/ir/chunitachi/chunitachi.test.ts index 15a06698b..505814cdd 100644 --- a/server/src/api/ir/chunitachi/chunitachi.test.ts +++ b/server/src/api/ir/chunitachi/chunitachi.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { RequireNeutralAuthentication } from "../../../test-utils/api-common"; import { CloseAllConnections } from "../../../test-utils/close-connections"; import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; diff --git a/server/src/api/ir/direct-manual/direct-manual.test.ts b/server/src/api/ir/direct-manual/direct-manual.test.ts index 41bed26c5..ef387bb6f 100644 --- a/server/src/api/ir/direct-manual/direct-manual.test.ts +++ b/server/src/api/ir/direct-manual/direct-manual.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { RequireNeutralAuthentication } from "../../../test-utils/api-common"; import { CloseAllConnections } from "../../../test-utils/close-connections"; import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; diff --git a/server/src/api/ir/fervidex/fervidex.test.ts b/server/src/api/ir/fervidex/fervidex.test.ts index 2ba247a62..7757fddd2 100644 --- a/server/src/api/ir/fervidex/fervidex.test.ts +++ b/server/src/api/ir/fervidex/fervidex.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { CloseAllConnections } from "../../../test-utils/close-connections"; import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; import mockApi from "../../../test-utils/mock-api"; diff --git a/server/src/api/ir/usc/common.test.ts b/server/src/api/ir/usc/common.test.ts index eb6771b05..bfcf330d5 100644 --- a/server/src/api/ir/usc/common.test.ts +++ b/server/src/api/ir/usc/common.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import ResetDBState from "../../../test-utils/reset-db-state"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./common"; import { ChartDocument, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; diff --git a/server/src/api/ir/usc/common.ts b/server/src/api/ir/usc/common.ts index eaa0da432..cbb43a406 100644 --- a/server/src/api/ir/usc/common.ts +++ b/server/src/api/ir/usc/common.ts @@ -3,7 +3,7 @@ import CreateLogCtx from "../../../common/logger"; import { GetPBOnChart, GetServerRecordOnChart } from "../../../common/scores"; import { MStoS } from "../../../common/util"; import { USCIR_ADJACENT_SCORE_N } from "../../../constants/usc-ir"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; const logger = CreateLogCtx(__filename); diff --git a/server/src/api/ir/usc/usc.test.ts b/server/src/api/ir/usc/usc.test.ts index ae76b2347..7687bfb92 100644 --- a/server/src/api/ir/usc/usc.test.ts +++ b/server/src/api/ir/usc/usc.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { CloseAllConnections } from "../../../test-utils/close-connections"; import mockApi from "../../../test-utils/mock-api"; import ResetDBState from "../../../test-utils/reset-db-state"; diff --git a/server/src/api/ir/usc/usc.ts b/server/src/api/ir/usc/usc.ts index 2c98a6959..7dba0e84d 100644 --- a/server/src/api/ir/usc/usc.ts +++ b/server/src/api/ir/usc/usc.ts @@ -1,7 +1,7 @@ import { Router, RequestHandler } from "express"; import { FindChartOnSHA256 } from "../../../common/database-lookup/chart"; import { SYMBOL_KtchiData } from "../../../constants/ktchi"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { ChartDocument, PBScoreDocument, diff --git a/server/src/common/auth.test.ts b/server/src/common/auth.test.ts index 4fb13acec..410ec8c75 100644 --- a/server/src/common/auth.test.ts +++ b/server/src/common/auth.test.ts @@ -7,7 +7,7 @@ import { ValidateCaptcha, } from "./auth"; import t from "tap"; -import db, { CloseMongoConnection } from "../db/db"; +import db, { CloseMongoConnection } from "../external/mongo/db"; import { PrivateUserDocument } from "kamaitachi-common"; import { prAssert } from "../test-utils/asserts"; import Prudence from "prudence"; diff --git a/server/src/common/auth.ts b/server/src/common/auth.ts index 9fa668e7a..5f6cf6a28 100644 --- a/server/src/common/auth.ts +++ b/server/src/common/auth.ts @@ -6,7 +6,7 @@ import { PublicAPIKeyDocument, PublicUserDocument, } from "kamaitachi-common"; -import db from "../db/db"; +import db from "../external/mongo/db"; import { GetNextCounterValue } from "./db"; import { InsertResult } from "monk"; import CreateLogCtx from "./logger"; diff --git a/server/src/common/class.ts b/server/src/common/class.ts index 85f04db48..2485defa8 100644 --- a/server/src/common/class.ts +++ b/server/src/common/class.ts @@ -1,6 +1,6 @@ import { Game, integer, Playtypes, UserGameStats } from "kamaitachi-common"; import { ClassData, gameClassValues } from "kamaitachi-common/js/game-classes"; -import db from "../db/db"; +import db from "../external/mongo/db"; import CreateLogCtx from "./logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/common/database-lookup/chart.ts b/server/src/common/database-lookup/chart.ts index 9d56d1aea..e2305b893 100644 --- a/server/src/common/database-lookup/chart.ts +++ b/server/src/common/database-lookup/chart.ts @@ -1,5 +1,5 @@ import { Difficulties, Game, integer, Playtypes, IDStrings } from "kamaitachi-common"; -import db from "../../db/db"; +import db from "../../external/mongo/db"; export function FindChartWithChartID(game: Game, chartID: string) { return db.charts[game].findOne({ chartID }); diff --git a/server/src/common/database-lookup/song.ts b/server/src/common/database-lookup/song.ts index b2ef74b15..74c829d93 100644 --- a/server/src/common/database-lookup/song.ts +++ b/server/src/common/database-lookup/song.ts @@ -1,6 +1,6 @@ import { Game, AnySongDocument, integer } from "kamaitachi-common"; import { FindOneResult } from "monk"; -import db from "../../db/db"; +import db from "../../external/mongo/db"; import { EscapeStringRegexp } from "../util"; /** diff --git a/server/src/common/db.test.ts b/server/src/common/db.test.ts index 8076cf408..98533ccb8 100644 --- a/server/src/common/db.test.ts +++ b/server/src/common/db.test.ts @@ -1,6 +1,6 @@ import { GetNextCounterValue } from "./db"; import t from "tap"; -import db, { CloseMongoConnection } from "../db/db"; +import db, { CloseMongoConnection } from "../external/mongo/db"; import ResetDBState from "../test-utils/reset-db-state"; t.test("#GetNextCounterValue", (t) => { diff --git a/server/src/common/db.ts b/server/src/common/db.ts index 06b3af7e4..a00cae05e 100644 --- a/server/src/common/db.ts +++ b/server/src/common/db.ts @@ -1,4 +1,4 @@ -import db from "../db/db"; +import db from "../external/mongo/db"; import CreateLogCtx from "./logger"; const logger = CreateLogCtx(__filename); import { integer } from "kamaitachi-common"; diff --git a/server/src/common/folder.test.ts b/server/src/common/folder.test.ts index 3b720bdb9..fbe5b429b 100644 --- a/server/src/common/folder.test.ts +++ b/server/src/common/folder.test.ts @@ -8,7 +8,7 @@ import { GetFolderCharts, ResolveFolderToCharts, } from "./folder"; -import db, { CloseMongoConnection } from "../db/db"; +import db, { CloseMongoConnection } from "../external/mongo/db"; import ResetDBState from "../test-utils/reset-db-state"; import deepmerge from "deepmerge"; diff --git a/server/src/common/folder.ts b/server/src/common/folder.ts index 93da26666..ee99623bb 100644 --- a/server/src/common/folder.ts +++ b/server/src/common/folder.ts @@ -1,4 +1,4 @@ -import db from "../db/db"; +import db from "../external/mongo/db"; import CreateLogCtx from "./logger"; import { FolderDocument, AnyChartDocument, AnySongDocument } from "kamaitachi-common"; import { FilterQuery } from "mongodb"; diff --git a/server/src/common/goal.test.ts b/server/src/common/goal.test.ts index 91680d978..1019ce0f1 100644 --- a/server/src/common/goal.test.ts +++ b/server/src/common/goal.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../db/db"; +import db, { CloseMongoConnection } from "../external/mongo/db"; import CreateLogCtx from "./logger"; import ResetDBState from "../test-utils/reset-db-state"; import { EvaluateGoalForUser } from "./goal"; diff --git a/server/src/common/goal.ts b/server/src/common/goal.ts index 9d5d00b52..d7a631b14 100644 --- a/server/src/common/goal.ts +++ b/server/src/common/goal.ts @@ -1,6 +1,6 @@ import { GoalDocument, integer, PBScoreDocument, Game } from "kamaitachi-common"; import { grades, lamps } from "kamaitachi-common/js/config"; -import db from "../db/db"; +import db from "../external/mongo/db"; import { KtLogger } from "../types"; import { GetFolderChartIDs } from "./folder"; import { FilterQuery } from "mongodb"; diff --git a/server/src/common/logger.test.ts b/server/src/common/logger.test.ts index 6228aedd2..b3ee53231 100644 --- a/server/src/common/logger.test.ts +++ b/server/src/common/logger.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import { CloseMongoConnection } from "../db/db"; +import { CloseMongoConnection } from "../external/mongo/db"; import CreateLogCtx, { Transports } from "./logger"; t.test("Logger Tests", (t) => { diff --git a/server/src/common/scores.ts b/server/src/common/scores.ts index 5f3ff432d..f13419729 100644 --- a/server/src/common/scores.ts +++ b/server/src/common/scores.ts @@ -1,4 +1,4 @@ -import db from "../db/db"; +import db from "../external/mongo/db"; import { integer } from "kamaitachi-common"; export function GetPBOnChart(userID: integer, chartID: string) { diff --git a/server/src/common/session.test.ts b/server/src/common/session.test.ts index 7c05dc828..d1793ede0 100644 --- a/server/src/common/session.test.ts +++ b/server/src/common/session.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../db/db"; +import db, { CloseMongoConnection } from "../external/mongo/db"; import ResetDBState from "../test-utils/reset-db-state"; import { GetScoresFromSession } from "./session"; diff --git a/server/src/common/session.ts b/server/src/common/session.ts index 7c1fca6e7..4e50a1041 100644 --- a/server/src/common/session.ts +++ b/server/src/common/session.ts @@ -1,6 +1,6 @@ import { SessionDocument, ScoreDocument, SessionScoreInfo } from "kamaitachi-common"; import { Condition } from "mongodb"; -import db from "../db/db"; +import db from "../external/mongo/db"; /** * Returns all the score documents inside a session. diff --git a/server/src/common/tierlist.ts b/server/src/common/tierlist.ts index 68d53b09c..b451f5718 100644 --- a/server/src/common/tierlist.ts +++ b/server/src/common/tierlist.ts @@ -1,6 +1,6 @@ import crypto from "crypto"; import { AnyChartDocument, Game, Playtypes } from "kamaitachi-common"; -import db from "../db/db"; +import db from "../external/mongo/db"; import CreateLogCtx from "./logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/common/user.test.ts b/server/src/common/user.test.ts index 1d0f0ddda..4eceec9c9 100644 --- a/server/src/common/user.test.ts +++ b/server/src/common/user.test.ts @@ -1,6 +1,6 @@ import t from "tap"; -import { CloseMongoConnection } from "../db/db"; -import { PRUDENCE_PRIVATE_USER, PRUDENCE_PUBLIC_USER } from "../db/schemas"; +import { CloseMongoConnection } from "../external/mongo/db"; +import { PRUDENCE_PRIVATE_USER, PRUDENCE_PUBLIC_USER } from "../external/mongo/schemas"; import { prAssert } from "../test-utils/asserts"; import { GetUserCaseInsensitive, PRIVATEINFO_GetUserCaseInsensitive, FormatUserDoc } from "./user"; import { PublicUserDocument } from "kamaitachi-common"; diff --git a/server/src/common/user.ts b/server/src/common/user.ts index 237f5164b..714f57e55 100644 --- a/server/src/common/user.ts +++ b/server/src/common/user.ts @@ -1,6 +1,6 @@ import { integer, PublicUserDocument } from "kamaitachi-common"; import { FindOneResult } from "monk"; -import db from "../db/db"; +import db from "../external/mongo/db"; import CreateLogCtx from "./logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/db/db.ts b/server/src/external/mongo/db.ts similarity index 96% rename from server/src/db/db.ts rename to server/src/external/mongo/db.ts index 7f43846fc..5bafd8737 100644 --- a/server/src/db/db.ts +++ b/server/src/external/mongo/db.ts @@ -26,7 +26,7 @@ import { UserMilestoneDocument, } from "kamaitachi-common"; import monk from "monk"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../../common/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/db/schemas.ts b/server/src/external/mongo/schemas.ts similarity index 100% rename from server/src/db/schemas.ts rename to server/src/external/mongo/schemas.ts diff --git a/server/src/redis/redis-store.ts b/server/src/external/redis/redis-store.ts similarity index 93% rename from server/src/redis/redis-store.ts rename to server/src/external/redis/redis-store.ts index 1cb3c12f5..2e3a7811a 100644 --- a/server/src/redis/redis-store.ts +++ b/server/src/external/redis/redis-store.ts @@ -1,6 +1,6 @@ import connectRedis from "connect-redis"; import expressSession from "express-session"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../../common/logger"; import redis from "redis"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/calculated-data/calculated-data.test.ts b/server/src/score-import/framework/calculated-data/calculated-data.test.ts index 260edf23c..6c9441c6a 100644 --- a/server/src/score-import/framework/calculated-data/calculated-data.test.ts +++ b/server/src/score-import/framework/calculated-data/calculated-data.test.ts @@ -1,6 +1,6 @@ import Pr from "prudence"; import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import CreateLogCtx from "../../../common/logger"; import { prAssert } from "../../../test-utils/asserts"; import { diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts b/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts index 92d722a93..ae3aecf8d 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts +++ b/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import { CloseMongoConnection } from "../../../db/db"; +import { CloseMongoConnection } from "../../../external/mongo/db"; import { AnyChartDocument, Difficulties, Lamps, ScoreDocument } from "kamaitachi-common"; import { CalculateBPI, diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.ts b/server/src/score-import/framework/calculated-data/game-specific-stats.ts index 6bdade110..c28ee0c12 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.ts +++ b/server/src/score-import/framework/calculated-data/game-specific-stats.ts @@ -1,5 +1,5 @@ import { AnyChartDocument, ESDCore, integer, Grades, Lamps } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { KtLogger } from "../../../types"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/calculated-data/game-specific.test.ts b/server/src/score-import/framework/calculated-data/game-specific.test.ts index 6230f64d9..9064bc8f8 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.test.ts +++ b/server/src/score-import/framework/calculated-data/game-specific.test.ts @@ -1,6 +1,6 @@ import Pr from "prudence"; import t from "tap"; -import { CloseMongoConnection } from "../../../db/db"; +import { CloseMongoConnection } from "../../../external/mongo/db"; import CreateLogCtx from "../../../common/logger"; import { prAssert } from "../../../test-utils/asserts"; import { diff --git a/server/src/score-import/framework/calculated-data/game-specific.ts b/server/src/score-import/framework/calculated-data/game-specific.ts index 6f3ec528c..b87fadbd7 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.ts +++ b/server/src/score-import/framework/calculated-data/game-specific.ts @@ -1,5 +1,5 @@ import { AnyChartDocument, ChartDocument, Game, Playtypes, Grades, Lamps } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { KtLogger } from "../../../types"; import { DryScore } from "../common/types"; import { diff --git a/server/src/score-import/framework/common/import-logger.test.ts b/server/src/score-import/framework/common/import-logger.test.ts index 1807a9bcd..0f5e1f997 100644 --- a/server/src/score-import/framework/common/import-logger.test.ts +++ b/server/src/score-import/framework/common/import-logger.test.ts @@ -1,7 +1,7 @@ import t from "tap"; import { CreateImportLoggerAndID } from "./import-logger"; import { PublicUserDocument } from "kamaitachi-common"; -import { CloseMongoConnection } from "../../../db/db"; +import { CloseMongoConnection } from "../../../external/mongo/db"; t.test("#CreateImportLoggerAndID", (t) => { const { importID, logger } = CreateImportLoggerAndID( diff --git a/server/src/score-import/framework/goals/goals.test.ts b/server/src/score-import/framework/goals/goals.test.ts index e991b86e7..63945a9db 100644 --- a/server/src/score-import/framework/goals/goals.test.ts +++ b/server/src/score-import/framework/goals/goals.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import ResetDBState from "../../../test-utils/reset-db-state"; import { GetRelevantFolderGoals, diff --git a/server/src/score-import/framework/goals/goals.ts b/server/src/score-import/framework/goals/goals.ts index c8db1cf44..4c0471b0a 100644 --- a/server/src/score-import/framework/goals/goals.ts +++ b/server/src/score-import/framework/goals/goals.ts @@ -1,6 +1,6 @@ import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; import { EvaluateGoalForUser } from "../../../common/goal"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { KtLogger } from "../../../types"; /** diff --git a/server/src/score-import/framework/milestones/milestones.test.ts b/server/src/score-import/framework/milestones/milestones.test.ts index 9a99d1027..7d5d6165b 100644 --- a/server/src/score-import/framework/milestones/milestones.test.ts +++ b/server/src/score-import/framework/milestones/milestones.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { TestingIIDXSPMilestone } from "../../../test-utils/test-data"; diff --git a/server/src/score-import/framework/milestones/milestones.ts b/server/src/score-import/framework/milestones/milestones.ts index f618ce8de..592f1dce7 100644 --- a/server/src/score-import/framework/milestones/milestones.ts +++ b/server/src/score-import/framework/milestones/milestones.ts @@ -7,7 +7,7 @@ import { UserMilestoneDocument, MilestoneImportInfo, } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { ProcessMilestoneFromGII } from "../../../common/milestone"; import { BulkWriteUpdateOneOperation } from "mongodb"; diff --git a/server/src/score-import/framework/pb/create-pb-doc.test.ts b/server/src/score-import/framework/pb/create-pb-doc.test.ts index adf9d2aeb..4df533a53 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import ResetDBState from "../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; import { CreatePBDoc } from "./create-pb-doc"; diff --git a/server/src/score-import/framework/pb/create-pb-doc.ts b/server/src/score-import/framework/pb/create-pb-doc.ts index 689f56e3a..03819e25b 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.ts @@ -1,4 +1,4 @@ -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import { KtLogger } from "../../../types"; diff --git a/server/src/score-import/framework/pb/game-specific-merge.ts b/server/src/score-import/framework/pb/game-specific-merge.ts index aeb40d93e..a7f583bb1 100644 --- a/server/src/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/score-import/framework/pb/game-specific-merge.ts @@ -1,6 +1,6 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import { FindChartWithChartID } from "../../../common/database-lookup/chart"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { KtLogger } from "../../../types"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; import { InternalFailure } from "../common/converter-failures"; diff --git a/server/src/score-import/framework/pb/process-pbs.test.ts b/server/src/score-import/framework/pb/process-pbs.test.ts index 096a7b9d7..52ae0c971 100644 --- a/server/src/score-import/framework/pb/process-pbs.test.ts +++ b/server/src/score-import/framework/pb/process-pbs.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; diff --git a/server/src/score-import/framework/pb/process-pbs.ts b/server/src/score-import/framework/pb/process-pbs.ts index 6d5513c5d..c02867b37 100644 --- a/server/src/score-import/framework/pb/process-pbs.ts +++ b/server/src/score-import/framework/pb/process-pbs.ts @@ -1,5 +1,5 @@ import { integer, PBScoreDocument } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { KtLogger } from "../../../types"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; diff --git a/server/src/score-import/framework/score-import-main.ts b/server/src/score-import/framework/score-import-main.ts index 28c5842fe..481c478d0 100644 --- a/server/src/score-import/framework/score-import-main.ts +++ b/server/src/score-import/framework/score-import-main.ts @@ -15,7 +15,7 @@ import { CreateSessions } from "./sessions/sessions"; import { GetMilisecondsSince } from "../../common/util"; import { ProcessPBs } from "./pb/process-pbs"; import { UpdateUsersGamePlaytypeStats } from "./user-game-stats/update-ugs"; -import db from "../../db/db"; +import db from "../../external/mongo/db"; import { GetAndUpdateUsersGoals } from "./goals/goals"; import { UpdateUsersMilestones } from "./milestones/milestones"; import { ClassHandler } from "./user-game-stats/classes"; diff --git a/server/src/score-import/framework/score-importing/insert-score.test.ts b/server/src/score-import/framework/score-importing/insert-score.test.ts index 5d12a74e5..64762f592 100644 --- a/server/src/score-import/framework/score-importing/insert-score.test.ts +++ b/server/src/score-import/framework/score-importing/insert-score.test.ts @@ -1,6 +1,6 @@ import { ScoreDocument } from "kamaitachi-common"; import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import ResetDBState from "../../../test-utils/reset-db-state"; import { InsertQueue, QueueScoreInsert } from "./insert-score"; diff --git a/server/src/score-import/framework/score-importing/insert-score.ts b/server/src/score-import/framework/score-importing/insert-score.ts index effd9ee9b..64ae86dc6 100644 --- a/server/src/score-import/framework/score-importing/insert-score.ts +++ b/server/src/score-import/framework/score-importing/insert-score.ts @@ -1,5 +1,5 @@ import { ScoreDocument } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import CreateLogCtx from "../../../common/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/score-importing/score-id.test.ts b/server/src/score-import/framework/score-importing/score-id.test.ts index 871ab69d0..b0834ca5a 100644 --- a/server/src/score-import/framework/score-importing/score-id.test.ts +++ b/server/src/score-import/framework/score-importing/score-id.test.ts @@ -1,6 +1,6 @@ import { ScoreDocument } from "kamaitachi-common"; import t from "tap"; -import { CloseMongoConnection } from "../../../db/db"; +import { CloseMongoConnection } from "../../../external/mongo/db"; import ResetDBState from "../../../test-utils/reset-db-state"; import { Testing511SPA, TestingIIDXSPDryScore } from "../../../test-utils/test-data"; import { CreateScoreID, GetWithScoreID } from "./score-id"; diff --git a/server/src/score-import/framework/score-importing/score-id.ts b/server/src/score-import/framework/score-importing/score-id.ts index 1ee89cb5b..4d9e2eef8 100644 --- a/server/src/score-import/framework/score-importing/score-id.ts +++ b/server/src/score-import/framework/score-importing/score-id.ts @@ -1,5 +1,5 @@ import crypto from "crypto"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { integer } from "kamaitachi-common"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/score-importing/score-importing.ts b/server/src/score-import/framework/score-importing/score-importing.ts index 71d494339..5085f11a4 100644 --- a/server/src/score-import/framework/score-importing/score-importing.ts +++ b/server/src/score-import/framework/score-importing/score-importing.ts @@ -16,7 +16,7 @@ import { SkipScoreFailure, } from "../common/converter-failures"; import { CreateScoreID } from "./score-id"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { AppendLogCtx } from "../../../common/logger"; import { KtLogger } from "../../../types"; import { diff --git a/server/src/score-import/framework/sessions/sessions.ts b/server/src/score-import/framework/sessions/sessions.ts index bdaa67f56..789b18920 100644 --- a/server/src/score-import/framework/sessions/sessions.ts +++ b/server/src/score-import/framework/sessions/sessions.ts @@ -9,7 +9,7 @@ import { SessionInfoReturn, Game, } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { AppendLogCtx } from "../../../common/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; diff --git a/server/src/score-import/framework/user-game-stats/classes.test.ts b/server/src/score-import/framework/user-game-stats/classes.test.ts index b03d4fd48..f571800ae 100644 --- a/server/src/score-import/framework/user-game-stats/classes.test.ts +++ b/server/src/score-import/framework/user-game-stats/classes.test.ts @@ -1,6 +1,6 @@ import { UserGameStats } from "kamaitachi-common"; import t from "tap"; -import { CloseMongoConnection } from "../../../db/db"; +import { CloseMongoConnection } from "../../../external/mongo/db"; import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { CalculateClassDeltas, UpdateUGSClasses } from "./classes"; diff --git a/server/src/score-import/framework/user-game-stats/rating.test.ts b/server/src/score-import/framework/user-game-stats/rating.test.ts index 129e1e909..9e1bf8e9b 100644 --- a/server/src/score-import/framework/user-game-stats/rating.test.ts +++ b/server/src/score-import/framework/user-game-stats/rating.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import ResetDBState from "../../../test-utils/reset-db-state"; import { TestingIIDXSPScorePB } from "../../../test-utils/test-data"; import { CalculateCustomRatings, CalculateRatings } from "./rating"; diff --git a/server/src/score-import/framework/user-game-stats/rating.ts b/server/src/score-import/framework/user-game-stats/rating.ts index 2a1788853..2070b6cbb 100644 --- a/server/src/score-import/framework/user-game-stats/rating.ts +++ b/server/src/score-import/framework/user-game-stats/rating.ts @@ -1,5 +1,5 @@ import { Game, Playtypes, integer, GameSpecificCalcLookup, IDStrings } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { KtLogger } from "../../../types"; export async function CalculateRatings( diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts b/server/src/score-import/framework/user-game-stats/update-ugs.test.ts index d88fc0898..bcd6fac5b 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts +++ b/server/src/score-import/framework/user-game-stats/update-ugs.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../db/db"; +import db, { CloseMongoConnection } from "../../../external/mongo/db"; import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { UpdateUsersGamePlaytypeStats } from "./update-ugs"; diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.ts b/server/src/score-import/framework/user-game-stats/update-ugs.ts index 4da325ff4..4053a02ab 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/score-import/framework/user-game-stats/update-ugs.ts @@ -3,7 +3,7 @@ // That's about all there is to it! import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; -import db from "../../../db/db"; +import db from "../../../external/mongo/db"; import { KtLogger } from "../../../types"; import { CalculateClassDeltas, UpdateUGSClasses, ClassHandler } from "./classes"; import { CalculateRatings, CalculateCustomRatings } from "./rating"; diff --git a/server/src/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/score-import/import-types/common/batch-manual/converter.test.ts index 5f7a60040..8d456924a 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/converter.test.ts @@ -5,7 +5,7 @@ import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-u import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; import { EscapeStringRegexp } from "../../../../common/util"; -import db, { CloseMongoConnection } from "../../../../db/db"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; import { Game } from "kamaitachi-common"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/score-import/import-types/common/batch-manual/parser.test.ts index d52f23fd3..b0a36efe5 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/parser.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import { CloseMongoConnection } from "../../../../db/db"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; import CreateLogCtx from "../../../../common/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts index fb9025140..0709f608f 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../../db/db"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import ConverterFn, { EamScoreConverter, EamScoreConverterWrapper } from "./converter"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts index 47df2fff0..3722868e0 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import CreateLogCtx from "../../../../common/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import GenericParseEamIIDXCSV, { NaiveCSVParse, ResolveHeaders } from "./parser"; -import { CloseMongoConnection } from "../../../../db/db"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; import { TestingIIDXEamusementCSV26, TestingIIDXEamusementCSV27, diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts index f0b7155a8..65c84b401 100644 --- a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts +++ b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../../db/db"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts b/server/src/score-import/import-types/file/mer-iidx/parser.test.ts index bb0473ecb..11e6a8b06 100644 --- a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts +++ b/server/src/score-import/import-types/file/mer-iidx/parser.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { CloseMongoConnection } from "../../../../db/db"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; import CreateLogCtx from "../../../../common/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts index 6e06bf3bb..4fcf7a2db 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { CloseMongoConnection } from "../../../../db/db"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { diff --git a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts index 17380b438..bee2c7f6c 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import { GetMilisecondsSince } from "../../../../common/util"; -import { CloseMongoConnection } from "../../../../db/db"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; import CreateLogCtx from "../../../../common/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; diff --git a/server/src/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/score-import/import-types/ir/fervidex/converter.test.ts index b286f44eb..dee253dc5 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.test.ts +++ b/server/src/score-import/import-types/ir/fervidex/converter.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../../db/db"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; diff --git a/server/src/server.ts b/server/src/server.ts index 78d63bf6e..bd184bf37 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -4,7 +4,7 @@ import CreateLogCtx from "./common/logger"; import expressSession from "express-session"; import { SESSION_SECRET } from "./secrets"; import { integer } from "kamaitachi-common"; -import { RedisClient, RedisStore } from "./redis/redis-store"; +import { RedisClient, RedisStore } from "./external/redis/redis-store"; const logger = CreateLogCtx(__filename); diff --git a/server/src/test-utils/close-connections.ts b/server/src/test-utils/close-connections.ts index 2e8837b04..9589d709a 100644 --- a/server/src/test-utils/close-connections.ts +++ b/server/src/test-utils/close-connections.ts @@ -1,5 +1,5 @@ -import { CloseMongoConnection } from "../db/db"; -import { CloseRedisConnection } from "../redis/redis-store"; +import { CloseMongoConnection } from "../external/mongo/db"; +import { CloseRedisConnection } from "../external/redis/redis-store"; import { CloseServerConnection } from "./mock-api"; export async function CloseAllConnections() { diff --git a/server/src/test-utils/reset-db-state.ts b/server/src/test-utils/reset-db-state.ts index fd379729c..3df3cc15c 100644 --- a/server/src/test-utils/reset-db-state.ts +++ b/server/src/test-utils/reset-db-state.ts @@ -1,7 +1,7 @@ /** * Resets the state of the database. */ -import db from "../db/db"; +import db from "../external/mongo/db"; import fs from "fs"; import path from "path"; import CreateLogCtx from "../common/logger"; diff --git a/server/src/test-utils/test-data.ts b/server/src/test-utils/test-data.ts index 1022aaee9..1d98d5786 100644 --- a/server/src/test-utils/test-data.ts +++ b/server/src/test-utils/test-data.ts @@ -10,7 +10,7 @@ import { SongDocument, } from "kamaitachi-common"; import path from "path"; -import db from "../db/db"; +import db from "../external/mongo/db"; import { DryScore } from "../score-import/framework/common/types"; import { BarbatosScore } from "../score-import/import-types/ir/barbatos/types"; From d744e851f99ae31c958283425ec7fc59a2a8404c Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 17:46:08 +0100 Subject: [PATCH 02/19] Refactor the location of server code --- server/src/main.ts | 2 +- .../import-types/ir/usc/converter.ts | 2 +- .../import-types/ir/usc/parser.ts | 2 +- .../middleware/prudence-validate.test.ts | 0 .../middleware/prudence-validate.ts | 2 +- .../middleware/require-logged-in.test.ts | 0 .../middleware/require-logged-in.ts | 2 +- .../middleware/sanitise-qstring.test.ts | 0 .../middleware/sanitise-qstring.ts | 0 .../router/api/auth/router.ts} | 12 ++++----- .../router/api/import/router.test.ts} | 14 +++++----- .../router/api/import/router.ts} | 26 +++++++++---------- .../api.ts => server/router/api/router.ts} | 6 ++--- .../router/ir/barbatos/router.test.ts} | 14 +++++----- .../router/ir/barbatos/router.ts} | 6 ++--- .../router/ir/chunitachi/router.test.ts} | 14 +++++----- .../router/ir/chunitachi/router.ts} | 6 ++--- .../router/ir/direct-manual/router.test.ts} | 14 +++++----- .../router/ir/direct-manual/router.ts} | 8 +++--- .../router/ir/fervidex/router.test.ts} | 12 ++++----- .../router/ir/fervidex/router.ts} | 18 ++++++------- .../ir/ir.ts => server/router/ir/router.ts} | 10 +++---- .../router}/ir/usc/common.test.ts | 4 +-- .../{api => server/router}/ir/usc/common.ts | 10 +++---- .../router/ir/usc/router.test.ts} | 8 +++--- .../usc.ts => server/router/ir/usc/router.ts} | 22 ++++++++-------- server/src/server/router/router.ts | 10 +++++++ server/src/{ => server}/server.ts | 10 +++---- server/src/test-utils/mock-api.ts | 2 +- server/src/test-utils/server.ts | 2 +- 30 files changed, 124 insertions(+), 114 deletions(-) rename server/src/{ => server}/middleware/prudence-validate.test.ts (100%) rename server/src/{ => server}/middleware/prudence-validate.ts (93%) rename server/src/{ => server}/middleware/require-logged-in.test.ts (100%) rename server/src/{ => server}/middleware/require-logged-in.ts (88%) rename server/src/{ => server}/middleware/sanitise-qstring.test.ts (100%) rename server/src/{ => server}/middleware/sanitise-qstring.ts (100%) rename server/src/{api/auth/auth.ts => server/router/api/auth/router.ts} (93%) rename server/src/{api/import/import.test.ts => server/router/api/import/router.test.ts} (93%) rename server/src/{api/import/import.ts => server/router/api/import/router.ts} (75%) rename server/src/{api/api.ts => server/router/api/router.ts} (61%) rename server/src/{api/ir/barbatos/barbatos.test.ts => server/router/ir/barbatos/router.test.ts} (72%) rename server/src/{api/ir/barbatos/barbatos.ts => server/router/ir/barbatos/router.ts} (72%) rename server/src/{api/ir/chunitachi/chunitachi.test.ts => server/router/ir/chunitachi/router.test.ts} (80%) rename server/src/{api/ir/chunitachi/chunitachi.ts => server/router/ir/chunitachi/router.ts} (80%) rename server/src/{api/ir/direct-manual/direct-manual.test.ts => server/router/ir/direct-manual/router.test.ts} (72%) rename server/src/{api/ir/direct-manual/direct-manual.ts => server/router/ir/direct-manual/router.ts} (75%) rename server/src/{api/ir/fervidex/fervidex.test.ts => server/router/ir/fervidex/router.test.ts} (94%) rename server/src/{api/ir/fervidex/fervidex.ts => server/router/ir/fervidex/router.ts} (91%) rename server/src/{api/ir/ir.ts => server/router/ir/router.ts} (56%) rename server/src/{api => server/router}/ir/usc/common.test.ts (98%) rename server/src/{api => server/router}/ir/usc/common.ts (95%) rename server/src/{api/ir/usc/usc.test.ts => server/router/ir/usc/router.test.ts} (97%) rename server/src/{api/ir/usc/usc.ts => server/router/ir/usc/router.ts} (92%) create mode 100644 server/src/server/router/router.ts rename server/src/{ => server}/server.ts (88%) diff --git a/server/src/main.ts b/server/src/main.ts index 1b6bcf3c7..bbcafa6a9 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -12,7 +12,7 @@ function FormatVersion() { } import CreateLogCtx from "./common/logger"; -import server from "./server"; +import server from "./server/server"; import serverConfig from "./server-config"; import dotenv from "dotenv"; diff --git a/server/src/score-import/import-types/ir/usc/converter.ts b/server/src/score-import/import-types/ir/usc/converter.ts index 0679273b9..d318ab4e0 100644 --- a/server/src/score-import/import-types/ir/usc/converter.ts +++ b/server/src/score-import/import-types/ir/usc/converter.ts @@ -1,4 +1,4 @@ -import { USCClientScore } from "../../../../api/ir/usc/common"; +import { USCClientScore } from "../../../../server/router/ir/usc/common"; import { FindSongOnID } from "../../../../common/database-lookup/song"; import { KtLogger } from "../../../../types"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/score-import/import-types/ir/usc/parser.ts b/server/src/score-import/import-types/ir/usc/parser.ts index ed1a0620f..173230ba6 100644 --- a/server/src/score-import/import-types/ir/usc/parser.ts +++ b/server/src/score-import/import-types/ir/usc/parser.ts @@ -3,7 +3,7 @@ import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { FormatPrError } from "../../../../common/prudence"; -import { USCClientScore } from "../../../../api/ir/usc/common"; +import { USCClientScore } from "../../../../server/router/ir/usc/common"; import { IRUSCContext } from "./types"; import { ConverterIRUSC } from "./converter"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/middleware/prudence-validate.test.ts b/server/src/server/middleware/prudence-validate.test.ts similarity index 100% rename from server/src/middleware/prudence-validate.test.ts rename to server/src/server/middleware/prudence-validate.test.ts diff --git a/server/src/middleware/prudence-validate.ts b/server/src/server/middleware/prudence-validate.ts similarity index 93% rename from server/src/middleware/prudence-validate.ts rename to server/src/server/middleware/prudence-validate.ts index 88827d214..c04070a3b 100644 --- a/server/src/middleware/prudence-validate.ts +++ b/server/src/server/middleware/prudence-validate.ts @@ -1,5 +1,5 @@ import Prudence, { MiddlewareErrorHandler } from "prudence"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../../common/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/middleware/require-logged-in.test.ts b/server/src/server/middleware/require-logged-in.test.ts similarity index 100% rename from server/src/middleware/require-logged-in.test.ts rename to server/src/server/middleware/require-logged-in.test.ts diff --git a/server/src/middleware/require-logged-in.ts b/server/src/server/middleware/require-logged-in.ts similarity index 88% rename from server/src/middleware/require-logged-in.ts rename to server/src/server/middleware/require-logged-in.ts index bc8d2877e..ef4085793 100644 --- a/server/src/middleware/require-logged-in.ts +++ b/server/src/server/middleware/require-logged-in.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../../common/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/middleware/sanitise-qstring.test.ts b/server/src/server/middleware/sanitise-qstring.test.ts similarity index 100% rename from server/src/middleware/sanitise-qstring.test.ts rename to server/src/server/middleware/sanitise-qstring.test.ts diff --git a/server/src/middleware/sanitise-qstring.ts b/server/src/server/middleware/sanitise-qstring.ts similarity index 100% rename from server/src/middleware/sanitise-qstring.ts rename to server/src/server/middleware/sanitise-qstring.ts diff --git a/server/src/api/auth/auth.ts b/server/src/server/router/api/auth/router.ts similarity index 93% rename from server/src/api/auth/auth.ts rename to server/src/server/router/api/auth/router.ts index 977d91b38..d30e1c5e6 100644 --- a/server/src/api/auth/auth.ts +++ b/server/src/server/router/api/auth/router.ts @@ -7,17 +7,17 @@ import { ReinstateInvite, ValidatePassword, ValidateCaptcha, -} from "../../common/auth"; +} from "../../../../common/auth"; import { FormatUserDoc, GetUserCaseInsensitive, PRIVATEINFO_GetUserCaseInsensitive, -} from "../../common/user"; +} from "../../../../common/user"; -import db from "../../external/mongo/db"; -import CreateLogCtx from "../../common/logger"; -import prValidate from "../../middleware/prudence-validate"; -import { RequireLoggedIn } from "../../middleware/require-logged-in"; +import db from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../common/logger"; +import prValidate from "../../../middleware/prudence-validate"; +import { RequireLoggedIn } from "../../../middleware/require-logged-in"; const logger = CreateLogCtx(__filename); diff --git a/server/src/api/import/import.test.ts b/server/src/server/router/api/import/router.test.ts similarity index 93% rename from server/src/api/import/import.test.ts rename to server/src/server/router/api/import/router.test.ts index 2f45e3546..07c7973a5 100644 --- a/server/src/api/import/import.test.ts +++ b/server/src/server/router/api/import/router.test.ts @@ -1,16 +1,16 @@ import t from "tap"; -import mockApi from "../../test-utils/mock-api"; +import mockApi from "../../../../test-utils/mock-api"; import { GetKTDataBuffer, LoadKTBlackIIDXData, TestingIIDXEamusementCSV26, TestingIIDXEamusementCSV27, -} from "../../test-utils/test-data"; -import { CloseAllConnections } from "../../test-utils/close-connections"; -import { RequireNeutralAuthentication } from "../../test-utils/api-common"; -import { CreateFakeAuthCookie } from "../../test-utils/fake-session"; -import ResetDBState from "../../test-utils/reset-db-state"; -import db from "../../external/mongo/db"; +} from "../../../../test-utils/test-data"; +import { CloseAllConnections } from "../../../../test-utils/close-connections"; +import { RequireNeutralAuthentication } from "../../../../test-utils/api-common"; +import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import db from "../../../../external/mongo/db"; // reset DB handles the post-stuff diff --git a/server/src/api/import/import.ts b/server/src/server/router/api/import/router.ts similarity index 75% rename from server/src/api/import/import.ts rename to server/src/server/router/api/import/router.ts index 922e683ef..6a9cea36b 100644 --- a/server/src/api/import/import.ts +++ b/server/src/server/router/api/import/router.ts @@ -2,14 +2,14 @@ import { Router } from "express"; import { FileUploadImportTypes } from "kamaitachi-common"; import { fileImportTypes } from "kamaitachi-common/js/config"; import Prudence from "prudence"; -import { GetUserWithIDGuaranteed } from "../../common/user"; -import CreateLogCtx from "../../common/logger"; -import prValidate from "../../middleware/prudence-validate"; -import { RequireLoggedIn } from "../../middleware/require-logged-in"; -import ScoreImportFatalError from "../../score-import/framework/score-importing/score-import-error"; -import { KtLogger } from "../../types"; -import { ExpressWrappedScoreImportMain } from "../../score-import/framework/express-wrapper"; -import { CreateMulterSingleUploadMiddleware } from "../../common/multer"; +import { GetUserWithIDGuaranteed } from "../../../../common/user"; +import CreateLogCtx from "../../../../common/logger"; +import prValidate from "../../../middleware/prudence-validate"; +import { RequireLoggedIn } from "../../../middleware/require-logged-in"; +import ScoreImportFatalError from "../../../../score-import/framework/score-importing/score-import-error"; +import { KtLogger } from "../../../../types"; +import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import { CreateMulterSingleUploadMiddleware } from "../../../../common/multer"; const logger = CreateLogCtx(__filename); @@ -64,11 +64,11 @@ router.post( } ); -import ParseEamusementIIDXCSV from "../../score-import/import-types/file/eamusement-iidx-csv/parser"; -import ParseBatchManual from "../../score-import/import-types/file/batch-manual/parser"; -import { ParseSolidStateXML } from "../../score-import/import-types/file/solid-state-squad/parser"; -import { ParseMerIIDX } from "../../score-import/import-types/file/mer-iidx/parser"; -import ParsePLIIIDXCSV from "../../score-import/import-types/file/pli-iidx-csv/parser"; +import ParseEamusementIIDXCSV from "../../../../score-import/import-types/file/eamusement-iidx-csv/parser"; +import ParseBatchManual from "../../../../score-import/import-types/file/batch-manual/parser"; +import { ParseSolidStateXML } from "../../../../score-import/import-types/file/solid-state-squad/parser"; +import { ParseMerIIDX } from "../../../../score-import/import-types/file/mer-iidx/parser"; +import ParsePLIIIDXCSV from "../../../../score-import/import-types/file/pli-iidx-csv/parser"; /** * Resolves the data from a file upload into an iterable, diff --git a/server/src/api/api.ts b/server/src/server/router/api/router.ts similarity index 61% rename from server/src/api/api.ts rename to server/src/server/router/api/router.ts index 5c40944c4..fede8397e 100644 --- a/server/src/api/api.ts +++ b/server/src/server/router/api/router.ts @@ -1,7 +1,7 @@ import { Router } from "express"; -import authRouter from "./auth/auth"; -import importRouter from "./import/import"; -import irRouter from "./ir/ir"; +import authRouter from "./auth/router"; +import importRouter from "./import/router"; +import irRouter from "../ir/router"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/api/ir/barbatos/barbatos.test.ts b/server/src/server/router/ir/barbatos/router.test.ts similarity index 72% rename from server/src/api/ir/barbatos/barbatos.test.ts rename to server/src/server/router/ir/barbatos/router.test.ts index ceb6cda89..eeeac052e 100644 --- a/server/src/api/ir/barbatos/barbatos.test.ts +++ b/server/src/server/router/ir/barbatos/router.test.ts @@ -1,11 +1,11 @@ import t from "tap"; -import { RequireNeutralAuthentication } from "../../../test-utils/api-common"; -import { CloseAllConnections } from "../../../test-utils/close-connections"; -import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import mockApi from "../../../test-utils/mock-api"; -import { TestingBarbatosScore } from "../../../test-utils/test-data"; -import db from "../../../external/mongo/db"; +import { RequireNeutralAuthentication } from "../../../../test-utils/api-common"; +import { CloseAllConnections } from "../../../../test-utils/close-connections"; +import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import mockApi from "../../../../test-utils/mock-api"; +import { TestingBarbatosScore } from "../../../../test-utils/test-data"; +import db from "../../../../external/mongo/db"; t.test("POST /api/ir/barbatos/score/submit", async (t) => { const cookie = await CreateFakeAuthCookie(mockApi); diff --git a/server/src/api/ir/barbatos/barbatos.ts b/server/src/server/router/ir/barbatos/router.ts similarity index 72% rename from server/src/api/ir/barbatos/barbatos.ts rename to server/src/server/router/ir/barbatos/router.ts index 03d7291e9..8491d7a17 100644 --- a/server/src/api/ir/barbatos/barbatos.ts +++ b/server/src/server/router/ir/barbatos/router.ts @@ -1,8 +1,8 @@ import { Router } from "express"; -import { GetUserWithIDGuaranteed } from "../../../common/user"; +import { GetUserWithIDGuaranteed } from "../../../../common/user"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper"; -import { ParseBarbatosSingle } from "../../../score-import/import-types/ir/barbatos/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import { ParseBarbatosSingle } from "../../../../score-import/import-types/ir/barbatos/parser"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/api/ir/chunitachi/chunitachi.test.ts b/server/src/server/router/ir/chunitachi/router.test.ts similarity index 80% rename from server/src/api/ir/chunitachi/chunitachi.test.ts rename to server/src/server/router/ir/chunitachi/router.test.ts index 505814cdd..8e6fa8328 100644 --- a/server/src/api/ir/chunitachi/chunitachi.test.ts +++ b/server/src/server/router/ir/chunitachi/router.test.ts @@ -1,11 +1,11 @@ import t from "tap"; -import db from "../../../external/mongo/db"; -import { RequireNeutralAuthentication } from "../../../test-utils/api-common"; -import { CloseAllConnections } from "../../../test-utils/close-connections"; -import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; -import mockApi from "../../../test-utils/mock-api"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { GetKTDataJSON } from "../../../test-utils/test-data"; +import db from "../../../../external/mongo/db"; +import { RequireNeutralAuthentication } from "../../../../test-utils/api-common"; +import { CloseAllConnections } from "../../../../test-utils/close-connections"; +import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session"; +import mockApi from "../../../../test-utils/mock-api"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { GetKTDataJSON } from "../../../../test-utils/test-data"; import deepmerge from "deepmerge"; t.test("POST /api/ir/chunitachi/import", async (t) => { diff --git a/server/src/api/ir/chunitachi/chunitachi.ts b/server/src/server/router/ir/chunitachi/router.ts similarity index 80% rename from server/src/api/ir/chunitachi/chunitachi.ts rename to server/src/server/router/ir/chunitachi/router.ts index d3556fbae..66c4d031e 100644 --- a/server/src/api/ir/chunitachi/chunitachi.ts +++ b/server/src/server/router/ir/chunitachi/router.ts @@ -1,8 +1,8 @@ import { Router } from "express"; -import { GetUserWithIDGuaranteed } from "../../../common/user"; +import { GetUserWithIDGuaranteed } from "../../../../common/user"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper"; -import ParseDirectManual from "../../../score-import/import-types/ir/direct-manual/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import ParseDirectManual from "../../../../score-import/import-types/ir/direct-manual/parser"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/api/ir/direct-manual/direct-manual.test.ts b/server/src/server/router/ir/direct-manual/router.test.ts similarity index 72% rename from server/src/api/ir/direct-manual/direct-manual.test.ts rename to server/src/server/router/ir/direct-manual/router.test.ts index ef387bb6f..035d3b053 100644 --- a/server/src/api/ir/direct-manual/direct-manual.test.ts +++ b/server/src/server/router/ir/direct-manual/router.test.ts @@ -1,11 +1,11 @@ import t from "tap"; -import db from "../../../external/mongo/db"; -import { RequireNeutralAuthentication } from "../../../test-utils/api-common"; -import { CloseAllConnections } from "../../../test-utils/close-connections"; -import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; -import mockApi from "../../../test-utils/mock-api"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { GetKTDataJSON } from "../../../test-utils/test-data"; +import db from "../../../../external/mongo/db"; +import { RequireNeutralAuthentication } from "../../../../test-utils/api-common"; +import { CloseAllConnections } from "../../../../test-utils/close-connections"; +import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session"; +import mockApi from "../../../../test-utils/mock-api"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { GetKTDataJSON } from "../../../../test-utils/test-data"; t.test("POST /api/ir/direct-manual/import", async (t) => { const cookie = await CreateFakeAuthCookie(mockApi); diff --git a/server/src/api/ir/direct-manual/direct-manual.ts b/server/src/server/router/ir/direct-manual/router.ts similarity index 75% rename from server/src/api/ir/direct-manual/direct-manual.ts rename to server/src/server/router/ir/direct-manual/router.ts index 64062e6f1..0c6b24804 100644 --- a/server/src/api/ir/direct-manual/direct-manual.ts +++ b/server/src/server/router/ir/direct-manual/router.ts @@ -1,9 +1,9 @@ import { Router } from "express"; -import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../common/user"; -import CreateLogCtx from "../../../common/logger"; +import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../../common/user"; +import CreateLogCtx from "../../../../common/logger"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper"; -import ParseDirectManual from "../../../score-import/import-types/ir/direct-manual/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import ParseDirectManual from "../../../../score-import/import-types/ir/direct-manual/parser"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/api/ir/fervidex/fervidex.test.ts b/server/src/server/router/ir/fervidex/router.test.ts similarity index 94% rename from server/src/api/ir/fervidex/fervidex.test.ts rename to server/src/server/router/ir/fervidex/router.test.ts index 7757fddd2..ebdaefed1 100644 --- a/server/src/api/ir/fervidex/fervidex.test.ts +++ b/server/src/server/router/ir/fervidex/router.test.ts @@ -1,10 +1,10 @@ import t from "tap"; -import db from "../../../external/mongo/db"; -import { CloseAllConnections } from "../../../test-utils/close-connections"; -import { CreateFakeAuthCookie } from "../../../test-utils/fake-session"; -import mockApi from "../../../test-utils/mock-api"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { GetKTDataJSON } from "../../../test-utils/test-data"; +import db from "../../../../external/mongo/db"; +import { CloseAllConnections } from "../../../../test-utils/close-connections"; +import { CreateFakeAuthCookie } from "../../../../test-utils/fake-session"; +import mockApi from "../../../../test-utils/mock-api"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { GetKTDataJSON } from "../../../../test-utils/test-data"; // eslint-disable-next-line @typescript-eslint/no-explicit-any function TestHeaders(url: string, cookie: string[], data: any) { diff --git a/server/src/api/ir/fervidex/fervidex.ts b/server/src/server/router/ir/fervidex/router.ts similarity index 91% rename from server/src/api/ir/fervidex/fervidex.ts rename to server/src/server/router/ir/fervidex/router.ts index 5d1af513e..394bf5ad1 100644 --- a/server/src/api/ir/fervidex/fervidex.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -1,15 +1,15 @@ import { Router, RequestHandler } from "express"; -import { UpdateClassIfGreater } from "../../../common/class"; -import { GetUserWithIDGuaranteed } from "../../../common/user"; -import { ParseEA3SoftID } from "../../../common/util"; -import { EXT_HEROIC_VERSE, MODEL_INFINITAS_2, REV_2DXBMS } from "../../../constants/ea3id"; +import { UpdateClassIfGreater } from "../../../../common/class"; +import { GetUserWithIDGuaranteed } from "../../../../common/user"; +import { ParseEA3SoftID } from "../../../../common/util"; +import { EXT_HEROIC_VERSE, MODEL_INFINITAS_2, REV_2DXBMS } from "../../../../constants/ea3id"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper"; -import { ParseFervidexStatic } from "../../../score-import/import-types/ir/fervidex-static/parser"; -import { ParseFervidexSingle } from "../../../score-import/import-types/ir/fervidex/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import { ParseFervidexStatic } from "../../../../score-import/import-types/ir/fervidex-static/parser"; +import { ParseFervidexSingle } from "../../../../score-import/import-types/ir/fervidex/parser"; import { Playtypes } from "kamaitachi-common"; -import CreateLogCtx from "../../../common/logger"; -import { FERVIDEX_COURSE_LOOKUP } from "../../../score-import/import-types/ir/fervidex-static/class-handler"; +import CreateLogCtx from "../../../../common/logger"; +import { FERVIDEX_COURSE_LOOKUP } from "../../../../score-import/import-types/ir/fervidex-static/class-handler"; const logger = CreateLogCtx(__filename); diff --git a/server/src/api/ir/ir.ts b/server/src/server/router/ir/router.ts similarity index 56% rename from server/src/api/ir/ir.ts rename to server/src/server/router/ir/router.ts index 9b350949f..3a318b1a1 100644 --- a/server/src/api/ir/ir.ts +++ b/server/src/server/router/ir/router.ts @@ -1,9 +1,9 @@ import { Router } from "express"; -import barbatosIR from "./barbatos/barbatos"; -import chunitachiIR from "./chunitachi/chunitachi"; -import directManualIR from "./direct-manual/direct-manual"; -import fervidexIR from "./fervidex/fervidex"; -import uscIR from "./usc/usc"; +import barbatosIR from "./barbatos/router"; +import chunitachiIR from "./chunitachi/router"; +import directManualIR from "./direct-manual/router"; +import fervidexIR from "./fervidex/router"; +import uscIR from "./usc/router"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/api/ir/usc/common.test.ts b/server/src/server/router/ir/usc/common.test.ts similarity index 98% rename from server/src/api/ir/usc/common.test.ts rename to server/src/server/router/ir/usc/common.test.ts index bfcf330d5..2aa2daa14 100644 --- a/server/src/api/ir/usc/common.test.ts +++ b/server/src/server/router/ir/usc/common.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import ResetDBState from "../../../test-utils/reset-db-state"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import ResetDBState from "../../../../test-utils/reset-db-state"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./common"; import { ChartDocument, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import deepmerge from "deepmerge"; diff --git a/server/src/api/ir/usc/common.ts b/server/src/server/router/ir/usc/common.ts similarity index 95% rename from server/src/api/ir/usc/common.ts rename to server/src/server/router/ir/usc/common.ts index cbb43a406..2c979a3b8 100644 --- a/server/src/api/ir/usc/common.ts +++ b/server/src/server/router/ir/usc/common.ts @@ -1,9 +1,9 @@ import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitachi-common"; -import CreateLogCtx from "../../../common/logger"; -import { GetPBOnChart, GetServerRecordOnChart } from "../../../common/scores"; -import { MStoS } from "../../../common/util"; -import { USCIR_ADJACENT_SCORE_N } from "../../../constants/usc-ir"; -import db from "../../../external/mongo/db"; +import CreateLogCtx from "../../../../common/logger"; +import { GetPBOnChart, GetServerRecordOnChart } from "../../../../common/scores"; +import { MStoS } from "../../../../common/util"; +import { USCIR_ADJACENT_SCORE_N } from "../../../../constants/usc-ir"; +import db from "../../../../external/mongo/db"; const logger = CreateLogCtx(__filename); diff --git a/server/src/api/ir/usc/usc.test.ts b/server/src/server/router/ir/usc/router.test.ts similarity index 97% rename from server/src/api/ir/usc/usc.test.ts rename to server/src/server/router/ir/usc/router.test.ts index 7687bfb92..ce4e9051c 100644 --- a/server/src/api/ir/usc/usc.test.ts +++ b/server/src/server/router/ir/usc/router.test.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db from "../../../external/mongo/db"; -import { CloseAllConnections } from "../../../test-utils/close-connections"; -import mockApi from "../../../test-utils/mock-api"; -import ResetDBState from "../../../test-utils/reset-db-state"; +import db from "../../../../external/mongo/db"; +import { CloseAllConnections } from "../../../../test-utils/close-connections"; +import mockApi from "../../../../test-utils/mock-api"; +import ResetDBState from "../../../../test-utils/reset-db-state"; import deepmerge from "deepmerge"; import { PBScoreDocument } from "kamaitachi-common"; diff --git a/server/src/api/ir/usc/usc.ts b/server/src/server/router/ir/usc/router.ts similarity index 92% rename from server/src/api/ir/usc/usc.ts rename to server/src/server/router/ir/usc/router.ts index 7dba0e84d..518e5e17b 100644 --- a/server/src/api/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -1,22 +1,22 @@ import { Router, RequestHandler } from "express"; -import { FindChartOnSHA256 } from "../../../common/database-lookup/chart"; -import { SYMBOL_KtchiData } from "../../../constants/ktchi"; -import db from "../../../external/mongo/db"; +import { FindChartOnSHA256 } from "../../../../common/database-lookup/chart"; +import { SYMBOL_KtchiData } from "../../../../constants/ktchi"; +import db from "../../../../external/mongo/db"; import { ChartDocument, PBScoreDocument, SuccessfulAPIResponse, ImportDocument, } from "kamaitachi-common"; -import { AssertStrAsPositiveNonZeroInt } from "../../../score-import/framework/common/string-asserts"; -import CreateLogCtx from "../../../common/logger"; +import { AssertStrAsPositiveNonZeroInt } from "../../../../score-import/framework/common/string-asserts"; +import CreateLogCtx from "../../../../common/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./common"; -import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper"; -import { GetUserWithID } from "../../../common/user"; -import { KtLogger } from "../../../types"; -import { ParseIRUSC } from "../../../score-import/import-types/ir/usc/parser"; -import { USCIR_MAX_LEADERBOARD_N } from "../../../constants/usc-ir"; -import { CreateMulterSingleUploadMiddleware } from "../../../common/multer"; +import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import { GetUserWithID } from "../../../../common/user"; +import { KtLogger } from "../../../../types"; +import { ParseIRUSC } from "../../../../score-import/import-types/ir/usc/parser"; +import { USCIR_MAX_LEADERBOARD_N } from "../../../../constants/usc-ir"; +import { CreateMulterSingleUploadMiddleware } from "../../../../common/multer"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/router.ts b/server/src/server/router/router.ts new file mode 100644 index 000000000..572fa8ccf --- /dev/null +++ b/server/src/server/router/router.ts @@ -0,0 +1,10 @@ +import { Router } from "express"; +import apiRouter from "./api/router"; +import irRouter from "./ir/router"; + +const router: Router = Router({ mergeParams: true }); + +router.use("/api/v1", apiRouter); +router.use("/ir", irRouter); + +export default router; diff --git a/server/src/server.ts b/server/src/server/server.ts similarity index 88% rename from server/src/server.ts rename to server/src/server/server.ts index bd184bf37..aaa2eb78d 100644 --- a/server/src/server.ts +++ b/server/src/server/server.ts @@ -1,10 +1,10 @@ import express, { Express } from "express"; import "express-async-errors"; -import CreateLogCtx from "./common/logger"; +import CreateLogCtx from "../common/logger"; import expressSession from "express-session"; -import { SESSION_SECRET } from "./secrets"; +import { SESSION_SECRET } from "../secrets"; import { integer } from "kamaitachi-common"; -import { RedisClient, RedisStore } from "./external/redis/redis-store"; +import { RedisClient, RedisStore } from "../external/redis/redis-store"; const logger = CreateLogCtx(__filename); @@ -50,9 +50,9 @@ process.on("unhandledRejection", (reason, promise) => { // limit them so as not to choke the api app.use(express.json({ limit: "1mb" })); -import apiRouter from "./api/api"; +import mainRouter from "./router/router"; -app.use("/api", apiRouter); +app.use("/", apiRouter); /** * If any user gets to this point, we send them index.html and let react router do the routing (and 404ing) diff --git a/server/src/test-utils/mock-api.ts b/server/src/test-utils/mock-api.ts index f55268bf3..b1182b825 100644 --- a/server/src/test-utils/mock-api.ts +++ b/server/src/test-utils/mock-api.ts @@ -3,7 +3,7 @@ import CreateLogCtx from "../common/logger"; const logger = CreateLogCtx(__filename); -import server from "../server"; +import server from "../server/server"; logger.verbose("Creating Mock Server Connection..."); const connection = server.listen(8079); diff --git a/server/src/test-utils/server.ts b/server/src/test-utils/server.ts index 932e8a81a..fce93ab1f 100644 --- a/server/src/test-utils/server.ts +++ b/server/src/test-utils/server.ts @@ -1,4 +1,4 @@ -import server from "../server"; +import server from "../server/server"; import supertest from "supertest"; const mockServer = supertest(server); From 9b24a6ea4a7bc182a666ac2ecf1fd531fe2e3790 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 17:46:27 +0100 Subject: [PATCH 03/19] move server-config to server --- server/src/main.ts | 2 +- server/src/{ => server}/server-config.ts | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename server/src/{ => server}/server-config.ts (100%) diff --git a/server/src/main.ts b/server/src/main.ts index bbcafa6a9..fe4011784 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -13,7 +13,7 @@ function FormatVersion() { import CreateLogCtx from "./common/logger"; import server from "./server/server"; -import serverConfig from "./server-config"; +import serverConfig from "./server/server-config"; import dotenv from "dotenv"; dotenv.config(); diff --git a/server/src/server-config.ts b/server/src/server/server-config.ts similarity index 100% rename from server/src/server-config.ts rename to server/src/server/server-config.ts From eabeae4452e5c0735b42c61bd062cb6ab79c3536 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 17:47:04 +0100 Subject: [PATCH 04/19] move src/types to src/common/types --- server/@types/express/index.d.ts | 2 +- server/src/common/goal.ts | 2 +- server/src/common/logger.ts | 2 +- server/src/{ => common}/types.ts | 0 .../score-import/framework/calculated-data/calculated-data.ts | 2 +- .../framework/calculated-data/game-specific-stats.ts | 2 +- .../src/score-import/framework/calculated-data/game-specific.ts | 2 +- server/src/score-import/framework/common/import-logger.ts | 2 +- server/src/score-import/framework/goals/goals.ts | 2 +- server/src/score-import/framework/milestones/milestones.ts | 2 +- server/src/score-import/framework/pb/create-pb-doc.test.ts | 2 +- server/src/score-import/framework/pb/create-pb-doc.ts | 2 +- server/src/score-import/framework/pb/game-specific-merge.ts | 2 +- server/src/score-import/framework/pb/process-pbs.ts | 2 +- server/src/score-import/framework/score-import-main.ts | 2 +- .../src/score-import/framework/score-importing/hydrate-score.ts | 2 +- .../score-import/framework/score-importing/score-importing.ts | 2 +- server/src/score-import/framework/sessions/sessions.ts | 2 +- server/src/score-import/framework/user-game-stats/classes.ts | 2 +- server/src/score-import/framework/user-game-stats/rating.ts | 2 +- server/src/score-import/framework/user-game-stats/update-ugs.ts | 2 +- server/src/score-import/import-types/api/eag-iidx/parser.ts | 2 +- server/src/score-import/import-types/api/eag-sdvx/parser.ts | 2 +- server/src/score-import/import-types/api/flo-iidx/parser.ts | 2 +- server/src/score-import/import-types/api/flo-sdvx/parser.ts | 2 +- .../src/score-import/import-types/common/api-kai/iidx/parser.ts | 2 +- .../src/score-import/import-types/common/api-kai/sdvx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/traverse-api.ts | 2 +- .../score-import/import-types/common/batch-manual/converter.ts | 2 +- .../src/score-import/import-types/common/batch-manual/parser.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.ts | 2 +- server/src/score-import/import-types/common/types.ts | 2 +- .../src/score-import/import-types/file/batch-manual/parser.ts | 2 +- .../import-types/file/eamusement-iidx-csv/parser.ts | 2 +- server/src/score-import/import-types/file/mer-iidx/converter.ts | 2 +- server/src/score-import/import-types/file/mer-iidx/parser.ts | 2 +- .../src/score-import/import-types/file/pli-iidx-csv/parser.ts | 2 +- .../import-types/file/solid-state-squad/converter.ts | 2 +- .../score-import/import-types/file/solid-state-squad/parser.ts | 2 +- server/src/score-import/import-types/ir/barbatos/converter.ts | 2 +- server/src/score-import/import-types/ir/barbatos/parser.ts | 2 +- server/src/score-import/import-types/ir/direct-manual/parser.ts | 2 +- .../src/score-import/import-types/ir/fervidex-static/parser.ts | 2 +- server/src/score-import/import-types/ir/fervidex/parser.ts | 2 +- server/src/score-import/import-types/ir/usc/converter.ts | 2 +- server/src/score-import/import-types/ir/usc/parser.ts | 2 +- server/src/server/router/api/import/router.ts | 2 +- server/src/server/router/ir/usc/router.ts | 2 +- 49 files changed, 48 insertions(+), 48 deletions(-) rename server/src/{ => common}/types.ts (100%) diff --git a/server/@types/express/index.d.ts b/server/@types/express/index.d.ts index 16120d416..b1527b98d 100644 --- a/server/@types/express/index.d.ts +++ b/server/@types/express/index.d.ts @@ -1,6 +1,6 @@ import { Session, SessionData } from "express-session"; import { SYMBOL_KtchiData } from "../../src/constants/ktchi"; -import { KtchiRequestData, KtchiSessionData } from "../../src/types"; +import { KtchiRequestData, KtchiSessionData } from "../../src/common/types"; export {}; diff --git a/server/src/common/goal.ts b/server/src/common/goal.ts index d7a631b14..593ff837f 100644 --- a/server/src/common/goal.ts +++ b/server/src/common/goal.ts @@ -1,7 +1,7 @@ import { GoalDocument, integer, PBScoreDocument, Game } from "kamaitachi-common"; import { grades, lamps } from "kamaitachi-common/js/config"; import db from "../external/mongo/db"; -import { KtLogger } from "../types"; +import { KtLogger } from "./types"; import { GetFolderChartIDs } from "./folder"; import { FilterQuery } from "mongodb"; diff --git a/server/src/common/logger.ts b/server/src/common/logger.ts index 34ce171aa..2718671b8 100644 --- a/server/src/common/logger.ts +++ b/server/src/common/logger.ts @@ -1,5 +1,5 @@ import winston, { format, transports } from "winston"; -import { KtLogger } from "../types"; +import { KtLogger } from "./types"; const level = process.env.LOG_LEVEL ?? "info"; diff --git a/server/src/types.ts b/server/src/common/types.ts similarity index 100% rename from server/src/types.ts rename to server/src/common/types.ts diff --git a/server/src/score-import/framework/calculated-data/calculated-data.ts b/server/src/score-import/framework/calculated-data/calculated-data.ts index edd4a805f..1a85b7cda 100644 --- a/server/src/score-import/framework/calculated-data/calculated-data.ts +++ b/server/src/score-import/framework/calculated-data/calculated-data.ts @@ -5,7 +5,7 @@ import { GetDefaultTierlist, GetOneTierlistData, } from "../../../common/tierlist"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { DryScore } from "../common/types"; import { CreateGameSpecific } from "./game-specific"; import { CalculateCHUNITHMRating, CalculateGITADORARating } from "./game-specific-stats"; diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.ts b/server/src/score-import/framework/calculated-data/game-specific-stats.ts index c28ee0c12..c96a1ca7d 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.ts +++ b/server/src/score-import/framework/calculated-data/game-specific-stats.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ESDCore, integer, Grades, Lamps } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { DryScore } from "../common/types"; /** diff --git a/server/src/score-import/framework/calculated-data/game-specific.ts b/server/src/score-import/framework/calculated-data/game-specific.ts index b87fadbd7..97da778a5 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.ts +++ b/server/src/score-import/framework/calculated-data/game-specific.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ChartDocument, Game, Playtypes, Grades, Lamps } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { DryScore } from "../common/types"; import { CalculateBPI, diff --git a/server/src/score-import/framework/common/import-logger.ts b/server/src/score-import/framework/common/import-logger.ts index 5e32dcb4a..70be59412 100644 --- a/server/src/score-import/framework/common/import-logger.ts +++ b/server/src/score-import/framework/common/import-logger.ts @@ -2,7 +2,7 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; import { FormatUserDoc } from "../../../common/user"; import { rootLogger } from "../../../common/logger"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { const importID = crypto.randomBytes(20).toString("hex"); diff --git a/server/src/score-import/framework/goals/goals.ts b/server/src/score-import/framework/goals/goals.ts index 4c0471b0a..4a4b61cc5 100644 --- a/server/src/score-import/framework/goals/goals.ts +++ b/server/src/score-import/framework/goals/goals.ts @@ -1,7 +1,7 @@ import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; import { EvaluateGoalForUser } from "../../../common/goal"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; /** * Update a user's progress on all of their set goals. diff --git a/server/src/score-import/framework/milestones/milestones.ts b/server/src/score-import/framework/milestones/milestones.ts index 592f1dce7..338c445b6 100644 --- a/server/src/score-import/framework/milestones/milestones.ts +++ b/server/src/score-import/framework/milestones/milestones.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { integer, Game, diff --git a/server/src/score-import/framework/pb/create-pb-doc.test.ts b/server/src/score-import/framework/pb/create-pb-doc.test.ts index 4df533a53..4b957d2d0 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.test.ts @@ -5,7 +5,7 @@ import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../test- import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; import CreateLogCtx from "../../../common/logger"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { lamps } from "kamaitachi-common/js/config"; let IIDXScore = TestingIIDXSPScore; diff --git a/server/src/score-import/framework/pb/create-pb-doc.ts b/server/src/score-import/framework/pb/create-pb-doc.ts index 03819e25b..9b10ad3a7 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.ts @@ -1,7 +1,7 @@ import db from "../../../external/mongo/db"; import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { IIDXMergeFn, SDVXMergeFn } from "./game-specific-merge"; import { BulkWriteUpdateOneOperation } from "mongodb"; export type PBScoreDocumentNoRank = Omit; diff --git a/server/src/score-import/framework/pb/game-specific-merge.ts b/server/src/score-import/framework/pb/game-specific-merge.ts index a7f583bb1..b1816c6e3 100644 --- a/server/src/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/score-import/framework/pb/game-specific-merge.ts @@ -1,7 +1,7 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import { FindChartWithChartID } from "../../../common/database-lookup/chart"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; import { InternalFailure } from "../common/converter-failures"; diff --git a/server/src/score-import/framework/pb/process-pbs.ts b/server/src/score-import/framework/pb/process-pbs.ts index c02867b37..609c50487 100644 --- a/server/src/score-import/framework/pb/process-pbs.ts +++ b/server/src/score-import/framework/pb/process-pbs.ts @@ -1,6 +1,6 @@ import { integer, PBScoreDocument } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; export async function ProcessPBs( diff --git a/server/src/score-import/framework/score-import-main.ts b/server/src/score-import/framework/score-import-main.ts index 481c478d0..082a9e0df 100644 --- a/server/src/score-import/framework/score-import-main.ts +++ b/server/src/score-import/framework/score-import-main.ts @@ -8,7 +8,7 @@ import { integer, IDStrings, } from "kamaitachi-common"; -import { KtLogger } from "../../types"; +import { KtLogger } from "../../common/types"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; diff --git a/server/src/score-import/framework/score-importing/hydrate-score.ts b/server/src/score-import/framework/score-importing/hydrate-score.ts index 7a1efcf50..1654a8eca 100644 --- a/server/src/score-import/framework/score-importing/hydrate-score.ts +++ b/server/src/score-import/framework/score-importing/hydrate-score.ts @@ -5,7 +5,7 @@ import { ScoreDocument, AnySongDocument, } from "kamaitachi-common"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { CreateCalculatedData } from "../calculated-data/calculated-data"; import { CalculateESDForGame } from "../common/score-utils"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/score-importing/score-importing.ts b/server/src/score-import/framework/score-importing/score-importing.ts index 5085f11a4..8b95b4778 100644 --- a/server/src/score-import/framework/score-importing/score-importing.ts +++ b/server/src/score-import/framework/score-importing/score-importing.ts @@ -18,7 +18,7 @@ import { import { CreateScoreID } from "./score-id"; import db from "../../../external/mongo/db"; import { AppendLogCtx } from "../../../common/logger"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { ConverterFunctionReturns, ConverterFnReturn, diff --git a/server/src/score-import/framework/sessions/sessions.ts b/server/src/score-import/framework/sessions/sessions.ts index 789b18920..f868307f7 100644 --- a/server/src/score-import/framework/sessions/sessions.ts +++ b/server/src/score-import/framework/sessions/sessions.ts @@ -15,7 +15,7 @@ import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; import { GetScoresFromSession } from "../../../common/session"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { ScorePlaytypeMap } from "../common/types"; const TWO_HOURS = 1000 * 60 * 60 * 2; diff --git a/server/src/score-import/framework/user-game-stats/classes.ts b/server/src/score-import/framework/user-game-stats/classes.ts index 52252f4e5..94546fba9 100644 --- a/server/src/score-import/framework/user-game-stats/classes.ts +++ b/server/src/score-import/framework/user-game-stats/classes.ts @@ -1,7 +1,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import { gameClassValues } from "kamaitachi-common/js/game-classes"; import deepmerge from "deepmerge"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { CalculateGitadoraColour, CalculateJubeatColour } from "./builtin-class-handlers"; import { ReturnClassIfGreater } from "../../../common/class"; diff --git a/server/src/score-import/framework/user-game-stats/rating.ts b/server/src/score-import/framework/user-game-stats/rating.ts index 2070b6cbb..0a8660d71 100644 --- a/server/src/score-import/framework/user-game-stats/rating.ts +++ b/server/src/score-import/framework/user-game-stats/rating.ts @@ -1,6 +1,6 @@ import { Game, Playtypes, integer, GameSpecificCalcLookup, IDStrings } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; export async function CalculateRatings( game: Game, diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.ts b/server/src/score-import/framework/user-game-stats/update-ugs.ts index 4053a02ab..fc3852840 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/score-import/framework/user-game-stats/update-ugs.ts @@ -4,7 +4,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../types"; +import { KtLogger } from "../../../common/types"; import { CalculateClassDeltas, UpdateUGSClasses, ClassHandler } from "./classes"; import { CalculateRatings, CalculateCustomRatings } from "./rating"; diff --git a/server/src/score-import/import-types/api/eag-iidx/parser.ts b/server/src/score-import/import-types/api/eag-iidx/parser.ts index 6c047b4d8..9039baf1e 100644 --- a/server/src/score-import/import-types/api/eag-iidx/parser.ts +++ b/server/src/score-import/import-types/api/eag-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/score-import/import-types/api/eag-sdvx/parser.ts b/server/src/score-import/import-types/api/eag-sdvx/parser.ts index 0ea40eca3..c7b6ad8c8 100644 --- a/server/src/score-import/import-types/api/eag-sdvx/parser.ts +++ b/server/src/score-import/import-types/api/eag-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/score-import/import-types/api/flo-iidx/parser.ts b/server/src/score-import/import-types/api/flo-iidx/parser.ts index 444d7f936..ce5dd08f6 100644 --- a/server/src/score-import/import-types/api/flo-iidx/parser.ts +++ b/server/src/score-import/import-types/api/flo-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/score-import/import-types/api/flo-sdvx/parser.ts b/server/src/score-import/import-types/api/flo-sdvx/parser.ts index f5e5e7e36..aa4da3e91 100644 --- a/server/src/score-import/import-types/api/flo-sdvx/parser.ts +++ b/server/src/score-import/import-types/api/flo-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/score-import/import-types/common/api-kai/iidx/parser.ts b/server/src/score-import/import-types/common/api-kai/iidx/parser.ts index eb9082664..8701a8097 100644 --- a/server/src/score-import/import-types/common/api-kai/iidx/parser.ts +++ b/server/src/score-import/import-types/common/api-kai/iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../types"; +import { KtLogger } from "../../../../../common/types"; import nodeFetch from "../../../../../common/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; diff --git a/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts b/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts index cf52809d2..2882210c6 100644 --- a/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts +++ b/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../types"; +import { KtLogger } from "../../../../../common/types"; import nodeFetch from "../../../../../common/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; diff --git a/server/src/score-import/import-types/common/api-kai/traverse-api.ts b/server/src/score-import/import-types/common/api-kai/traverse-api.ts index e5a33ae9b..1e773167e 100644 --- a/server/src/score-import/import-types/common/api-kai/traverse-api.ts +++ b/server/src/score-import/import-types/common/api-kai/traverse-api.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import nodeFetch from "../../../../common/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/score-import/import-types/common/batch-manual/converter.ts b/server/src/score-import/import-types/common/batch-manual/converter.ts index d374e778c..5656b69af 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.ts +++ b/server/src/score-import/import-types/common/batch-manual/converter.ts @@ -17,7 +17,7 @@ import { AssertStrAsPositiveInt, } from "../../../framework/common/string-asserts"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/score-import/import-types/common/batch-manual/parser.ts b/server/src/score-import/import-types/common/batch-manual/parser.ts index e4f7d2f0f..3fbb64edb 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/score-import/import-types/common/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts index ec733952a..7955a697b 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts @@ -10,7 +10,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { GetGradeFromPercent } from "../../../framework/common/score-utils"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types"; -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts index f0e8ee0c4..454cfd068 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -1,5 +1,5 @@ import { Difficulties } from "kamaitachi-common"; -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../types"; import ConverterFn from "./converter"; diff --git a/server/src/score-import/import-types/common/types.ts b/server/src/score-import/import-types/common/types.ts index 6b7f4c3a5..35ba040fb 100644 --- a/server/src/score-import/import-types/common/types.ts +++ b/server/src/score-import/import-types/common/types.ts @@ -1,4 +1,4 @@ -import { EmptyObject, KtLogger } from "../../../types"; +import { EmptyObject, KtLogger } from "../../../common/types"; import { MerScore } from "../file/mer-iidx/types"; import { S3Score } from "../file/solid-state-squad/types"; import { BarbatosScore } from "../ir/barbatos/types"; diff --git a/server/src/score-import/import-types/file/batch-manual/parser.ts b/server/src/score-import/import-types/file/batch-manual/parser.ts index b1cecfba1..443d02e9a 100644 --- a/server/src/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/score-import/import-types/file/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; diff --git a/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts b/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts index a2885f82f..8d4d902db 100644 --- a/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts +++ b/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.ts b/server/src/score-import/import-types/file/mer-iidx/converter.ts index 1ef2421c5..71e27e882 100644 --- a/server/src/score-import/import-types/file/mer-iidx/converter.ts +++ b/server/src/score-import/import-types/file/mer-iidx/converter.ts @@ -1,6 +1,6 @@ import { FindIIDXChartOnInGameID } from "../../../../common/database-lookup/chart"; import { FindSongOnID } from "../../../../common/database-lookup/song"; -import { EmptyObject } from "../../../../types"; +import { EmptyObject } from "../../../../common/types"; import { InternalFailure, KTDataNotFoundFailure, diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.ts b/server/src/score-import/import-types/file/mer-iidx/parser.ts index a5dab9cba..82a24d3e4 100644 --- a/server/src/score-import/import-types/file/mer-iidx/parser.ts +++ b/server/src/score-import/import-types/file/mer-iidx/parser.ts @@ -1,6 +1,6 @@ import p from "prudence"; import { FormatPrError } from "../../../../common/prudence"; -import { EmptyObject, KtLogger } from "../../../../types"; +import { EmptyObject, KtLogger } from "../../../../common/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../../common/types"; import { ConvertFileMerIIDX } from "./converter"; diff --git a/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts b/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts index 2a6b1869c..8b409dfd7 100644 --- a/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts +++ b/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.ts b/server/src/score-import/import-types/file/solid-state-squad/converter.ts index aba903e4a..9fcab0a8c 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/converter.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/converter.ts @@ -1,4 +1,4 @@ -import { EmptyObject, KtLogger } from "../../../../types"; +import { EmptyObject, KtLogger } from "../../../../common/types"; import { InvalidScoreFailure, KTDataNotFoundFailure, diff --git a/server/src/score-import/import-types/file/solid-state-squad/parser.ts b/server/src/score-import/import-types/file/solid-state-squad/parser.ts index d773552e3..003ab1442 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/parser.ts @@ -1,5 +1,5 @@ import { parse as FastParseXML } from "fast-xml-parser"; -import { EmptyObject, KtLogger } from "../../../../types"; +import { EmptyObject, KtLogger } from "../../../../common/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import p, { PrudenceSchema } from "prudence"; import { FormatPrError } from "../../../../common/prudence"; diff --git a/server/src/score-import/import-types/ir/barbatos/converter.ts b/server/src/score-import/import-types/ir/barbatos/converter.ts index e0f27997c..97c1ee851 100644 --- a/server/src/score-import/import-types/ir/barbatos/converter.ts +++ b/server/src/score-import/import-types/ir/barbatos/converter.ts @@ -1,6 +1,6 @@ import { FindSDVXChartOnInGameID } from "../../../../common/database-lookup/chart"; import { FindSongOnID } from "../../../../common/database-lookup/song"; -import { EmptyObject } from "../../../../types"; +import { EmptyObject } from "../../../../common/types"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, diff --git a/server/src/score-import/import-types/ir/barbatos/parser.ts b/server/src/score-import/import-types/ir/barbatos/parser.ts index be7cd248a..850c462d1 100644 --- a/server/src/score-import/import-types/ir/barbatos/parser.ts +++ b/server/src/score-import/import-types/ir/barbatos/parser.ts @@ -1,4 +1,4 @@ -import { EmptyObject, KtLogger } from "../../../../types"; +import { EmptyObject, KtLogger } from "../../../../common/types"; import p from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError } from "../../../../common/prudence"; diff --git a/server/src/score-import/import-types/ir/direct-manual/parser.ts b/server/src/score-import/import-types/ir/direct-manual/parser.ts index 99029af7f..078af5992 100644 --- a/server/src/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/score-import/import-types/ir/direct-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/score-import/import-types/ir/fervidex-static/parser.ts index 1f55e2f10..0080472c2 100644 --- a/server/src/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/score-import/import-types/ir/fervidex-static/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import p, { PrudenceSchema } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError } from "../../../../common/prudence"; diff --git a/server/src/score-import/import-types/ir/fervidex/parser.ts b/server/src/score-import/import-types/ir/fervidex/parser.ts index 19c96b68e..b28eb0c40 100644 --- a/server/src/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/score-import/import-types/ir/fervidex/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError, optNull } from "../../../../common/prudence"; diff --git a/server/src/score-import/import-types/ir/usc/converter.ts b/server/src/score-import/import-types/ir/usc/converter.ts index d318ab4e0..6be2f97ed 100644 --- a/server/src/score-import/import-types/ir/usc/converter.ts +++ b/server/src/score-import/import-types/ir/usc/converter.ts @@ -1,6 +1,6 @@ import { USCClientScore } from "../../../../server/router/ir/usc/common"; import { FindSongOnID } from "../../../../common/database-lookup/song"; -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { IRUSCContext } from "./types"; diff --git a/server/src/score-import/import-types/ir/usc/parser.ts b/server/src/score-import/import-types/ir/usc/parser.ts index 173230ba6..6562df025 100644 --- a/server/src/score-import/import-types/ir/usc/parser.ts +++ b/server/src/score-import/import-types/ir/usc/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index 6a9cea36b..daea2b32a 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -7,7 +7,7 @@ import CreateLogCtx from "../../../../common/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../score-import/framework/score-importing/score-import-error"; -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import { CreateMulterSingleUploadMiddleware } from "../../../../common/multer"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 518e5e17b..c0d0c8a49 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -13,7 +13,7 @@ import CreateLogCtx from "../../../../common/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./common"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../common/user"; -import { KtLogger } from "../../../../types"; +import { KtLogger } from "../../../../common/types"; import { ParseIRUSC } from "../../../../score-import/import-types/ir/usc/parser"; import { USCIR_MAX_LEADERBOARD_N } from "../../../../constants/usc-ir"; import { CreateMulterSingleUploadMiddleware } from "../../../../common/multer"; From 09f5af727ac3a383869b4d8c729eefbf34b41d8c Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 17:49:10 +0100 Subject: [PATCH 05/19] rename data to data-sets --- server/src/{data => datasets}/text-files/english-adjectives.txt | 0 server/src/{data => datasets}/text-files/english-nouns.txt | 0 server/src/{data => datasets}/words.ts | 0 server/src/score-import/framework/sessions/name-generation.ts | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename server/src/{data => datasets}/text-files/english-adjectives.txt (100%) rename server/src/{data => datasets}/text-files/english-nouns.txt (100%) rename server/src/{data => datasets}/words.ts (100%) diff --git a/server/src/data/text-files/english-adjectives.txt b/server/src/datasets/text-files/english-adjectives.txt similarity index 100% rename from server/src/data/text-files/english-adjectives.txt rename to server/src/datasets/text-files/english-adjectives.txt diff --git a/server/src/data/text-files/english-nouns.txt b/server/src/datasets/text-files/english-nouns.txt similarity index 100% rename from server/src/data/text-files/english-nouns.txt rename to server/src/datasets/text-files/english-nouns.txt diff --git a/server/src/data/words.ts b/server/src/datasets/words.ts similarity index 100% rename from server/src/data/words.ts rename to server/src/datasets/words.ts diff --git a/server/src/score-import/framework/sessions/name-generation.ts b/server/src/score-import/framework/sessions/name-generation.ts index 9dbbdc52e..b6042da4c 100644 --- a/server/src/score-import/framework/sessions/name-generation.ts +++ b/server/src/score-import/framework/sessions/name-generation.ts @@ -1,4 +1,4 @@ -import { GetRandomAdjective, GetRandomNoun } from "../../../data/words"; +import { GetRandomAdjective, GetRandomNoun } from "../../../datasets/words"; export function GenerateRandomSessionName() { const adj1 = GetRandomAdjective(); From 7f1829daaea1658a6763bfd846eeb5bc5b30863a Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 17:56:41 +0100 Subject: [PATCH 06/19] rename src/common to src/utils --- server/@types/express/index.d.ts | 2 +- server/src/external/mongo/db.ts | 2 +- server/src/external/redis/redis-store.ts | 2 +- server/src/main.ts | 2 +- .../framework/calculated-data/calculated-data.test.ts | 4 ++-- .../framework/calculated-data/calculated-data.ts | 4 ++-- .../calculated-data/game-specific-stats.test.ts | 2 +- .../framework/calculated-data/game-specific-stats.ts | 2 +- .../framework/calculated-data/game-specific.test.ts | 2 +- .../framework/calculated-data/game-specific.ts | 2 +- .../src/score-import/framework/common/import-logger.ts | 6 +++--- .../src/score-import/framework/common/score-utils.ts | 2 +- server/src/score-import/framework/goals/goals.test.ts | 4 ++-- server/src/score-import/framework/goals/goals.ts | 4 ++-- .../framework/milestones/milestones.test.ts | 2 +- .../score-import/framework/milestones/milestones.ts | 4 ++-- .../score-import/framework/pb/create-pb-doc.test.ts | 4 ++-- server/src/score-import/framework/pb/create-pb-doc.ts | 2 +- .../score-import/framework/pb/game-specific-merge.ts | 4 ++-- .../src/score-import/framework/pb/process-pbs.test.ts | 2 +- server/src/score-import/framework/pb/process-pbs.ts | 2 +- server/src/score-import/framework/score-import-main.ts | 4 ++-- .../framework/score-importing/hydrate-score.ts | 2 +- .../framework/score-importing/insert-score.ts | 2 +- .../framework/score-importing/score-importing.ts | 4 ++-- server/src/score-import/framework/sessions/sessions.ts | 6 +++--- .../framework/user-game-stats/classes.test.ts | 2 +- .../score-import/framework/user-game-stats/classes.ts | 4 ++-- .../framework/user-game-stats/rating.test.ts | 2 +- .../score-import/framework/user-game-stats/rating.ts | 2 +- .../framework/user-game-stats/update-ugs.test.ts | 2 +- .../framework/user-game-stats/update-ugs.ts | 2 +- .../score-import/import-types/api/eag-iidx/parser.ts | 2 +- .../score-import/import-types/api/eag-sdvx/parser.ts | 2 +- .../score-import/import-types/api/flo-iidx/parser.ts | 2 +- .../score-import/import-types/api/flo-sdvx/parser.ts | 2 +- .../import-types/common/api-kai/iidx/converter.ts | 6 +++--- .../import-types/common/api-kai/iidx/parser.ts | 4 ++-- .../import-types/common/api-kai/sdvx/converter.ts | 6 +++--- .../import-types/common/api-kai/sdvx/parser.ts | 4 ++-- .../import-types/common/api-kai/traverse-api.ts | 4 ++-- .../import-types/common/batch-manual/converter.test.ts | 4 ++-- .../import-types/common/batch-manual/converter.ts | 6 +++--- .../import-types/common/batch-manual/parser.test.ts | 4 ++-- .../import-types/common/batch-manual/parser.ts | 4 ++-- .../common/eamusement-iidx-csv/converter.test.ts | 2 +- .../common/eamusement-iidx-csv/converter.ts | 6 +++--- .../common/eamusement-iidx-csv/parser.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.ts | 2 +- server/src/score-import/import-types/common/types.ts | 2 +- .../import-types/file/batch-manual/parser.ts | 2 +- .../import-types/file/eamusement-iidx-csv/parser.ts | 2 +- .../import-types/file/mer-iidx/converter.test.ts | 2 +- .../import-types/file/mer-iidx/converter.ts | 6 +++--- .../import-types/file/mer-iidx/parser.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/parser.ts | 4 ++-- .../import-types/file/pli-iidx-csv/parser.ts | 2 +- .../file/solid-state-squad/converter.test.ts | 2 +- .../import-types/file/solid-state-squad/converter.ts | 6 +++--- .../import-types/file/solid-state-squad/parser.test.ts | 4 ++-- .../import-types/file/solid-state-squad/parser.ts | 4 ++-- .../score-import/import-types/ir/barbatos/converter.ts | 6 +++--- .../score-import/import-types/ir/barbatos/parser.ts | 4 ++-- .../import-types/ir/direct-manual/parser.ts | 2 +- .../import-types/ir/fervidex-static/converter.ts | 4 ++-- .../import-types/ir/fervidex-static/parser.ts | 4 ++-- .../import-types/ir/fervidex/converter.test.ts | 2 +- .../score-import/import-types/ir/fervidex/converter.ts | 4 ++-- .../score-import/import-types/ir/fervidex/parser.ts | 6 +++--- .../src/score-import/import-types/ir/usc/converter.ts | 4 ++-- server/src/score-import/import-types/ir/usc/parser.ts | 4 ++-- server/src/server/middleware/prudence-validate.ts | 2 +- server/src/server/middleware/require-logged-in.ts | 2 +- server/src/server/router/api/auth/router.ts | 6 +++--- server/src/server/router/api/import/router.ts | 8 ++++---- server/src/server/router/ir/barbatos/router.ts | 2 +- server/src/server/router/ir/chunitachi/router.ts | 2 +- server/src/server/router/ir/direct-manual/router.ts | 4 ++-- server/src/server/router/ir/fervidex/router.ts | 8 ++++---- server/src/server/router/ir/usc/common.ts | 6 +++--- server/src/server/router/ir/usc/router.ts | 10 +++++----- server/src/server/server.ts | 2 +- server/src/test-utils/fake-session.ts | 2 +- server/src/test-utils/mock-api.ts | 2 +- server/src/test-utils/mock-fetch.ts | 2 +- server/src/test-utils/reset-db-state.ts | 2 +- server/src/{common => utils}/auth.test.ts | 0 server/src/{common => utils}/auth.ts | 0 server/src/{common => utils}/class.ts | 0 server/src/{common => utils}/database-lookup/chart.ts | 0 server/src/{common => utils}/database-lookup/song.ts | 0 server/src/{common => utils}/db.test.ts | 0 server/src/{common => utils}/db.ts | 0 server/src/{common => utils}/fetch.ts | 0 server/src/{common => utils}/folder.test.ts | 0 server/src/{common => utils}/folder.ts | 0 server/src/{common => utils}/goal.test.ts | 0 server/src/{common => utils}/goal.ts | 0 server/src/{common => utils}/logger.test.ts | 0 server/src/{common => utils}/logger.ts | 0 server/src/{common => utils}/milestone.ts | 0 server/src/{common => utils}/multer.ts | 0 server/src/{common => utils}/prudence.ts | 0 server/src/{common => utils}/scores.ts | 0 server/src/{common => utils}/session.test.ts | 0 server/src/{common => utils}/session.ts | 0 server/src/{common => utils}/tierlist.ts | 0 server/src/{common => utils}/types.ts | 0 server/src/{common => utils}/user.test.ts | 0 server/src/{common => utils}/user.ts | 0 server/src/{common => utils}/util.test.ts | 0 server/src/{common => utils}/util.ts | 0 112 files changed, 146 insertions(+), 146 deletions(-) rename server/src/{common => utils}/auth.test.ts (100%) rename server/src/{common => utils}/auth.ts (100%) rename server/src/{common => utils}/class.ts (100%) rename server/src/{common => utils}/database-lookup/chart.ts (100%) rename server/src/{common => utils}/database-lookup/song.ts (100%) rename server/src/{common => utils}/db.test.ts (100%) rename server/src/{common => utils}/db.ts (100%) rename server/src/{common => utils}/fetch.ts (100%) rename server/src/{common => utils}/folder.test.ts (100%) rename server/src/{common => utils}/folder.ts (100%) rename server/src/{common => utils}/goal.test.ts (100%) rename server/src/{common => utils}/goal.ts (100%) rename server/src/{common => utils}/logger.test.ts (100%) rename server/src/{common => utils}/logger.ts (100%) rename server/src/{common => utils}/milestone.ts (100%) rename server/src/{common => utils}/multer.ts (100%) rename server/src/{common => utils}/prudence.ts (100%) rename server/src/{common => utils}/scores.ts (100%) rename server/src/{common => utils}/session.test.ts (100%) rename server/src/{common => utils}/session.ts (100%) rename server/src/{common => utils}/tierlist.ts (100%) rename server/src/{common => utils}/types.ts (100%) rename server/src/{common => utils}/user.test.ts (100%) rename server/src/{common => utils}/user.ts (100%) rename server/src/{common => utils}/util.test.ts (100%) rename server/src/{common => utils}/util.ts (100%) diff --git a/server/@types/express/index.d.ts b/server/@types/express/index.d.ts index b1527b98d..51d17e184 100644 --- a/server/@types/express/index.d.ts +++ b/server/@types/express/index.d.ts @@ -1,6 +1,6 @@ import { Session, SessionData } from "express-session"; import { SYMBOL_KtchiData } from "../../src/constants/ktchi"; -import { KtchiRequestData, KtchiSessionData } from "../../src/common/types"; +import { KtchiRequestData, KtchiSessionData } from "../../src/utils/types"; export {}; diff --git a/server/src/external/mongo/db.ts b/server/src/external/mongo/db.ts index 5bafd8737..66968466e 100644 --- a/server/src/external/mongo/db.ts +++ b/server/src/external/mongo/db.ts @@ -26,7 +26,7 @@ import { UserMilestoneDocument, } from "kamaitachi-common"; import monk from "monk"; -import CreateLogCtx from "../../common/logger"; +import CreateLogCtx from "../../utils/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/external/redis/redis-store.ts b/server/src/external/redis/redis-store.ts index 2e3a7811a..2b94de719 100644 --- a/server/src/external/redis/redis-store.ts +++ b/server/src/external/redis/redis-store.ts @@ -1,6 +1,6 @@ import connectRedis from "connect-redis"; import expressSession from "express-session"; -import CreateLogCtx from "../../common/logger"; +import CreateLogCtx from "../../utils/logger"; import redis from "redis"; const logger = CreateLogCtx(__filename); diff --git a/server/src/main.ts b/server/src/main.ts index fe4011784..0ca598dd0 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -11,7 +11,7 @@ function FormatVersion() { return `v${[major, minor, patch].join(".")} (${name})`; } -import CreateLogCtx from "./common/logger"; +import CreateLogCtx from "./utils/logger"; import server from "./server/server"; import serverConfig from "./server/server-config"; import dotenv from "dotenv"; diff --git a/server/src/score-import/framework/calculated-data/calculated-data.test.ts b/server/src/score-import/framework/calculated-data/calculated-data.test.ts index 6c9441c6a..6071f52f7 100644 --- a/server/src/score-import/framework/calculated-data/calculated-data.test.ts +++ b/server/src/score-import/framework/calculated-data/calculated-data.test.ts @@ -1,7 +1,7 @@ import Pr from "prudence"; import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import { prAssert } from "../../../test-utils/asserts"; import { Testing511SPA, @@ -12,7 +12,7 @@ import { import { CreateCalculatedData, CalculateLampRating, CalculateRating } from "./calculated-data"; import deepmerge from "deepmerge"; import ResetDBState from "../../../test-utils/reset-db-state"; -import { GetDefaultTierlist } from "../../../common/tierlist"; +import { GetDefaultTierlist } from "../../../utils/tierlist"; const mockLogger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/calculated-data/calculated-data.ts b/server/src/score-import/framework/calculated-data/calculated-data.ts index 1a85b7cda..edf8eb454 100644 --- a/server/src/score-import/framework/calculated-data/calculated-data.ts +++ b/server/src/score-import/framework/calculated-data/calculated-data.ts @@ -4,8 +4,8 @@ import { GetAllTierlistDataOfType, GetDefaultTierlist, GetOneTierlistData, -} from "../../../common/tierlist"; -import { KtLogger } from "../../../common/types"; +} from "../../../utils/tierlist"; +import { KtLogger } from "../../../utils/types"; import { DryScore } from "../common/types"; import { CreateGameSpecific } from "./game-specific"; import { CalculateCHUNITHMRating, CalculateGITADORARating } from "./game-specific-stats"; diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts b/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts index ae3aecf8d..ae55e1ee0 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts +++ b/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts @@ -11,7 +11,7 @@ import { CalculateVF5, KaidenPercentile, } from "./game-specific-stats"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import { isApproximately } from "../../../test-utils/asserts"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.ts b/server/src/score-import/framework/calculated-data/game-specific-stats.ts index c96a1ca7d..d1eba73ea 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.ts +++ b/server/src/score-import/framework/calculated-data/game-specific-stats.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ESDCore, integer, Grades, Lamps } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { DryScore } from "../common/types"; /** diff --git a/server/src/score-import/framework/calculated-data/game-specific.test.ts b/server/src/score-import/framework/calculated-data/game-specific.test.ts index 9064bc8f8..6307d7e31 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.test.ts +++ b/server/src/score-import/framework/calculated-data/game-specific.test.ts @@ -1,7 +1,7 @@ import Pr from "prudence"; import t from "tap"; import { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import { prAssert } from "../../../test-utils/asserts"; import { Testing511SPA, diff --git a/server/src/score-import/framework/calculated-data/game-specific.ts b/server/src/score-import/framework/calculated-data/game-specific.ts index 97da778a5..cf3767c7b 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.ts +++ b/server/src/score-import/framework/calculated-data/game-specific.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ChartDocument, Game, Playtypes, Grades, Lamps } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { DryScore } from "../common/types"; import { CalculateBPI, diff --git a/server/src/score-import/framework/common/import-logger.ts b/server/src/score-import/framework/common/import-logger.ts index 70be59412..55d73707f 100644 --- a/server/src/score-import/framework/common/import-logger.ts +++ b/server/src/score-import/framework/common/import-logger.ts @@ -1,8 +1,8 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; -import { FormatUserDoc } from "../../../common/user"; -import { rootLogger } from "../../../common/logger"; -import { KtLogger } from "../../../common/types"; +import { FormatUserDoc } from "../../../utils/user"; +import { rootLogger } from "../../../utils/logger"; +import { KtLogger } from "../../../utils/types"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { const importID = crypto.randomBytes(20).toString("hex"); diff --git a/server/src/score-import/framework/common/score-utils.ts b/server/src/score-import/framework/common/score-utils.ts index 41ce0052b..0e09e3448 100644 --- a/server/src/score-import/framework/common/score-utils.ts +++ b/server/src/score-import/framework/common/score-utils.ts @@ -10,7 +10,7 @@ import { Playtypes, } from "kamaitachi-common"; import { judgementWindows, gamePercentMax } from "kamaitachi-common/js/config"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import { InternalFailure, InvalidScoreFailure } from "./converter-failures"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/goals/goals.test.ts b/server/src/score-import/framework/goals/goals.test.ts index 63945a9db..a00d5bee2 100644 --- a/server/src/score-import/framework/goals/goals.test.ts +++ b/server/src/score-import/framework/goals/goals.test.ts @@ -9,7 +9,7 @@ import { ProcessGoal, } from "./goals"; import { GoalDocument, UserGoalDocument } from "kamaitachi-common"; -import { CreateFolderChartLookup } from "../../../common/folder"; +import { CreateFolderChartLookup } from "../../../utils/folder"; import { GetKTDataJSON, Testing511SPA, @@ -19,7 +19,7 @@ import { TestingIIDXFolderSP10, } from "../../../test-utils/test-data"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/goals/goals.ts b/server/src/score-import/framework/goals/goals.ts index 4a4b61cc5..c14c57649 100644 --- a/server/src/score-import/framework/goals/goals.ts +++ b/server/src/score-import/framework/goals/goals.ts @@ -1,7 +1,7 @@ import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; -import { EvaluateGoalForUser } from "../../../common/goal"; +import { EvaluateGoalForUser } from "../../../utils/goal"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; /** * Update a user's progress on all of their set goals. diff --git a/server/src/score-import/framework/milestones/milestones.test.ts b/server/src/score-import/framework/milestones/milestones.test.ts index 7d5d6165b..6efd9870a 100644 --- a/server/src/score-import/framework/milestones/milestones.test.ts +++ b/server/src/score-import/framework/milestones/milestones.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { TestingIIDXSPMilestone } from "../../../test-utils/test-data"; import { UpdateUsersMilestones } from "./milestones"; diff --git a/server/src/score-import/framework/milestones/milestones.ts b/server/src/score-import/framework/milestones/milestones.ts index 338c445b6..88fd9a605 100644 --- a/server/src/score-import/framework/milestones/milestones.ts +++ b/server/src/score-import/framework/milestones/milestones.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { integer, Game, @@ -8,7 +8,7 @@ import { MilestoneImportInfo, } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { ProcessMilestoneFromGII } from "../../../common/milestone"; +import { ProcessMilestoneFromGII } from "../../../utils/milestone"; import { BulkWriteUpdateOneOperation } from "mongodb"; export async function UpdateUsersMilestones( diff --git a/server/src/score-import/framework/pb/create-pb-doc.test.ts b/server/src/score-import/framework/pb/create-pb-doc.test.ts index 4b957d2d0..5044264fa 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.test.ts @@ -4,8 +4,8 @@ import ResetDBState from "../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../common/logger"; -import { KtLogger } from "../../../common/types"; +import CreateLogCtx from "../../../utils/logger"; +import { KtLogger } from "../../../utils/types"; import { lamps } from "kamaitachi-common/js/config"; let IIDXScore = TestingIIDXSPScore; diff --git a/server/src/score-import/framework/pb/create-pb-doc.ts b/server/src/score-import/framework/pb/create-pb-doc.ts index 9b10ad3a7..1c1981566 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.ts @@ -1,7 +1,7 @@ import db from "../../../external/mongo/db"; import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { IIDXMergeFn, SDVXMergeFn } from "./game-specific-merge"; import { BulkWriteUpdateOneOperation } from "mongodb"; export type PBScoreDocumentNoRank = Omit; diff --git a/server/src/score-import/framework/pb/game-specific-merge.ts b/server/src/score-import/framework/pb/game-specific-merge.ts index b1816c6e3..a8d86de83 100644 --- a/server/src/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/score-import/framework/pb/game-specific-merge.ts @@ -1,7 +1,7 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { FindChartWithChartID } from "../../../common/database-lookup/chart"; +import { FindChartWithChartID } from "../../../utils/database-lookup/chart"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; import { InternalFailure } from "../common/converter-failures"; diff --git a/server/src/score-import/framework/pb/process-pbs.test.ts b/server/src/score-import/framework/pb/process-pbs.test.ts index 52ae0c971..b0335f293 100644 --- a/server/src/score-import/framework/pb/process-pbs.test.ts +++ b/server/src/score-import/framework/pb/process-pbs.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; import { ProcessPBs } from "./process-pbs"; diff --git a/server/src/score-import/framework/pb/process-pbs.ts b/server/src/score-import/framework/pb/process-pbs.ts index 609c50487..fe4e1ebcf 100644 --- a/server/src/score-import/framework/pb/process-pbs.ts +++ b/server/src/score-import/framework/pb/process-pbs.ts @@ -1,6 +1,6 @@ import { integer, PBScoreDocument } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; export async function ProcessPBs( diff --git a/server/src/score-import/framework/score-import-main.ts b/server/src/score-import/framework/score-import-main.ts index 082a9e0df..a143515b7 100644 --- a/server/src/score-import/framework/score-import-main.ts +++ b/server/src/score-import/framework/score-import-main.ts @@ -8,11 +8,11 @@ import { integer, IDStrings, } from "kamaitachi-common"; -import { KtLogger } from "../../common/types"; +import { KtLogger } from "../../utils/types"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; -import { GetMilisecondsSince } from "../../common/util"; +import { GetMilisecondsSince } from "../../utils/util"; import { ProcessPBs } from "./pb/process-pbs"; import { UpdateUsersGamePlaytypeStats } from "./user-game-stats/update-ugs"; import db from "../../external/mongo/db"; diff --git a/server/src/score-import/framework/score-importing/hydrate-score.ts b/server/src/score-import/framework/score-importing/hydrate-score.ts index 1654a8eca..36c610de5 100644 --- a/server/src/score-import/framework/score-importing/hydrate-score.ts +++ b/server/src/score-import/framework/score-importing/hydrate-score.ts @@ -5,7 +5,7 @@ import { ScoreDocument, AnySongDocument, } from "kamaitachi-common"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { CreateCalculatedData } from "../calculated-data/calculated-data"; import { CalculateESDForGame } from "../common/score-utils"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/score-importing/insert-score.ts b/server/src/score-import/framework/score-importing/insert-score.ts index 64ae86dc6..9cd7ae431 100644 --- a/server/src/score-import/framework/score-importing/insert-score.ts +++ b/server/src/score-import/framework/score-importing/insert-score.ts @@ -1,6 +1,6 @@ import { ScoreDocument } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; const logger = CreateLogCtx(__filename); const ScoreQueue: ScoreDocument[] = []; diff --git a/server/src/score-import/framework/score-importing/score-importing.ts b/server/src/score-import/framework/score-importing/score-importing.ts index 8b95b4778..8db4070e2 100644 --- a/server/src/score-import/framework/score-importing/score-importing.ts +++ b/server/src/score-import/framework/score-importing/score-importing.ts @@ -17,8 +17,8 @@ import { } from "../common/converter-failures"; import { CreateScoreID } from "./score-id"; import db from "../../../external/mongo/db"; -import { AppendLogCtx } from "../../../common/logger"; -import { KtLogger } from "../../../common/types"; +import { AppendLogCtx } from "../../../utils/logger"; +import { KtLogger } from "../../../utils/types"; import { ConverterFunctionReturns, ConverterFnReturn, diff --git a/server/src/score-import/framework/sessions/sessions.ts b/server/src/score-import/framework/sessions/sessions.ts index f868307f7..3f582333c 100644 --- a/server/src/score-import/framework/sessions/sessions.ts +++ b/server/src/score-import/framework/sessions/sessions.ts @@ -10,12 +10,12 @@ import { Game, } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { AppendLogCtx } from "../../../common/logger"; +import { AppendLogCtx } from "../../../utils/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; -import { GetScoresFromSession } from "../../../common/session"; -import { KtLogger } from "../../../common/types"; +import { GetScoresFromSession } from "../../../utils/session"; +import { KtLogger } from "../../../utils/types"; import { ScorePlaytypeMap } from "../common/types"; const TWO_HOURS = 1000 * 60 * 60 * 2; diff --git a/server/src/score-import/framework/user-game-stats/classes.test.ts b/server/src/score-import/framework/user-game-stats/classes.test.ts index f571800ae..3765df7f1 100644 --- a/server/src/score-import/framework/user-game-stats/classes.test.ts +++ b/server/src/score-import/framework/user-game-stats/classes.test.ts @@ -1,7 +1,7 @@ import { UserGameStats } from "kamaitachi-common"; import t from "tap"; import { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { CalculateClassDeltas, UpdateUGSClasses } from "./classes"; diff --git a/server/src/score-import/framework/user-game-stats/classes.ts b/server/src/score-import/framework/user-game-stats/classes.ts index 94546fba9..ad2e561be 100644 --- a/server/src/score-import/framework/user-game-stats/classes.ts +++ b/server/src/score-import/framework/user-game-stats/classes.ts @@ -1,9 +1,9 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import { gameClassValues } from "kamaitachi-common/js/game-classes"; import deepmerge from "deepmerge"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { CalculateGitadoraColour, CalculateJubeatColour } from "./builtin-class-handlers"; -import { ReturnClassIfGreater } from "../../../common/class"; +import { ReturnClassIfGreater } from "../../../utils/class"; export interface ClassHandler { ( diff --git a/server/src/score-import/framework/user-game-stats/rating.test.ts b/server/src/score-import/framework/user-game-stats/rating.test.ts index 9e1bf8e9b..745dd70e4 100644 --- a/server/src/score-import/framework/user-game-stats/rating.test.ts +++ b/server/src/score-import/framework/user-game-stats/rating.test.ts @@ -4,7 +4,7 @@ import ResetDBState from "../../../test-utils/reset-db-state"; import { TestingIIDXSPScorePB } from "../../../test-utils/test-data"; import { CalculateCustomRatings, CalculateRatings } from "./rating"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/user-game-stats/rating.ts b/server/src/score-import/framework/user-game-stats/rating.ts index 0a8660d71..016316fad 100644 --- a/server/src/score-import/framework/user-game-stats/rating.ts +++ b/server/src/score-import/framework/user-game-stats/rating.ts @@ -1,6 +1,6 @@ import { Game, Playtypes, integer, GameSpecificCalcLookup, IDStrings } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; export async function CalculateRatings( game: Game, diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts b/server/src/score-import/framework/user-game-stats/update-ugs.test.ts index bcd6fac5b..14c207999 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts +++ b/server/src/score-import/framework/user-game-stats/update-ugs.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../common/logger"; +import CreateLogCtx from "../../../utils/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { UpdateUsersGamePlaytypeStats } from "./update-ugs"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.ts b/server/src/score-import/framework/user-game-stats/update-ugs.ts index fc3852840..b3aaad6ae 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/score-import/framework/user-game-stats/update-ugs.ts @@ -4,7 +4,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../common/types"; +import { KtLogger } from "../../../utils/types"; import { CalculateClassDeltas, UpdateUGSClasses, ClassHandler } from "./classes"; import { CalculateRatings, CalculateCustomRatings } from "./rating"; diff --git a/server/src/score-import/import-types/api/eag-iidx/parser.ts b/server/src/score-import/import-types/api/eag-iidx/parser.ts index 9039baf1e..791ae1cc1 100644 --- a/server/src/score-import/import-types/api/eag-iidx/parser.ts +++ b/server/src/score-import/import-types/api/eag-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/score-import/import-types/api/eag-sdvx/parser.ts b/server/src/score-import/import-types/api/eag-sdvx/parser.ts index c7b6ad8c8..9cd7c9b67 100644 --- a/server/src/score-import/import-types/api/eag-sdvx/parser.ts +++ b/server/src/score-import/import-types/api/eag-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/score-import/import-types/api/flo-iidx/parser.ts b/server/src/score-import/import-types/api/flo-iidx/parser.ts index ce5dd08f6..892b62213 100644 --- a/server/src/score-import/import-types/api/flo-iidx/parser.ts +++ b/server/src/score-import/import-types/api/flo-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/score-import/import-types/api/flo-sdvx/parser.ts b/server/src/score-import/import-types/api/flo-sdvx/parser.ts index aa4da3e91..63ce21163 100644 --- a/server/src/score-import/import-types/api/flo-sdvx/parser.ts +++ b/server/src/score-import/import-types/api/flo-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/score-import/import-types/common/api-kai/iidx/converter.ts b/server/src/score-import/import-types/common/api-kai/iidx/converter.ts index cf8b428a7..86f0e0e16 100644 --- a/server/src/score-import/import-types/common/api-kai/iidx/converter.ts +++ b/server/src/score-import/import-types/common/api-kai/iidx/converter.ts @@ -1,4 +1,4 @@ -import { FindIIDXChartOnInGameIDVersion } from "../../../../../common/database-lookup/chart"; +import { FindIIDXChartOnInGameIDVersion } from "../../../../../utils/database-lookup/chart"; import { KaiContext, KaiIIDXScore } from "../types"; import p from "prudence"; import { @@ -6,8 +6,8 @@ import { InvalidScoreFailure, KTDataNotFoundFailure, } from "../../../../framework/common/converter-failures"; -import { FormatPrError } from "../../../../../common/prudence"; -import { FindSongOnID } from "../../../../../common/database-lookup/song"; +import { FormatPrError } from "../../../../../utils/prudence"; +import { FindSongOnID } from "../../../../../utils/database-lookup/song"; import { GenericGetGradeAndPercent, ParseDateFromString, diff --git a/server/src/score-import/import-types/common/api-kai/iidx/parser.ts b/server/src/score-import/import-types/common/api-kai/iidx/parser.ts index 8701a8097..a02a16ee5 100644 --- a/server/src/score-import/import-types/common/api-kai/iidx/parser.ts +++ b/server/src/score-import/import-types/common/api-kai/iidx/parser.ts @@ -1,5 +1,5 @@ -import { KtLogger } from "../../../../../common/types"; -import nodeFetch from "../../../../../common/fetch"; +import { KtLogger } from "../../../../../utils/types"; +import nodeFetch from "../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; import { EAG_API_URL, FLO_API_URL } from "../../../../../secrets"; diff --git a/server/src/score-import/import-types/common/api-kai/sdvx/converter.ts b/server/src/score-import/import-types/common/api-kai/sdvx/converter.ts index a0cab7faa..086b6296b 100644 --- a/server/src/score-import/import-types/common/api-kai/sdvx/converter.ts +++ b/server/src/score-import/import-types/common/api-kai/sdvx/converter.ts @@ -1,4 +1,4 @@ -import { FindSDVXChartOnInGameIDVersion } from "../../../../../common/database-lookup/chart"; +import { FindSDVXChartOnInGameIDVersion } from "../../../../../utils/database-lookup/chart"; import { KaiContext, KaiSDVXScore } from "../types"; import p from "prudence"; import { @@ -6,8 +6,8 @@ import { InvalidScoreFailure, KTDataNotFoundFailure, } from "../../../../framework/common/converter-failures"; -import { FormatPrError } from "../../../../../common/prudence"; -import { FindSongOnID } from "../../../../../common/database-lookup/song"; +import { FormatPrError } from "../../../../../utils/prudence"; +import { FindSongOnID } from "../../../../../utils/database-lookup/song"; import { GenericGetGradeAndPercent, ParseDateFromString, diff --git a/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts b/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts index 2882210c6..2904ece86 100644 --- a/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts +++ b/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts @@ -1,5 +1,5 @@ -import { KtLogger } from "../../../../../common/types"; -import nodeFetch from "../../../../../common/fetch"; +import { KtLogger } from "../../../../../utils/types"; +import nodeFetch from "../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; import { EAG_API_URL, FLO_API_URL } from "../../../../../secrets"; diff --git a/server/src/score-import/import-types/common/api-kai/traverse-api.ts b/server/src/score-import/import-types/common/api-kai/traverse-api.ts index 1e773167e..79b42c4c0 100644 --- a/server/src/score-import/import-types/common/api-kai/traverse-api.ts +++ b/server/src/score-import/import-types/common/api-kai/traverse-api.ts @@ -1,6 +1,6 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import nodeFetch from "../../../../common/fetch"; +import nodeFetch from "../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; /** diff --git a/server/src/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/score-import/import-types/common/batch-manual/converter.test.ts index 8d456924a..faa7b21a9 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/converter.test.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; -import { EscapeStringRegexp } from "../../../../common/util"; +import { EscapeStringRegexp } from "../../../../utils/util"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; import { Game } from "kamaitachi-common"; import ResetDBState from "../../../../test-utils/reset-db-state"; diff --git a/server/src/score-import/import-types/common/batch-manual/converter.ts b/server/src/score-import/import-types/common/batch-manual/converter.ts index 5656b69af..75c3e5779 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.ts +++ b/server/src/score-import/import-types/common/batch-manual/converter.ts @@ -5,19 +5,19 @@ import { InvalidScoreFailure, KTDataNotFoundFailure, } from "../../../framework/common/converter-failures"; -import { FindSongOnID, FindSongOnTitleInsensitive } from "../../../../common/database-lookup/song"; +import { FindSongOnID, FindSongOnTitleInsensitive } from "../../../../utils/database-lookup/song"; import { FindBMSChartOnHash, FindChartWithPTDF, FindChartWithPTDFVersion, FindDDRChartOnSongHash, -} from "../../../../common/database-lookup/chart"; +} from "../../../../utils/database-lookup/chart"; import { AssertStrAsDifficulty, AssertStrAsPositiveInt, } from "../../../framework/common/string-asserts"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/score-import/import-types/common/batch-manual/parser.test.ts index b0a36efe5..89c47bf5a 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/parser.test.ts @@ -1,10 +1,10 @@ import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; import { BatchManual } from "./types"; -import { EscapeStringRegexp } from "../../../../common/util"; +import { EscapeStringRegexp } from "../../../../utils/util"; import deepmerge from "deepmerge"; const mockErr = (...msg: string[]) => diff --git a/server/src/score-import/import-types/common/batch-manual/parser.ts b/server/src/score-import/import-types/common/batch-manual/parser.ts index 3fbb64edb..906fa8d20 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/score-import/import-types/common/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; @@ -6,7 +6,7 @@ import { lamps, supportedGames, validHitData, validPlaytypes } from "kamaitachi- import { Game, ImportTypes } from "kamaitachi-common"; import { ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; -import { FormatPrError } from "../../../../common/prudence"; +import { FormatPrError } from "../../../../utils/prudence"; import { ParserFunctionReturnsSync } from "../types"; const optNull = (v: ValidSchemaValue) => p.optional(p.nullable(v)); diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts index 0709f608f..887e24213 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import ConverterFn, { EamScoreConverter, EamScoreConverterWrapper } from "./converter"; import p from "prudence"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts index 7955a697b..d275a12e5 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts @@ -1,6 +1,6 @@ import { Lamps, AnySongDocument, ChartDocument } from "kamaitachi-common"; -import { FindChartWithPTDFVersion } from "../../../../common/database-lookup/chart"; -import { FindSongOnTitleInsensitive } from "../../../../common/database-lookup/song"; +import { FindChartWithPTDFVersion } from "../../../../utils/database-lookup/chart"; +import { FindSongOnTitleInsensitive } from "../../../../utils/database-lookup/song"; import { KTDataNotFoundFailure, InternalFailure, @@ -10,7 +10,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { GetGradeFromPercent } from "../../../framework/common/score-utils"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types"; -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts index 3722868e0..baf62add3 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import GenericParseEamIIDXCSV, { NaiveCSVParse, ResolveHeaders } from "./parser"; import { CloseMongoConnection } from "../../../../external/mongo/db"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts index 454cfd068..f6051d908 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -1,5 +1,5 @@ import { Difficulties } from "kamaitachi-common"; -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../types"; import ConverterFn from "./converter"; diff --git a/server/src/score-import/import-types/common/types.ts b/server/src/score-import/import-types/common/types.ts index 35ba040fb..14fa60ad7 100644 --- a/server/src/score-import/import-types/common/types.ts +++ b/server/src/score-import/import-types/common/types.ts @@ -1,4 +1,4 @@ -import { EmptyObject, KtLogger } from "../../../common/types"; +import { EmptyObject, KtLogger } from "../../../utils/types"; import { MerScore } from "../file/mer-iidx/types"; import { S3Score } from "../file/solid-state-squad/types"; import { BarbatosScore } from "../ir/barbatos/types"; diff --git a/server/src/score-import/import-types/file/batch-manual/parser.ts b/server/src/score-import/import-types/file/batch-manual/parser.ts index 443d02e9a..901185008 100644 --- a/server/src/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/score-import/import-types/file/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; diff --git a/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts b/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts index 8d4d902db..07258502e 100644 --- a/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts +++ b/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts index 65c84b401..a787a71f8 100644 --- a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts +++ b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.ts b/server/src/score-import/import-types/file/mer-iidx/converter.ts index 71e27e882..da90de2af 100644 --- a/server/src/score-import/import-types/file/mer-iidx/converter.ts +++ b/server/src/score-import/import-types/file/mer-iidx/converter.ts @@ -1,6 +1,6 @@ -import { FindIIDXChartOnInGameID } from "../../../../common/database-lookup/chart"; -import { FindSongOnID } from "../../../../common/database-lookup/song"; -import { EmptyObject } from "../../../../common/types"; +import { FindIIDXChartOnInGameID } from "../../../../utils/database-lookup/chart"; +import { FindSongOnID } from "../../../../utils/database-lookup/song"; +import { EmptyObject } from "../../../../utils/types"; import { InternalFailure, KTDataNotFoundFailure, diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts b/server/src/score-import/import-types/file/mer-iidx/parser.test.ts index 11e6a8b06..021cdc07f 100644 --- a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts +++ b/server/src/score-import/import-types/file/mer-iidx/parser.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataBuffer, GetKTDataJSON } from "../../../../test-utils/test-data"; diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.ts b/server/src/score-import/import-types/file/mer-iidx/parser.ts index 82a24d3e4..7a7461667 100644 --- a/server/src/score-import/import-types/file/mer-iidx/parser.ts +++ b/server/src/score-import/import-types/file/mer-iidx/parser.ts @@ -1,6 +1,6 @@ import p from "prudence"; -import { FormatPrError } from "../../../../common/prudence"; -import { EmptyObject, KtLogger } from "../../../../common/types"; +import { FormatPrError } from "../../../../utils/prudence"; +import { EmptyObject, KtLogger } from "../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../../common/types"; import { ConvertFileMerIIDX } from "./converter"; diff --git a/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts b/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts index 8b409dfd7..0877863df 100644 --- a/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts +++ b/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts index 4fcf7a2db..480c8092c 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.ts b/server/src/score-import/import-types/file/solid-state-squad/converter.ts index 9fcab0a8c..d3e6b26c7 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/converter.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/converter.ts @@ -1,4 +1,4 @@ -import { EmptyObject, KtLogger } from "../../../../common/types"; +import { EmptyObject, KtLogger } from "../../../../utils/types"; import { InvalidScoreFailure, KTDataNotFoundFailure, @@ -6,8 +6,8 @@ import { } from "../../../framework/common/converter-failures"; import { S3Score } from "./types"; import { Playtypes, Difficulties, Grades, Lamps } from "kamaitachi-common"; -import { FindSongOnTitleInsensitive } from "../../../../common/database-lookup/song"; -import { FindChartWithPTDFVersion } from "../../../../common/database-lookup/chart"; +import { FindSongOnTitleInsensitive } from "../../../../utils/database-lookup/song"; +import { FindChartWithPTDFVersion } from "../../../../utils/database-lookup/chart"; import { GenericGetGradeAndPercent, ParseDateFromString, diff --git a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts index bee2c7f6c..1562a8193 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { GetMilisecondsSince } from "../../../../common/util"; +import { GetMilisecondsSince } from "../../../../utils/util"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataBuffer } from "../../../../test-utils/test-data"; diff --git a/server/src/score-import/import-types/file/solid-state-squad/parser.ts b/server/src/score-import/import-types/file/solid-state-squad/parser.ts index 003ab1442..4fb4dd52e 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/parser.ts @@ -1,8 +1,8 @@ import { parse as FastParseXML } from "fast-xml-parser"; -import { EmptyObject, KtLogger } from "../../../../common/types"; +import { EmptyObject, KtLogger } from "../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import p, { PrudenceSchema } from "prudence"; -import { FormatPrError } from "../../../../common/prudence"; +import { FormatPrError } from "../../../../utils/prudence"; import { S3Score } from "./types"; import { ConvertFileS3 } from "./converter"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/ir/barbatos/converter.ts b/server/src/score-import/import-types/ir/barbatos/converter.ts index 97c1ee851..f494b46e5 100644 --- a/server/src/score-import/import-types/ir/barbatos/converter.ts +++ b/server/src/score-import/import-types/ir/barbatos/converter.ts @@ -1,6 +1,6 @@ -import { FindSDVXChartOnInGameID } from "../../../../common/database-lookup/chart"; -import { FindSongOnID } from "../../../../common/database-lookup/song"; -import { EmptyObject } from "../../../../common/types"; +import { FindSDVXChartOnInGameID } from "../../../../utils/database-lookup/chart"; +import { FindSongOnID } from "../../../../utils/database-lookup/song"; +import { EmptyObject } from "../../../../utils/types"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, diff --git a/server/src/score-import/import-types/ir/barbatos/parser.ts b/server/src/score-import/import-types/ir/barbatos/parser.ts index 850c462d1..fd25a1d80 100644 --- a/server/src/score-import/import-types/ir/barbatos/parser.ts +++ b/server/src/score-import/import-types/ir/barbatos/parser.ts @@ -1,7 +1,7 @@ -import { EmptyObject, KtLogger } from "../../../../common/types"; +import { EmptyObject, KtLogger } from "../../../../utils/types"; import p from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { FormatPrError } from "../../../../common/prudence"; +import { FormatPrError } from "../../../../utils/prudence"; import { BarbatosScore } from "./types"; import { ConverterIRBarbatos } from "./converter"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/ir/direct-manual/parser.ts b/server/src/score-import/import-types/ir/direct-manual/parser.ts index 078af5992..621ef5960 100644 --- a/server/src/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/score-import/import-types/ir/direct-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/ir/fervidex-static/converter.ts b/server/src/score-import/import-types/ir/fervidex-static/converter.ts index 485648bbb..dd95922f9 100644 --- a/server/src/score-import/import-types/ir/fervidex-static/converter.ts +++ b/server/src/score-import/import-types/ir/fervidex-static/converter.ts @@ -1,11 +1,11 @@ -import { FindSongOnID } from "../../../../common/database-lookup/song"; +import { FindSongOnID } from "../../../../utils/database-lookup/song"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, KTDataNotFoundFailure, } from "../../../framework/common/converter-failures"; import { Lamps } from "kamaitachi-common"; -import { FindChartOnInGameIDVersion } from "../../../../common/database-lookup/chart"; +import { FindChartOnInGameIDVersion } from "../../../../utils/database-lookup/chart"; import { FervidexStaticContext, FervidexStaticScore } from "./types"; import { FERVIDEX_LAMP_LOOKUP, SplitFervidexChartRef } from "../fervidex/converter"; import { DryScore } from "../../../framework/common/types"; diff --git a/server/src/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/score-import/import-types/ir/fervidex-static/parser.ts index 0080472c2..bcf9e4bbc 100644 --- a/server/src/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/score-import/import-types/ir/fervidex-static/parser.ts @@ -1,7 +1,7 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import p, { PrudenceSchema } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { FormatPrError } from "../../../../common/prudence"; +import { FormatPrError } from "../../../../utils/prudence"; import { ConverterIRFervidexStatic } from "./converter"; import { FervidexStaticContext, FervidexStaticScore } from "./types"; import { FerHeaders, SoftwareIDToVersion } from "../fervidex/parser"; diff --git a/server/src/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/score-import/import-types/ir/fervidex/converter.test.ts index dee253dc5..756462c9c 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.test.ts +++ b/server/src/score-import/import-types/ir/fervidex/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; import { InternalFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/score-import/import-types/ir/fervidex/converter.ts b/server/src/score-import/import-types/ir/fervidex/converter.ts index 2f57b09c4..ad9521c2b 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.ts +++ b/server/src/score-import/import-types/ir/fervidex/converter.ts @@ -1,4 +1,4 @@ -import { FindSongOnID } from "../../../../common/database-lookup/song"; +import { FindSongOnID } from "../../../../utils/database-lookup/song"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, @@ -10,7 +10,7 @@ import { Lamps, Difficulties, Playtypes } from "kamaitachi-common"; import { FindIIDXChartOnInGameIDVersion, FindIIDXChartWith2DXtraHash, -} from "../../../../common/database-lookup/chart"; +} from "../../../../utils/database-lookup/chart"; import { ConverterFunction } from "../../common/types"; import { DryScore } from "../../../framework/common/types"; diff --git a/server/src/score-import/import-types/ir/fervidex/parser.ts b/server/src/score-import/import-types/ir/fervidex/parser.ts index b28eb0c40..cb31032cf 100644 --- a/server/src/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/score-import/import-types/ir/fervidex/parser.ts @@ -1,10 +1,10 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { FormatPrError, optNull } from "../../../../common/prudence"; +import { FormatPrError, optNull } from "../../../../utils/prudence"; import { FervidexContext, FervidexScore } from "./types"; import { ConverterIRFervidex } from "./converter"; -import { ParseEA3SoftID } from "../../../../common/util"; +import { ParseEA3SoftID } from "../../../../utils/util"; import { EXT_HEROIC_VERSE, MODEL_IIDX, diff --git a/server/src/score-import/import-types/ir/usc/converter.ts b/server/src/score-import/import-types/ir/usc/converter.ts index 6be2f97ed..3c68504ec 100644 --- a/server/src/score-import/import-types/ir/usc/converter.ts +++ b/server/src/score-import/import-types/ir/usc/converter.ts @@ -1,6 +1,6 @@ import { USCClientScore } from "../../../../server/router/ir/usc/common"; -import { FindSongOnID } from "../../../../common/database-lookup/song"; -import { KtLogger } from "../../../../common/types"; +import { FindSongOnID } from "../../../../utils/database-lookup/song"; +import { KtLogger } from "../../../../utils/types"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { IRUSCContext } from "./types"; diff --git a/server/src/score-import/import-types/ir/usc/parser.ts b/server/src/score-import/import-types/ir/usc/parser.ts index 6562df025..708e1279a 100644 --- a/server/src/score-import/import-types/ir/usc/parser.ts +++ b/server/src/score-import/import-types/ir/usc/parser.ts @@ -1,8 +1,8 @@ -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; -import { FormatPrError } from "../../../../common/prudence"; +import { FormatPrError } from "../../../../utils/prudence"; import { USCClientScore } from "../../../../server/router/ir/usc/common"; import { IRUSCContext } from "./types"; import { ConverterIRUSC } from "./converter"; diff --git a/server/src/server/middleware/prudence-validate.ts b/server/src/server/middleware/prudence-validate.ts index c04070a3b..a7232a115 100644 --- a/server/src/server/middleware/prudence-validate.ts +++ b/server/src/server/middleware/prudence-validate.ts @@ -1,5 +1,5 @@ import Prudence, { MiddlewareErrorHandler } from "prudence"; -import CreateLogCtx from "../../common/logger"; +import CreateLogCtx from "../../utils/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/middleware/require-logged-in.ts b/server/src/server/middleware/require-logged-in.ts index ef4085793..160d776b2 100644 --- a/server/src/server/middleware/require-logged-in.ts +++ b/server/src/server/middleware/require-logged-in.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import CreateLogCtx from "../../common/logger"; +import CreateLogCtx from "../../utils/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/api/auth/router.ts b/server/src/server/router/api/auth/router.ts index d30e1c5e6..18f8a1e57 100644 --- a/server/src/server/router/api/auth/router.ts +++ b/server/src/server/router/api/auth/router.ts @@ -7,15 +7,15 @@ import { ReinstateInvite, ValidatePassword, ValidateCaptcha, -} from "../../../../common/auth"; +} from "../../../../utils/auth"; import { FormatUserDoc, GetUserCaseInsensitive, PRIVATEINFO_GetUserCaseInsensitive, -} from "../../../../common/user"; +} from "../../../../utils/user"; import db from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index daea2b32a..b0c9a6630 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -2,14 +2,14 @@ import { Router } from "express"; import { FileUploadImportTypes } from "kamaitachi-common"; import { fileImportTypes } from "kamaitachi-common/js/config"; import Prudence from "prudence"; -import { GetUserWithIDGuaranteed } from "../../../../common/user"; -import CreateLogCtx from "../../../../common/logger"; +import { GetUserWithIDGuaranteed } from "../../../../utils/user"; +import CreateLogCtx from "../../../../utils/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../score-import/framework/score-importing/score-import-error"; -import { KtLogger } from "../../../../common/types"; +import { KtLogger } from "../../../../utils/types"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; -import { CreateMulterSingleUploadMiddleware } from "../../../../common/multer"; +import { CreateMulterSingleUploadMiddleware } from "../../../../utils/multer"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/barbatos/router.ts b/server/src/server/router/ir/barbatos/router.ts index 8491d7a17..22fd7dd78 100644 --- a/server/src/server/router/ir/barbatos/router.ts +++ b/server/src/server/router/ir/barbatos/router.ts @@ -1,5 +1,5 @@ import { Router } from "express"; -import { GetUserWithIDGuaranteed } from "../../../../common/user"; +import { GetUserWithIDGuaranteed } from "../../../../utils/user"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import { ParseBarbatosSingle } from "../../../../score-import/import-types/ir/barbatos/parser"; diff --git a/server/src/server/router/ir/chunitachi/router.ts b/server/src/server/router/ir/chunitachi/router.ts index 66c4d031e..9543e08ef 100644 --- a/server/src/server/router/ir/chunitachi/router.ts +++ b/server/src/server/router/ir/chunitachi/router.ts @@ -1,5 +1,5 @@ import { Router } from "express"; -import { GetUserWithIDGuaranteed } from "../../../../common/user"; +import { GetUserWithIDGuaranteed } from "../../../../utils/user"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import ParseDirectManual from "../../../../score-import/import-types/ir/direct-manual/parser"; diff --git a/server/src/server/router/ir/direct-manual/router.ts b/server/src/server/router/ir/direct-manual/router.ts index 0c6b24804..88addc63d 100644 --- a/server/src/server/router/ir/direct-manual/router.ts +++ b/server/src/server/router/ir/direct-manual/router.ts @@ -1,6 +1,6 @@ import { Router } from "express"; -import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../../common/user"; -import CreateLogCtx from "../../../../common/logger"; +import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../../utils/user"; +import CreateLogCtx from "../../../../utils/logger"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import ParseDirectManual from "../../../../score-import/import-types/ir/direct-manual/parser"; diff --git a/server/src/server/router/ir/fervidex/router.ts b/server/src/server/router/ir/fervidex/router.ts index 394bf5ad1..1b98b2229 100644 --- a/server/src/server/router/ir/fervidex/router.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -1,14 +1,14 @@ import { Router, RequestHandler } from "express"; -import { UpdateClassIfGreater } from "../../../../common/class"; -import { GetUserWithIDGuaranteed } from "../../../../common/user"; -import { ParseEA3SoftID } from "../../../../common/util"; +import { UpdateClassIfGreater } from "../../../../utils/class"; +import { GetUserWithIDGuaranteed } from "../../../../utils/user"; +import { ParseEA3SoftID } from "../../../../utils/util"; import { EXT_HEROIC_VERSE, MODEL_INFINITAS_2, REV_2DXBMS } from "../../../../constants/ea3id"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import { ParseFervidexStatic } from "../../../../score-import/import-types/ir/fervidex-static/parser"; import { ParseFervidexSingle } from "../../../../score-import/import-types/ir/fervidex/parser"; import { Playtypes } from "kamaitachi-common"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import { FERVIDEX_COURSE_LOOKUP } from "../../../../score-import/import-types/ir/fervidex-static/class-handler"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/common.ts b/server/src/server/router/ir/usc/common.ts index 2c979a3b8..98ac86c8a 100644 --- a/server/src/server/router/ir/usc/common.ts +++ b/server/src/server/router/ir/usc/common.ts @@ -1,7 +1,7 @@ import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitachi-common"; -import CreateLogCtx from "../../../../common/logger"; -import { GetPBOnChart, GetServerRecordOnChart } from "../../../../common/scores"; -import { MStoS } from "../../../../common/util"; +import CreateLogCtx from "../../../../utils/logger"; +import { GetPBOnChart, GetServerRecordOnChart } from "../../../../utils/scores"; +import { MStoS } from "../../../../utils/util"; import { USCIR_ADJACENT_SCORE_N } from "../../../../constants/usc-ir"; import db from "../../../../external/mongo/db"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index c0d0c8a49..1c15b2c83 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -1,5 +1,5 @@ import { Router, RequestHandler } from "express"; -import { FindChartOnSHA256 } from "../../../../common/database-lookup/chart"; +import { FindChartOnSHA256 } from "../../../../utils/database-lookup/chart"; import { SYMBOL_KtchiData } from "../../../../constants/ktchi"; import db from "../../../../external/mongo/db"; import { @@ -9,14 +9,14 @@ import { ImportDocument, } from "kamaitachi-common"; import { AssertStrAsPositiveNonZeroInt } from "../../../../score-import/framework/common/string-asserts"; -import CreateLogCtx from "../../../../common/logger"; +import CreateLogCtx from "../../../../utils/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./common"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; -import { GetUserWithID } from "../../../../common/user"; -import { KtLogger } from "../../../../common/types"; +import { GetUserWithID } from "../../../../utils/user"; +import { KtLogger } from "../../../../utils/types"; import { ParseIRUSC } from "../../../../score-import/import-types/ir/usc/parser"; import { USCIR_MAX_LEADERBOARD_N } from "../../../../constants/usc-ir"; -import { CreateMulterSingleUploadMiddleware } from "../../../../common/multer"; +import { CreateMulterSingleUploadMiddleware } from "../../../../utils/multer"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/server.ts b/server/src/server/server.ts index aaa2eb78d..c2488c858 100644 --- a/server/src/server/server.ts +++ b/server/src/server/server.ts @@ -1,6 +1,6 @@ import express, { Express } from "express"; import "express-async-errors"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../utils/logger"; import expressSession from "express-session"; import { SESSION_SECRET } from "../secrets"; import { integer } from "kamaitachi-common"; diff --git a/server/src/test-utils/fake-session.ts b/server/src/test-utils/fake-session.ts index 33b0122b3..3e8008b69 100644 --- a/server/src/test-utils/fake-session.ts +++ b/server/src/test-utils/fake-session.ts @@ -1,5 +1,5 @@ import ResetDBState from "./reset-db-state"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../utils/logger"; import supertest from "supertest"; const logger = CreateLogCtx(__filename); diff --git a/server/src/test-utils/mock-api.ts b/server/src/test-utils/mock-api.ts index b1182b825..e1666c3ba 100644 --- a/server/src/test-utils/mock-api.ts +++ b/server/src/test-utils/mock-api.ts @@ -1,5 +1,5 @@ import supertest from "supertest"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../utils/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/test-utils/mock-fetch.ts b/server/src/test-utils/mock-fetch.ts index 2c5875640..241441ca5 100644 --- a/server/src/test-utils/mock-fetch.ts +++ b/server/src/test-utils/mock-fetch.ts @@ -1,5 +1,5 @@ import { Response } from "node-fetch"; -import { NodeFetch } from "../common/fetch"; +import { NodeFetch } from "../utils/fetch"; export function MockFetch(data: Partial) { // We know! this is a mock function. diff --git a/server/src/test-utils/reset-db-state.ts b/server/src/test-utils/reset-db-state.ts index 3df3cc15c..bfb11fb70 100644 --- a/server/src/test-utils/reset-db-state.ts +++ b/server/src/test-utils/reset-db-state.ts @@ -4,7 +4,7 @@ import db from "../external/mongo/db"; import fs from "fs"; import path from "path"; -import CreateLogCtx from "../common/logger"; +import CreateLogCtx from "../utils/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/common/auth.test.ts b/server/src/utils/auth.test.ts similarity index 100% rename from server/src/common/auth.test.ts rename to server/src/utils/auth.test.ts diff --git a/server/src/common/auth.ts b/server/src/utils/auth.ts similarity index 100% rename from server/src/common/auth.ts rename to server/src/utils/auth.ts diff --git a/server/src/common/class.ts b/server/src/utils/class.ts similarity index 100% rename from server/src/common/class.ts rename to server/src/utils/class.ts diff --git a/server/src/common/database-lookup/chart.ts b/server/src/utils/database-lookup/chart.ts similarity index 100% rename from server/src/common/database-lookup/chart.ts rename to server/src/utils/database-lookup/chart.ts diff --git a/server/src/common/database-lookup/song.ts b/server/src/utils/database-lookup/song.ts similarity index 100% rename from server/src/common/database-lookup/song.ts rename to server/src/utils/database-lookup/song.ts diff --git a/server/src/common/db.test.ts b/server/src/utils/db.test.ts similarity index 100% rename from server/src/common/db.test.ts rename to server/src/utils/db.test.ts diff --git a/server/src/common/db.ts b/server/src/utils/db.ts similarity index 100% rename from server/src/common/db.ts rename to server/src/utils/db.ts diff --git a/server/src/common/fetch.ts b/server/src/utils/fetch.ts similarity index 100% rename from server/src/common/fetch.ts rename to server/src/utils/fetch.ts diff --git a/server/src/common/folder.test.ts b/server/src/utils/folder.test.ts similarity index 100% rename from server/src/common/folder.test.ts rename to server/src/utils/folder.test.ts diff --git a/server/src/common/folder.ts b/server/src/utils/folder.ts similarity index 100% rename from server/src/common/folder.ts rename to server/src/utils/folder.ts diff --git a/server/src/common/goal.test.ts b/server/src/utils/goal.test.ts similarity index 100% rename from server/src/common/goal.test.ts rename to server/src/utils/goal.test.ts diff --git a/server/src/common/goal.ts b/server/src/utils/goal.ts similarity index 100% rename from server/src/common/goal.ts rename to server/src/utils/goal.ts diff --git a/server/src/common/logger.test.ts b/server/src/utils/logger.test.ts similarity index 100% rename from server/src/common/logger.test.ts rename to server/src/utils/logger.test.ts diff --git a/server/src/common/logger.ts b/server/src/utils/logger.ts similarity index 100% rename from server/src/common/logger.ts rename to server/src/utils/logger.ts diff --git a/server/src/common/milestone.ts b/server/src/utils/milestone.ts similarity index 100% rename from server/src/common/milestone.ts rename to server/src/utils/milestone.ts diff --git a/server/src/common/multer.ts b/server/src/utils/multer.ts similarity index 100% rename from server/src/common/multer.ts rename to server/src/utils/multer.ts diff --git a/server/src/common/prudence.ts b/server/src/utils/prudence.ts similarity index 100% rename from server/src/common/prudence.ts rename to server/src/utils/prudence.ts diff --git a/server/src/common/scores.ts b/server/src/utils/scores.ts similarity index 100% rename from server/src/common/scores.ts rename to server/src/utils/scores.ts diff --git a/server/src/common/session.test.ts b/server/src/utils/session.test.ts similarity index 100% rename from server/src/common/session.test.ts rename to server/src/utils/session.test.ts diff --git a/server/src/common/session.ts b/server/src/utils/session.ts similarity index 100% rename from server/src/common/session.ts rename to server/src/utils/session.ts diff --git a/server/src/common/tierlist.ts b/server/src/utils/tierlist.ts similarity index 100% rename from server/src/common/tierlist.ts rename to server/src/utils/tierlist.ts diff --git a/server/src/common/types.ts b/server/src/utils/types.ts similarity index 100% rename from server/src/common/types.ts rename to server/src/utils/types.ts diff --git a/server/src/common/user.test.ts b/server/src/utils/user.test.ts similarity index 100% rename from server/src/common/user.test.ts rename to server/src/utils/user.test.ts diff --git a/server/src/common/user.ts b/server/src/utils/user.ts similarity index 100% rename from server/src/common/user.ts rename to server/src/utils/user.ts diff --git a/server/src/common/util.test.ts b/server/src/utils/util.test.ts similarity index 100% rename from server/src/common/util.test.ts rename to server/src/utils/util.test.ts diff --git a/server/src/common/util.ts b/server/src/utils/util.ts similarity index 100% rename from server/src/common/util.ts rename to server/src/utils/util.ts From ae5f8a7e08588776cb7a27df5b96df4e9c131529 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:09:09 +0100 Subject: [PATCH 07/19] de-utils a lot of stuff --- .../framework/milestones/milestones.ts | 39 +++++++++++++++++- .../import-types/ir/usc/converter.ts | 2 +- .../import-types/ir/usc/parser.ts | 2 +- .../middleware/multer-upload.ts} | 2 +- .../router/api/auth}/auth.test.ts | 8 ++-- .../{utils => server/router/api/auth}/auth.ts | 12 +++--- server/src/server/router/api/auth/router.ts | 2 +- server/src/server/router/api/import/router.ts | 2 +- server/src/server/router/ir/usc/router.ts | 4 +- .../ir/usc/{common.test.ts => usc.test.ts} | 2 +- .../router/ir/usc/{common.ts => usc.ts} | 0 server/src/utils/milestone.ts | 40 +------------------ 12 files changed, 58 insertions(+), 57 deletions(-) rename server/src/{utils/multer.ts => server/middleware/multer-upload.ts} (96%) rename server/src/{utils => server/router/api/auth}/auth.test.ts (89%) rename server/src/{utils => server/router/api/auth}/auth.ts (89%) rename server/src/server/router/ir/usc/{common.test.ts => usc.test.ts} (99%) rename server/src/server/router/ir/usc/{common.ts => usc.ts} (100%) diff --git a/server/src/score-import/framework/milestones/milestones.ts b/server/src/score-import/framework/milestones/milestones.ts index 88fd9a605..2bd98e22e 100644 --- a/server/src/score-import/framework/milestones/milestones.ts +++ b/server/src/score-import/framework/milestones/milestones.ts @@ -6,10 +6,47 @@ import { GoalImportInfo, UserMilestoneDocument, MilestoneImportInfo, + MilestoneDocument, } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { ProcessMilestoneFromGII } from "../../../utils/milestone"; import { BulkWriteUpdateOneOperation } from "mongodb"; +import { CalculateMilestoneOutOf, GetGoalIDsFromMilestone } from "../../../utils/milestone"; + +/** + * Processes and updates a user's milestones from their Goal Import Info (i.e. what is returned + * about goals from imports) + */ +export function ProcessMilestoneFromGII( + milestone: MilestoneDocument, + gii: Map +) { + const goalIDs = GetGoalIDsFromMilestone(milestone); + + let progress = 0; + + for (const goalID of goalIDs) { + const userInfo = gii.get(goalID); + + if (!userInfo) { + continue; + } + + if (!userInfo.achieved) { + continue; + } + + progress++; + } + + const outOf = CalculateMilestoneOutOf(milestone, goalIDs); + + // milestone achieved! + if (progress >= outOf) { + return { achieved: true, progress }; + } + + return { achieved: false, progress }; +} export async function UpdateUsersMilestones( importGoalInfo: GoalImportInfo[], diff --git a/server/src/score-import/import-types/ir/usc/converter.ts b/server/src/score-import/import-types/ir/usc/converter.ts index 3c68504ec..62b2e306f 100644 --- a/server/src/score-import/import-types/ir/usc/converter.ts +++ b/server/src/score-import/import-types/ir/usc/converter.ts @@ -1,4 +1,4 @@ -import { USCClientScore } from "../../../../server/router/ir/usc/common"; +import { USCClientScore } from "../../../../server/router/ir/usc/usc"; import { FindSongOnID } from "../../../../utils/database-lookup/song"; import { KtLogger } from "../../../../utils/types"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/score-import/import-types/ir/usc/parser.ts b/server/src/score-import/import-types/ir/usc/parser.ts index 708e1279a..5b6bd13c8 100644 --- a/server/src/score-import/import-types/ir/usc/parser.ts +++ b/server/src/score-import/import-types/ir/usc/parser.ts @@ -3,7 +3,7 @@ import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { FormatPrError } from "../../../../utils/prudence"; -import { USCClientScore } from "../../../../server/router/ir/usc/common"; +import { USCClientScore } from "../../../../server/router/ir/usc/usc"; import { IRUSCContext } from "./types"; import { ConverterIRUSC } from "./converter"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/utils/multer.ts b/server/src/server/middleware/multer-upload.ts similarity index 96% rename from server/src/utils/multer.ts rename to server/src/server/middleware/multer-upload.ts index e70895c3f..505f065a3 100644 --- a/server/src/utils/multer.ts +++ b/server/src/server/middleware/multer-upload.ts @@ -2,7 +2,7 @@ import { RequestHandler } from "express"; import multer, { MulterError } from "multer"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../../utils/logger"; const defaultLogger = CreateLogCtx(__filename); diff --git a/server/src/utils/auth.test.ts b/server/src/server/router/api/auth/auth.test.ts similarity index 89% rename from server/src/utils/auth.test.ts rename to server/src/server/router/api/auth/auth.test.ts index 410ec8c75..89080136c 100644 --- a/server/src/utils/auth.test.ts +++ b/server/src/server/router/api/auth/auth.test.ts @@ -7,12 +7,12 @@ import { ValidateCaptcha, } from "./auth"; import t from "tap"; -import db, { CloseMongoConnection } from "../external/mongo/db"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; import { PrivateUserDocument } from "kamaitachi-common"; -import { prAssert } from "../test-utils/asserts"; +import { prAssert } from "../../../../test-utils/asserts"; import Prudence from "prudence"; -import ResetDBState from "../test-utils/reset-db-state"; -import { MockFetch } from "../test-utils/mock-fetch"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { MockFetch } from "../../../../test-utils/mock-fetch"; t.test("#CreateAPIKey", (t) => { t.match( diff --git a/server/src/utils/auth.ts b/server/src/server/router/api/auth/auth.ts similarity index 89% rename from server/src/utils/auth.ts rename to server/src/server/router/api/auth/auth.ts index 5f6cf6a28..088538d48 100644 --- a/server/src/utils/auth.ts +++ b/server/src/server/router/api/auth/auth.ts @@ -6,13 +6,13 @@ import { PublicAPIKeyDocument, PublicUserDocument, } from "kamaitachi-common"; -import db from "../external/mongo/db"; -import { GetNextCounterValue } from "./db"; import { InsertResult } from "monk"; -import CreateLogCtx from "./logger"; -import { FormatUserDoc } from "./user"; -import nodeFetch from "./fetch"; -import { CAPTCHA_SECRET_KEY } from "../secrets"; +import { CAPTCHA_SECRET_KEY } from "../../../../example-secrets"; +import db from "../../../../external/mongo/db"; +import { GetNextCounterValue } from "../../../../utils/db"; +import CreateLogCtx from "../../../../utils/logger"; +import { FormatUserDoc } from "../../../../utils/user"; +import nodeFetch from "../../../../utils/fetch"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/api/auth/router.ts b/server/src/server/router/api/auth/router.ts index 18f8a1e57..2e90f3032 100644 --- a/server/src/server/router/api/auth/router.ts +++ b/server/src/server/router/api/auth/router.ts @@ -7,7 +7,7 @@ import { ReinstateInvite, ValidatePassword, ValidateCaptcha, -} from "../../../../utils/auth"; +} from "./auth"; import { FormatUserDoc, GetUserCaseInsensitive, diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index b0c9a6630..2c7958319 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -9,7 +9,7 @@ import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../score-import/framework/score-importing/score-import-error"; import { KtLogger } from "../../../../utils/types"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; -import { CreateMulterSingleUploadMiddleware } from "../../../../utils/multer"; +import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 1c15b2c83..788a19699 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -10,13 +10,13 @@ import { } from "kamaitachi-common"; import { AssertStrAsPositiveNonZeroInt } from "../../../../score-import/framework/common/string-asserts"; import CreateLogCtx from "../../../../utils/logger"; -import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./common"; +import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../utils/user"; import { KtLogger } from "../../../../utils/types"; import { ParseIRUSC } from "../../../../score-import/import-types/ir/usc/parser"; import { USCIR_MAX_LEADERBOARD_N } from "../../../../constants/usc-ir"; -import { CreateMulterSingleUploadMiddleware } from "../../../../utils/multer"; +import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/common.test.ts b/server/src/server/router/ir/usc/usc.test.ts similarity index 99% rename from server/src/server/router/ir/usc/common.test.ts rename to server/src/server/router/ir/usc/usc.test.ts index 2aa2daa14..d69390e4d 100644 --- a/server/src/server/router/ir/usc/common.test.ts +++ b/server/src/server/router/ir/usc/usc.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; import ResetDBState from "../../../../test-utils/reset-db-state"; -import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./common"; +import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; import { ChartDocument, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import deepmerge from "deepmerge"; diff --git a/server/src/server/router/ir/usc/common.ts b/server/src/server/router/ir/usc/usc.ts similarity index 100% rename from server/src/server/router/ir/usc/common.ts rename to server/src/server/router/ir/usc/usc.ts diff --git a/server/src/utils/milestone.ts b/server/src/utils/milestone.ts index e4ecdd700..84b89880d 100644 --- a/server/src/utils/milestone.ts +++ b/server/src/utils/milestone.ts @@ -1,46 +1,10 @@ import { MilestoneDocument, integer, GoalImportInfo } from "kamaitachi-common"; -/** - * Processes and updates a user's milestones from their Goal Import Info (i.e. what is returned - * about goals from imports) - */ -export function ProcessMilestoneFromGII( - milestone: MilestoneDocument, - gii: Map -) { - const goalIDs = GetGoalIDsFromMilestone(milestone); - - let progress = 0; - - for (const goalID of goalIDs) { - const userInfo = gii.get(goalID); - - if (!userInfo) { - continue; - } - - if (!userInfo.achieved) { - continue; - } - - progress++; - } - - const outOf = CalculateMilestoneOutOf(milestone, goalIDs); - - // milestone achieved! - if (progress >= outOf) { - return { achieved: true, progress }; - } - - return { achieved: false, progress }; -} - /** * Retrieves the goalID documents in a single array from the * nested structure of milestones. */ -function GetGoalIDsFromMilestone(milestone: MilestoneDocument) { +export function GetGoalIDsFromMilestone(milestone: MilestoneDocument) { // this sucks - maybe a nicer way to do this, because nested // maps are just ugly return milestone.milestoneData.map((e) => e.goals.map((e) => e.goalID)).flat(1); @@ -50,7 +14,7 @@ function GetGoalIDsFromMilestone(milestone: MilestoneDocument) { * Work out how many goals need to be achieved for this * milestone to be considered completed. */ -function CalculateMilestoneOutOf(milestone: MilestoneDocument, goalIDs: string[]): integer { +export function CalculateMilestoneOutOf(milestone: MilestoneDocument, goalIDs: string[]): integer { if (milestone.criteria.type === "all") { return goalIDs.length; } else if (milestone.criteria.type === "abs") { From 776b2072fe67585c5cc5edd2990a94bd049c1751 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:13:47 +0100 Subject: [PATCH 08/19] Move charts/songs to queries Fixes #132 --- .../framework/pb/game-specific-merge.ts | 2 +- .../import-types/ir/fervidex/converter.ts | 4 ++-- .../import-types/ir/usc/converter.ts | 2 +- server/src/server/router/ir/usc/router.ts | 2 +- .../chart.ts => queries/charts.ts} | 0 .../song.ts => queries/songs.ts} | 0 server/src/utils/user.ts | 19 ++----------------- 7 files changed, 7 insertions(+), 22 deletions(-) rename server/src/utils/{database-lookup/chart.ts => queries/charts.ts} (100%) rename server/src/utils/{database-lookup/song.ts => queries/songs.ts} (100%) diff --git a/server/src/score-import/framework/pb/game-specific-merge.ts b/server/src/score-import/framework/pb/game-specific-merge.ts index a8d86de83..b5e8e1d3f 100644 --- a/server/src/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/score-import/framework/pb/game-specific-merge.ts @@ -1,5 +1,5 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { FindChartWithChartID } from "../../../utils/database-lookup/chart"; +import { FindChartWithChartID } from "../../../utils/queries/charts"; import db from "../../../external/mongo/db"; import { KtLogger } from "../../../utils/types"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; diff --git a/server/src/score-import/import-types/ir/fervidex/converter.ts b/server/src/score-import/import-types/ir/fervidex/converter.ts index ad9521c2b..c941de735 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.ts +++ b/server/src/score-import/import-types/ir/fervidex/converter.ts @@ -1,4 +1,4 @@ -import { FindSongOnID } from "../../../../utils/database-lookup/song"; +import { FindSongOnID } from "../../../../utils/queries/songs"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, @@ -10,7 +10,7 @@ import { Lamps, Difficulties, Playtypes } from "kamaitachi-common"; import { FindIIDXChartOnInGameIDVersion, FindIIDXChartWith2DXtraHash, -} from "../../../../utils/database-lookup/chart"; +} from "../../../../utils/queries/charts"; import { ConverterFunction } from "../../common/types"; import { DryScore } from "../../../framework/common/types"; diff --git a/server/src/score-import/import-types/ir/usc/converter.ts b/server/src/score-import/import-types/ir/usc/converter.ts index 62b2e306f..f5fd58f43 100644 --- a/server/src/score-import/import-types/ir/usc/converter.ts +++ b/server/src/score-import/import-types/ir/usc/converter.ts @@ -1,5 +1,5 @@ import { USCClientScore } from "../../../../server/router/ir/usc/usc"; -import { FindSongOnID } from "../../../../utils/database-lookup/song"; +import { FindSongOnID } from "../../../../utils/queries/songs"; import { KtLogger } from "../../../../utils/types"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 788a19699..8635ce61f 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -1,5 +1,5 @@ import { Router, RequestHandler } from "express"; -import { FindChartOnSHA256 } from "../../../../utils/database-lookup/chart"; +import { FindChartOnSHA256 } from "../../../../utils/queries/charts"; import { SYMBOL_KtchiData } from "../../../../constants/ktchi"; import db from "../../../../external/mongo/db"; import { diff --git a/server/src/utils/database-lookup/chart.ts b/server/src/utils/queries/charts.ts similarity index 100% rename from server/src/utils/database-lookup/chart.ts rename to server/src/utils/queries/charts.ts diff --git a/server/src/utils/database-lookup/song.ts b/server/src/utils/queries/songs.ts similarity index 100% rename from server/src/utils/database-lookup/song.ts rename to server/src/utils/queries/songs.ts diff --git a/server/src/utils/user.ts b/server/src/utils/user.ts index 714f57e55..44111c81b 100644 --- a/server/src/utils/user.ts +++ b/server/src/utils/user.ts @@ -103,29 +103,14 @@ export function ResolveUser(usernameOrID: string) { if (usernameOrID.match(/^[0-9]$/u)) { const intID = Number(usernameOrID); - return db.users.findOne( - { - id: intID, - }, - { - projection: OMIT_PRIVATE_USER_RETURNS, - } - ); + return GetUserWithID(intID); } - return db.users.findOne( - { - usernameLowercase: usernameOrID, - }, - { - projection: OMIT_PRIVATE_USER_RETURNS, - } - ); + return GetUserCaseInsensitive(usernameOrID); } /** * Returns a formatted string indicating the user. This is used for logging. - * (This is not in user.ts to avoid a circular reference issue with logger.ts<->db.ts) * @param userdoc The user document to format. */ export function FormatUserDoc(userdoc: PublicUserDocument) { From 4925f5064ed5d8a25812d9e4787a52fc2dcb8605 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:16:23 +0100 Subject: [PATCH 09/19] move logger to dedicated folder --- server/src/external/mongo/db.ts | 2 +- server/src/external/redis/redis-store.ts | 2 +- server/src/{utils => logger}/logger.test.ts | 0 server/src/{utils => logger}/logger.ts | 0 server/src/main.ts | 2 +- .../framework/calculated-data/calculated-data.test.ts | 2 +- .../framework/calculated-data/game-specific-stats.test.ts | 2 +- .../framework/calculated-data/game-specific.test.ts | 2 +- server/src/score-import/framework/common/import-logger.ts | 2 +- server/src/score-import/framework/common/score-utils.ts | 2 +- server/src/score-import/framework/goals/goals.test.ts | 2 +- server/src/score-import/framework/milestones/milestones.test.ts | 2 +- server/src/score-import/framework/pb/create-pb-doc.test.ts | 2 +- server/src/score-import/framework/pb/process-pbs.test.ts | 2 +- .../src/score-import/framework/score-importing/insert-score.ts | 2 +- .../score-import/framework/score-importing/score-importing.ts | 2 +- server/src/score-import/framework/sessions/sessions.ts | 2 +- .../src/score-import/framework/user-game-stats/classes.test.ts | 2 +- .../src/score-import/framework/user-game-stats/rating.test.ts | 2 +- .../score-import/framework/user-game-stats/update-ugs.test.ts | 2 +- .../import-types/common/batch-manual/converter.test.ts | 2 +- .../import-types/common/batch-manual/parser.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/converter.test.ts | 2 +- .../src/score-import/import-types/file/mer-iidx/parser.test.ts | 2 +- .../import-types/file/solid-state-squad/converter.test.ts | 2 +- .../import-types/file/solid-state-squad/parser.test.ts | 2 +- .../src/score-import/import-types/ir/fervidex/converter.test.ts | 2 +- server/src/server/middleware/multer-upload.ts | 2 +- server/src/server/middleware/prudence-validate.ts | 2 +- server/src/server/middleware/require-logged-in.ts | 2 +- server/src/server/router/api/auth/auth.ts | 2 +- server/src/server/router/api/auth/router.ts | 2 +- server/src/server/router/api/import/router.ts | 2 +- server/src/server/router/ir/direct-manual/router.ts | 2 +- server/src/server/router/ir/fervidex/router.ts | 2 +- server/src/server/router/ir/usc/router.ts | 2 +- server/src/server/router/ir/usc/usc.ts | 2 +- server/src/server/server.ts | 2 +- server/src/test-utils/fake-session.ts | 2 +- server/src/test-utils/mock-api.ts | 2 +- server/src/test-utils/reset-db-state.ts | 2 +- 43 files changed, 41 insertions(+), 41 deletions(-) rename server/src/{utils => logger}/logger.test.ts (100%) rename server/src/{utils => logger}/logger.ts (100%) diff --git a/server/src/external/mongo/db.ts b/server/src/external/mongo/db.ts index 66968466e..14bf7c052 100644 --- a/server/src/external/mongo/db.ts +++ b/server/src/external/mongo/db.ts @@ -26,7 +26,7 @@ import { UserMilestoneDocument, } from "kamaitachi-common"; import monk from "monk"; -import CreateLogCtx from "../../utils/logger"; +import CreateLogCtx from "../../logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/external/redis/redis-store.ts b/server/src/external/redis/redis-store.ts index 2b94de719..69ddbd955 100644 --- a/server/src/external/redis/redis-store.ts +++ b/server/src/external/redis/redis-store.ts @@ -1,6 +1,6 @@ import connectRedis from "connect-redis"; import expressSession from "express-session"; -import CreateLogCtx from "../../utils/logger"; +import CreateLogCtx from "../../logger/logger"; import redis from "redis"; const logger = CreateLogCtx(__filename); diff --git a/server/src/utils/logger.test.ts b/server/src/logger/logger.test.ts similarity index 100% rename from server/src/utils/logger.test.ts rename to server/src/logger/logger.test.ts diff --git a/server/src/utils/logger.ts b/server/src/logger/logger.ts similarity index 100% rename from server/src/utils/logger.ts rename to server/src/logger/logger.ts diff --git a/server/src/main.ts b/server/src/main.ts index 0ca598dd0..b0fa91bf0 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -11,7 +11,7 @@ function FormatVersion() { return `v${[major, minor, patch].join(".")} (${name})`; } -import CreateLogCtx from "./utils/logger"; +import CreateLogCtx from "./logger/logger"; import server from "./server/server"; import serverConfig from "./server/server-config"; import dotenv from "dotenv"; diff --git a/server/src/score-import/framework/calculated-data/calculated-data.test.ts b/server/src/score-import/framework/calculated-data/calculated-data.test.ts index 6071f52f7..e04e2d8e0 100644 --- a/server/src/score-import/framework/calculated-data/calculated-data.test.ts +++ b/server/src/score-import/framework/calculated-data/calculated-data.test.ts @@ -1,7 +1,7 @@ import Pr from "prudence"; import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import { prAssert } from "../../../test-utils/asserts"; import { Testing511SPA, diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts b/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts index ae55e1ee0..309d1ad12 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts +++ b/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts @@ -11,7 +11,7 @@ import { CalculateVF5, KaidenPercentile, } from "./game-specific-stats"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import { isApproximately } from "../../../test-utils/asserts"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/calculated-data/game-specific.test.ts b/server/src/score-import/framework/calculated-data/game-specific.test.ts index 6307d7e31..56e1dd25d 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.test.ts +++ b/server/src/score-import/framework/calculated-data/game-specific.test.ts @@ -1,7 +1,7 @@ import Pr from "prudence"; import t from "tap"; import { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import { prAssert } from "../../../test-utils/asserts"; import { Testing511SPA, diff --git a/server/src/score-import/framework/common/import-logger.ts b/server/src/score-import/framework/common/import-logger.ts index 55d73707f..b193daabe 100644 --- a/server/src/score-import/framework/common/import-logger.ts +++ b/server/src/score-import/framework/common/import-logger.ts @@ -1,7 +1,7 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; import { FormatUserDoc } from "../../../utils/user"; -import { rootLogger } from "../../../utils/logger"; +import { rootLogger } from "../../../logger/logger"; import { KtLogger } from "../../../utils/types"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { diff --git a/server/src/score-import/framework/common/score-utils.ts b/server/src/score-import/framework/common/score-utils.ts index 0e09e3448..2a99b2b9f 100644 --- a/server/src/score-import/framework/common/score-utils.ts +++ b/server/src/score-import/framework/common/score-utils.ts @@ -10,7 +10,7 @@ import { Playtypes, } from "kamaitachi-common"; import { judgementWindows, gamePercentMax } from "kamaitachi-common/js/config"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import { InternalFailure, InvalidScoreFailure } from "./converter-failures"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/goals/goals.test.ts b/server/src/score-import/framework/goals/goals.test.ts index a00d5bee2..cdceb211e 100644 --- a/server/src/score-import/framework/goals/goals.test.ts +++ b/server/src/score-import/framework/goals/goals.test.ts @@ -19,7 +19,7 @@ import { TestingIIDXFolderSP10, } from "../../../test-utils/test-data"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/milestones/milestones.test.ts b/server/src/score-import/framework/milestones/milestones.test.ts index 6efd9870a..ef930913a 100644 --- a/server/src/score-import/framework/milestones/milestones.test.ts +++ b/server/src/score-import/framework/milestones/milestones.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { TestingIIDXSPMilestone } from "../../../test-utils/test-data"; import { UpdateUsersMilestones } from "./milestones"; diff --git a/server/src/score-import/framework/pb/create-pb-doc.test.ts b/server/src/score-import/framework/pb/create-pb-doc.test.ts index 5044264fa..4045aece7 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.test.ts @@ -4,7 +4,7 @@ import ResetDBState from "../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import { KtLogger } from "../../../utils/types"; import { lamps } from "kamaitachi-common/js/config"; diff --git a/server/src/score-import/framework/pb/process-pbs.test.ts b/server/src/score-import/framework/pb/process-pbs.test.ts index b0335f293..f6a3f0a18 100644 --- a/server/src/score-import/framework/pb/process-pbs.test.ts +++ b/server/src/score-import/framework/pb/process-pbs.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; import { ProcessPBs } from "./process-pbs"; diff --git a/server/src/score-import/framework/score-importing/insert-score.ts b/server/src/score-import/framework/score-importing/insert-score.ts index 9cd7ae431..bd9430371 100644 --- a/server/src/score-import/framework/score-importing/insert-score.ts +++ b/server/src/score-import/framework/score-importing/insert-score.ts @@ -1,6 +1,6 @@ import { ScoreDocument } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; const logger = CreateLogCtx(__filename); const ScoreQueue: ScoreDocument[] = []; diff --git a/server/src/score-import/framework/score-importing/score-importing.ts b/server/src/score-import/framework/score-importing/score-importing.ts index 8db4070e2..816404cbd 100644 --- a/server/src/score-import/framework/score-importing/score-importing.ts +++ b/server/src/score-import/framework/score-importing/score-importing.ts @@ -17,7 +17,7 @@ import { } from "../common/converter-failures"; import { CreateScoreID } from "./score-id"; import db from "../../../external/mongo/db"; -import { AppendLogCtx } from "../../../utils/logger"; +import { AppendLogCtx } from "../../../logger/logger"; import { KtLogger } from "../../../utils/types"; import { ConverterFunctionReturns, diff --git a/server/src/score-import/framework/sessions/sessions.ts b/server/src/score-import/framework/sessions/sessions.ts index 3f582333c..195c50872 100644 --- a/server/src/score-import/framework/sessions/sessions.ts +++ b/server/src/score-import/framework/sessions/sessions.ts @@ -10,7 +10,7 @@ import { Game, } from "kamaitachi-common"; import db from "../../../external/mongo/db"; -import { AppendLogCtx } from "../../../utils/logger"; +import { AppendLogCtx } from "../../../logger/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; diff --git a/server/src/score-import/framework/user-game-stats/classes.test.ts b/server/src/score-import/framework/user-game-stats/classes.test.ts index 3765df7f1..c8c9c5dfe 100644 --- a/server/src/score-import/framework/user-game-stats/classes.test.ts +++ b/server/src/score-import/framework/user-game-stats/classes.test.ts @@ -1,7 +1,7 @@ import { UserGameStats } from "kamaitachi-common"; import t from "tap"; import { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { CalculateClassDeltas, UpdateUGSClasses } from "./classes"; diff --git a/server/src/score-import/framework/user-game-stats/rating.test.ts b/server/src/score-import/framework/user-game-stats/rating.test.ts index 745dd70e4..7a82e2ac4 100644 --- a/server/src/score-import/framework/user-game-stats/rating.test.ts +++ b/server/src/score-import/framework/user-game-stats/rating.test.ts @@ -4,7 +4,7 @@ import ResetDBState from "../../../test-utils/reset-db-state"; import { TestingIIDXSPScorePB } from "../../../test-utils/test-data"; import { CalculateCustomRatings, CalculateRatings } from "./rating"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts b/server/src/score-import/framework/user-game-stats/update-ugs.test.ts index 14c207999..22f095ded 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts +++ b/server/src/score-import/framework/user-game-stats/update-ugs.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../utils/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { UpdateUsersGamePlaytypeStats } from "./update-ugs"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/score-import/import-types/common/batch-manual/converter.test.ts index faa7b21a9..a4c7abc4e 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/converter.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/score-import/import-types/common/batch-manual/parser.test.ts index 89c47bf5a..5bcfd7648 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/parser.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; import { BatchManual } from "./types"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts index 887e24213..0c5430b45 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import ConverterFn, { EamScoreConverter, EamScoreConverterWrapper } from "./converter"; import p from "prudence"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts index baf62add3..b880cd53f 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts +++ b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import GenericParseEamIIDXCSV, { NaiveCSVParse, ResolveHeaders } from "./parser"; import { CloseMongoConnection } from "../../../../external/mongo/db"; diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts index a787a71f8..83989d463 100644 --- a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts +++ b/server/src/score-import/import-types/file/mer-iidx/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts b/server/src/score-import/import-types/file/mer-iidx/parser.test.ts index 021cdc07f..71094d312 100644 --- a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts +++ b/server/src/score-import/import-types/file/mer-iidx/parser.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataBuffer, GetKTDataJSON } from "../../../../test-utils/test-data"; diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts index 480c8092c..028d69431 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, diff --git a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts index 1562a8193..8cf961a35 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import { GetMilisecondsSince } from "../../../../utils/util"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataBuffer } from "../../../../test-utils/test-data"; diff --git a/server/src/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/score-import/import-types/ir/fervidex/converter.test.ts index 756462c9c..e65a3ef3c 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.test.ts +++ b/server/src/score-import/import-types/ir/fervidex/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; import { InternalFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/server/middleware/multer-upload.ts b/server/src/server/middleware/multer-upload.ts index 505f065a3..31b26054a 100644 --- a/server/src/server/middleware/multer-upload.ts +++ b/server/src/server/middleware/multer-upload.ts @@ -2,7 +2,7 @@ import { RequestHandler } from "express"; import multer, { MulterError } from "multer"; -import CreateLogCtx from "../../utils/logger"; +import CreateLogCtx from "../../logger/logger"; const defaultLogger = CreateLogCtx(__filename); diff --git a/server/src/server/middleware/prudence-validate.ts b/server/src/server/middleware/prudence-validate.ts index a7232a115..fb90cbf82 100644 --- a/server/src/server/middleware/prudence-validate.ts +++ b/server/src/server/middleware/prudence-validate.ts @@ -1,5 +1,5 @@ import Prudence, { MiddlewareErrorHandler } from "prudence"; -import CreateLogCtx from "../../utils/logger"; +import CreateLogCtx from "../../logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/middleware/require-logged-in.ts b/server/src/server/middleware/require-logged-in.ts index 160d776b2..3aa515d17 100644 --- a/server/src/server/middleware/require-logged-in.ts +++ b/server/src/server/middleware/require-logged-in.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import CreateLogCtx from "../../utils/logger"; +import CreateLogCtx from "../../logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/api/auth/auth.ts b/server/src/server/router/api/auth/auth.ts index 088538d48..d0647488b 100644 --- a/server/src/server/router/api/auth/auth.ts +++ b/server/src/server/router/api/auth/auth.ts @@ -10,7 +10,7 @@ import { InsertResult } from "monk"; import { CAPTCHA_SECRET_KEY } from "../../../../example-secrets"; import db from "../../../../external/mongo/db"; import { GetNextCounterValue } from "../../../../utils/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { FormatUserDoc } from "../../../../utils/user"; import nodeFetch from "../../../../utils/fetch"; diff --git a/server/src/server/router/api/auth/router.ts b/server/src/server/router/api/auth/router.ts index 2e90f3032..d8e8ac650 100644 --- a/server/src/server/router/api/auth/router.ts +++ b/server/src/server/router/api/auth/router.ts @@ -15,7 +15,7 @@ import { } from "../../../../utils/user"; import db from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index 2c7958319..b474f37af 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -3,7 +3,7 @@ import { FileUploadImportTypes } from "kamaitachi-common"; import { fileImportTypes } from "kamaitachi-common/js/config"; import Prudence from "prudence"; import { GetUserWithIDGuaranteed } from "../../../../utils/user"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../score-import/framework/score-importing/score-import-error"; diff --git a/server/src/server/router/ir/direct-manual/router.ts b/server/src/server/router/ir/direct-manual/router.ts index 88addc63d..c1a799981 100644 --- a/server/src/server/router/ir/direct-manual/router.ts +++ b/server/src/server/router/ir/direct-manual/router.ts @@ -1,6 +1,6 @@ import { Router } from "express"; import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../../utils/user"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import ParseDirectManual from "../../../../score-import/import-types/ir/direct-manual/parser"; diff --git a/server/src/server/router/ir/fervidex/router.ts b/server/src/server/router/ir/fervidex/router.ts index 1b98b2229..8818d5a5e 100644 --- a/server/src/server/router/ir/fervidex/router.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -8,7 +8,7 @@ import { ExpressWrappedScoreImportMain } from "../../../../score-import/framewor import { ParseFervidexStatic } from "../../../../score-import/import-types/ir/fervidex-static/parser"; import { ParseFervidexSingle } from "../../../../score-import/import-types/ir/fervidex/parser"; import { Playtypes } from "kamaitachi-common"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { FERVIDEX_COURSE_LOOKUP } from "../../../../score-import/import-types/ir/fervidex-static/class-handler"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 8635ce61f..756fd46a8 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -9,7 +9,7 @@ import { ImportDocument, } from "kamaitachi-common"; import { AssertStrAsPositiveNonZeroInt } from "../../../../score-import/framework/common/string-asserts"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../utils/user"; diff --git a/server/src/server/router/ir/usc/usc.ts b/server/src/server/router/ir/usc/usc.ts index 98ac86c8a..3e30ab5ff 100644 --- a/server/src/server/router/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/usc.ts @@ -1,5 +1,5 @@ import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitachi-common"; -import CreateLogCtx from "../../../../utils/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { GetPBOnChart, GetServerRecordOnChart } from "../../../../utils/scores"; import { MStoS } from "../../../../utils/util"; import { USCIR_ADJACENT_SCORE_N } from "../../../../constants/usc-ir"; diff --git a/server/src/server/server.ts b/server/src/server/server.ts index c2488c858..e43d48fe4 100644 --- a/server/src/server/server.ts +++ b/server/src/server/server.ts @@ -1,6 +1,6 @@ import express, { Express } from "express"; import "express-async-errors"; -import CreateLogCtx from "../utils/logger"; +import CreateLogCtx from "../logger/logger"; import expressSession from "express-session"; import { SESSION_SECRET } from "../secrets"; import { integer } from "kamaitachi-common"; diff --git a/server/src/test-utils/fake-session.ts b/server/src/test-utils/fake-session.ts index 3e8008b69..9577ca0c2 100644 --- a/server/src/test-utils/fake-session.ts +++ b/server/src/test-utils/fake-session.ts @@ -1,5 +1,5 @@ import ResetDBState from "./reset-db-state"; -import CreateLogCtx from "../utils/logger"; +import CreateLogCtx from "../logger/logger"; import supertest from "supertest"; const logger = CreateLogCtx(__filename); diff --git a/server/src/test-utils/mock-api.ts b/server/src/test-utils/mock-api.ts index e1666c3ba..0e8ba77a2 100644 --- a/server/src/test-utils/mock-api.ts +++ b/server/src/test-utils/mock-api.ts @@ -1,5 +1,5 @@ import supertest from "supertest"; -import CreateLogCtx from "../utils/logger"; +import CreateLogCtx from "../logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/test-utils/reset-db-state.ts b/server/src/test-utils/reset-db-state.ts index bfb11fb70..be99967cf 100644 --- a/server/src/test-utils/reset-db-state.ts +++ b/server/src/test-utils/reset-db-state.ts @@ -4,7 +4,7 @@ import db from "../external/mongo/db"; import fs from "fs"; import path from "path"; -import CreateLogCtx from "../utils/logger"; +import CreateLogCtx from "../logger/logger"; const logger = CreateLogCtx(__filename); From 6adf035622dadb6306bba96da12c7b0ffe80c4cc Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:16:40 +0100 Subject: [PATCH 10/19] fix invalid import in logger.ts --- server/src/logger/logger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/logger/logger.ts b/server/src/logger/logger.ts index 2718671b8..4afb39be3 100644 --- a/server/src/logger/logger.ts +++ b/server/src/logger/logger.ts @@ -1,5 +1,5 @@ import winston, { format, transports } from "winston"; -import { KtLogger } from "./types"; +import { KtLogger } from "../utils/types"; const level = process.env.LOG_LEVEL ?? "info"; From af05f1c9b1c218cda7aa77a2192eff05bbcaca2e Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:17:16 +0100 Subject: [PATCH 11/19] fix more broken imports --- server/src/logger/logger.test.ts | 2 +- server/src/main.ts | 2 +- server/src/utils/class.ts | 2 +- server/src/utils/db.ts | 2 +- server/src/utils/folder.test.ts | 2 +- server/src/utils/folder.ts | 2 +- server/src/utils/goal.test.ts | 2 +- server/src/utils/tierlist.ts | 2 +- server/src/utils/user.ts | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/src/logger/logger.test.ts b/server/src/logger/logger.test.ts index b3ee53231..229ab4b89 100644 --- a/server/src/logger/logger.test.ts +++ b/server/src/logger/logger.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import { CloseMongoConnection } from "../external/mongo/db"; -import CreateLogCtx, { Transports } from "./logger"; +import CreateLogCtx, { Transports } from "../logger/logger"; t.test("Logger Tests", (t) => { const logger = CreateLogCtx(__filename); diff --git a/server/src/main.ts b/server/src/main.ts index b0fa91bf0..43675ff97 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -11,7 +11,7 @@ function FormatVersion() { return `v${[major, minor, patch].join(".")} (${name})`; } -import CreateLogCtx from "./logger/logger"; +import CreateLogCtx from "../logger/logger/logger"; import server from "./server/server"; import serverConfig from "./server/server-config"; import dotenv from "dotenv"; diff --git a/server/src/utils/class.ts b/server/src/utils/class.ts index 2485defa8..08130efd6 100644 --- a/server/src/utils/class.ts +++ b/server/src/utils/class.ts @@ -1,7 +1,7 @@ import { Game, integer, Playtypes, UserGameStats } from "kamaitachi-common"; import { ClassData, gameClassValues } from "kamaitachi-common/js/game-classes"; import db from "../external/mongo/db"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/utils/db.ts b/server/src/utils/db.ts index a00cae05e..90121e6f1 100644 --- a/server/src/utils/db.ts +++ b/server/src/utils/db.ts @@ -1,5 +1,5 @@ import db from "../external/mongo/db"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../logger/logger"; const logger = CreateLogCtx(__filename); import { integer } from "kamaitachi-common"; diff --git a/server/src/utils/folder.test.ts b/server/src/utils/folder.test.ts index fbe5b429b..d4b695b5f 100644 --- a/server/src/utils/folder.test.ts +++ b/server/src/utils/folder.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../logger/logger"; import { Testing511SPA } from "../test-utils/test-data"; import { ChartDocument, FolderDocument } from "kamaitachi-common"; import { diff --git a/server/src/utils/folder.ts b/server/src/utils/folder.ts index ee99623bb..76ab9b82a 100644 --- a/server/src/utils/folder.ts +++ b/server/src/utils/folder.ts @@ -1,5 +1,5 @@ import db from "../external/mongo/db"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../logger/logger"; import { FolderDocument, AnyChartDocument, AnySongDocument } from "kamaitachi-common"; import { FilterQuery } from "mongodb"; import deepmerge from "deepmerge"; diff --git a/server/src/utils/goal.test.ts b/server/src/utils/goal.test.ts index 1019ce0f1..45c1d7f79 100644 --- a/server/src/utils/goal.test.ts +++ b/server/src/utils/goal.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../external/mongo/db"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../logger/logger"; import ResetDBState from "../test-utils/reset-db-state"; import { EvaluateGoalForUser } from "./goal"; import { GoalDocument } from "kamaitachi-common"; diff --git a/server/src/utils/tierlist.ts b/server/src/utils/tierlist.ts index b451f5718..4d18e3cfc 100644 --- a/server/src/utils/tierlist.ts +++ b/server/src/utils/tierlist.ts @@ -1,7 +1,7 @@ import crypto from "crypto"; import { AnyChartDocument, Game, Playtypes } from "kamaitachi-common"; import db from "../external/mongo/db"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/utils/user.ts b/server/src/utils/user.ts index 44111c81b..1cea21d0c 100644 --- a/server/src/utils/user.ts +++ b/server/src/utils/user.ts @@ -1,7 +1,7 @@ import { integer, PublicUserDocument } from "kamaitachi-common"; import { FindOneResult } from "monk"; import db from "../external/mongo/db"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "../logger/logger"; const logger = CreateLogCtx(__filename); From c9efa5715090f5cb043a2d72c046176a9ae8ecb3 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:17:32 +0100 Subject: [PATCH 12/19] (and more) --- server/src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main.ts b/server/src/main.ts index 43675ff97..b0fa91bf0 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -11,7 +11,7 @@ function FormatVersion() { return `v${[major, minor, patch].join(".")} (${name})`; } -import CreateLogCtx from "../logger/logger/logger"; +import CreateLogCtx from "./logger/logger"; import server from "./server/server"; import serverConfig from "./server/server-config"; import dotenv from "dotenv"; From c52cf36adf03e4892b5c80cb73639f9e70cb01c3 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:18:40 +0100 Subject: [PATCH 13/19] move ea3id --- .../import-types/ir/fervidex/parser.ts | 2 +- .../src/server/router/ir/fervidex/router.ts | 2 +- server/src/server/server.ts | 2 +- server/src/utils/ea3id.ts | 19 ++++++++++++++++++ server/src/utils/util.ts | 20 ------------------- 5 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 server/src/utils/ea3id.ts diff --git a/server/src/score-import/import-types/ir/fervidex/parser.ts b/server/src/score-import/import-types/ir/fervidex/parser.ts index cb31032cf..ae0a21235 100644 --- a/server/src/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/score-import/import-types/ir/fervidex/parser.ts @@ -4,7 +4,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { FormatPrError, optNull } from "../../../../utils/prudence"; import { FervidexContext, FervidexScore } from "./types"; import { ConverterIRFervidex } from "./converter"; -import { ParseEA3SoftID } from "../../../../utils/util"; +import { ParseEA3SoftID } from "../../../../utils/ea3id"; import { EXT_HEROIC_VERSE, MODEL_IIDX, diff --git a/server/src/server/router/ir/fervidex/router.ts b/server/src/server/router/ir/fervidex/router.ts index 8818d5a5e..c3188bdf6 100644 --- a/server/src/server/router/ir/fervidex/router.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -1,7 +1,7 @@ import { Router, RequestHandler } from "express"; import { UpdateClassIfGreater } from "../../../../utils/class"; import { GetUserWithIDGuaranteed } from "../../../../utils/user"; -import { ParseEA3SoftID } from "../../../../utils/util"; +import { ParseEA3SoftID } from "../../../../utils/ea3id"; import { EXT_HEROIC_VERSE, MODEL_INFINITAS_2, REV_2DXBMS } from "../../../../constants/ea3id"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; diff --git a/server/src/server/server.ts b/server/src/server/server.ts index e43d48fe4..e07ce01ec 100644 --- a/server/src/server/server.ts +++ b/server/src/server/server.ts @@ -52,7 +52,7 @@ app.use(express.json({ limit: "1mb" })); import mainRouter from "./router/router"; -app.use("/", apiRouter); +app.use("/", mainRouter); /** * If any user gets to this point, we send them index.html and let react router do the routing (and 404ing) diff --git a/server/src/utils/ea3id.ts b/server/src/utils/ea3id.ts new file mode 100644 index 000000000..54476f48a --- /dev/null +++ b/server/src/utils/ea3id.ts @@ -0,0 +1,19 @@ +export function ParseEA3SoftID(ver: string) { + const a = ver.split(":"); + + if (a.length !== 5) { + throw new Error(`Invalid Version Code. Had ${a.length} components.`); + } + + if (!ver.match(/^[A-Z0-9]{3}:[A-Z]:[A-Z]:[A-Z]:[0-9]{10}$/u)) { + throw new Error(`Invalid Version Code.`); + } + + return { + model: a[0], + dest: a[1], // region + spec: a[2], + rev: a[3], + ext: a[4], + }; +} diff --git a/server/src/utils/util.ts b/server/src/utils/util.ts index 2c516fe07..27c030b53 100644 --- a/server/src/utils/util.ts +++ b/server/src/utils/util.ts @@ -15,26 +15,6 @@ export function EscapeStringRegexp(string: string) { return string.replace(/[|\\{}()[\]^$+*?.]/gu, "\\$&").replace(/-/gu, "\\x2d"); } -export function ParseEA3SoftID(ver: string) { - const a = ver.split(":"); - - if (a.length !== 5) { - throw new Error(`Invalid Version Code. Had ${a.length} components.`); - } - - if (!ver.match(/^[A-Z0-9]{3}:[A-Z]:[A-Z]:[A-Z]:[0-9]{10}$/u)) { - throw new Error(`Invalid Version Code.`); - } - - return { - model: a[0], - dest: a[1], // region - spec: a[2], - rev: a[3], - ext: a[4], - }; -} - /** * Takes a process.hrtime.bigint(), and returns the miliseconds elapsed since it. * This function will not work if more than 100(ish) days have passed since the first reference. From 47247d6024f943b9ed0dee0cd9c82b7cc72ac848 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:57:34 +0100 Subject: [PATCH 14/19] Move score-import to lib/score-import --- .../calculated-data/calculated-data.test.ts | 12 ++++++------ .../framework/calculated-data/calculated-data.ts | 4 ++-- .../calculated-data/game-specific-stats.test.ts | 6 +++--- .../calculated-data/game-specific-stats.ts | 4 ++-- .../calculated-data/game-specific.test.ts | 8 ++++---- .../framework/calculated-data/game-specific.ts | 4 ++-- .../framework/common/converter-failures.ts | 0 .../framework/common/import-logger.test.ts | 2 +- .../score-import/framework/common/import-logger.ts | 6 +++--- .../score-import/framework/common/score-utils.ts | 2 +- .../framework/common/string-asserts.test.ts | 0 .../framework/common/string-asserts.ts | 0 .../score-import/framework/common/types.ts | 0 .../score-import/framework/express-wrapper.ts | 0 .../score-import/framework/goals/goals.test.ts | 10 +++++----- .../score-import/framework/goals/goals.ts | 6 +++--- .../framework/milestones/milestones.test.ts | 8 ++++---- .../framework/milestones/milestones.ts | 6 +++--- .../framework/pb/create-pb-doc.test.ts | 10 +++++----- .../score-import/framework/pb/create-pb-doc.ts | 4 ++-- .../framework/pb/game-specific-merge.ts | 6 +++--- .../score-import/framework/pb/process-pbs.test.ts | 8 ++++---- .../score-import/framework/pb/process-pbs.ts | 4 ++-- .../score-import/framework/score-import-main.ts | 6 +++--- .../score-importing/hydrate-score.test.ts | 0 .../framework/score-importing/hydrate-score.ts | 2 +- .../framework/score-importing/insert-score.test.ts | 4 ++-- .../framework/score-importing/insert-score.ts | 4 ++-- .../framework/score-importing/score-id.test.ts | 6 +++--- .../framework/score-importing/score-id.ts | 2 +- .../score-importing/score-import-error.test.ts | 0 .../score-importing/score-import-error.ts | 0 .../score-importing/score-importing.test.ts | 0 .../framework/score-importing/score-importing.ts | 6 +++--- .../framework/sessions/name-generation.test.ts | 0 .../framework/sessions/name-generation.ts | 2 +- .../framework/sessions/performance-calc.test.ts | 0 .../framework/sessions/performance-calc.ts | 0 .../framework/sessions/sessions.test.ts | 0 .../score-import/framework/sessions/sessions.ts | 8 ++++---- .../user-game-stats/builtin-class-handlers.test.ts | 0 .../user-game-stats/builtin-class-handlers.ts | 0 .../framework/user-game-stats/classes.test.ts | 6 +++--- .../framework/user-game-stats/classes.ts | 4 ++-- .../framework/user-game-stats/rating.test.ts | 8 ++++---- .../framework/user-game-stats/rating.ts | 4 ++-- .../framework/user-game-stats/update-ugs.test.ts | 8 ++++---- .../framework/user-game-stats/update-ugs.ts | 4 ++-- .../score-import/import-types/DOCUMENTATION | 0 .../import-types/api/eag-iidx/parser.ts | 2 +- .../import-types/api/eag-sdvx/parser.ts | 2 +- .../import-types/api/flo-iidx/parser.ts | 2 +- .../import-types/api/flo-sdvx/parser.ts | 2 +- .../import-types/common/api-kai/iidx/converter.ts | 6 +++--- .../import-types/common/api-kai/iidx/parser.ts | 6 +++--- .../import-types/common/api-kai/sdvx/converter.ts | 6 +++--- .../import-types/common/api-kai/sdvx/parser.ts | 6 +++--- .../import-types/common/api-kai/traverse-api.ts | 4 ++-- .../import-types/common/api-kai/types.ts | 0 .../common/batch-manual/converter.test.ts | 10 +++++----- .../import-types/common/batch-manual/converter.ts | 8 ++++---- .../common/batch-manual/parser.test.ts | 6 +++--- .../import-types/common/batch-manual/parser.ts | 4 ++-- .../import-types/common/batch-manual/types.ts | 0 .../common/eamusement-iidx-csv/converter.test.ts | 8 ++++---- .../common/eamusement-iidx-csv/converter.ts | 6 +++--- .../common/eamusement-iidx-csv/parser.test.ts | 8 ++++---- .../common/eamusement-iidx-csv/parser.ts | 2 +- .../common/eamusement-iidx-csv/types.ts | 0 .../score-import/import-types/common/types.ts | 2 +- .../import-types/file/batch-manual/parser.ts | 2 +- .../file/eamusement-iidx-csv/parser.ts | 2 +- .../import-types/file/mer-iidx/converter.test.ts | 8 ++++---- .../import-types/file/mer-iidx/converter.ts | 6 +++--- .../import-types/file/mer-iidx/parser.test.ts | 10 +++++----- .../import-types/file/mer-iidx/parser.ts | 4 ++-- .../import-types/file/mer-iidx/types.ts | 0 .../import-types/file/pli-iidx-csv/parser.ts | 2 +- .../file/solid-state-squad/converter.test.ts | 8 ++++---- .../file/solid-state-squad/converter.ts | 6 +++--- .../file/solid-state-squad/parser.test.ts | 12 ++++++------ .../import-types/file/solid-state-squad/parser.ts | 4 ++-- .../import-types/file/solid-state-squad/types.ts | 0 .../import-types/ir/barbatos/converter.ts | 6 +++--- .../import-types/ir/barbatos/parser.ts | 4 ++-- .../score-import/import-types/ir/barbatos/types.ts | 0 .../import-types/ir/direct-manual/parser.ts | 2 +- .../ir/fervidex-static/class-handler.ts | 0 .../import-types/ir/fervidex-static/converter.ts | 4 ++-- .../import-types/ir/fervidex-static/parser.ts | 4 ++-- .../import-types/ir/fervidex-static/types.ts | 0 .../import-types/ir/fervidex/converter.test.ts | 8 ++++---- .../import-types/ir/fervidex/converter.ts | 4 ++-- .../import-types/ir/fervidex/parser.ts | 8 ++++---- .../score-import/import-types/ir/fervidex/types.ts | 0 .../score-import/import-types/ir/usc/converter.ts | 8 ++++---- .../score-import/import-types/ir/usc/parser.ts | 6 +++--- .../score-import/import-types/ir/usc/types.ts | 0 server/src/server/router/api/import/router.ts | 14 +++++++------- server/src/server/router/ir/barbatos/router.ts | 4 ++-- server/src/server/router/ir/chunitachi/router.ts | 4 ++-- .../src/server/router/ir/direct-manual/router.ts | 4 ++-- server/src/server/router/ir/fervidex/router.ts | 8 ++++---- server/src/server/router/ir/usc/router.ts | 6 +++--- server/src/test-utils/test-data.ts | 4 ++-- 105 files changed, 218 insertions(+), 218 deletions(-) rename server/src/{ => lib}/score-import/framework/calculated-data/calculated-data.test.ts (92%) rename server/src/{ => lib}/score-import/framework/calculated-data/calculated-data.ts (95%) rename server/src/{ => lib}/score-import/framework/calculated-data/game-specific-stats.test.ts (94%) rename server/src/{ => lib}/score-import/framework/calculated-data/game-specific-stats.ts (95%) rename server/src/{ => lib}/score-import/framework/calculated-data/game-specific.test.ts (89%) rename server/src/{ => lib}/score-import/framework/calculated-data/game-specific.ts (92%) rename server/src/{ => lib}/score-import/framework/common/converter-failures.ts (100%) rename server/src/{ => lib}/score-import/framework/common/import-logger.test.ts (90%) rename server/src/{ => lib}/score-import/framework/common/import-logger.ts (79%) rename server/src/{ => lib}/score-import/framework/common/score-utils.ts (95%) rename server/src/{ => lib}/score-import/framework/common/string-asserts.test.ts (100%) rename server/src/{ => lib}/score-import/framework/common/string-asserts.ts (100%) rename server/src/{ => lib}/score-import/framework/common/types.ts (100%) rename server/src/{ => lib}/score-import/framework/express-wrapper.ts (100%) rename server/src/{ => lib}/score-import/framework/goals/goals.test.ts (97%) rename server/src/{ => lib}/score-import/framework/goals/goals.ts (97%) rename server/src/{ => lib}/score-import/framework/milestones/milestones.test.ts (97%) rename server/src/{ => lib}/score-import/framework/milestones/milestones.ts (97%) rename server/src/{ => lib}/score-import/framework/pb/create-pb-doc.test.ts (94%) rename server/src/{ => lib}/score-import/framework/pb/create-pb-doc.ts (98%) rename server/src/{ => lib}/score-import/framework/pb/game-specific-merge.ts (95%) rename server/src/{ => lib}/score-import/framework/pb/process-pbs.test.ts (86%) rename server/src/{ => lib}/score-import/framework/pb/process-pbs.ts (94%) rename server/src/{ => lib}/score-import/framework/score-import-main.ts (95%) rename server/src/{ => lib}/score-import/framework/score-importing/hydrate-score.test.ts (100%) rename server/src/{ => lib}/score-import/framework/score-importing/hydrate-score.ts (94%) rename server/src/{ => lib}/score-import/framework/score-importing/insert-score.test.ts (92%) rename server/src/{ => lib}/score-import/framework/score-importing/insert-score.ts (90%) rename server/src/{ => lib}/score-import/framework/score-importing/score-id.test.ts (89%) rename server/src/{ => lib}/score-import/framework/score-importing/score-id.ts (93%) rename server/src/{ => lib}/score-import/framework/score-importing/score-import-error.test.ts (100%) rename server/src/{ => lib}/score-import/framework/score-importing/score-import-error.ts (100%) rename server/src/{ => lib}/score-import/framework/score-importing/score-importing.test.ts (100%) rename server/src/{ => lib}/score-import/framework/score-importing/score-importing.ts (95%) rename server/src/{ => lib}/score-import/framework/sessions/name-generation.test.ts (100%) rename server/src/{ => lib}/score-import/framework/sessions/name-generation.ts (71%) rename server/src/{ => lib}/score-import/framework/sessions/performance-calc.test.ts (100%) rename server/src/{ => lib}/score-import/framework/sessions/performance-calc.ts (100%) rename server/src/{ => lib}/score-import/framework/sessions/sessions.test.ts (100%) rename server/src/{ => lib}/score-import/framework/sessions/sessions.ts (97%) rename server/src/{ => lib}/score-import/framework/user-game-stats/builtin-class-handlers.test.ts (100%) rename server/src/{ => lib}/score-import/framework/user-game-stats/builtin-class-handlers.ts (100%) rename server/src/{ => lib}/score-import/framework/user-game-stats/classes.test.ts (94%) rename server/src/{ => lib}/score-import/framework/user-game-stats/classes.ts (98%) rename server/src/{ => lib}/score-import/framework/user-game-stats/rating.test.ts (94%) rename server/src/{ => lib}/score-import/framework/user-game-stats/rating.ts (98%) rename server/src/{ => lib}/score-import/framework/user-game-stats/update-ugs.test.ts (95%) rename server/src/{ => lib}/score-import/framework/user-game-stats/update-ugs.ts (95%) rename server/src/{ => lib}/score-import/import-types/DOCUMENTATION (100%) rename server/src/{ => lib}/score-import/import-types/api/eag-iidx/parser.ts (81%) rename server/src/{ => lib}/score-import/import-types/api/eag-sdvx/parser.ts (81%) rename server/src/{ => lib}/score-import/import-types/api/flo-iidx/parser.ts (81%) rename server/src/{ => lib}/score-import/import-types/api/flo-sdvx/parser.ts (81%) rename server/src/{ => lib}/score-import/import-types/common/api-kai/iidx/converter.ts (93%) rename server/src/{ => lib}/score-import/import-types/common/api-kai/iidx/parser.ts (80%) rename server/src/{ => lib}/score-import/import-types/common/api-kai/sdvx/converter.ts (94%) rename server/src/{ => lib}/score-import/import-types/common/api-kai/sdvx/parser.ts (80%) rename server/src/{ => lib}/score-import/import-types/common/api-kai/traverse-api.ts (96%) rename server/src/{ => lib}/score-import/import-types/common/api-kai/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/common/batch-manual/converter.test.ts (97%) rename server/src/{ => lib}/score-import/import-types/common/batch-manual/converter.ts (96%) rename server/src/{ => lib}/score-import/import-types/common/batch-manual/parser.test.ts (98%) rename server/src/{ => lib}/score-import/import-types/common/batch-manual/parser.ts (97%) rename server/src/{ => lib}/score-import/import-types/common/batch-manual/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts (97%) rename server/src/{ => lib}/score-import/import-types/common/eamusement-iidx-csv/converter.ts (94%) rename server/src/{ => lib}/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts (97%) rename server/src/{ => lib}/score-import/import-types/common/eamusement-iidx-csv/parser.ts (95%) rename server/src/{ => lib}/score-import/import-types/common/eamusement-iidx-csv/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/common/types.ts (98%) rename server/src/{ => lib}/score-import/import-types/file/batch-manual/parser.ts (95%) rename server/src/{ => lib}/score-import/import-types/file/eamusement-iidx-csv/parser.ts (88%) rename server/src/{ => lib}/score-import/import-types/file/mer-iidx/converter.test.ts (93%) rename server/src/{ => lib}/score-import/import-types/file/mer-iidx/converter.ts (91%) rename server/src/{ => lib}/score-import/import-types/file/mer-iidx/parser.test.ts (92%) rename server/src/{ => lib}/score-import/import-types/file/mer-iidx/parser.ts (93%) rename server/src/{ => lib}/score-import/import-types/file/mer-iidx/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/file/pli-iidx-csv/parser.ts (88%) rename server/src/{ => lib}/score-import/import-types/file/solid-state-squad/converter.test.ts (96%) rename server/src/{ => lib}/score-import/import-types/file/solid-state-squad/converter.ts (95%) rename server/src/{ => lib}/score-import/import-types/file/solid-state-squad/parser.test.ts (94%) rename server/src/{ => lib}/score-import/import-types/file/solid-state-squad/parser.ts (95%) rename server/src/{ => lib}/score-import/import-types/file/solid-state-squad/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/ir/barbatos/converter.ts (92%) rename server/src/{ => lib}/score-import/import-types/ir/barbatos/parser.ts (91%) rename server/src/{ => lib}/score-import/import-types/ir/barbatos/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/ir/direct-manual/parser.ts (92%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex-static/class-handler.ts (100%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex-static/converter.ts (93%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex-static/parser.ts (96%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex-static/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex/converter.test.ts (96%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex/converter.ts (98%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex/parser.ts (94%) rename server/src/{ => lib}/score-import/import-types/ir/fervidex/types.ts (100%) rename server/src/{ => lib}/score-import/import-types/ir/usc/converter.ts (93%) rename server/src/{ => lib}/score-import/import-types/ir/usc/parser.ts (87%) rename server/src/{ => lib}/score-import/import-types/ir/usc/types.ts (100%) diff --git a/server/src/score-import/framework/calculated-data/calculated-data.test.ts b/server/src/lib/score-import/framework/calculated-data/calculated-data.test.ts similarity index 92% rename from server/src/score-import/framework/calculated-data/calculated-data.test.ts rename to server/src/lib/score-import/framework/calculated-data/calculated-data.test.ts index e04e2d8e0..002ed71d7 100644 --- a/server/src/score-import/framework/calculated-data/calculated-data.test.ts +++ b/server/src/lib/score-import/framework/calculated-data/calculated-data.test.ts @@ -1,18 +1,18 @@ import Pr from "prudence"; import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../logger/logger"; -import { prAssert } from "../../../test-utils/asserts"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../logger/logger"; +import { prAssert } from "../../../../test-utils/asserts"; import { Testing511SPA, TestingDoraChart, TestingGITADORADoraDryScore, TestingIIDXSPDryScore, -} from "../../../test-utils/test-data"; +} from "../../../../test-utils/test-data"; import { CreateCalculatedData, CalculateLampRating, CalculateRating } from "./calculated-data"; import deepmerge from "deepmerge"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { GetDefaultTierlist } from "../../../utils/tierlist"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { GetDefaultTierlist } from "../../../../utils/tierlist"; const mockLogger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/calculated-data/calculated-data.ts b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts similarity index 95% rename from server/src/score-import/framework/calculated-data/calculated-data.ts rename to server/src/lib/score-import/framework/calculated-data/calculated-data.ts index edf8eb454..3f17a60be 100644 --- a/server/src/score-import/framework/calculated-data/calculated-data.ts +++ b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts @@ -4,8 +4,8 @@ import { GetAllTierlistDataOfType, GetDefaultTierlist, GetOneTierlistData, -} from "../../../utils/tierlist"; -import { KtLogger } from "../../../utils/types"; +} from "../../../../utils/tierlist"; +import { KtLogger } from "../../../../utils/types"; import { DryScore } from "../common/types"; import { CreateGameSpecific } from "./game-specific"; import { CalculateCHUNITHMRating, CalculateGITADORARating } from "./game-specific-stats"; diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.test.ts similarity index 94% rename from server/src/score-import/framework/calculated-data/game-specific-stats.test.ts rename to server/src/lib/score-import/framework/calculated-data/game-specific-stats.test.ts index 309d1ad12..fb2048c0c 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import { CloseMongoConnection } from "../../../external/mongo/db"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; import { AnyChartDocument, Difficulties, Lamps, ScoreDocument } from "kamaitachi-common"; import { CalculateBPI, @@ -11,8 +11,8 @@ import { CalculateVF5, KaidenPercentile, } from "./game-specific-stats"; -import CreateLogCtx from "../../../logger/logger"; -import { isApproximately } from "../../../test-utils/asserts"; +import CreateLogCtx from "../../../../logger/logger"; +import { isApproximately } from "../../../../test-utils/asserts"; import { DryScore } from "../common/types"; t.test("#CalculateBPI", (t) => { diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.ts b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts similarity index 95% rename from server/src/score-import/framework/calculated-data/game-specific-stats.ts rename to server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts index d1eba73ea..73369ad9e 100644 --- a/server/src/score-import/framework/calculated-data/game-specific-stats.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ESDCore, integer, Grades, Lamps } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../utils/types"; +import db from "../../../../external/mongo/db"; +import { KtLogger } from "../../../../utils/types"; import { DryScore } from "../common/types"; /** diff --git a/server/src/score-import/framework/calculated-data/game-specific.test.ts b/server/src/lib/score-import/framework/calculated-data/game-specific.test.ts similarity index 89% rename from server/src/score-import/framework/calculated-data/game-specific.test.ts rename to server/src/lib/score-import/framework/calculated-data/game-specific.test.ts index 56e1dd25d..79d124bba 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.test.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific.test.ts @@ -1,13 +1,13 @@ import Pr from "prudence"; import t from "tap"; -import { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../logger/logger"; -import { prAssert } from "../../../test-utils/asserts"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../logger/logger"; +import { prAssert } from "../../../../test-utils/asserts"; import { Testing511SPA, TestingIIDXSPDryScore, TestingSDVXSingleDryScore, -} from "../../../test-utils/test-data"; +} from "../../../../test-utils/test-data"; import { CreateGameSpecific } from "./game-specific"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/calculated-data/game-specific.ts b/server/src/lib/score-import/framework/calculated-data/game-specific.ts similarity index 92% rename from server/src/score-import/framework/calculated-data/game-specific.ts rename to server/src/lib/score-import/framework/calculated-data/game-specific.ts index cf3767c7b..197433334 100644 --- a/server/src/score-import/framework/calculated-data/game-specific.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ChartDocument, Game, Playtypes, Grades, Lamps } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../utils/types"; +import db from "../../../../external/mongo/db"; +import { KtLogger } from "../../../../utils/types"; import { DryScore } from "../common/types"; import { CalculateBPI, diff --git a/server/src/score-import/framework/common/converter-failures.ts b/server/src/lib/score-import/framework/common/converter-failures.ts similarity index 100% rename from server/src/score-import/framework/common/converter-failures.ts rename to server/src/lib/score-import/framework/common/converter-failures.ts diff --git a/server/src/score-import/framework/common/import-logger.test.ts b/server/src/lib/score-import/framework/common/import-logger.test.ts similarity index 90% rename from server/src/score-import/framework/common/import-logger.test.ts rename to server/src/lib/score-import/framework/common/import-logger.test.ts index 0f5e1f997..2ca9905ae 100644 --- a/server/src/score-import/framework/common/import-logger.test.ts +++ b/server/src/lib/score-import/framework/common/import-logger.test.ts @@ -1,7 +1,7 @@ import t from "tap"; import { CreateImportLoggerAndID } from "./import-logger"; import { PublicUserDocument } from "kamaitachi-common"; -import { CloseMongoConnection } from "../../../external/mongo/db"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; t.test("#CreateImportLoggerAndID", (t) => { const { importID, logger } = CreateImportLoggerAndID( diff --git a/server/src/score-import/framework/common/import-logger.ts b/server/src/lib/score-import/framework/common/import-logger.ts similarity index 79% rename from server/src/score-import/framework/common/import-logger.ts rename to server/src/lib/score-import/framework/common/import-logger.ts index b193daabe..4abce84a3 100644 --- a/server/src/score-import/framework/common/import-logger.ts +++ b/server/src/lib/score-import/framework/common/import-logger.ts @@ -1,8 +1,8 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; -import { FormatUserDoc } from "../../../utils/user"; -import { rootLogger } from "../../../logger/logger"; -import { KtLogger } from "../../../utils/types"; +import { FormatUserDoc } from "../../../../utils/user"; +import { rootLogger } from "../../../../logger/logger"; +import { KtLogger } from "../../../../utils/types"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { const importID = crypto.randomBytes(20).toString("hex"); diff --git a/server/src/score-import/framework/common/score-utils.ts b/server/src/lib/score-import/framework/common/score-utils.ts similarity index 95% rename from server/src/score-import/framework/common/score-utils.ts rename to server/src/lib/score-import/framework/common/score-utils.ts index 2a99b2b9f..5f10e0d95 100644 --- a/server/src/score-import/framework/common/score-utils.ts +++ b/server/src/lib/score-import/framework/common/score-utils.ts @@ -10,7 +10,7 @@ import { Playtypes, } from "kamaitachi-common"; import { judgementWindows, gamePercentMax } from "kamaitachi-common/js/config"; -import CreateLogCtx from "../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { InternalFailure, InvalidScoreFailure } from "./converter-failures"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/common/string-asserts.test.ts b/server/src/lib/score-import/framework/common/string-asserts.test.ts similarity index 100% rename from server/src/score-import/framework/common/string-asserts.test.ts rename to server/src/lib/score-import/framework/common/string-asserts.test.ts diff --git a/server/src/score-import/framework/common/string-asserts.ts b/server/src/lib/score-import/framework/common/string-asserts.ts similarity index 100% rename from server/src/score-import/framework/common/string-asserts.ts rename to server/src/lib/score-import/framework/common/string-asserts.ts diff --git a/server/src/score-import/framework/common/types.ts b/server/src/lib/score-import/framework/common/types.ts similarity index 100% rename from server/src/score-import/framework/common/types.ts rename to server/src/lib/score-import/framework/common/types.ts diff --git a/server/src/score-import/framework/express-wrapper.ts b/server/src/lib/score-import/framework/express-wrapper.ts similarity index 100% rename from server/src/score-import/framework/express-wrapper.ts rename to server/src/lib/score-import/framework/express-wrapper.ts diff --git a/server/src/score-import/framework/goals/goals.test.ts b/server/src/lib/score-import/framework/goals/goals.test.ts similarity index 97% rename from server/src/score-import/framework/goals/goals.test.ts rename to server/src/lib/score-import/framework/goals/goals.test.ts index cdceb211e..eaaf97662 100644 --- a/server/src/score-import/framework/goals/goals.test.ts +++ b/server/src/lib/score-import/framework/goals/goals.test.ts @@ -1,6 +1,6 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import ResetDBState from "../../../test-utils/reset-db-state"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetRelevantFolderGoals, GetRelevantGoals, @@ -9,7 +9,7 @@ import { ProcessGoal, } from "./goals"; import { GoalDocument, UserGoalDocument } from "kamaitachi-common"; -import { CreateFolderChartLookup } from "../../../utils/folder"; +import { CreateFolderChartLookup } from "../../../../utils/folder"; import { GetKTDataJSON, Testing511SPA, @@ -17,9 +17,9 @@ import { HC511Goal, HC511UserGoal, TestingIIDXFolderSP10, -} from "../../../test-utils/test-data"; +} from "../../../../test-utils/test-data"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/goals/goals.ts b/server/src/lib/score-import/framework/goals/goals.ts similarity index 97% rename from server/src/score-import/framework/goals/goals.ts rename to server/src/lib/score-import/framework/goals/goals.ts index c14c57649..757c2b6b5 100644 --- a/server/src/score-import/framework/goals/goals.ts +++ b/server/src/lib/score-import/framework/goals/goals.ts @@ -1,7 +1,7 @@ import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; -import { EvaluateGoalForUser } from "../../../utils/goal"; -import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../utils/types"; +import { EvaluateGoalForUser } from "../../../../utils/goal"; +import db from "../../../../external/mongo/db"; +import { KtLogger } from "../../../../utils/types"; /** * Update a user's progress on all of their set goals. diff --git a/server/src/score-import/framework/milestones/milestones.test.ts b/server/src/lib/score-import/framework/milestones/milestones.test.ts similarity index 97% rename from server/src/score-import/framework/milestones/milestones.test.ts rename to server/src/lib/score-import/framework/milestones/milestones.test.ts index ef930913a..e5d60f922 100644 --- a/server/src/score-import/framework/milestones/milestones.test.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.test.ts @@ -1,8 +1,8 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../logger/logger"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { TestingIIDXSPMilestone } from "../../../test-utils/test-data"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../logger/logger"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { TestingIIDXSPMilestone } from "../../../../test-utils/test-data"; import { UpdateUsersMilestones } from "./milestones"; import { GoalImportInfo } from "kamaitachi-common"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/framework/milestones/milestones.ts b/server/src/lib/score-import/framework/milestones/milestones.ts similarity index 97% rename from server/src/score-import/framework/milestones/milestones.ts rename to server/src/lib/score-import/framework/milestones/milestones.ts index 2bd98e22e..73910f6e9 100644 --- a/server/src/score-import/framework/milestones/milestones.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../utils/types"; +import { KtLogger } from "../../../../utils/types"; import { integer, Game, @@ -8,9 +8,9 @@ import { MilestoneImportInfo, MilestoneDocument, } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; +import db from "../../../../external/mongo/db"; import { BulkWriteUpdateOneOperation } from "mongodb"; -import { CalculateMilestoneOutOf, GetGoalIDsFromMilestone } from "../../../utils/milestone"; +import { CalculateMilestoneOutOf, GetGoalIDsFromMilestone } from "../../../../utils/milestone"; /** * Processes and updates a user's milestones from their Goal Import Info (i.e. what is returned diff --git a/server/src/score-import/framework/pb/create-pb-doc.test.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts similarity index 94% rename from server/src/score-import/framework/pb/create-pb-doc.test.ts rename to server/src/lib/score-import/framework/pb/create-pb-doc.test.ts index 4045aece7..4f7fcc089 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts @@ -1,11 +1,11 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../../test-utils/test-data"; import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../logger/logger"; -import { KtLogger } from "../../../utils/types"; +import CreateLogCtx from "../../../../logger/logger"; +import { KtLogger } from "../../../../utils/types"; import { lamps } from "kamaitachi-common/js/config"; let IIDXScore = TestingIIDXSPScore; diff --git a/server/src/score-import/framework/pb/create-pb-doc.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.ts similarity index 98% rename from server/src/score-import/framework/pb/create-pb-doc.ts rename to server/src/lib/score-import/framework/pb/create-pb-doc.ts index 1c1981566..5a4a705b7 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.ts @@ -1,7 +1,7 @@ -import db from "../../../external/mongo/db"; +import db from "../../../../external/mongo/db"; import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { KtLogger } from "../../../utils/types"; +import { KtLogger } from "../../../../utils/types"; import { IIDXMergeFn, SDVXMergeFn } from "./game-specific-merge"; import { BulkWriteUpdateOneOperation } from "mongodb"; export type PBScoreDocumentNoRank = Omit; diff --git a/server/src/score-import/framework/pb/game-specific-merge.ts b/server/src/lib/score-import/framework/pb/game-specific-merge.ts similarity index 95% rename from server/src/score-import/framework/pb/game-specific-merge.ts rename to server/src/lib/score-import/framework/pb/game-specific-merge.ts index b5e8e1d3f..08ffe5f47 100644 --- a/server/src/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/lib/score-import/framework/pb/game-specific-merge.ts @@ -1,7 +1,7 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { FindChartWithChartID } from "../../../utils/queries/charts"; -import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../utils/types"; +import { FindChartWithChartID } from "../../../../utils/queries/charts"; +import db from "../../../../external/mongo/db"; +import { KtLogger } from "../../../../utils/types"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; import { InternalFailure } from "../common/converter-failures"; diff --git a/server/src/score-import/framework/pb/process-pbs.test.ts b/server/src/lib/score-import/framework/pb/process-pbs.test.ts similarity index 86% rename from server/src/score-import/framework/pb/process-pbs.test.ts rename to server/src/lib/score-import/framework/pb/process-pbs.test.ts index f6a3f0a18..2f7526d45 100644 --- a/server/src/score-import/framework/pb/process-pbs.test.ts +++ b/server/src/lib/score-import/framework/pb/process-pbs.test.ts @@ -1,8 +1,8 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../logger/logger"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../logger/logger"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { Testing511SPA, TestingIIDXSPScore } from "../../../../test-utils/test-data"; import { ProcessPBs } from "./process-pbs"; import deepmerge from "deepmerge"; import crypto from "crypto"; diff --git a/server/src/score-import/framework/pb/process-pbs.ts b/server/src/lib/score-import/framework/pb/process-pbs.ts similarity index 94% rename from server/src/score-import/framework/pb/process-pbs.ts rename to server/src/lib/score-import/framework/pb/process-pbs.ts index fe4e1ebcf..ded599515 100644 --- a/server/src/score-import/framework/pb/process-pbs.ts +++ b/server/src/lib/score-import/framework/pb/process-pbs.ts @@ -1,6 +1,6 @@ import { integer, PBScoreDocument } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../utils/types"; +import db from "../../../../external/mongo/db"; +import { KtLogger } from "../../../../utils/types"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; export async function ProcessPBs( diff --git a/server/src/score-import/framework/score-import-main.ts b/server/src/lib/score-import/framework/score-import-main.ts similarity index 95% rename from server/src/score-import/framework/score-import-main.ts rename to server/src/lib/score-import/framework/score-import-main.ts index a143515b7..95be6a7ec 100644 --- a/server/src/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -8,14 +8,14 @@ import { integer, IDStrings, } from "kamaitachi-common"; -import { KtLogger } from "../../utils/types"; +import { KtLogger } from "../../../utils/types"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; -import { GetMilisecondsSince } from "../../utils/util"; +import { GetMilisecondsSince } from "../../../utils/util"; import { ProcessPBs } from "./pb/process-pbs"; import { UpdateUsersGamePlaytypeStats } from "./user-game-stats/update-ugs"; -import db from "../../external/mongo/db"; +import db from "../../../external/mongo/db"; import { GetAndUpdateUsersGoals } from "./goals/goals"; import { UpdateUsersMilestones } from "./milestones/milestones"; import { ClassHandler } from "./user-game-stats/classes"; diff --git a/server/src/score-import/framework/score-importing/hydrate-score.test.ts b/server/src/lib/score-import/framework/score-importing/hydrate-score.test.ts similarity index 100% rename from server/src/score-import/framework/score-importing/hydrate-score.test.ts rename to server/src/lib/score-import/framework/score-importing/hydrate-score.test.ts diff --git a/server/src/score-import/framework/score-importing/hydrate-score.ts b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts similarity index 94% rename from server/src/score-import/framework/score-importing/hydrate-score.ts rename to server/src/lib/score-import/framework/score-importing/hydrate-score.ts index 36c610de5..20fca5279 100644 --- a/server/src/score-import/framework/score-importing/hydrate-score.ts +++ b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts @@ -5,7 +5,7 @@ import { ScoreDocument, AnySongDocument, } from "kamaitachi-common"; -import { KtLogger } from "../../../utils/types"; +import { KtLogger } from "../../../../utils/types"; import { CreateCalculatedData } from "../calculated-data/calculated-data"; import { CalculateESDForGame } from "../common/score-utils"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/score-importing/insert-score.test.ts b/server/src/lib/score-import/framework/score-importing/insert-score.test.ts similarity index 92% rename from server/src/score-import/framework/score-importing/insert-score.test.ts rename to server/src/lib/score-import/framework/score-importing/insert-score.test.ts index 64762f592..910519ce6 100644 --- a/server/src/score-import/framework/score-importing/insert-score.test.ts +++ b/server/src/lib/score-import/framework/score-importing/insert-score.test.ts @@ -1,7 +1,7 @@ import { ScoreDocument } from "kamaitachi-common"; import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import ResetDBState from "../../../test-utils/reset-db-state"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import ResetDBState from "../../../../test-utils/reset-db-state"; import { InsertQueue, QueueScoreInsert } from "./insert-score"; // these two get the same tests, because they're too closely linked diff --git a/server/src/score-import/framework/score-importing/insert-score.ts b/server/src/lib/score-import/framework/score-importing/insert-score.ts similarity index 90% rename from server/src/score-import/framework/score-importing/insert-score.ts rename to server/src/lib/score-import/framework/score-importing/insert-score.ts index bd9430371..561426626 100644 --- a/server/src/score-import/framework/score-importing/insert-score.ts +++ b/server/src/lib/score-import/framework/score-importing/insert-score.ts @@ -1,6 +1,6 @@ import { ScoreDocument } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; -import CreateLogCtx from "../../../logger/logger"; +import db from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../logger/logger"; const logger = CreateLogCtx(__filename); const ScoreQueue: ScoreDocument[] = []; diff --git a/server/src/score-import/framework/score-importing/score-id.test.ts b/server/src/lib/score-import/framework/score-importing/score-id.test.ts similarity index 89% rename from server/src/score-import/framework/score-importing/score-id.test.ts rename to server/src/lib/score-import/framework/score-importing/score-id.test.ts index b0834ca5a..7149e6e31 100644 --- a/server/src/score-import/framework/score-importing/score-id.test.ts +++ b/server/src/lib/score-import/framework/score-importing/score-id.test.ts @@ -1,8 +1,8 @@ import { ScoreDocument } from "kamaitachi-common"; import t from "tap"; -import { CloseMongoConnection } from "../../../external/mongo/db"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { Testing511SPA, TestingIIDXSPDryScore } from "../../../test-utils/test-data"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { Testing511SPA, TestingIIDXSPDryScore } from "../../../../test-utils/test-data"; import { CreateScoreID, GetWithScoreID } from "./score-id"; t.beforeEach(ResetDBState); diff --git a/server/src/score-import/framework/score-importing/score-id.ts b/server/src/lib/score-import/framework/score-importing/score-id.ts similarity index 93% rename from server/src/score-import/framework/score-importing/score-id.ts rename to server/src/lib/score-import/framework/score-importing/score-id.ts index 4d9e2eef8..6ec102b1c 100644 --- a/server/src/score-import/framework/score-importing/score-id.ts +++ b/server/src/lib/score-import/framework/score-importing/score-id.ts @@ -1,5 +1,5 @@ import crypto from "crypto"; -import db from "../../../external/mongo/db"; +import db from "../../../../external/mongo/db"; import { integer } from "kamaitachi-common"; import { DryScore } from "../common/types"; diff --git a/server/src/score-import/framework/score-importing/score-import-error.test.ts b/server/src/lib/score-import/framework/score-importing/score-import-error.test.ts similarity index 100% rename from server/src/score-import/framework/score-importing/score-import-error.test.ts rename to server/src/lib/score-import/framework/score-importing/score-import-error.test.ts diff --git a/server/src/score-import/framework/score-importing/score-import-error.ts b/server/src/lib/score-import/framework/score-importing/score-import-error.ts similarity index 100% rename from server/src/score-import/framework/score-importing/score-import-error.ts rename to server/src/lib/score-import/framework/score-importing/score-import-error.ts diff --git a/server/src/score-import/framework/score-importing/score-importing.test.ts b/server/src/lib/score-import/framework/score-importing/score-importing.test.ts similarity index 100% rename from server/src/score-import/framework/score-importing/score-importing.test.ts rename to server/src/lib/score-import/framework/score-importing/score-importing.test.ts diff --git a/server/src/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts similarity index 95% rename from server/src/score-import/framework/score-importing/score-importing.ts rename to server/src/lib/score-import/framework/score-importing/score-importing.ts index 816404cbd..70fb67077 100644 --- a/server/src/score-import/framework/score-importing/score-importing.ts +++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts @@ -16,9 +16,9 @@ import { SkipScoreFailure, } from "../common/converter-failures"; import { CreateScoreID } from "./score-id"; -import db from "../../../external/mongo/db"; -import { AppendLogCtx } from "../../../logger/logger"; -import { KtLogger } from "../../../utils/types"; +import db from "../../../../external/mongo/db"; +import { AppendLogCtx } from "../../../../logger/logger"; +import { KtLogger } from "../../../../utils/types"; import { ConverterFunctionReturns, ConverterFnReturn, diff --git a/server/src/score-import/framework/sessions/name-generation.test.ts b/server/src/lib/score-import/framework/sessions/name-generation.test.ts similarity index 100% rename from server/src/score-import/framework/sessions/name-generation.test.ts rename to server/src/lib/score-import/framework/sessions/name-generation.test.ts diff --git a/server/src/score-import/framework/sessions/name-generation.ts b/server/src/lib/score-import/framework/sessions/name-generation.ts similarity index 71% rename from server/src/score-import/framework/sessions/name-generation.ts rename to server/src/lib/score-import/framework/sessions/name-generation.ts index b6042da4c..ab5304b83 100644 --- a/server/src/score-import/framework/sessions/name-generation.ts +++ b/server/src/lib/score-import/framework/sessions/name-generation.ts @@ -1,4 +1,4 @@ -import { GetRandomAdjective, GetRandomNoun } from "../../../datasets/words"; +import { GetRandomAdjective, GetRandomNoun } from "../../../../datasets/words"; export function GenerateRandomSessionName() { const adj1 = GetRandomAdjective(); diff --git a/server/src/score-import/framework/sessions/performance-calc.test.ts b/server/src/lib/score-import/framework/sessions/performance-calc.test.ts similarity index 100% rename from server/src/score-import/framework/sessions/performance-calc.test.ts rename to server/src/lib/score-import/framework/sessions/performance-calc.test.ts diff --git a/server/src/score-import/framework/sessions/performance-calc.ts b/server/src/lib/score-import/framework/sessions/performance-calc.ts similarity index 100% rename from server/src/score-import/framework/sessions/performance-calc.ts rename to server/src/lib/score-import/framework/sessions/performance-calc.ts diff --git a/server/src/score-import/framework/sessions/sessions.test.ts b/server/src/lib/score-import/framework/sessions/sessions.test.ts similarity index 100% rename from server/src/score-import/framework/sessions/sessions.test.ts rename to server/src/lib/score-import/framework/sessions/sessions.test.ts diff --git a/server/src/score-import/framework/sessions/sessions.ts b/server/src/lib/score-import/framework/sessions/sessions.ts similarity index 97% rename from server/src/score-import/framework/sessions/sessions.ts rename to server/src/lib/score-import/framework/sessions/sessions.ts index 195c50872..71c3cb0b0 100644 --- a/server/src/score-import/framework/sessions/sessions.ts +++ b/server/src/lib/score-import/framework/sessions/sessions.ts @@ -9,13 +9,13 @@ import { SessionInfoReturn, Game, } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; -import { AppendLogCtx } from "../../../logger/logger"; +import db from "../../../../external/mongo/db"; +import { AppendLogCtx } from "../../../../logger/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; -import { GetScoresFromSession } from "../../../utils/session"; -import { KtLogger } from "../../../utils/types"; +import { GetScoresFromSession } from "../../../../utils/session"; +import { KtLogger } from "../../../../utils/types"; import { ScorePlaytypeMap } from "../common/types"; const TWO_HOURS = 1000 * 60 * 60 * 2; diff --git a/server/src/score-import/framework/user-game-stats/builtin-class-handlers.test.ts b/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.test.ts similarity index 100% rename from server/src/score-import/framework/user-game-stats/builtin-class-handlers.test.ts rename to server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.test.ts diff --git a/server/src/score-import/framework/user-game-stats/builtin-class-handlers.ts b/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts similarity index 100% rename from server/src/score-import/framework/user-game-stats/builtin-class-handlers.ts rename to server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts diff --git a/server/src/score-import/framework/user-game-stats/classes.test.ts b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts similarity index 94% rename from server/src/score-import/framework/user-game-stats/classes.test.ts rename to server/src/lib/score-import/framework/user-game-stats/classes.test.ts index c8c9c5dfe..c4594ac22 100644 --- a/server/src/score-import/framework/user-game-stats/classes.test.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts @@ -1,8 +1,8 @@ import { UserGameStats } from "kamaitachi-common"; import t from "tap"; -import { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../logger/logger"; -import ResetDBState from "../../../test-utils/reset-db-state"; +import { CloseMongoConnection } from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../logger/logger"; +import ResetDBState from "../../../../test-utils/reset-db-state"; import { CalculateClassDeltas, UpdateUGSClasses } from "./classes"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/user-game-stats/classes.ts b/server/src/lib/score-import/framework/user-game-stats/classes.ts similarity index 98% rename from server/src/score-import/framework/user-game-stats/classes.ts rename to server/src/lib/score-import/framework/user-game-stats/classes.ts index ad2e561be..06223b33d 100644 --- a/server/src/score-import/framework/user-game-stats/classes.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.ts @@ -1,9 +1,9 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import { gameClassValues } from "kamaitachi-common/js/game-classes"; import deepmerge from "deepmerge"; -import { KtLogger } from "../../../utils/types"; +import { KtLogger } from "../../../../utils/types"; import { CalculateGitadoraColour, CalculateJubeatColour } from "./builtin-class-handlers"; -import { ReturnClassIfGreater } from "../../../utils/class"; +import { ReturnClassIfGreater } from "../../../../utils/class"; export interface ClassHandler { ( diff --git a/server/src/score-import/framework/user-game-stats/rating.test.ts b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts similarity index 94% rename from server/src/score-import/framework/user-game-stats/rating.test.ts rename to server/src/lib/score-import/framework/user-game-stats/rating.test.ts index 7a82e2ac4..d168ec531 100644 --- a/server/src/score-import/framework/user-game-stats/rating.test.ts +++ b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts @@ -1,10 +1,10 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import ResetDBState from "../../../test-utils/reset-db-state"; -import { TestingIIDXSPScorePB } from "../../../test-utils/test-data"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import ResetDBState from "../../../../test-utils/reset-db-state"; +import { TestingIIDXSPScorePB } from "../../../../test-utils/test-data"; import { CalculateCustomRatings, CalculateRatings } from "./rating"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/user-game-stats/rating.ts b/server/src/lib/score-import/framework/user-game-stats/rating.ts similarity index 98% rename from server/src/score-import/framework/user-game-stats/rating.ts rename to server/src/lib/score-import/framework/user-game-stats/rating.ts index 016316fad..ac7f11368 100644 --- a/server/src/score-import/framework/user-game-stats/rating.ts +++ b/server/src/lib/score-import/framework/user-game-stats/rating.ts @@ -1,6 +1,6 @@ import { Game, Playtypes, integer, GameSpecificCalcLookup, IDStrings } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../utils/types"; +import db from "../../../../external/mongo/db"; +import { KtLogger } from "../../../../utils/types"; export async function CalculateRatings( game: Game, diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts similarity index 95% rename from server/src/score-import/framework/user-game-stats/update-ugs.test.ts rename to server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts index 22f095ded..a57a3cf01 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.test.ts +++ b/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../external/mongo/db"; -import CreateLogCtx from "../../../logger/logger"; -import ResetDBState from "../../../test-utils/reset-db-state"; +import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import CreateLogCtx from "../../../../logger/logger"; +import ResetDBState from "../../../../test-utils/reset-db-state"; import { UpdateUsersGamePlaytypeStats } from "./update-ugs"; import deepmerge from "deepmerge"; import crypto from "crypto"; -import { TestingIIDXSPScorePB } from "../../../test-utils/test-data"; +import { TestingIIDXSPScorePB } from "../../../../test-utils/test-data"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/framework/user-game-stats/update-ugs.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts similarity index 95% rename from server/src/score-import/framework/user-game-stats/update-ugs.ts rename to server/src/lib/score-import/framework/user-game-stats/update-ugs.ts index b3aaad6ae..2f65061f6 100644 --- a/server/src/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts @@ -3,8 +3,8 @@ // That's about all there is to it! import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; -import db from "../../../external/mongo/db"; -import { KtLogger } from "../../../utils/types"; +import db from "../../../../external/mongo/db"; +import { KtLogger } from "../../../../utils/types"; import { CalculateClassDeltas, UpdateUGSClasses, ClassHandler } from "./classes"; import { CalculateRatings, CalculateCustomRatings } from "./rating"; diff --git a/server/src/score-import/import-types/DOCUMENTATION b/server/src/lib/score-import/import-types/DOCUMENTATION similarity index 100% rename from server/src/score-import/import-types/DOCUMENTATION rename to server/src/lib/score-import/import-types/DOCUMENTATION diff --git a/server/src/score-import/import-types/api/eag-iidx/parser.ts b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts similarity index 81% rename from server/src/score-import/import-types/api/eag-iidx/parser.ts rename to server/src/lib/score-import/import-types/api/eag-iidx/parser.ts index 791ae1cc1..449af8390 100644 --- a/server/src/score-import/import-types/api/eag-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/score-import/import-types/api/eag-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts similarity index 81% rename from server/src/score-import/import-types/api/eag-sdvx/parser.ts rename to server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts index 9cd7c9b67..dff1040bd 100644 --- a/server/src/score-import/import-types/api/eag-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/score-import/import-types/api/flo-iidx/parser.ts b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts similarity index 81% rename from server/src/score-import/import-types/api/flo-iidx/parser.ts rename to server/src/lib/score-import/import-types/api/flo-iidx/parser.ts index 892b62213..a2541135c 100644 --- a/server/src/score-import/import-types/api/flo-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/score-import/import-types/api/flo-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts similarity index 81% rename from server/src/score-import/import-types/api/flo-sdvx/parser.ts rename to server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts index 63ce21163..978298eb8 100644 --- a/server/src/score-import/import-types/api/flo-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/score-import/import-types/common/api-kai/iidx/converter.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts similarity index 93% rename from server/src/score-import/import-types/common/api-kai/iidx/converter.ts rename to server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts index 86f0e0e16..32b74415f 100644 --- a/server/src/score-import/import-types/common/api-kai/iidx/converter.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts @@ -1,4 +1,4 @@ -import { FindIIDXChartOnInGameIDVersion } from "../../../../../utils/database-lookup/chart"; +import { FindIIDXChartOnInGameIDVersion } from "../../../../../../utils/queries/charts"; import { KaiContext, KaiIIDXScore } from "../types"; import p from "prudence"; import { @@ -6,8 +6,8 @@ import { InvalidScoreFailure, KTDataNotFoundFailure, } from "../../../../framework/common/converter-failures"; -import { FormatPrError } from "../../../../../utils/prudence"; -import { FindSongOnID } from "../../../../../utils/database-lookup/song"; +import { FormatPrError } from "../../../../../../utils/prudence"; +import { FindSongOnID } from "../../../../../../utils/queries/songs"; import { GenericGetGradeAndPercent, ParseDateFromString, diff --git a/server/src/score-import/import-types/common/api-kai/iidx/parser.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts similarity index 80% rename from server/src/score-import/import-types/common/api-kai/iidx/parser.ts rename to server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts index a02a16ee5..dc46cf519 100644 --- a/server/src/score-import/import-types/common/api-kai/iidx/parser.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts @@ -1,8 +1,8 @@ -import { KtLogger } from "../../../../../utils/types"; -import nodeFetch from "../../../../../utils/fetch"; +import { KtLogger } from "../../../../../../utils/types"; +import nodeFetch from "../../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; -import { EAG_API_URL, FLO_API_URL } from "../../../../../secrets"; +import { EAG_API_URL, FLO_API_URL } from "../../../../../../secrets"; import { ConvertAPIKaiIIDX } from "./converter"; import { TraverseKaiAPI } from "../traverse-api"; import { ParserFunctionReturnsAsync } from "../../types"; diff --git a/server/src/score-import/import-types/common/api-kai/sdvx/converter.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts similarity index 94% rename from server/src/score-import/import-types/common/api-kai/sdvx/converter.ts rename to server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts index 086b6296b..60ba9e36d 100644 --- a/server/src/score-import/import-types/common/api-kai/sdvx/converter.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts @@ -1,4 +1,4 @@ -import { FindSDVXChartOnInGameIDVersion } from "../../../../../utils/database-lookup/chart"; +import { FindSDVXChartOnInGameIDVersion } from "../../../../../../utils/queries/charts"; import { KaiContext, KaiSDVXScore } from "../types"; import p from "prudence"; import { @@ -6,8 +6,8 @@ import { InvalidScoreFailure, KTDataNotFoundFailure, } from "../../../../framework/common/converter-failures"; -import { FormatPrError } from "../../../../../utils/prudence"; -import { FindSongOnID } from "../../../../../utils/database-lookup/song"; +import { FormatPrError } from "../../../../../../utils/prudence"; +import { FindSongOnID } from "../../../../../../utils/queries/songs"; import { GenericGetGradeAndPercent, ParseDateFromString, diff --git a/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts similarity index 80% rename from server/src/score-import/import-types/common/api-kai/sdvx/parser.ts rename to server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts index 2904ece86..c782e102b 100644 --- a/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts @@ -1,8 +1,8 @@ -import { KtLogger } from "../../../../../utils/types"; -import nodeFetch from "../../../../../utils/fetch"; +import { KtLogger } from "../../../../../../utils/types"; +import nodeFetch from "../../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; -import { EAG_API_URL, FLO_API_URL } from "../../../../../secrets"; +import { EAG_API_URL, FLO_API_URL } from "../../../../../../secrets"; import { ConvertAPIKaiSDVX } from "./converter"; import { TraverseKaiAPI } from "../traverse-api"; import { ParserFunctionReturnsAsync } from "../../types"; diff --git a/server/src/score-import/import-types/common/api-kai/traverse-api.ts b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts similarity index 96% rename from server/src/score-import/import-types/common/api-kai/traverse-api.ts rename to server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts index 79b42c4c0..9f8ab7945 100644 --- a/server/src/score-import/import-types/common/api-kai/traverse-api.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts @@ -1,6 +1,6 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import nodeFetch from "../../../../utils/fetch"; +import nodeFetch from "../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; /** diff --git a/server/src/score-import/import-types/common/api-kai/types.ts b/server/src/lib/score-import/import-types/common/api-kai/types.ts similarity index 100% rename from server/src/score-import/import-types/common/api-kai/types.ts rename to server/src/lib/score-import/import-types/common/api-kai/types.ts diff --git a/server/src/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts similarity index 97% rename from server/src/score-import/import-types/common/batch-manual/converter.test.ts rename to server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts index a4c7abc4e..c9b6c3537 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts @@ -1,13 +1,13 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import CreateLogCtx from "../../../../logger/logger"; -import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; +import CreateLogCtx from "../../../../../logger/logger"; +import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data"; import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; -import { EscapeStringRegexp } from "../../../../utils/util"; -import db, { CloseMongoConnection } from "../../../../external/mongo/db"; +import { EscapeStringRegexp } from "../../../../../utils/util"; +import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; import { Game } from "kamaitachi-common"; -import ResetDBState from "../../../../test-utils/reset-db-state"; +import ResetDBState from "../../../../../test-utils/reset-db-state"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; const baseBatchManualScore = { diff --git a/server/src/score-import/import-types/common/batch-manual/converter.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts similarity index 96% rename from server/src/score-import/import-types/common/batch-manual/converter.ts rename to server/src/lib/score-import/import-types/common/batch-manual/converter.ts index 75c3e5779..6cfb07537 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts @@ -1,23 +1,23 @@ -import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; +import { BatchManualContext, BatchManualScore } from "./types"; import { AnyChartDocument, AnySongDocument, ImportTypes } from "kamaitachi-common"; import { InternalFailure, InvalidScoreFailure, KTDataNotFoundFailure, } from "../../../framework/common/converter-failures"; -import { FindSongOnID, FindSongOnTitleInsensitive } from "../../../../utils/database-lookup/song"; +import { FindSongOnID, FindSongOnTitleInsensitive } from "../../../../../utils/queries/songs"; import { FindBMSChartOnHash, FindChartWithPTDF, FindChartWithPTDFVersion, FindDDRChartOnSongHash, -} from "../../../../utils/database-lookup/chart"; +} from "../../../../../utils/queries/charts"; import { AssertStrAsDifficulty, AssertStrAsPositiveInt, } from "../../../framework/common/string-asserts"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts similarity index 98% rename from server/src/score-import/import-types/common/batch-manual/parser.test.ts rename to server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts index 5bcfd7648..43e6b3447 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts @@ -1,10 +1,10 @@ import t from "tap"; -import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import { CloseMongoConnection } from "../../../../../external/mongo/db"; +import CreateLogCtx from "../../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; import { BatchManual } from "./types"; -import { EscapeStringRegexp } from "../../../../utils/util"; +import { EscapeStringRegexp } from "../../../../../utils/util"; import deepmerge from "deepmerge"; const mockErr = (...msg: string[]) => diff --git a/server/src/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts similarity index 97% rename from server/src/score-import/import-types/common/batch-manual/parser.ts rename to server/src/lib/score-import/import-types/common/batch-manual/parser.ts index 906fa8d20..b9865077d 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; @@ -6,7 +6,7 @@ import { lamps, supportedGames, validHitData, validPlaytypes } from "kamaitachi- import { Game, ImportTypes } from "kamaitachi-common"; import { ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; -import { FormatPrError } from "../../../../utils/prudence"; +import { FormatPrError } from "../../../../../utils/prudence"; import { ParserFunctionReturnsSync } from "../types"; const optNull = (v: ValidSchemaValue) => p.optional(p.nullable(v)); diff --git a/server/src/score-import/import-types/common/batch-manual/types.ts b/server/src/lib/score-import/import-types/common/batch-manual/types.ts similarity index 100% rename from server/src/score-import/import-types/common/batch-manual/types.ts rename to server/src/lib/score-import/import-types/common/batch-manual/types.ts diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts similarity index 97% rename from server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts rename to server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts index 0c5430b45..038bf595f 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts @@ -1,10 +1,10 @@ import t from "tap"; -import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; -import ResetDBState from "../../../../test-utils/reset-db-state"; +import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; +import CreateLogCtx from "../../../../../logger/logger"; +import ResetDBState from "../../../../../test-utils/reset-db-state"; import ConverterFn, { EamScoreConverter, EamScoreConverterWrapper } from "./converter"; import p from "prudence"; -import { prAssert } from "../../../../test-utils/asserts"; +import { prAssert } from "../../../../../test-utils/asserts"; import deepmerge from "deepmerge"; import { EamusementScoreData } from "./types"; import { diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts similarity index 94% rename from server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts rename to server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts index d275a12e5..6f8f934cb 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts @@ -1,6 +1,6 @@ import { Lamps, AnySongDocument, ChartDocument } from "kamaitachi-common"; -import { FindChartWithPTDFVersion } from "../../../../utils/database-lookup/chart"; -import { FindSongOnTitleInsensitive } from "../../../../utils/database-lookup/song"; +import { FindChartWithPTDFVersion } from "../../../../../utils/queries/charts"; +import { FindSongOnTitleInsensitive } from "../../../../../utils/queries/songs"; import { KTDataNotFoundFailure, InternalFailure, @@ -10,7 +10,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { GetGradeFromPercent } from "../../../framework/common/score-utils"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts similarity index 97% rename from server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts rename to server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts index b880cd53f..551bf97b9 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts @@ -1,13 +1,13 @@ import t from "tap"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import GenericParseEamIIDXCSV, { NaiveCSVParse, ResolveHeaders } from "./parser"; -import { CloseMongoConnection } from "../../../../external/mongo/db"; +import { CloseMongoConnection } from "../../../../../external/mongo/db"; import { TestingIIDXEamusementCSV26, TestingIIDXEamusementCSV27, -} from "../../../../test-utils/test-data"; -import { MockMulterFile } from "../../../../test-utils/mock-multer"; +} from "../../../../../test-utils/test-data"; +import { MockMulterFile } from "../../../../../test-utils/mock-multer"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts similarity index 95% rename from server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts rename to server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts index f6051d908..cc212a4d9 100644 --- a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -1,5 +1,5 @@ import { Difficulties } from "kamaitachi-common"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../types"; import ConverterFn from "./converter"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/types.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/types.ts similarity index 100% rename from server/src/score-import/import-types/common/eamusement-iidx-csv/types.ts rename to server/src/lib/score-import/import-types/common/eamusement-iidx-csv/types.ts diff --git a/server/src/score-import/import-types/common/types.ts b/server/src/lib/score-import/import-types/common/types.ts similarity index 98% rename from server/src/score-import/import-types/common/types.ts rename to server/src/lib/score-import/import-types/common/types.ts index 14fa60ad7..954fa9796 100644 --- a/server/src/score-import/import-types/common/types.ts +++ b/server/src/lib/score-import/import-types/common/types.ts @@ -1,4 +1,4 @@ -import { EmptyObject, KtLogger } from "../../../utils/types"; +import { EmptyObject, KtLogger } from "../../../../utils/types"; import { MerScore } from "../file/mer-iidx/types"; import { S3Score } from "../file/solid-state-squad/types"; import { BarbatosScore } from "../ir/barbatos/types"; diff --git a/server/src/score-import/import-types/file/batch-manual/parser.ts b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts similarity index 95% rename from server/src/score-import/import-types/file/batch-manual/parser.ts rename to server/src/lib/score-import/import-types/file/batch-manual/parser.ts index 901185008..0ee58a4e4 100644 --- a/server/src/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; diff --git a/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts similarity index 88% rename from server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts rename to server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts index 07258502e..2d6c9c760 100644 --- a/server/src/score-import/import-types/file/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts b/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts similarity index 93% rename from server/src/score-import/import-types/file/mer-iidx/converter.test.ts rename to server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts index 83989d463..c93d868a9 100644 --- a/server/src/score-import/import-types/file/mer-iidx/converter.test.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts @@ -1,14 +1,14 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; -import ResetDBState from "../../../../test-utils/reset-db-state"; +import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; +import CreateLogCtx from "../../../../../logger/logger"; +import ResetDBState from "../../../../../test-utils/reset-db-state"; import { GetKTDataJSON, LoadKTBlackIIDXData, Testing511Song, Testing511SPA, -} from "../../../../test-utils/test-data"; +} from "../../../../../test-utils/test-data"; import { ConvertFileMerIIDX } from "./converter"; import deepmerge from "deepmerge"; import { MerScore } from "./types"; diff --git a/server/src/score-import/import-types/file/mer-iidx/converter.ts b/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts similarity index 91% rename from server/src/score-import/import-types/file/mer-iidx/converter.ts rename to server/src/lib/score-import/import-types/file/mer-iidx/converter.ts index da90de2af..07be7c467 100644 --- a/server/src/score-import/import-types/file/mer-iidx/converter.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts @@ -1,6 +1,6 @@ -import { FindIIDXChartOnInGameID } from "../../../../utils/database-lookup/chart"; -import { FindSongOnID } from "../../../../utils/database-lookup/song"; -import { EmptyObject } from "../../../../utils/types"; +import { FindIIDXChartOnInGameID } from "../../../../../utils/queries/charts"; +import { FindSongOnID } from "../../../../../utils/queries/songs"; +import { EmptyObject } from "../../../../../utils/types"; import { InternalFailure, KTDataNotFoundFailure, diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts b/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts similarity index 92% rename from server/src/score-import/import-types/file/mer-iidx/parser.test.ts rename to server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts index 71094d312..eb4121cf8 100644 --- a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; -import { MockMulterFile } from "../../../../test-utils/mock-multer"; -import ResetDBState from "../../../../test-utils/reset-db-state"; -import { GetKTDataBuffer, GetKTDataJSON } from "../../../../test-utils/test-data"; +import { CloseMongoConnection } from "../../../../../external/mongo/db"; +import CreateLogCtx from "../../../../../logger/logger"; +import { MockMulterFile } from "../../../../../test-utils/mock-multer"; +import ResetDBState from "../../../../../test-utils/reset-db-state"; +import { GetKTDataBuffer, GetKTDataJSON } from "../../../../../test-utils/test-data"; import { ParseMerIIDX } from "./parser"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.ts b/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts similarity index 93% rename from server/src/score-import/import-types/file/mer-iidx/parser.ts rename to server/src/lib/score-import/import-types/file/mer-iidx/parser.ts index 7a7461667..9d1e0827d 100644 --- a/server/src/score-import/import-types/file/mer-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts @@ -1,6 +1,6 @@ import p from "prudence"; -import { FormatPrError } from "../../../../utils/prudence"; -import { EmptyObject, KtLogger } from "../../../../utils/types"; +import { FormatPrError } from "../../../../../utils/prudence"; +import { EmptyObject, KtLogger } from "../../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../../common/types"; import { ConvertFileMerIIDX } from "./converter"; diff --git a/server/src/score-import/import-types/file/mer-iidx/types.ts b/server/src/lib/score-import/import-types/file/mer-iidx/types.ts similarity index 100% rename from server/src/score-import/import-types/file/mer-iidx/types.ts rename to server/src/lib/score-import/import-types/file/mer-iidx/types.ts diff --git a/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts similarity index 88% rename from server/src/score-import/import-types/file/pli-iidx-csv/parser.ts rename to server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts index 0877863df..174c079d7 100644 --- a/server/src/score-import/import-types/file/pli-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts similarity index 96% rename from server/src/score-import/import-types/file/solid-state-squad/converter.test.ts rename to server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts index 028d69431..2fa6cce9e 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts @@ -1,14 +1,14 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; -import ResetDBState from "../../../../test-utils/reset-db-state"; +import { CloseMongoConnection } from "../../../../../external/mongo/db"; +import CreateLogCtx from "../../../../../logger/logger"; +import ResetDBState from "../../../../../test-utils/reset-db-state"; import { GetKTDataJSON, LoadKTBlackIIDXData, Testing511Song, Testing511SPA, -} from "../../../../test-utils/test-data"; +} from "../../../../../test-utils/test-data"; import { ConvertFileS3, ParseDifficulty, ResolveS3Lamp } from "./converter"; import { S3Score } from "./types"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts similarity index 95% rename from server/src/score-import/import-types/file/solid-state-squad/converter.ts rename to server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts index d3e6b26c7..0581560cb 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/converter.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts @@ -1,4 +1,4 @@ -import { EmptyObject, KtLogger } from "../../../../utils/types"; +import { EmptyObject, KtLogger } from "../../../../../utils/types"; import { InvalidScoreFailure, KTDataNotFoundFailure, @@ -6,8 +6,8 @@ import { } from "../../../framework/common/converter-failures"; import { S3Score } from "./types"; import { Playtypes, Difficulties, Grades, Lamps } from "kamaitachi-common"; -import { FindSongOnTitleInsensitive } from "../../../../utils/database-lookup/song"; -import { FindChartWithPTDFVersion } from "../../../../utils/database-lookup/chart"; +import { FindSongOnTitleInsensitive } from "../../../../../utils/queries/songs"; +import { FindChartWithPTDFVersion } from "../../../../../utils/queries/charts"; import { GenericGetGradeAndPercent, ParseDateFromString, diff --git a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts similarity index 94% rename from server/src/score-import/import-types/file/solid-state-squad/parser.test.ts rename to server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts index 8cf961a35..7daa27d58 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -1,11 +1,11 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { GetMilisecondsSince } from "../../../../utils/util"; -import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; -import { MockMulterFile } from "../../../../test-utils/mock-multer"; -import ResetDBState from "../../../../test-utils/reset-db-state"; -import { GetKTDataBuffer } from "../../../../test-utils/test-data"; +import { GetMilisecondsSince } from "../../../../../utils/util"; +import { CloseMongoConnection } from "../../../../../external/mongo/db"; +import CreateLogCtx from "../../../../../logger/logger"; +import { MockMulterFile } from "../../../../../test-utils/mock-multer"; +import ResetDBState from "../../../../../test-utils/reset-db-state"; +import { GetKTDataBuffer } from "../../../../../test-utils/test-data"; import { ParseSolidStateXML } from "./parser"; const logger = CreateLogCtx(__filename); diff --git a/server/src/score-import/import-types/file/solid-state-squad/parser.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.ts similarity index 95% rename from server/src/score-import/import-types/file/solid-state-squad/parser.ts rename to server/src/lib/score-import/import-types/file/solid-state-squad/parser.ts index 4fb4dd52e..612458e09 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.ts @@ -1,8 +1,8 @@ import { parse as FastParseXML } from "fast-xml-parser"; -import { EmptyObject, KtLogger } from "../../../../utils/types"; +import { EmptyObject, KtLogger } from "../../../../../utils/types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import p, { PrudenceSchema } from "prudence"; -import { FormatPrError } from "../../../../utils/prudence"; +import { FormatPrError } from "../../../../../utils/prudence"; import { S3Score } from "./types"; import { ConvertFileS3 } from "./converter"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/file/solid-state-squad/types.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/types.ts similarity index 100% rename from server/src/score-import/import-types/file/solid-state-squad/types.ts rename to server/src/lib/score-import/import-types/file/solid-state-squad/types.ts diff --git a/server/src/score-import/import-types/ir/barbatos/converter.ts b/server/src/lib/score-import/import-types/ir/barbatos/converter.ts similarity index 92% rename from server/src/score-import/import-types/ir/barbatos/converter.ts rename to server/src/lib/score-import/import-types/ir/barbatos/converter.ts index f494b46e5..981198327 100644 --- a/server/src/score-import/import-types/ir/barbatos/converter.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/converter.ts @@ -1,6 +1,6 @@ -import { FindSDVXChartOnInGameID } from "../../../../utils/database-lookup/chart"; -import { FindSongOnID } from "../../../../utils/database-lookup/song"; -import { EmptyObject } from "../../../../utils/types"; +import { FindSDVXChartOnInGameID } from "../../../../../utils/queries/charts"; +import { FindSongOnID } from "../../../../../utils/queries/songs"; +import { EmptyObject } from "../../../../../utils/types"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, diff --git a/server/src/score-import/import-types/ir/barbatos/parser.ts b/server/src/lib/score-import/import-types/ir/barbatos/parser.ts similarity index 91% rename from server/src/score-import/import-types/ir/barbatos/parser.ts rename to server/src/lib/score-import/import-types/ir/barbatos/parser.ts index fd25a1d80..b3f12646b 100644 --- a/server/src/score-import/import-types/ir/barbatos/parser.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/parser.ts @@ -1,7 +1,7 @@ -import { EmptyObject, KtLogger } from "../../../../utils/types"; +import { EmptyObject, KtLogger } from "../../../../../utils/types"; import p from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { FormatPrError } from "../../../../utils/prudence"; +import { FormatPrError } from "../../../../../utils/prudence"; import { BarbatosScore } from "./types"; import { ConverterIRBarbatos } from "./converter"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/ir/barbatos/types.ts b/server/src/lib/score-import/import-types/ir/barbatos/types.ts similarity index 100% rename from server/src/score-import/import-types/ir/barbatos/types.ts rename to server/src/lib/score-import/import-types/ir/barbatos/types.ts diff --git a/server/src/score-import/import-types/ir/direct-manual/parser.ts b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts similarity index 92% rename from server/src/score-import/import-types/ir/direct-manual/parser.ts rename to server/src/lib/score-import/import-types/ir/direct-manual/parser.ts index 621ef5960..c85b3c018 100644 --- a/server/src/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/ir/fervidex-static/class-handler.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts similarity index 100% rename from server/src/score-import/import-types/ir/fervidex-static/class-handler.ts rename to server/src/lib/score-import/import-types/ir/fervidex-static/class-handler.ts diff --git a/server/src/score-import/import-types/ir/fervidex-static/converter.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/converter.ts similarity index 93% rename from server/src/score-import/import-types/ir/fervidex-static/converter.ts rename to server/src/lib/score-import/import-types/ir/fervidex-static/converter.ts index dd95922f9..5b8fb5733 100644 --- a/server/src/score-import/import-types/ir/fervidex-static/converter.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/converter.ts @@ -1,11 +1,11 @@ -import { FindSongOnID } from "../../../../utils/database-lookup/song"; +import { FindSongOnID } from "../../../../../utils/queries/songs"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, KTDataNotFoundFailure, } from "../../../framework/common/converter-failures"; import { Lamps } from "kamaitachi-common"; -import { FindChartOnInGameIDVersion } from "../../../../utils/database-lookup/chart"; +import { FindChartOnInGameIDVersion } from "../../../../../utils/queries/charts"; import { FervidexStaticContext, FervidexStaticScore } from "./types"; import { FERVIDEX_LAMP_LOOKUP, SplitFervidexChartRef } from "../fervidex/converter"; import { DryScore } from "../../../framework/common/types"; diff --git a/server/src/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts similarity index 96% rename from server/src/score-import/import-types/ir/fervidex-static/parser.ts rename to server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts index bcf9e4bbc..5698e1271 100644 --- a/server/src/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts @@ -1,7 +1,7 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import p, { PrudenceSchema } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { FormatPrError } from "../../../../utils/prudence"; +import { FormatPrError } from "../../../../../utils/prudence"; import { ConverterIRFervidexStatic } from "./converter"; import { FervidexStaticContext, FervidexStaticScore } from "./types"; import { FerHeaders, SoftwareIDToVersion } from "../fervidex/parser"; diff --git a/server/src/score-import/import-types/ir/fervidex-static/types.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/types.ts similarity index 100% rename from server/src/score-import/import-types/ir/fervidex-static/types.ts rename to server/src/lib/score-import/import-types/ir/fervidex-static/types.ts diff --git a/server/src/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts similarity index 96% rename from server/src/score-import/import-types/ir/fervidex/converter.test.ts rename to server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts index e65a3ef3c..ff2ede622 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.test.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; -import ResetDBState from "../../../../test-utils/reset-db-state"; -import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; +import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; +import CreateLogCtx from "../../../../../logger/logger"; +import ResetDBState from "../../../../../test-utils/reset-db-state"; +import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data"; import { InternalFailure } from "../../../framework/common/converter-failures"; import { ConverterIRFervidex, diff --git a/server/src/score-import/import-types/ir/fervidex/converter.ts b/server/src/lib/score-import/import-types/ir/fervidex/converter.ts similarity index 98% rename from server/src/score-import/import-types/ir/fervidex/converter.ts rename to server/src/lib/score-import/import-types/ir/fervidex/converter.ts index c941de735..186d6b226 100644 --- a/server/src/score-import/import-types/ir/fervidex/converter.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/converter.ts @@ -1,4 +1,4 @@ -import { FindSongOnID } from "../../../../utils/queries/songs"; +import { FindSongOnID } from "../../../../../utils/queries/songs"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { InternalFailure, @@ -10,7 +10,7 @@ import { Lamps, Difficulties, Playtypes } from "kamaitachi-common"; import { FindIIDXChartOnInGameIDVersion, FindIIDXChartWith2DXtraHash, -} from "../../../../utils/queries/charts"; +} from "../../../../../utils/queries/charts"; import { ConverterFunction } from "../../common/types"; import { DryScore } from "../../../framework/common/types"; diff --git a/server/src/score-import/import-types/ir/fervidex/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts similarity index 94% rename from server/src/score-import/import-types/ir/fervidex/parser.ts rename to server/src/lib/score-import/import-types/ir/fervidex/parser.ts index ae0a21235..1d05f9baa 100644 --- a/server/src/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts @@ -1,17 +1,17 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import { FormatPrError, optNull } from "../../../../utils/prudence"; +import { FormatPrError, optNull } from "../../../../../utils/prudence"; import { FervidexContext, FervidexScore } from "./types"; import { ConverterIRFervidex } from "./converter"; -import { ParseEA3SoftID } from "../../../../utils/ea3id"; +import { ParseEA3SoftID } from "../../../../../utils/ea3id"; import { EXT_HEROIC_VERSE, MODEL_IIDX, MODEL_INFINITAS_2, REV_2DXTRA, REV_OMNIMIX, -} from "../../../../constants/ea3id"; +} from "../../../../../constants/ea3id"; import { ParserFunctionReturnsSync } from "../../common/types"; const PR_Fervidex: PrudenceSchema = { diff --git a/server/src/score-import/import-types/ir/fervidex/types.ts b/server/src/lib/score-import/import-types/ir/fervidex/types.ts similarity index 100% rename from server/src/score-import/import-types/ir/fervidex/types.ts rename to server/src/lib/score-import/import-types/ir/fervidex/types.ts diff --git a/server/src/score-import/import-types/ir/usc/converter.ts b/server/src/lib/score-import/import-types/ir/usc/converter.ts similarity index 93% rename from server/src/score-import/import-types/ir/usc/converter.ts rename to server/src/lib/score-import/import-types/ir/usc/converter.ts index f5fd58f43..a242a3ab5 100644 --- a/server/src/score-import/import-types/ir/usc/converter.ts +++ b/server/src/lib/score-import/import-types/ir/usc/converter.ts @@ -1,6 +1,6 @@ -import { USCClientScore } from "../../../../server/router/ir/usc/usc"; -import { FindSongOnID } from "../../../../utils/queries/songs"; -import { KtLogger } from "../../../../utils/types"; +import { USCClientScore } from "../../../../../server/router/ir/usc/usc"; +import { FindSongOnID } from "../../../../../utils/queries/songs"; +import { KtLogger } from "../../../../../utils/types"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { IRUSCContext } from "./types"; @@ -14,7 +14,7 @@ import { USC_DEFAULT_NEAR, USC_DEFAULT_PERFECT, USC_DEFAULT_SLAM, -} from "../../../../constants/usc-ir"; +} from "../../../../../constants/usc-ir"; function DeriveNoteMod(data: USCClientScore): "NORMAL" | "MIRROR" | "RANDOM" | "MIR-RAN" { if (data.options.mirror && data.options.random) { diff --git a/server/src/score-import/import-types/ir/usc/parser.ts b/server/src/lib/score-import/import-types/ir/usc/parser.ts similarity index 87% rename from server/src/score-import/import-types/ir/usc/parser.ts rename to server/src/lib/score-import/import-types/ir/usc/parser.ts index 5b6bd13c8..755b09df1 100644 --- a/server/src/score-import/import-types/ir/usc/parser.ts +++ b/server/src/lib/score-import/import-types/ir/usc/parser.ts @@ -1,9 +1,9 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../../utils/types"; import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; -import { FormatPrError } from "../../../../utils/prudence"; -import { USCClientScore } from "../../../../server/router/ir/usc/usc"; +import { FormatPrError } from "../../../../../utils/prudence"; +import { USCClientScore } from "../../../../../server/router/ir/usc/usc"; import { IRUSCContext } from "./types"; import { ConverterIRUSC } from "./converter"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/score-import/import-types/ir/usc/types.ts b/server/src/lib/score-import/import-types/ir/usc/types.ts similarity index 100% rename from server/src/score-import/import-types/ir/usc/types.ts rename to server/src/lib/score-import/import-types/ir/usc/types.ts diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index b474f37af..e138019f0 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -6,9 +6,9 @@ import { GetUserWithIDGuaranteed } from "../../../../utils/user"; import CreateLogCtx from "../../../../logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import ScoreImportFatalError from "../../../../score-import/framework/score-importing/score-import-error"; +import ScoreImportFatalError from "../../../../lib/score-import/framework/score-importing/score-import-error"; import { KtLogger } from "../../../../utils/types"; -import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; const logger = CreateLogCtx(__filename); @@ -64,11 +64,11 @@ router.post( } ); -import ParseEamusementIIDXCSV from "../../../../score-import/import-types/file/eamusement-iidx-csv/parser"; -import ParseBatchManual from "../../../../score-import/import-types/file/batch-manual/parser"; -import { ParseSolidStateXML } from "../../../../score-import/import-types/file/solid-state-squad/parser"; -import { ParseMerIIDX } from "../../../../score-import/import-types/file/mer-iidx/parser"; -import ParsePLIIIDXCSV from "../../../../score-import/import-types/file/pli-iidx-csv/parser"; +import ParseEamusementIIDXCSV from "../../../../lib/score-import/import-types/file/eamusement-iidx-csv/parser"; +import ParseBatchManual from "../../../../lib/score-import/import-types/file/batch-manual/parser"; +import { ParseSolidStateXML } from "../../../../lib/score-import/import-types/file/solid-state-squad/parser"; +import { ParseMerIIDX } from "../../../../lib/score-import/import-types/file/mer-iidx/parser"; +import ParsePLIIIDXCSV from "../../../../lib/score-import/import-types/file/pli-iidx-csv/parser"; /** * Resolves the data from a file upload into an iterable, diff --git a/server/src/server/router/ir/barbatos/router.ts b/server/src/server/router/ir/barbatos/router.ts index 22fd7dd78..8989abc2b 100644 --- a/server/src/server/router/ir/barbatos/router.ts +++ b/server/src/server/router/ir/barbatos/router.ts @@ -1,8 +1,8 @@ import { Router } from "express"; import { GetUserWithIDGuaranteed } from "../../../../utils/user"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; -import { ParseBarbatosSingle } from "../../../../score-import/import-types/ir/barbatos/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; +import { ParseBarbatosSingle } from "../../../../lib/score-import/import-types/ir/barbatos/parser"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/server/router/ir/chunitachi/router.ts b/server/src/server/router/ir/chunitachi/router.ts index 9543e08ef..8d87b0a7d 100644 --- a/server/src/server/router/ir/chunitachi/router.ts +++ b/server/src/server/router/ir/chunitachi/router.ts @@ -1,8 +1,8 @@ import { Router } from "express"; import { GetUserWithIDGuaranteed } from "../../../../utils/user"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; -import ParseDirectManual from "../../../../score-import/import-types/ir/direct-manual/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; +import ParseDirectManual from "../../../../lib/score-import/import-types/ir/direct-manual/parser"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/server/router/ir/direct-manual/router.ts b/server/src/server/router/ir/direct-manual/router.ts index c1a799981..273c1bea3 100644 --- a/server/src/server/router/ir/direct-manual/router.ts +++ b/server/src/server/router/ir/direct-manual/router.ts @@ -2,8 +2,8 @@ import { Router } from "express"; import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../../utils/user"; import CreateLogCtx from "../../../../logger/logger"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; -import ParseDirectManual from "../../../../score-import/import-types/ir/direct-manual/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; +import ParseDirectManual from "../../../../lib/score-import/import-types/ir/direct-manual/parser"; const router: Router = Router({ mergeParams: true }); diff --git a/server/src/server/router/ir/fervidex/router.ts b/server/src/server/router/ir/fervidex/router.ts index c3188bdf6..2681dfbce 100644 --- a/server/src/server/router/ir/fervidex/router.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -4,12 +4,12 @@ import { GetUserWithIDGuaranteed } from "../../../../utils/user"; import { ParseEA3SoftID } from "../../../../utils/ea3id"; import { EXT_HEROIC_VERSE, MODEL_INFINITAS_2, REV_2DXBMS } from "../../../../constants/ea3id"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; -import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; -import { ParseFervidexStatic } from "../../../../score-import/import-types/ir/fervidex-static/parser"; -import { ParseFervidexSingle } from "../../../../score-import/import-types/ir/fervidex/parser"; +import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; +import { ParseFervidexStatic } from "../../../../lib/score-import/import-types/ir/fervidex-static/parser"; +import { ParseFervidexSingle } from "../../../../lib/score-import/import-types/ir/fervidex/parser"; import { Playtypes } from "kamaitachi-common"; import CreateLogCtx from "../../../../logger/logger"; -import { FERVIDEX_COURSE_LOOKUP } from "../../../../score-import/import-types/ir/fervidex-static/class-handler"; +import { FERVIDEX_COURSE_LOOKUP } from "../../../../lib/score-import/import-types/ir/fervidex-static/class-handler"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 756fd46a8..5a62a6f91 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -8,13 +8,13 @@ import { SuccessfulAPIResponse, ImportDocument, } from "kamaitachi-common"; -import { AssertStrAsPositiveNonZeroInt } from "../../../../score-import/framework/common/string-asserts"; +import { AssertStrAsPositiveNonZeroInt } from "../../../../lib/score-import/framework/common/string-asserts"; import CreateLogCtx from "../../../../logger/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; -import { ExpressWrappedScoreImportMain } from "../../../../score-import/framework/express-wrapper"; +import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../utils/user"; import { KtLogger } from "../../../../utils/types"; -import { ParseIRUSC } from "../../../../score-import/import-types/ir/usc/parser"; +import { ParseIRUSC } from "../../../../lib/score-import/import-types/ir/usc/parser"; import { USCIR_MAX_LEADERBOARD_N } from "../../../../constants/usc-ir"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; diff --git a/server/src/test-utils/test-data.ts b/server/src/test-utils/test-data.ts index 1d98d5786..a437a5c62 100644 --- a/server/src/test-utils/test-data.ts +++ b/server/src/test-utils/test-data.ts @@ -11,8 +11,8 @@ import { } from "kamaitachi-common"; import path from "path"; import db from "../external/mongo/db"; -import { DryScore } from "../score-import/framework/common/types"; -import { BarbatosScore } from "../score-import/import-types/ir/barbatos/types"; +import { DryScore } from "../lib/score-import/framework/common/types"; +import { BarbatosScore } from "../lib/score-import/import-types/ir/barbatos/types"; const file = (name: string) => path.join(__dirname, "/test-data", name); From b80259ff266ee18e78ef703aafb8f15826282407 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:58:31 +0100 Subject: [PATCH 15/19] move logger to lib/logger --- server/src/external/mongo/db.ts | 2 +- server/src/external/redis/redis-store.ts | 2 +- server/src/{ => lib}/logger/logger.test.ts | 4 ++-- server/src/{ => lib}/logger/logger.ts | 2 +- .../framework/calculated-data/calculated-data.test.ts | 2 +- .../framework/calculated-data/game-specific-stats.test.ts | 2 +- .../framework/calculated-data/game-specific.test.ts | 2 +- server/src/lib/score-import/framework/common/import-logger.ts | 2 +- server/src/lib/score-import/framework/common/score-utils.ts | 2 +- server/src/lib/score-import/framework/goals/goals.test.ts | 2 +- .../lib/score-import/framework/milestones/milestones.test.ts | 2 +- .../src/lib/score-import/framework/pb/create-pb-doc.test.ts | 2 +- server/src/lib/score-import/framework/pb/process-pbs.test.ts | 2 +- .../score-import/framework/score-importing/insert-score.ts | 2 +- .../score-import/framework/score-importing/score-importing.ts | 2 +- server/src/lib/score-import/framework/sessions/sessions.ts | 2 +- .../score-import/framework/user-game-stats/classes.test.ts | 2 +- .../lib/score-import/framework/user-game-stats/rating.test.ts | 2 +- .../score-import/framework/user-game-stats/update-ugs.test.ts | 2 +- .../import-types/common/batch-manual/converter.test.ts | 2 +- .../import-types/common/batch-manual/parser.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/converter.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/parser.test.ts | 2 +- .../import-types/file/solid-state-squad/converter.test.ts | 2 +- .../import-types/file/solid-state-squad/parser.test.ts | 2 +- .../score-import/import-types/ir/fervidex/converter.test.ts | 2 +- server/src/main.ts | 2 +- server/src/server/middleware/multer-upload.ts | 2 +- server/src/server/middleware/prudence-validate.ts | 2 +- server/src/server/middleware/require-logged-in.ts | 2 +- server/src/server/router/api/auth/auth.ts | 2 +- server/src/server/router/api/auth/router.ts | 2 +- server/src/server/router/api/import/router.ts | 2 +- server/src/server/router/ir/direct-manual/router.ts | 2 +- server/src/server/router/ir/fervidex/router.ts | 2 +- server/src/server/router/ir/usc/router.ts | 2 +- server/src/server/router/ir/usc/usc.ts | 2 +- server/src/server/server.ts | 2 +- server/src/test-utils/fake-session.ts | 2 +- server/src/test-utils/mock-api.ts | 2 +- server/src/test-utils/reset-db-state.ts | 2 +- server/src/utils/class.ts | 2 +- server/src/utils/db.ts | 2 +- server/src/utils/folder.test.ts | 2 +- server/src/utils/folder.ts | 2 +- server/src/utils/goal.test.ts | 2 +- server/src/utils/tierlist.ts | 2 +- server/src/utils/user.ts | 2 +- 50 files changed, 51 insertions(+), 51 deletions(-) rename server/src/{ => lib}/logger/logger.test.ts (83%) rename server/src/{ => lib}/logger/logger.ts (95%) diff --git a/server/src/external/mongo/db.ts b/server/src/external/mongo/db.ts index 14bf7c052..a38df380c 100644 --- a/server/src/external/mongo/db.ts +++ b/server/src/external/mongo/db.ts @@ -26,7 +26,7 @@ import { UserMilestoneDocument, } from "kamaitachi-common"; import monk from "monk"; -import CreateLogCtx from "../../logger/logger"; +import CreateLogCtx from "../../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/external/redis/redis-store.ts b/server/src/external/redis/redis-store.ts index 69ddbd955..358cf9fd5 100644 --- a/server/src/external/redis/redis-store.ts +++ b/server/src/external/redis/redis-store.ts @@ -1,6 +1,6 @@ import connectRedis from "connect-redis"; import expressSession from "express-session"; -import CreateLogCtx from "../../logger/logger"; +import CreateLogCtx from "../../lib/logger/logger"; import redis from "redis"; const logger = CreateLogCtx(__filename); diff --git a/server/src/logger/logger.test.ts b/server/src/lib/logger/logger.test.ts similarity index 83% rename from server/src/logger/logger.test.ts rename to server/src/lib/logger/logger.test.ts index 229ab4b89..38545d5c6 100644 --- a/server/src/logger/logger.test.ts +++ b/server/src/lib/logger/logger.test.ts @@ -1,6 +1,6 @@ import t from "tap"; -import { CloseMongoConnection } from "../external/mongo/db"; -import CreateLogCtx, { Transports } from "../logger/logger"; +import { CloseMongoConnection } from "../../external/mongo/db"; +import CreateLogCtx, { Transports } from "./logger"; t.test("Logger Tests", (t) => { const logger = CreateLogCtx(__filename); diff --git a/server/src/logger/logger.ts b/server/src/lib/logger/logger.ts similarity index 95% rename from server/src/logger/logger.ts rename to server/src/lib/logger/logger.ts index 4afb39be3..4cbc3596c 100644 --- a/server/src/logger/logger.ts +++ b/server/src/lib/logger/logger.ts @@ -1,5 +1,5 @@ import winston, { format, transports } from "winston"; -import { KtLogger } from "../utils/types"; +import { KtLogger } from "../../utils/types"; const level = process.env.LOG_LEVEL ?? "info"; diff --git a/server/src/lib/score-import/framework/calculated-data/calculated-data.test.ts b/server/src/lib/score-import/framework/calculated-data/calculated-data.test.ts index 002ed71d7..bb9692095 100644 --- a/server/src/lib/score-import/framework/calculated-data/calculated-data.test.ts +++ b/server/src/lib/score-import/framework/calculated-data/calculated-data.test.ts @@ -1,7 +1,7 @@ import Pr from "prudence"; import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import { prAssert } from "../../../../test-utils/asserts"; import { Testing511SPA, diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.test.ts b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.test.ts index fb2048c0c..2c0f74428 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.test.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.test.ts @@ -11,7 +11,7 @@ import { CalculateVF5, KaidenPercentile, } from "./game-specific-stats"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import { isApproximately } from "../../../../test-utils/asserts"; import { DryScore } from "../common/types"; diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific.test.ts b/server/src/lib/score-import/framework/calculated-data/game-specific.test.ts index 79d124bba..1d7115cb3 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific.test.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific.test.ts @@ -1,7 +1,7 @@ import Pr from "prudence"; import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import { prAssert } from "../../../../test-utils/asserts"; import { Testing511SPA, diff --git a/server/src/lib/score-import/framework/common/import-logger.ts b/server/src/lib/score-import/framework/common/import-logger.ts index 4abce84a3..428c3487c 100644 --- a/server/src/lib/score-import/framework/common/import-logger.ts +++ b/server/src/lib/score-import/framework/common/import-logger.ts @@ -1,7 +1,7 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; import { FormatUserDoc } from "../../../../utils/user"; -import { rootLogger } from "../../../../logger/logger"; +import { rootLogger } from "../../../logger/logger"; import { KtLogger } from "../../../../utils/types"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { diff --git a/server/src/lib/score-import/framework/common/score-utils.ts b/server/src/lib/score-import/framework/common/score-utils.ts index 5f10e0d95..2a99b2b9f 100644 --- a/server/src/lib/score-import/framework/common/score-utils.ts +++ b/server/src/lib/score-import/framework/common/score-utils.ts @@ -10,7 +10,7 @@ import { Playtypes, } from "kamaitachi-common"; import { judgementWindows, gamePercentMax } from "kamaitachi-common/js/config"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import { InternalFailure, InvalidScoreFailure } from "./converter-failures"; const logger = CreateLogCtx(__filename); diff --git a/server/src/lib/score-import/framework/goals/goals.test.ts b/server/src/lib/score-import/framework/goals/goals.test.ts index eaaf97662..7c577cbc1 100644 --- a/server/src/lib/score-import/framework/goals/goals.test.ts +++ b/server/src/lib/score-import/framework/goals/goals.test.ts @@ -19,7 +19,7 @@ import { TestingIIDXFolderSP10, } from "../../../../test-utils/test-data"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/lib/score-import/framework/milestones/milestones.test.ts b/server/src/lib/score-import/framework/milestones/milestones.test.ts index e5d60f922..96d993535 100644 --- a/server/src/lib/score-import/framework/milestones/milestones.test.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { TestingIIDXSPMilestone } from "../../../../test-utils/test-data"; import { UpdateUsersMilestones } from "./milestones"; diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts index 4f7fcc089..5abfd7b1f 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts @@ -4,7 +4,7 @@ import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../../test-utils/test-data"; import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import { KtLogger } from "../../../../utils/types"; import { lamps } from "kamaitachi-common/js/config"; diff --git a/server/src/lib/score-import/framework/pb/process-pbs.test.ts b/server/src/lib/score-import/framework/pb/process-pbs.test.ts index 2f7526d45..bc1f8def7 100644 --- a/server/src/lib/score-import/framework/pb/process-pbs.test.ts +++ b/server/src/lib/score-import/framework/pb/process-pbs.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { Testing511SPA, TestingIIDXSPScore } from "../../../../test-utils/test-data"; import { ProcessPBs } from "./process-pbs"; diff --git a/server/src/lib/score-import/framework/score-importing/insert-score.ts b/server/src/lib/score-import/framework/score-importing/insert-score.ts index 561426626..8c6502153 100644 --- a/server/src/lib/score-import/framework/score-importing/insert-score.ts +++ b/server/src/lib/score-import/framework/score-importing/insert-score.ts @@ -1,6 +1,6 @@ import { ScoreDocument } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; const logger = CreateLogCtx(__filename); const ScoreQueue: ScoreDocument[] = []; diff --git a/server/src/lib/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts index 70fb67077..b7760ce48 100644 --- a/server/src/lib/score-import/framework/score-importing/score-importing.ts +++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts @@ -17,7 +17,7 @@ import { } from "../common/converter-failures"; import { CreateScoreID } from "./score-id"; import db from "../../../../external/mongo/db"; -import { AppendLogCtx } from "../../../../logger/logger"; +import { AppendLogCtx } from "../../../logger/logger"; import { KtLogger } from "../../../../utils/types"; import { ConverterFunctionReturns, diff --git a/server/src/lib/score-import/framework/sessions/sessions.ts b/server/src/lib/score-import/framework/sessions/sessions.ts index 71c3cb0b0..d7aa5c455 100644 --- a/server/src/lib/score-import/framework/sessions/sessions.ts +++ b/server/src/lib/score-import/framework/sessions/sessions.ts @@ -10,7 +10,7 @@ import { Game, } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { AppendLogCtx } from "../../../../logger/logger"; +import { AppendLogCtx } from "../../../logger/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; diff --git a/server/src/lib/score-import/framework/user-game-stats/classes.test.ts b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts index c4594ac22..ccda4f8e7 100644 --- a/server/src/lib/score-import/framework/user-game-stats/classes.test.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.test.ts @@ -1,7 +1,7 @@ import { UserGameStats } from "kamaitachi-common"; import t from "tap"; import { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { CalculateClassDeltas, UpdateUGSClasses } from "./classes"; diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.test.ts b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts index d168ec531..44e4db545 100644 --- a/server/src/lib/score-import/framework/user-game-stats/rating.test.ts +++ b/server/src/lib/score-import/framework/user-game-stats/rating.test.ts @@ -4,7 +4,7 @@ import ResetDBState from "../../../../test-utils/reset-db-state"; import { TestingIIDXSPScorePB } from "../../../../test-utils/test-data"; import { CalculateCustomRatings, CalculateRatings } from "./rating"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import crypto from "crypto"; const logger = CreateLogCtx(__filename); diff --git a/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts index a57a3cf01..f93af4b82 100644 --- a/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts +++ b/server/src/lib/score-import/framework/user-game-stats/update-ugs.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../logger/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { UpdateUsersGamePlaytypeStats } from "./update-ugs"; import deepmerge from "deepmerge"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts index c9b6c3537..f6b7d524c 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data"; import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts index 43e6b3447..4dd0f04a2 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import { CloseMongoConnection } from "../../../../../external/mongo/db"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; import { BatchManual } from "./types"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts index 038bf595f..ee4d4af84 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../../test-utils/reset-db-state"; import ConverterFn, { EamScoreConverter, EamScoreConverterWrapper } from "./converter"; import p from "prudence"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts index 551bf97b9..f6a75f618 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import GenericParseEamIIDXCSV, { NaiveCSVParse, ResolveHeaders } from "./parser"; import { CloseMongoConnection } from "../../../../../external/mongo/db"; diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts b/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts index c93d868a9..aadb40a63 100644 --- a/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../../test-utils/reset-db-state"; import { GetKTDataJSON, diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts b/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts index eb4121cf8..4ce4ebbdd 100644 --- a/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/parser.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import { CloseMongoConnection } from "../../../../../external/mongo/db"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { MockMulterFile } from "../../../../../test-utils/mock-multer"; import ResetDBState from "../../../../../test-utils/reset-db-state"; import { GetKTDataBuffer, GetKTDataJSON } from "../../../../../test-utils/test-data"; diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts index 2fa6cce9e..d6ad59207 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import { CloseMongoConnection } from "../../../../../external/mongo/db"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../../test-utils/reset-db-state"; import { GetKTDataJSON, diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts index 7daa27d58..85c9b669f 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import { GetMilisecondsSince } from "../../../../../utils/util"; import { CloseMongoConnection } from "../../../../../external/mongo/db"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import { MockMulterFile } from "../../../../../test-utils/mock-multer"; import ResetDBState from "../../../../../test-utils/reset-db-state"; import { GetKTDataBuffer } from "../../../../../test-utils/test-data"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts index ff2ede622..7ff64a1b2 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/converter.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; -import CreateLogCtx from "../../../../../logger/logger"; +import CreateLogCtx from "../../../../logger/logger"; import ResetDBState from "../../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data"; import { InternalFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/main.ts b/server/src/main.ts index b0fa91bf0..c5b11eb90 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -11,7 +11,7 @@ function FormatVersion() { return `v${[major, minor, patch].join(".")} (${name})`; } -import CreateLogCtx from "./logger/logger"; +import CreateLogCtx from "./lib/logger/logger"; import server from "./server/server"; import serverConfig from "./server/server-config"; import dotenv from "dotenv"; diff --git a/server/src/server/middleware/multer-upload.ts b/server/src/server/middleware/multer-upload.ts index 31b26054a..64189da81 100644 --- a/server/src/server/middleware/multer-upload.ts +++ b/server/src/server/middleware/multer-upload.ts @@ -2,7 +2,7 @@ import { RequestHandler } from "express"; import multer, { MulterError } from "multer"; -import CreateLogCtx from "../../logger/logger"; +import CreateLogCtx from "../../lib/logger/logger"; const defaultLogger = CreateLogCtx(__filename); diff --git a/server/src/server/middleware/prudence-validate.ts b/server/src/server/middleware/prudence-validate.ts index fb90cbf82..dff72eeb7 100644 --- a/server/src/server/middleware/prudence-validate.ts +++ b/server/src/server/middleware/prudence-validate.ts @@ -1,5 +1,5 @@ import Prudence, { MiddlewareErrorHandler } from "prudence"; -import CreateLogCtx from "../../logger/logger"; +import CreateLogCtx from "../../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/middleware/require-logged-in.ts b/server/src/server/middleware/require-logged-in.ts index 3aa515d17..d5d0c143e 100644 --- a/server/src/server/middleware/require-logged-in.ts +++ b/server/src/server/middleware/require-logged-in.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import CreateLogCtx from "../../logger/logger"; +import CreateLogCtx from "../../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/api/auth/auth.ts b/server/src/server/router/api/auth/auth.ts index d0647488b..b07859827 100644 --- a/server/src/server/router/api/auth/auth.ts +++ b/server/src/server/router/api/auth/auth.ts @@ -10,7 +10,7 @@ import { InsertResult } from "monk"; import { CAPTCHA_SECRET_KEY } from "../../../../example-secrets"; import db from "../../../../external/mongo/db"; import { GetNextCounterValue } from "../../../../utils/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../lib/logger/logger"; import { FormatUserDoc } from "../../../../utils/user"; import nodeFetch from "../../../../utils/fetch"; diff --git a/server/src/server/router/api/auth/router.ts b/server/src/server/router/api/auth/router.ts index d8e8ac650..c20cdc178 100644 --- a/server/src/server/router/api/auth/router.ts +++ b/server/src/server/router/api/auth/router.ts @@ -15,7 +15,7 @@ import { } from "../../../../utils/user"; import db from "../../../../external/mongo/db"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../lib/logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index e138019f0..8d84966de 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -3,7 +3,7 @@ import { FileUploadImportTypes } from "kamaitachi-common"; import { fileImportTypes } from "kamaitachi-common/js/config"; import Prudence from "prudence"; import { GetUserWithIDGuaranteed } from "../../../../utils/user"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../lib/logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../lib/score-import/framework/score-importing/score-import-error"; diff --git a/server/src/server/router/ir/direct-manual/router.ts b/server/src/server/router/ir/direct-manual/router.ts index 273c1bea3..2b8df213d 100644 --- a/server/src/server/router/ir/direct-manual/router.ts +++ b/server/src/server/router/ir/direct-manual/router.ts @@ -1,6 +1,6 @@ import { Router } from "express"; import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../../utils/user"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../lib/logger/logger"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import ParseDirectManual from "../../../../lib/score-import/import-types/ir/direct-manual/parser"; diff --git a/server/src/server/router/ir/fervidex/router.ts b/server/src/server/router/ir/fervidex/router.ts index 2681dfbce..9585ba116 100644 --- a/server/src/server/router/ir/fervidex/router.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -8,7 +8,7 @@ import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/fram import { ParseFervidexStatic } from "../../../../lib/score-import/import-types/ir/fervidex-static/parser"; import { ParseFervidexSingle } from "../../../../lib/score-import/import-types/ir/fervidex/parser"; import { Playtypes } from "kamaitachi-common"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../lib/logger/logger"; import { FERVIDEX_COURSE_LOOKUP } from "../../../../lib/score-import/import-types/ir/fervidex-static/class-handler"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 5a62a6f91..7eda2507c 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -9,7 +9,7 @@ import { ImportDocument, } from "kamaitachi-common"; import { AssertStrAsPositiveNonZeroInt } from "../../../../lib/score-import/framework/common/string-asserts"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../lib/logger/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../utils/user"; diff --git a/server/src/server/router/ir/usc/usc.ts b/server/src/server/router/ir/usc/usc.ts index 3e30ab5ff..8a53fc0a4 100644 --- a/server/src/server/router/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/usc.ts @@ -1,5 +1,5 @@ import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitachi-common"; -import CreateLogCtx from "../../../../logger/logger"; +import CreateLogCtx from "../../../../lib/logger/logger"; import { GetPBOnChart, GetServerRecordOnChart } from "../../../../utils/scores"; import { MStoS } from "../../../../utils/util"; import { USCIR_ADJACENT_SCORE_N } from "../../../../constants/usc-ir"; diff --git a/server/src/server/server.ts b/server/src/server/server.ts index e07ce01ec..56d85d813 100644 --- a/server/src/server/server.ts +++ b/server/src/server/server.ts @@ -1,6 +1,6 @@ import express, { Express } from "express"; import "express-async-errors"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; import expressSession from "express-session"; import { SESSION_SECRET } from "../secrets"; import { integer } from "kamaitachi-common"; diff --git a/server/src/test-utils/fake-session.ts b/server/src/test-utils/fake-session.ts index 9577ca0c2..343faa803 100644 --- a/server/src/test-utils/fake-session.ts +++ b/server/src/test-utils/fake-session.ts @@ -1,5 +1,5 @@ import ResetDBState from "./reset-db-state"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; import supertest from "supertest"; const logger = CreateLogCtx(__filename); diff --git a/server/src/test-utils/mock-api.ts b/server/src/test-utils/mock-api.ts index 0e8ba77a2..ba2dea59c 100644 --- a/server/src/test-utils/mock-api.ts +++ b/server/src/test-utils/mock-api.ts @@ -1,5 +1,5 @@ import supertest from "supertest"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/test-utils/reset-db-state.ts b/server/src/test-utils/reset-db-state.ts index be99967cf..3b1d08aaa 100644 --- a/server/src/test-utils/reset-db-state.ts +++ b/server/src/test-utils/reset-db-state.ts @@ -4,7 +4,7 @@ import db from "../external/mongo/db"; import fs from "fs"; import path from "path"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/utils/class.ts b/server/src/utils/class.ts index 08130efd6..8b2b10467 100644 --- a/server/src/utils/class.ts +++ b/server/src/utils/class.ts @@ -1,7 +1,7 @@ import { Game, integer, Playtypes, UserGameStats } from "kamaitachi-common"; import { ClassData, gameClassValues } from "kamaitachi-common/js/game-classes"; import db from "../external/mongo/db"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/utils/db.ts b/server/src/utils/db.ts index 90121e6f1..14b4bfe70 100644 --- a/server/src/utils/db.ts +++ b/server/src/utils/db.ts @@ -1,5 +1,5 @@ import db from "../external/mongo/db"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; const logger = CreateLogCtx(__filename); import { integer } from "kamaitachi-common"; diff --git a/server/src/utils/folder.test.ts b/server/src/utils/folder.test.ts index d4b695b5f..7d60e4946 100644 --- a/server/src/utils/folder.test.ts +++ b/server/src/utils/folder.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; import { Testing511SPA } from "../test-utils/test-data"; import { ChartDocument, FolderDocument } from "kamaitachi-common"; import { diff --git a/server/src/utils/folder.ts b/server/src/utils/folder.ts index 76ab9b82a..1efe06b0d 100644 --- a/server/src/utils/folder.ts +++ b/server/src/utils/folder.ts @@ -1,5 +1,5 @@ import db from "../external/mongo/db"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; import { FolderDocument, AnyChartDocument, AnySongDocument } from "kamaitachi-common"; import { FilterQuery } from "mongodb"; import deepmerge from "deepmerge"; diff --git a/server/src/utils/goal.test.ts b/server/src/utils/goal.test.ts index 45c1d7f79..4a338428c 100644 --- a/server/src/utils/goal.test.ts +++ b/server/src/utils/goal.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../external/mongo/db"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; import ResetDBState from "../test-utils/reset-db-state"; import { EvaluateGoalForUser } from "./goal"; import { GoalDocument } from "kamaitachi-common"; diff --git a/server/src/utils/tierlist.ts b/server/src/utils/tierlist.ts index 4d18e3cfc..cc4942f83 100644 --- a/server/src/utils/tierlist.ts +++ b/server/src/utils/tierlist.ts @@ -1,7 +1,7 @@ import crypto from "crypto"; import { AnyChartDocument, Game, Playtypes } from "kamaitachi-common"; import db from "../external/mongo/db"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; const logger = CreateLogCtx(__filename); diff --git a/server/src/utils/user.ts b/server/src/utils/user.ts index 1cea21d0c..a417783d7 100644 --- a/server/src/utils/user.ts +++ b/server/src/utils/user.ts @@ -1,7 +1,7 @@ import { integer, PublicUserDocument } from "kamaitachi-common"; import { FindOneResult } from "monk"; import db from "../external/mongo/db"; -import CreateLogCtx from "../logger/logger"; +import CreateLogCtx from "../lib/logger/logger"; const logger = CreateLogCtx(__filename); From 176502e32d048e1b2997259f871961b38732d738 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 18:59:07 +0100 Subject: [PATCH 16/19] move constants to lib/constants --- server/@types/express/index.d.ts | 2 +- server/src/{ => lib}/constants/ea3id.ts | 0 server/src/{ => lib}/constants/ktchi.ts | 0 server/src/{ => lib}/constants/usc-ir.ts | 0 .../src/lib/score-import/import-types/ir/fervidex/parser.ts | 2 +- server/src/lib/score-import/import-types/ir/usc/converter.ts | 2 +- server/src/server/router/ir/fervidex/router.ts | 2 +- server/src/server/router/ir/usc/router.ts | 4 ++-- server/src/server/router/ir/usc/usc.ts | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename server/src/{ => lib}/constants/ea3id.ts (100%) rename server/src/{ => lib}/constants/ktchi.ts (100%) rename server/src/{ => lib}/constants/usc-ir.ts (100%) diff --git a/server/@types/express/index.d.ts b/server/@types/express/index.d.ts index 51d17e184..75043b97e 100644 --- a/server/@types/express/index.d.ts +++ b/server/@types/express/index.d.ts @@ -1,5 +1,5 @@ import { Session, SessionData } from "express-session"; -import { SYMBOL_KtchiData } from "../../src/constants/ktchi"; +import { SYMBOL_KtchiData } from "../../src/lib/constants/ktchi"; import { KtchiRequestData, KtchiSessionData } from "../../src/utils/types"; export {}; diff --git a/server/src/constants/ea3id.ts b/server/src/lib/constants/ea3id.ts similarity index 100% rename from server/src/constants/ea3id.ts rename to server/src/lib/constants/ea3id.ts diff --git a/server/src/constants/ktchi.ts b/server/src/lib/constants/ktchi.ts similarity index 100% rename from server/src/constants/ktchi.ts rename to server/src/lib/constants/ktchi.ts diff --git a/server/src/constants/usc-ir.ts b/server/src/lib/constants/usc-ir.ts similarity index 100% rename from server/src/constants/usc-ir.ts rename to server/src/lib/constants/usc-ir.ts diff --git a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts index 1d05f9baa..c078ec492 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts @@ -11,7 +11,7 @@ import { MODEL_INFINITAS_2, REV_2DXTRA, REV_OMNIMIX, -} from "../../../../../constants/ea3id"; +} from "../../../../constants/ea3id"; import { ParserFunctionReturnsSync } from "../../common/types"; const PR_Fervidex: PrudenceSchema = { diff --git a/server/src/lib/score-import/import-types/ir/usc/converter.ts b/server/src/lib/score-import/import-types/ir/usc/converter.ts index a242a3ab5..a9b9bc3b4 100644 --- a/server/src/lib/score-import/import-types/ir/usc/converter.ts +++ b/server/src/lib/score-import/import-types/ir/usc/converter.ts @@ -14,7 +14,7 @@ import { USC_DEFAULT_NEAR, USC_DEFAULT_PERFECT, USC_DEFAULT_SLAM, -} from "../../../../../constants/usc-ir"; +} from "../../../../constants/usc-ir"; function DeriveNoteMod(data: USCClientScore): "NORMAL" | "MIRROR" | "RANDOM" | "MIR-RAN" { if (data.options.mirror && data.options.random) { diff --git a/server/src/server/router/ir/fervidex/router.ts b/server/src/server/router/ir/fervidex/router.ts index 9585ba116..25a713c17 100644 --- a/server/src/server/router/ir/fervidex/router.ts +++ b/server/src/server/router/ir/fervidex/router.ts @@ -2,7 +2,7 @@ import { Router, RequestHandler } from "express"; import { UpdateClassIfGreater } from "../../../../utils/class"; import { GetUserWithIDGuaranteed } from "../../../../utils/user"; import { ParseEA3SoftID } from "../../../../utils/ea3id"; -import { EXT_HEROIC_VERSE, MODEL_INFINITAS_2, REV_2DXBMS } from "../../../../constants/ea3id"; +import { EXT_HEROIC_VERSE, MODEL_INFINITAS_2, REV_2DXBMS } from "../../../../lib/constants/ea3id"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { ParseFervidexStatic } from "../../../../lib/score-import/import-types/ir/fervidex-static/parser"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 7eda2507c..3b5e2e722 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -1,6 +1,6 @@ import { Router, RequestHandler } from "express"; import { FindChartOnSHA256 } from "../../../../utils/queries/charts"; -import { SYMBOL_KtchiData } from "../../../../constants/ktchi"; +import { SYMBOL_KtchiData } from "../../../../lib/constants/ktchi"; import db from "../../../../external/mongo/db"; import { ChartDocument, @@ -15,7 +15,7 @@ import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/fram import { GetUserWithID } from "../../../../utils/user"; import { KtLogger } from "../../../../utils/types"; import { ParseIRUSC } from "../../../../lib/score-import/import-types/ir/usc/parser"; -import { USCIR_MAX_LEADERBOARD_N } from "../../../../constants/usc-ir"; +import { USCIR_MAX_LEADERBOARD_N } from "../../../../lib/constants/usc-ir"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; const logger = CreateLogCtx(__filename); diff --git a/server/src/server/router/ir/usc/usc.ts b/server/src/server/router/ir/usc/usc.ts index 8a53fc0a4..c807ea1da 100644 --- a/server/src/server/router/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/usc.ts @@ -2,7 +2,7 @@ import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitac import CreateLogCtx from "../../../../lib/logger/logger"; import { GetPBOnChart, GetServerRecordOnChart } from "../../../../utils/scores"; import { MStoS } from "../../../../utils/util"; -import { USCIR_ADJACENT_SCORE_N } from "../../../../constants/usc-ir"; +import { USCIR_ADJACENT_SCORE_N } from "../../../../lib/constants/usc-ir"; import db from "../../../../external/mongo/db"; const logger = CreateLogCtx(__filename); From 3e2c7f2279eb9b2995b19d37e7bdefc22233d8cc Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 19:05:55 +0100 Subject: [PATCH 17/19] rename util/util to util/misc --- server/src/lib/score-import/framework/score-import-main.ts | 2 +- .../import-types/common/batch-manual/converter.test.ts | 2 +- .../import-types/common/batch-manual/parser.test.ts | 2 +- .../import-types/file/solid-state-squad/parser.test.ts | 2 +- server/src/server/router/ir/usc/usc.ts | 2 +- server/src/utils/{util.test.ts => misc.test.ts} | 2 +- server/src/utils/{util.ts => misc.ts} | 7 +++++++ server/src/utils/queries/songs.ts | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) rename server/src/utils/{util.test.ts => misc.test.ts} (82%) rename server/src/utils/{util.ts => misc.ts} (87%) diff --git a/server/src/lib/score-import/framework/score-import-main.ts b/server/src/lib/score-import/framework/score-import-main.ts index 95be6a7ec..98a0c06a6 100644 --- a/server/src/lib/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -12,7 +12,7 @@ import { KtLogger } from "../../../utils/types"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; -import { GetMilisecondsSince } from "../../../utils/util"; +import { GetMilisecondsSince } from "../../../utils/misc"; import { ProcessPBs } from "./pb/process-pbs"; import { UpdateUsersGamePlaytypeStats } from "./user-game-stats/update-ugs"; import db from "../../../external/mongo/db"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts index f6b7d524c..5ef8e4168 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts @@ -4,7 +4,7 @@ import CreateLogCtx from "../../../../logger/logger"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../../test-utils/test-data"; import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; -import { EscapeStringRegexp } from "../../../../../utils/util"; +import { EscapeStringRegexp } from "../../../../../utils/misc"; import db, { CloseMongoConnection } from "../../../../../external/mongo/db"; import { Game } from "kamaitachi-common"; import ResetDBState from "../../../../../test-utils/reset-db-state"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts index 4dd0f04a2..1b206a087 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts @@ -4,7 +4,7 @@ import CreateLogCtx from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; import { BatchManual } from "./types"; -import { EscapeStringRegexp } from "../../../../../utils/util"; +import { EscapeStringRegexp } from "../../../../../utils/misc"; import deepmerge from "deepmerge"; const mockErr = (...msg: string[]) => diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts index 85c9b669f..d038b973a 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import { GetMilisecondsSince } from "../../../../../utils/util"; +import { GetMilisecondsSince } from "../../../../../utils/misc"; import { CloseMongoConnection } from "../../../../../external/mongo/db"; import CreateLogCtx from "../../../../logger/logger"; import { MockMulterFile } from "../../../../../test-utils/mock-multer"; diff --git a/server/src/server/router/ir/usc/usc.ts b/server/src/server/router/ir/usc/usc.ts index c807ea1da..1bdd2ea2f 100644 --- a/server/src/server/router/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/usc.ts @@ -1,7 +1,7 @@ import { integer, PBScoreDocument, ScoreDocument, ChartDocument } from "kamaitachi-common"; import CreateLogCtx from "../../../../lib/logger/logger"; import { GetPBOnChart, GetServerRecordOnChart } from "../../../../utils/scores"; -import { MStoS } from "../../../../utils/util"; +import { MStoS } from "../../../../utils/misc"; import { USCIR_ADJACENT_SCORE_N } from "../../../../lib/constants/usc-ir"; import db from "../../../../external/mongo/db"; diff --git a/server/src/utils/util.test.ts b/server/src/utils/misc.test.ts similarity index 82% rename from server/src/utils/util.test.ts rename to server/src/utils/misc.test.ts index 0e6897987..d1fe5323c 100644 --- a/server/src/utils/util.test.ts +++ b/server/src/utils/misc.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import { GetMilisecondsSince } from "./util"; +import { GetMilisecondsSince } from "./misc"; t.test("#GetMilisecondsSince", (t) => { const time = GetMilisecondsSince(10n); diff --git a/server/src/utils/util.ts b/server/src/utils/misc.ts similarity index 87% rename from server/src/utils/util.ts rename to server/src/utils/misc.ts index 27c030b53..a743fc183 100644 --- a/server/src/utils/util.ts +++ b/server/src/utils/misc.ts @@ -30,3 +30,10 @@ export function Random20Hex() { export function MStoS(ms: number) { return Math.floor(ms / 1000); } + +/** + * Random From Array - Selects a random value from an array. + */ +export function RFA(arr: unknown[]) { + return arr[Math.floor(Math.random() * arr.length)]; +} diff --git a/server/src/utils/queries/songs.ts b/server/src/utils/queries/songs.ts index 74c829d93..15a0b8dcd 100644 --- a/server/src/utils/queries/songs.ts +++ b/server/src/utils/queries/songs.ts @@ -1,7 +1,7 @@ import { Game, AnySongDocument, integer } from "kamaitachi-common"; import { FindOneResult } from "monk"; import db from "../../external/mongo/db"; -import { EscapeStringRegexp } from "../util"; +import { EscapeStringRegexp } from "../misc"; /** * Finds a song document for the given game with the given title (or alt-title). From da25b11702dfbb9557fcfb0be9844c3b10a3cba2 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 19:16:21 +0100 Subject: [PATCH 18/19] move KtLogger type to lib/logger/logger --- server/src/lib/logger/logger.ts | 5 +++-- .../framework/calculated-data/calculated-data.ts | 2 +- .../framework/calculated-data/game-specific-stats.ts | 2 +- .../score-import/framework/calculated-data/game-specific.ts | 2 +- .../src/lib/score-import/framework/common/import-logger.ts | 3 +-- server/src/lib/score-import/framework/goals/goals.ts | 2 +- .../src/lib/score-import/framework/milestones/milestones.ts | 2 +- .../src/lib/score-import/framework/pb/create-pb-doc.test.ts | 2 +- server/src/lib/score-import/framework/pb/create-pb-doc.ts | 2 +- .../src/lib/score-import/framework/pb/game-specific-merge.ts | 2 +- server/src/lib/score-import/framework/pb/process-pbs.ts | 2 +- server/src/lib/score-import/framework/score-import-main.ts | 2 +- .../score-import/framework/score-importing/hydrate-score.ts | 2 +- .../framework/score-importing/score-importing.ts | 2 +- server/src/lib/score-import/framework/sessions/sessions.ts | 4 ++-- .../lib/score-import/framework/user-game-stats/classes.ts | 2 +- .../src/lib/score-import/framework/user-game-stats/rating.ts | 2 +- .../lib/score-import/framework/user-game-stats/update-ugs.ts | 2 +- .../src/lib/score-import/import-types/api/eag-iidx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/eag-sdvx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/flo-iidx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/flo-sdvx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/traverse-api.ts | 2 +- .../import-types/common/batch-manual/converter.ts | 2 +- .../score-import/import-types/common/batch-manual/parser.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.ts | 2 +- .../score-import/import-types/file/batch-manual/parser.ts | 2 +- .../import-types/file/eamusement-iidx-csv/parser.ts | 2 +- .../score-import/import-types/file/pli-iidx-csv/parser.ts | 2 +- .../lib/score-import/import-types/ir/direct-manual/parser.ts | 2 +- .../score-import/import-types/ir/fervidex-static/parser.ts | 2 +- .../src/lib/score-import/import-types/ir/fervidex/parser.ts | 2 +- server/src/lib/score-import/import-types/ir/usc/converter.ts | 2 +- server/src/lib/score-import/import-types/ir/usc/parser.ts | 2 +- server/src/server/router/api/import/router.ts | 2 +- server/src/server/router/ir/usc/router.ts | 2 +- server/src/utils/types.ts | 2 -- 38 files changed, 40 insertions(+), 42 deletions(-) diff --git a/server/src/lib/logger/logger.ts b/server/src/lib/logger/logger.ts index 4cbc3596c..0f7ed80f1 100644 --- a/server/src/lib/logger/logger.ts +++ b/server/src/lib/logger/logger.ts @@ -1,5 +1,6 @@ -import winston, { format, transports } from "winston"; -import { KtLogger } from "../../utils/types"; +import winston, { format, transports, Logger, LeveledLogMethod } from "winston"; + +export type KtLogger = Logger & { severe: LeveledLogMethod }; const level = process.env.LOG_LEVEL ?? "info"; diff --git a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts index 3f17a60be..fe83fe15c 100644 --- a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts +++ b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts @@ -5,7 +5,7 @@ import { GetDefaultTierlist, GetOneTierlistData, } from "../../../../utils/tierlist"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { DryScore } from "../common/types"; import { CreateGameSpecific } from "./game-specific"; import { CalculateCHUNITHMRating, CalculateGITADORARating } from "./game-specific-stats"; diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts index 73369ad9e..c3289f66d 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ESDCore, integer, Grades, Lamps } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { DryScore } from "../common/types"; /** diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific.ts b/server/src/lib/score-import/framework/calculated-data/game-specific.ts index 197433334..2aa58df6c 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ChartDocument, Game, Playtypes, Grades, Lamps } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { DryScore } from "../common/types"; import { CalculateBPI, diff --git a/server/src/lib/score-import/framework/common/import-logger.ts b/server/src/lib/score-import/framework/common/import-logger.ts index 428c3487c..f000e7ffa 100644 --- a/server/src/lib/score-import/framework/common/import-logger.ts +++ b/server/src/lib/score-import/framework/common/import-logger.ts @@ -1,8 +1,7 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; import { FormatUserDoc } from "../../../../utils/user"; -import { rootLogger } from "../../../logger/logger"; -import { KtLogger } from "../../../../utils/types"; +import { rootLogger, KtLogger } from "../../../logger/logger"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { const importID = crypto.randomBytes(20).toString("hex"); diff --git a/server/src/lib/score-import/framework/goals/goals.ts b/server/src/lib/score-import/framework/goals/goals.ts index 757c2b6b5..4e47d9e5a 100644 --- a/server/src/lib/score-import/framework/goals/goals.ts +++ b/server/src/lib/score-import/framework/goals/goals.ts @@ -1,7 +1,7 @@ import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; import { EvaluateGoalForUser } from "../../../../utils/goal"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; /** * Update a user's progress on all of their set goals. diff --git a/server/src/lib/score-import/framework/milestones/milestones.ts b/server/src/lib/score-import/framework/milestones/milestones.ts index 73910f6e9..9f6d32865 100644 --- a/server/src/lib/score-import/framework/milestones/milestones.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { integer, Game, diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts index 5abfd7b1f..a1ea1c278 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts @@ -5,7 +5,7 @@ import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../../te import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; import CreateLogCtx from "../../../logger/logger"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { lamps } from "kamaitachi-common/js/config"; let IIDXScore = TestingIIDXSPScore; diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.ts index 5a4a705b7..0797974a8 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.ts @@ -1,7 +1,7 @@ import db from "../../../../external/mongo/db"; import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { IIDXMergeFn, SDVXMergeFn } from "./game-specific-merge"; import { BulkWriteUpdateOneOperation } from "mongodb"; export type PBScoreDocumentNoRank = Omit; diff --git a/server/src/lib/score-import/framework/pb/game-specific-merge.ts b/server/src/lib/score-import/framework/pb/game-specific-merge.ts index 08ffe5f47..28a2b7fb0 100644 --- a/server/src/lib/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/lib/score-import/framework/pb/game-specific-merge.ts @@ -1,7 +1,7 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import { FindChartWithChartID } from "../../../../utils/queries/charts"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; import { InternalFailure } from "../common/converter-failures"; diff --git a/server/src/lib/score-import/framework/pb/process-pbs.ts b/server/src/lib/score-import/framework/pb/process-pbs.ts index ded599515..9e933be0c 100644 --- a/server/src/lib/score-import/framework/pb/process-pbs.ts +++ b/server/src/lib/score-import/framework/pb/process-pbs.ts @@ -1,6 +1,6 @@ import { integer, PBScoreDocument } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; export async function ProcessPBs( diff --git a/server/src/lib/score-import/framework/score-import-main.ts b/server/src/lib/score-import/framework/score-import-main.ts index 98a0c06a6..6501bc97d 100644 --- a/server/src/lib/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -8,7 +8,7 @@ import { integer, IDStrings, } from "kamaitachi-common"; -import { KtLogger } from "../../../utils/types"; +import { KtLogger } from "../../../lib/logger/logger"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; diff --git a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts index 20fca5279..43adb3768 100644 --- a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts +++ b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts @@ -5,7 +5,7 @@ import { ScoreDocument, AnySongDocument, } from "kamaitachi-common"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CreateCalculatedData } from "../calculated-data/calculated-data"; import { CalculateESDForGame } from "../common/score-utils"; import { DryScore } from "../common/types"; diff --git a/server/src/lib/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts index b7760ce48..d43df2bde 100644 --- a/server/src/lib/score-import/framework/score-importing/score-importing.ts +++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts @@ -18,7 +18,7 @@ import { import { CreateScoreID } from "./score-id"; import db from "../../../../external/mongo/db"; import { AppendLogCtx } from "../../../logger/logger"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { ConverterFunctionReturns, ConverterFnReturn, diff --git a/server/src/lib/score-import/framework/sessions/sessions.ts b/server/src/lib/score-import/framework/sessions/sessions.ts index d7aa5c455..91d0571ae 100644 --- a/server/src/lib/score-import/framework/sessions/sessions.ts +++ b/server/src/lib/score-import/framework/sessions/sessions.ts @@ -10,12 +10,12 @@ import { Game, } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { AppendLogCtx } from "../../../logger/logger"; +import { AppendLogCtx, KtLogger } from "../../../logger/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; import { GetScoresFromSession } from "../../../../utils/session"; -import { KtLogger } from "../../../../utils/types"; + import { ScorePlaytypeMap } from "../common/types"; const TWO_HOURS = 1000 * 60 * 60 * 2; diff --git a/server/src/lib/score-import/framework/user-game-stats/classes.ts b/server/src/lib/score-import/framework/user-game-stats/classes.ts index 06223b33d..1fd52d6c8 100644 --- a/server/src/lib/score-import/framework/user-game-stats/classes.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.ts @@ -1,7 +1,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import { gameClassValues } from "kamaitachi-common/js/game-classes"; import deepmerge from "deepmerge"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CalculateGitadoraColour, CalculateJubeatColour } from "./builtin-class-handlers"; import { ReturnClassIfGreater } from "../../../../utils/class"; diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.ts b/server/src/lib/score-import/framework/user-game-stats/rating.ts index ac7f11368..fbe52c847 100644 --- a/server/src/lib/score-import/framework/user-game-stats/rating.ts +++ b/server/src/lib/score-import/framework/user-game-stats/rating.ts @@ -1,6 +1,6 @@ import { Game, Playtypes, integer, GameSpecificCalcLookup, IDStrings } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; export async function CalculateRatings( game: Game, diff --git a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts index 2f65061f6..22ade7cc9 100644 --- a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts @@ -4,7 +4,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CalculateClassDeltas, UpdateUGSClasses, ClassHandler } from "./classes"; import { CalculateRatings, CalculateCustomRatings } from "./rating"; diff --git a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts index 449af8390..81027e96e 100644 --- a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts index dff1040bd..83c51a016 100644 --- a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts index a2541135c..aa1c07de5 100644 --- a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts index 978298eb8..eab067c10 100644 --- a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts index 9f8ab7945..80c72679f 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import nodeFetch from "../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts index 6cfb07537..311085a08 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts @@ -17,7 +17,7 @@ import { AssertStrAsPositiveInt, } from "../../../framework/common/string-asserts"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts index b9865077d..7211383a4 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts index 6f8f934cb..140ec676c 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts @@ -10,7 +10,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { GetGradeFromPercent } from "../../../framework/common/score-utils"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts index cc212a4d9..96e1662cf 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -1,5 +1,5 @@ import { Difficulties } from "kamaitachi-common"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../types"; import ConverterFn from "./converter"; diff --git a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts index 0ee58a4e4..2366756f8 100644 --- a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; diff --git a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts index 2d6c9c760..17ea110d8 100644 --- a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts index 174c079d7..dc7b2f563 100644 --- a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts index c85b3c018..c4b84d682 100644 --- a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts index 5698e1271..8c9bf883f 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import p, { PrudenceSchema } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError } from "../../../../../utils/prudence"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts index c078ec492..af074394d 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError, optNull } from "../../../../../utils/prudence"; diff --git a/server/src/lib/score-import/import-types/ir/usc/converter.ts b/server/src/lib/score-import/import-types/ir/usc/converter.ts index a9b9bc3b4..5113b1eb6 100644 --- a/server/src/lib/score-import/import-types/ir/usc/converter.ts +++ b/server/src/lib/score-import/import-types/ir/usc/converter.ts @@ -1,6 +1,6 @@ import { USCClientScore } from "../../../../../server/router/ir/usc/usc"; import { FindSongOnID } from "../../../../../utils/queries/songs"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { IRUSCContext } from "./types"; diff --git a/server/src/lib/score-import/import-types/ir/usc/parser.ts b/server/src/lib/score-import/import-types/ir/usc/parser.ts index 755b09df1..aa0b542eb 100644 --- a/server/src/lib/score-import/import-types/ir/usc/parser.ts +++ b/server/src/lib/score-import/import-types/ir/usc/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index 8d84966de..9b182360a 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -7,7 +7,7 @@ import CreateLogCtx from "../../../../lib/logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../lib/score-import/framework/score-importing/score-import-error"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 3b5e2e722..d72e07a30 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -13,7 +13,7 @@ import CreateLogCtx from "../../../../lib/logger/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../utils/user"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { ParseIRUSC } from "../../../../lib/score-import/import-types/ir/usc/parser"; import { USCIR_MAX_LEADERBOARD_N } from "../../../../lib/constants/usc-ir"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; diff --git a/server/src/utils/types.ts b/server/src/utils/types.ts index 1fa95acbb..53409bbc8 100644 --- a/server/src/utils/types.ts +++ b/server/src/utils/types.ts @@ -26,8 +26,6 @@ export interface KTSuccessResponse { export type KTReponse = KTFailResponse | KTSuccessResponse; -export type KtLogger = Logger & { severe: LeveledLogMethod }; - /** * Clarity type for empty objects - such as in context. */ From b6e589d8e44815fc94e15a9eabb7491027e27835 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 19:21:53 +0100 Subject: [PATCH 19/19] fix faulty f+r --- .../score-import/framework/calculated-data/calculated-data.ts | 2 +- .../framework/calculated-data/game-specific-stats.ts | 2 +- .../score-import/framework/calculated-data/game-specific.ts | 2 +- server/src/lib/score-import/framework/goals/goals.ts | 2 +- .../src/lib/score-import/framework/milestones/milestones.ts | 2 +- .../src/lib/score-import/framework/pb/create-pb-doc.test.ts | 4 ++-- server/src/lib/score-import/framework/pb/create-pb-doc.ts | 2 +- .../src/lib/score-import/framework/pb/game-specific-merge.ts | 2 +- server/src/lib/score-import/framework/pb/process-pbs.ts | 2 +- server/src/lib/score-import/framework/score-import-main.ts | 2 +- .../score-import/framework/score-importing/hydrate-score.ts | 2 +- .../score-import/framework/score-importing/score-importing.ts | 4 ++-- .../src/lib/score-import/framework/user-game-stats/classes.ts | 2 +- .../src/lib/score-import/framework/user-game-stats/rating.ts | 2 +- .../lib/score-import/framework/user-game-stats/update-ugs.ts | 2 +- .../src/lib/score-import/import-types/api/eag-iidx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/eag-sdvx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/flo-iidx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/flo-sdvx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/iidx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/sdvx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/traverse-api.ts | 2 +- .../import-types/common/batch-manual/converter.ts | 2 +- .../score-import/import-types/common/batch-manual/parser.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.ts | 2 +- server/src/lib/score-import/import-types/common/types.ts | 3 ++- .../lib/score-import/import-types/file/batch-manual/parser.ts | 2 +- .../import-types/file/eamusement-iidx-csv/parser.ts | 2 +- .../src/lib/score-import/import-types/file/mer-iidx/parser.ts | 3 ++- .../lib/score-import/import-types/file/pli-iidx-csv/parser.ts | 2 +- .../import-types/file/solid-state-squad/converter.ts | 3 ++- .../src/lib/score-import/import-types/ir/barbatos/parser.ts | 3 ++- .../lib/score-import/import-types/ir/direct-manual/parser.ts | 2 +- .../score-import/import-types/ir/fervidex-static/parser.ts | 2 +- .../src/lib/score-import/import-types/ir/fervidex/parser.ts | 2 +- server/src/lib/score-import/import-types/ir/usc/converter.ts | 2 +- server/src/lib/score-import/import-types/ir/usc/parser.ts | 2 +- server/src/server/router/api/import/router.ts | 4 ++-- server/src/server/router/ir/usc/router.ts | 4 ++-- server/src/utils/goal.ts | 2 +- 41 files changed, 49 insertions(+), 45 deletions(-) diff --git a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts index fe83fe15c..70d649eea 100644 --- a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts +++ b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts @@ -5,7 +5,7 @@ import { GetDefaultTierlist, GetOneTierlistData, } from "../../../../utils/tierlist"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { DryScore } from "../common/types"; import { CreateGameSpecific } from "./game-specific"; import { CalculateCHUNITHMRating, CalculateGITADORARating } from "./game-specific-stats"; diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts index c3289f66d..ceeb19f34 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ESDCore, integer, Grades, Lamps } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { DryScore } from "../common/types"; /** diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific.ts b/server/src/lib/score-import/framework/calculated-data/game-specific.ts index 2aa58df6c..e092198cc 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ChartDocument, Game, Playtypes, Grades, Lamps } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { DryScore } from "../common/types"; import { CalculateBPI, diff --git a/server/src/lib/score-import/framework/goals/goals.ts b/server/src/lib/score-import/framework/goals/goals.ts index 4e47d9e5a..0bdee9f45 100644 --- a/server/src/lib/score-import/framework/goals/goals.ts +++ b/server/src/lib/score-import/framework/goals/goals.ts @@ -1,7 +1,7 @@ import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; import { EvaluateGoalForUser } from "../../../../utils/goal"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; /** * Update a user's progress on all of their set goals. diff --git a/server/src/lib/score-import/framework/milestones/milestones.ts b/server/src/lib/score-import/framework/milestones/milestones.ts index 9f6d32865..7cbba32ae 100644 --- a/server/src/lib/score-import/framework/milestones/milestones.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { integer, Game, diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts index a1ea1c278..dbd511144 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts @@ -4,8 +4,8 @@ import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../../test-utils/test-data"; import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../logger/logger"; -import { KtLogger } from "../../../../lib/logger/logger"; +import CreateLogCtx, { KtLogger } from "../../../logger/logger"; + import { lamps } from "kamaitachi-common/js/config"; let IIDXScore = TestingIIDXSPScore; diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.ts index 0797974a8..959460af4 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.ts @@ -1,7 +1,7 @@ import db from "../../../../external/mongo/db"; import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { IIDXMergeFn, SDVXMergeFn } from "./game-specific-merge"; import { BulkWriteUpdateOneOperation } from "mongodb"; export type PBScoreDocumentNoRank = Omit; diff --git a/server/src/lib/score-import/framework/pb/game-specific-merge.ts b/server/src/lib/score-import/framework/pb/game-specific-merge.ts index 28a2b7fb0..30ae19c7f 100644 --- a/server/src/lib/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/lib/score-import/framework/pb/game-specific-merge.ts @@ -1,7 +1,7 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import { FindChartWithChartID } from "../../../../utils/queries/charts"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; import { InternalFailure } from "../common/converter-failures"; diff --git a/server/src/lib/score-import/framework/pb/process-pbs.ts b/server/src/lib/score-import/framework/pb/process-pbs.ts index 9e933be0c..27a3a5614 100644 --- a/server/src/lib/score-import/framework/pb/process-pbs.ts +++ b/server/src/lib/score-import/framework/pb/process-pbs.ts @@ -1,6 +1,6 @@ import { integer, PBScoreDocument } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; export async function ProcessPBs( diff --git a/server/src/lib/score-import/framework/score-import-main.ts b/server/src/lib/score-import/framework/score-import-main.ts index 6501bc97d..ed8e07ba2 100644 --- a/server/src/lib/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -8,7 +8,7 @@ import { integer, IDStrings, } from "kamaitachi-common"; -import { KtLogger } from "../../../lib/logger/logger"; +import { KtLogger } from "../../logger/logger"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; diff --git a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts index 43adb3768..c80802c47 100644 --- a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts +++ b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts @@ -5,7 +5,7 @@ import { ScoreDocument, AnySongDocument, } from "kamaitachi-common"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { CreateCalculatedData } from "../calculated-data/calculated-data"; import { CalculateESDForGame } from "../common/score-utils"; import { DryScore } from "../common/types"; diff --git a/server/src/lib/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts index d43df2bde..7229b750d 100644 --- a/server/src/lib/score-import/framework/score-importing/score-importing.ts +++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts @@ -17,8 +17,8 @@ import { } from "../common/converter-failures"; import { CreateScoreID } from "./score-id"; import db from "../../../../external/mongo/db"; -import { AppendLogCtx } from "../../../logger/logger"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { AppendLogCtx, KtLogger } from "../../../logger/logger"; + import { ConverterFunctionReturns, ConverterFnReturn, diff --git a/server/src/lib/score-import/framework/user-game-stats/classes.ts b/server/src/lib/score-import/framework/user-game-stats/classes.ts index 1fd52d6c8..8007c08ce 100644 --- a/server/src/lib/score-import/framework/user-game-stats/classes.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.ts @@ -1,7 +1,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import { gameClassValues } from "kamaitachi-common/js/game-classes"; import deepmerge from "deepmerge"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { CalculateGitadoraColour, CalculateJubeatColour } from "./builtin-class-handlers"; import { ReturnClassIfGreater } from "../../../../utils/class"; diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.ts b/server/src/lib/score-import/framework/user-game-stats/rating.ts index fbe52c847..2c198cb5d 100644 --- a/server/src/lib/score-import/framework/user-game-stats/rating.ts +++ b/server/src/lib/score-import/framework/user-game-stats/rating.ts @@ -1,6 +1,6 @@ import { Game, Playtypes, integer, GameSpecificCalcLookup, IDStrings } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; export async function CalculateRatings( game: Game, diff --git a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts index 22ade7cc9..6c1ae851d 100644 --- a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts @@ -4,7 +4,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../lib/logger/logger"; +import { KtLogger } from "../../../logger/logger"; import { CalculateClassDeltas, UpdateUGSClasses, ClassHandler } from "./classes"; import { CalculateRatings, CalculateCustomRatings } from "./rating"; diff --git a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts index 81027e96e..1ad5240a7 100644 --- a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts index 83c51a016..95c011688 100644 --- a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts index aa1c07de5..65c5560b7 100644 --- a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts index eab067c10..3be7d3dec 100644 --- a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts index dc46cf519..0de4ad4ee 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../../utils/types"; +import { KtLogger } from "../../../../../logger/logger"; import nodeFetch from "../../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts index c782e102b..fe2fa2f66 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../../utils/types"; +import { KtLogger } from "../../../../../logger/logger"; import nodeFetch from "../../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; import { KaiContext } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts index 80c72679f..720da769a 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import nodeFetch from "../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts index 311085a08..d0e330240 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts @@ -17,7 +17,7 @@ import { AssertStrAsPositiveInt, } from "../../../framework/common/string-asserts"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts index 7211383a4..080a0a0b0 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts index 140ec676c..f3620966c 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts @@ -10,7 +10,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { GetGradeFromPercent } from "../../../framework/common/score-utils"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types"; -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts index 96e1662cf..958e2dc32 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -1,5 +1,5 @@ import { Difficulties } from "kamaitachi-common"; -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../types"; import ConverterFn from "./converter"; diff --git a/server/src/lib/score-import/import-types/common/types.ts b/server/src/lib/score-import/import-types/common/types.ts index 954fa9796..9464a6173 100644 --- a/server/src/lib/score-import/import-types/common/types.ts +++ b/server/src/lib/score-import/import-types/common/types.ts @@ -1,4 +1,5 @@ -import { EmptyObject, KtLogger } from "../../../../utils/types"; +import { EmptyObject } from "../../../../utils/types"; +import { KtLogger } from "../../../logger/logger"; import { MerScore } from "../file/mer-iidx/types"; import { S3Score } from "../file/solid-state-squad/types"; import { BarbatosScore } from "../ir/barbatos/types"; diff --git a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts index 2366756f8..5778c5dac 100644 --- a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; diff --git a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts index 17ea110d8..f33e2c64d 100644 --- a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts b/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts index 9d1e0827d..20dbc146e 100644 --- a/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/parser.ts @@ -1,6 +1,7 @@ import p from "prudence"; import { FormatPrError } from "../../../../../utils/prudence"; -import { EmptyObject, KtLogger } from "../../../../../utils/types"; +import { EmptyObject } from "../../../../../utils/types"; +import { KtLogger } from "../../../../logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../../common/types"; import { ConvertFileMerIIDX } from "./converter"; diff --git a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts index dc7b2f563..354e6e053 100644 --- a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts index 0581560cb..0d307bfda 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts @@ -1,4 +1,5 @@ -import { EmptyObject, KtLogger } from "../../../../../utils/types"; +import { EmptyObject } from "../../../../../utils/types"; +import { KtLogger } from "../../../../logger/logger"; import { InvalidScoreFailure, KTDataNotFoundFailure, diff --git a/server/src/lib/score-import/import-types/ir/barbatos/parser.ts b/server/src/lib/score-import/import-types/ir/barbatos/parser.ts index b3f12646b..a63db8ac1 100644 --- a/server/src/lib/score-import/import-types/ir/barbatos/parser.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/parser.ts @@ -1,4 +1,5 @@ -import { EmptyObject, KtLogger } from "../../../../../utils/types"; +import { EmptyObject } from "../../../../../utils/types"; +import { KtLogger } from "../../../../logger/logger"; import p from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError } from "../../../../../utils/prudence"; diff --git a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts index c4b84d682..d15bc7c83 100644 --- a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts index 8c9bf883f..cd04f25ed 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import p, { PrudenceSchema } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError } from "../../../../../utils/prudence"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts index af074394d..bdda5c846 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError, optNull } from "../../../../../utils/prudence"; diff --git a/server/src/lib/score-import/import-types/ir/usc/converter.ts b/server/src/lib/score-import/import-types/ir/usc/converter.ts index 5113b1eb6..01bf40506 100644 --- a/server/src/lib/score-import/import-types/ir/usc/converter.ts +++ b/server/src/lib/score-import/import-types/ir/usc/converter.ts @@ -1,6 +1,6 @@ import { USCClientScore } from "../../../../../server/router/ir/usc/usc"; import { FindSongOnID } from "../../../../../utils/queries/songs"; -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { IRUSCContext } from "./types"; diff --git a/server/src/lib/score-import/import-types/ir/usc/parser.ts b/server/src/lib/score-import/import-types/ir/usc/parser.ts index aa0b542eb..7455b3a8f 100644 --- a/server/src/lib/score-import/import-types/ir/usc/parser.ts +++ b/server/src/lib/score-import/import-types/ir/usc/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../lib/logger/logger"; +import { KtLogger } from "../../../../logger/logger"; import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index 9b182360a..2e615d45f 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -3,11 +3,11 @@ import { FileUploadImportTypes } from "kamaitachi-common"; import { fileImportTypes } from "kamaitachi-common/js/config"; import Prudence from "prudence"; import { GetUserWithIDGuaranteed } from "../../../../utils/user"; -import CreateLogCtx from "../../../../lib/logger/logger"; +import CreateLogCtx, { KtLogger } from "../../../../lib/logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../lib/score-import/framework/score-importing/score-import-error"; -import { KtLogger } from "../../../../lib/logger/logger"; + import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index d72e07a30..bd86da37d 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -9,11 +9,11 @@ import { ImportDocument, } from "kamaitachi-common"; import { AssertStrAsPositiveNonZeroInt } from "../../../../lib/score-import/framework/common/string-asserts"; -import CreateLogCtx from "../../../../lib/logger/logger"; +import CreateLogCtx, { KtLogger } from "../../../../lib/logger/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../utils/user"; -import { KtLogger } from "../../../../lib/logger/logger"; + import { ParseIRUSC } from "../../../../lib/score-import/import-types/ir/usc/parser"; import { USCIR_MAX_LEADERBOARD_N } from "../../../../lib/constants/usc-ir"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; diff --git a/server/src/utils/goal.ts b/server/src/utils/goal.ts index 593ff837f..18b026a26 100644 --- a/server/src/utils/goal.ts +++ b/server/src/utils/goal.ts @@ -1,7 +1,7 @@ import { GoalDocument, integer, PBScoreDocument, Game } from "kamaitachi-common"; import { grades, lamps } from "kamaitachi-common/js/config"; import db from "../external/mongo/db"; -import { KtLogger } from "./types"; +import { KtLogger } from "../lib/logger/logger"; import { GetFolderChartIDs } from "./folder"; import { FilterQuery } from "mongodb";