From 7f1829daaea1658a6763bfd846eeb5bc5b30863a Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 17:56:41 +0100 Subject: [PATCH] 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