From da25b11702dfbb9557fcfb0be9844c3b10a3cba2 Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 25 May 2021 19:16:21 +0100 Subject: [PATCH] move KtLogger type to lib/logger/logger --- server/src/lib/logger/logger.ts | 5 +++-- .../framework/calculated-data/calculated-data.ts | 2 +- .../framework/calculated-data/game-specific-stats.ts | 2 +- .../score-import/framework/calculated-data/game-specific.ts | 2 +- .../src/lib/score-import/framework/common/import-logger.ts | 3 +-- server/src/lib/score-import/framework/goals/goals.ts | 2 +- .../src/lib/score-import/framework/milestones/milestones.ts | 2 +- .../src/lib/score-import/framework/pb/create-pb-doc.test.ts | 2 +- server/src/lib/score-import/framework/pb/create-pb-doc.ts | 2 +- .../src/lib/score-import/framework/pb/game-specific-merge.ts | 2 +- server/src/lib/score-import/framework/pb/process-pbs.ts | 2 +- server/src/lib/score-import/framework/score-import-main.ts | 2 +- .../score-import/framework/score-importing/hydrate-score.ts | 2 +- .../framework/score-importing/score-importing.ts | 2 +- server/src/lib/score-import/framework/sessions/sessions.ts | 4 ++-- .../lib/score-import/framework/user-game-stats/classes.ts | 2 +- .../src/lib/score-import/framework/user-game-stats/rating.ts | 2 +- .../lib/score-import/framework/user-game-stats/update-ugs.ts | 2 +- .../src/lib/score-import/import-types/api/eag-iidx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/eag-sdvx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/flo-iidx/parser.ts | 2 +- .../src/lib/score-import/import-types/api/flo-sdvx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/traverse-api.ts | 2 +- .../import-types/common/batch-manual/converter.ts | 2 +- .../score-import/import-types/common/batch-manual/parser.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.ts | 2 +- .../score-import/import-types/file/batch-manual/parser.ts | 2 +- .../import-types/file/eamusement-iidx-csv/parser.ts | 2 +- .../score-import/import-types/file/pli-iidx-csv/parser.ts | 2 +- .../lib/score-import/import-types/ir/direct-manual/parser.ts | 2 +- .../score-import/import-types/ir/fervidex-static/parser.ts | 2 +- .../src/lib/score-import/import-types/ir/fervidex/parser.ts | 2 +- server/src/lib/score-import/import-types/ir/usc/converter.ts | 2 +- server/src/lib/score-import/import-types/ir/usc/parser.ts | 2 +- server/src/server/router/api/import/router.ts | 2 +- server/src/server/router/ir/usc/router.ts | 2 +- server/src/utils/types.ts | 2 -- 38 files changed, 40 insertions(+), 42 deletions(-) diff --git a/server/src/lib/logger/logger.ts b/server/src/lib/logger/logger.ts index 4cbc3596c..0f7ed80f1 100644 --- a/server/src/lib/logger/logger.ts +++ b/server/src/lib/logger/logger.ts @@ -1,5 +1,6 @@ -import winston, { format, transports } from "winston"; -import { KtLogger } from "../../utils/types"; +import winston, { format, transports, Logger, LeveledLogMethod } from "winston"; + +export type KtLogger = Logger & { severe: LeveledLogMethod }; const level = process.env.LOG_LEVEL ?? "info"; diff --git a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts index 3f17a60be..fe83fe15c 100644 --- a/server/src/lib/score-import/framework/calculated-data/calculated-data.ts +++ b/server/src/lib/score-import/framework/calculated-data/calculated-data.ts @@ -5,7 +5,7 @@ import { GetDefaultTierlist, GetOneTierlistData, } from "../../../../utils/tierlist"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { DryScore } from "../common/types"; import { CreateGameSpecific } from "./game-specific"; import { CalculateCHUNITHMRating, CalculateGITADORARating } from "./game-specific-stats"; diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts index 73369ad9e..c3289f66d 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific-stats.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ESDCore, integer, Grades, Lamps } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { DryScore } from "../common/types"; /** diff --git a/server/src/lib/score-import/framework/calculated-data/game-specific.ts b/server/src/lib/score-import/framework/calculated-data/game-specific.ts index 197433334..2aa58df6c 100644 --- a/server/src/lib/score-import/framework/calculated-data/game-specific.ts +++ b/server/src/lib/score-import/framework/calculated-data/game-specific.ts @@ -1,6 +1,6 @@ import { AnyChartDocument, ChartDocument, Game, Playtypes, Grades, Lamps } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { DryScore } from "../common/types"; import { CalculateBPI, diff --git a/server/src/lib/score-import/framework/common/import-logger.ts b/server/src/lib/score-import/framework/common/import-logger.ts index 428c3487c..f000e7ffa 100644 --- a/server/src/lib/score-import/framework/common/import-logger.ts +++ b/server/src/lib/score-import/framework/common/import-logger.ts @@ -1,8 +1,7 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; import { FormatUserDoc } from "../../../../utils/user"; -import { rootLogger } from "../../../logger/logger"; -import { KtLogger } from "../../../../utils/types"; +import { rootLogger, KtLogger } from "../../../logger/logger"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { const importID = crypto.randomBytes(20).toString("hex"); diff --git a/server/src/lib/score-import/framework/goals/goals.ts b/server/src/lib/score-import/framework/goals/goals.ts index 757c2b6b5..4e47d9e5a 100644 --- a/server/src/lib/score-import/framework/goals/goals.ts +++ b/server/src/lib/score-import/framework/goals/goals.ts @@ -1,7 +1,7 @@ import { integer, Game, GoalDocument, UserGoalDocument } from "kamaitachi-common"; import { EvaluateGoalForUser } from "../../../../utils/goal"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; /** * Update a user's progress on all of their set goals. diff --git a/server/src/lib/score-import/framework/milestones/milestones.ts b/server/src/lib/score-import/framework/milestones/milestones.ts index 73910f6e9..9f6d32865 100644 --- a/server/src/lib/score-import/framework/milestones/milestones.ts +++ b/server/src/lib/score-import/framework/milestones/milestones.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { integer, Game, diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts index 5abfd7b1f..a1ea1c278 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.test.ts @@ -5,7 +5,7 @@ import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../../te import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; import CreateLogCtx from "../../../logger/logger"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { lamps } from "kamaitachi-common/js/config"; let IIDXScore = TestingIIDXSPScore; diff --git a/server/src/lib/score-import/framework/pb/create-pb-doc.ts b/server/src/lib/score-import/framework/pb/create-pb-doc.ts index 5a4a705b7..0797974a8 100644 --- a/server/src/lib/score-import/framework/pb/create-pb-doc.ts +++ b/server/src/lib/score-import/framework/pb/create-pb-doc.ts @@ -1,7 +1,7 @@ import db from "../../../../external/mongo/db"; import { integer, PBScoreDocument, ScoreDocument } from "kamaitachi-common"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { IIDXMergeFn, SDVXMergeFn } from "./game-specific-merge"; import { BulkWriteUpdateOneOperation } from "mongodb"; export type PBScoreDocumentNoRank = Omit; diff --git a/server/src/lib/score-import/framework/pb/game-specific-merge.ts b/server/src/lib/score-import/framework/pb/game-specific-merge.ts index 08ffe5f47..28a2b7fb0 100644 --- a/server/src/lib/score-import/framework/pb/game-specific-merge.ts +++ b/server/src/lib/score-import/framework/pb/game-specific-merge.ts @@ -1,7 +1,7 @@ import { PBScoreDocument, ScoreDocument } from "kamaitachi-common"; import { FindChartWithChartID } from "../../../../utils/queries/charts"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CalculateVF4, CalculateVF5 } from "../calculated-data/game-specific-stats"; import { InternalFailure } from "../common/converter-failures"; diff --git a/server/src/lib/score-import/framework/pb/process-pbs.ts b/server/src/lib/score-import/framework/pb/process-pbs.ts index ded599515..9e933be0c 100644 --- a/server/src/lib/score-import/framework/pb/process-pbs.ts +++ b/server/src/lib/score-import/framework/pb/process-pbs.ts @@ -1,6 +1,6 @@ import { integer, PBScoreDocument } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CreatePBDoc, UpdateChartRanking, PBScoreDocumentNoRank } from "./create-pb-doc"; export async function ProcessPBs( diff --git a/server/src/lib/score-import/framework/score-import-main.ts b/server/src/lib/score-import/framework/score-import-main.ts index 98a0c06a6..6501bc97d 100644 --- a/server/src/lib/score-import/framework/score-import-main.ts +++ b/server/src/lib/score-import/framework/score-import-main.ts @@ -8,7 +8,7 @@ import { integer, IDStrings, } from "kamaitachi-common"; -import { KtLogger } from "../../../utils/types"; +import { KtLogger } from "../../../lib/logger/logger"; import { ImportAllIterableData } from "./score-importing/score-importing"; import { CreateImportLoggerAndID } from "./common/import-logger"; import { CreateSessions } from "./sessions/sessions"; diff --git a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts index 20fca5279..43adb3768 100644 --- a/server/src/lib/score-import/framework/score-importing/hydrate-score.ts +++ b/server/src/lib/score-import/framework/score-importing/hydrate-score.ts @@ -5,7 +5,7 @@ import { ScoreDocument, AnySongDocument, } from "kamaitachi-common"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CreateCalculatedData } from "../calculated-data/calculated-data"; import { CalculateESDForGame } from "../common/score-utils"; import { DryScore } from "../common/types"; diff --git a/server/src/lib/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts index b7760ce48..d43df2bde 100644 --- a/server/src/lib/score-import/framework/score-importing/score-importing.ts +++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts @@ -18,7 +18,7 @@ import { import { CreateScoreID } from "./score-id"; import db from "../../../../external/mongo/db"; import { AppendLogCtx } from "../../../logger/logger"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { ConverterFunctionReturns, ConverterFnReturn, diff --git a/server/src/lib/score-import/framework/sessions/sessions.ts b/server/src/lib/score-import/framework/sessions/sessions.ts index d7aa5c455..91d0571ae 100644 --- a/server/src/lib/score-import/framework/sessions/sessions.ts +++ b/server/src/lib/score-import/framework/sessions/sessions.ts @@ -10,12 +10,12 @@ import { Game, } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { AppendLogCtx } from "../../../logger/logger"; +import { AppendLogCtx, KtLogger } from "../../../logger/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; import { GetScoresFromSession } from "../../../../utils/session"; -import { KtLogger } from "../../../../utils/types"; + import { ScorePlaytypeMap } from "../common/types"; const TWO_HOURS = 1000 * 60 * 60 * 2; diff --git a/server/src/lib/score-import/framework/user-game-stats/classes.ts b/server/src/lib/score-import/framework/user-game-stats/classes.ts index 06223b33d..1fd52d6c8 100644 --- a/server/src/lib/score-import/framework/user-game-stats/classes.ts +++ b/server/src/lib/score-import/framework/user-game-stats/classes.ts @@ -1,7 +1,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import { gameClassValues } from "kamaitachi-common/js/game-classes"; import deepmerge from "deepmerge"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CalculateGitadoraColour, CalculateJubeatColour } from "./builtin-class-handlers"; import { ReturnClassIfGreater } from "../../../../utils/class"; diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.ts b/server/src/lib/score-import/framework/user-game-stats/rating.ts index ac7f11368..fbe52c847 100644 --- a/server/src/lib/score-import/framework/user-game-stats/rating.ts +++ b/server/src/lib/score-import/framework/user-game-stats/rating.ts @@ -1,6 +1,6 @@ import { Game, Playtypes, integer, GameSpecificCalcLookup, IDStrings } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; export async function CalculateRatings( game: Game, diff --git a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts index 2f65061f6..22ade7cc9 100644 --- a/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts +++ b/server/src/lib/score-import/framework/user-game-stats/update-ugs.ts @@ -4,7 +4,7 @@ import { Game, Playtypes, integer, UserGameStats, ClassDelta } from "kamaitachi-common"; import db from "../../../../external/mongo/db"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { CalculateClassDeltas, UpdateUGSClasses, ClassHandler } from "./classes"; import { CalculateRatings, CalculateCustomRatings } from "./rating"; diff --git a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts index 449af8390..81027e96e 100644 --- a/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts index dff1040bd..83c51a016 100644 --- a/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/eag-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts index a2541135c..aa1c07de5 100644 --- a/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-iidx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ParseKaiIIDX } from "../../common/api-kai/iidx/parser"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts index 978298eb8..eab067c10 100644 --- a/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts +++ b/server/src/lib/score-import/import-types/api/flo-sdvx/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { KaiAuthDocument } from "kamaitachi-common"; import { ParseKaiSDVX } from "../../common/api-kai/sdvx/parser"; diff --git a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts index 9f8ab7945..80c72679f 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/traverse-api.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import nodeFetch from "../../../../../utils/fetch"; import { KaiAuthDocument } from "kamaitachi-common"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts index 6cfb07537..311085a08 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.ts @@ -17,7 +17,7 @@ import { AssertStrAsPositiveInt, } from "../../../framework/common/string-asserts"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts index b9865077d..7211383a4 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { BatchManual, BatchManualContext, BatchManualScore } from "./types"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts index 6f8f934cb..140ec676c 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/converter.ts @@ -10,7 +10,7 @@ import ScoreImportFatalError from "../../../framework/score-importing/score-impo import { GetGradeFromPercent } from "../../../framework/common/score-utils"; import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts"; import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { DryScore } from "../../../framework/common/types"; import { ConverterFunction, ConverterFnReturn } from "../types"; diff --git a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts index cc212a4d9..96e1662cf 100644 --- a/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/common/eamusement-iidx-csv/parser.ts @@ -1,5 +1,5 @@ import { Difficulties } from "kamaitachi-common"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParserFunctionReturnsSync } from "../types"; import ConverterFn from "./converter"; diff --git a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts index 0ee58a4e4..2366756f8 100644 --- a/server/src/lib/score-import/import-types/file/batch-manual/parser.ts +++ b/server/src/lib/score-import/import-types/file/batch-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; diff --git a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts index 2d6c9c760..17ea110d8 100644 --- a/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/eamusement-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts index 174c079d7..dc7b2f563 100644 --- a/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts +++ b/server/src/lib/score-import/import-types/file/pli-iidx-csv/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import GenericParseEamIIDXCSV from "../../common/eamusement-iidx-csv/parser"; import { IIDXEamusementCSVContext, diff --git a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts index c85b3c018..c4b84d682 100644 --- a/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts +++ b/server/src/lib/score-import/import-types/ir/direct-manual/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ParseBatchManualFromObject } from "../../common/batch-manual/parser"; import { BatchManualContext, BatchManualScore } from "../../common/batch-manual/types"; import { ParserFunctionReturnsSync } from "../../common/types"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts index 5698e1271..8c9bf883f 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex-static/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import p, { PrudenceSchema } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError } from "../../../../../utils/prudence"; diff --git a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts index c078ec492..af074394d 100644 --- a/server/src/lib/score-import/import-types/ir/fervidex/parser.ts +++ b/server/src/lib/score-import/import-types/ir/fervidex/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import p, { PrudenceSchema, ValidSchemaValue } from "prudence"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { FormatPrError, optNull } from "../../../../../utils/prudence"; diff --git a/server/src/lib/score-import/import-types/ir/usc/converter.ts b/server/src/lib/score-import/import-types/ir/usc/converter.ts index a9b9bc3b4..5113b1eb6 100644 --- a/server/src/lib/score-import/import-types/ir/usc/converter.ts +++ b/server/src/lib/score-import/import-types/ir/usc/converter.ts @@ -1,6 +1,6 @@ import { USCClientScore } from "../../../../../server/router/ir/usc/usc"; import { FindSongOnID } from "../../../../../utils/queries/songs"; -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { InternalFailure, InvalidScoreFailure } from "../../../framework/common/converter-failures"; import { GenericGetGradeAndPercent } from "../../../framework/common/score-utils"; import { IRUSCContext } from "./types"; diff --git a/server/src/lib/score-import/import-types/ir/usc/parser.ts b/server/src/lib/score-import/import-types/ir/usc/parser.ts index 755b09df1..aa0b542eb 100644 --- a/server/src/lib/score-import/import-types/ir/usc/parser.ts +++ b/server/src/lib/score-import/import-types/ir/usc/parser.ts @@ -1,4 +1,4 @@ -import { KtLogger } from "../../../../../utils/types"; +import { KtLogger } from "../../../../../lib/logger/logger"; import { ChartDocument } from "kamaitachi-common"; import p, { PrudenceSchema } from "prudence"; import { InvalidScoreFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/server/router/api/import/router.ts b/server/src/server/router/api/import/router.ts index 8d84966de..9b182360a 100644 --- a/server/src/server/router/api/import/router.ts +++ b/server/src/server/router/api/import/router.ts @@ -7,7 +7,7 @@ import CreateLogCtx from "../../../../lib/logger/logger"; import prValidate from "../../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import ScoreImportFatalError from "../../../../lib/score-import/framework/score-importing/score-import-error"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; diff --git a/server/src/server/router/ir/usc/router.ts b/server/src/server/router/ir/usc/router.ts index 3b5e2e722..d72e07a30 100644 --- a/server/src/server/router/ir/usc/router.ts +++ b/server/src/server/router/ir/usc/router.ts @@ -13,7 +13,7 @@ import CreateLogCtx from "../../../../lib/logger/logger"; import { CreatePOSTScoresResponseBody, KtchiScoreToServerScore } from "./usc"; import { ExpressWrappedScoreImportMain } from "../../../../lib/score-import/framework/express-wrapper"; import { GetUserWithID } from "../../../../utils/user"; -import { KtLogger } from "../../../../utils/types"; +import { KtLogger } from "../../../../lib/logger/logger"; import { ParseIRUSC } from "../../../../lib/score-import/import-types/ir/usc/parser"; import { USCIR_MAX_LEADERBOARD_N } from "../../../../lib/constants/usc-ir"; import { CreateMulterSingleUploadMiddleware } from "../../../middleware/multer-upload"; diff --git a/server/src/utils/types.ts b/server/src/utils/types.ts index 1fa95acbb..53409bbc8 100644 --- a/server/src/utils/types.ts +++ b/server/src/utils/types.ts @@ -26,8 +26,6 @@ export interface KTSuccessResponse { export type KTReponse = KTFailResponse | KTSuccessResponse; -export type KtLogger = Logger & { severe: LeveledLogMethod }; - /** * Clarity type for empty objects - such as in context. */