From eabeae4452e5c0735b42c61bd062cb6ab79c3536 Mon Sep 17 00:00:00 2001
From: zkldi <notzkldi@zkldi.com>
Date: Tue, 25 May 2021 17:47:04 +0100
Subject: [PATCH] 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<PBScoreDocument, "rankingData">;
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";