From e9e6263fd198aa017edc0e878cc4fc9beb8556d6 Mon Sep 17 00:00:00 2001 From: zkldi Date: Thu, 20 May 2021 08:27:09 +0100 Subject: [PATCH] Move logger to common/logger --- server/scripts/initialise-counters.ts | 2 +- server/src/api/auth/auth.ts | 2 +- server/src/api/import/import.ts | 2 +- server/src/api/ir/direct-manual/direct-manual.ts | 2 +- server/src/common/auth.ts | 4 ++-- server/src/common/class.ts | 2 +- server/src/common/db.ts | 2 +- server/src/{ => common}/fetch.ts | 0 server/src/common/folder.test.ts | 2 +- server/src/common/folder.ts | 2 +- server/src/common/goal.test.ts | 2 +- server/src/{ => common}/logger.test.ts | 2 +- server/src/{ => common}/logger.ts | 2 +- server/src/common/tierlist.ts | 2 +- server/src/common/user.ts | 2 +- server/src/db/db.ts | 2 +- server/src/main.ts | 2 +- server/src/middleware/prudence-validate.ts | 2 +- server/src/middleware/require-logged-in.ts | 2 +- server/src/redis/redis-store.ts | 2 +- .../framework/calculated-data/calculated-data.test.ts | 2 +- .../framework/calculated-data/game-specific-stats.test.ts | 2 +- .../framework/calculated-data/game-specific.test.ts | 2 +- server/src/score-import/framework/common/import-logger.ts | 2 +- server/src/score-import/framework/common/score-utils.ts | 2 +- server/src/score-import/framework/goals/goals.test.ts | 2 +- .../src/score-import/framework/milestones/milestones.test.ts | 2 +- server/src/score-import/framework/pb/create-pb-doc.test.ts | 2 +- server/src/score-import/framework/pb/process-pbs.test.ts | 2 +- .../score-import/framework/score-importing/insert-score.ts | 2 +- .../score-import/framework/score-importing/score-importing.ts | 2 +- server/src/score-import/framework/sessions/sessions.ts | 2 +- .../score-import/framework/user-game-stats/classes.test.ts | 2 +- .../src/score-import/framework/user-game-stats/rating.test.ts | 2 +- .../score-import/framework/user-game-stats/update-ugs.test.ts | 2 +- .../score-import/import-types/common/api-kai/iidx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/sdvx/parser.ts | 2 +- .../score-import/import-types/common/api-kai/traverse-api.ts | 2 +- .../import-types/common/batch-manual/converter.test.ts | 2 +- .../import-types/common/batch-manual/parser.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/converter.test.ts | 2 +- .../import-types/common/eamusement-iidx-csv/parser.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/converter.test.ts | 2 +- .../score-import/import-types/file/mer-iidx/parser.test.ts | 2 +- .../import-types/file/solid-state-squad/converter.test.ts | 2 +- .../import-types/file/solid-state-squad/parser.test.ts | 2 +- .../score-import/import-types/ir/fervidex/converter.test.ts | 2 +- server/src/server.ts | 2 +- server/src/test-utils/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 +- 52 files changed, 52 insertions(+), 52 deletions(-) rename server/src/{ => common}/fetch.ts (100%) rename server/src/{ => common}/logger.test.ts (93%) rename server/src/{ => common}/logger.ts (95%) diff --git a/server/scripts/initialise-counters.ts b/server/scripts/initialise-counters.ts index f11c5915f..5908f0a4e 100644 --- a/server/scripts/initialise-counters.ts +++ b/server/scripts/initialise-counters.ts @@ -1,5 +1,5 @@ import db from "../db/db"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; const logger = CreateLogCtx("scripts/initialise-counters.ts"); diff --git a/server/src/api/auth/auth.ts b/server/src/api/auth/auth.ts index 4863943f7..1b09d9e2e 100644 --- a/server/src/api/auth/auth.ts +++ b/server/src/api/auth/auth.ts @@ -15,7 +15,7 @@ import { } from "../../common/user"; import db from "../../db/db"; -import CreateLogCtx from "../../logger"; +import CreateLogCtx from "../../common/logger"; import prValidate from "../../middleware/prudence-validate"; import { RequireLoggedIn } from "../../middleware/require-logged-in"; diff --git a/server/src/api/import/import.ts b/server/src/api/import/import.ts index 6aba4b492..95891bbfb 100644 --- a/server/src/api/import/import.ts +++ b/server/src/api/import/import.ts @@ -4,7 +4,7 @@ import { fileImportTypes } from "kamaitachi-common/js/config"; import multer, { MulterError } from "multer"; import Prudence from "prudence"; import { GetUserWithIDGuaranteed } from "../../common/user"; -import CreateLogCtx from "../../logger"; +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"; diff --git a/server/src/api/ir/direct-manual/direct-manual.ts b/server/src/api/ir/direct-manual/direct-manual.ts index 899afd648..1f00218b3 100644 --- a/server/src/api/ir/direct-manual/direct-manual.ts +++ b/server/src/api/ir/direct-manual/direct-manual.ts @@ -1,6 +1,6 @@ import { Router } from "express"; import { GetUserWithID, GetUserWithIDGuaranteed } from "../../../common/user"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import { RequireLoggedIn } from "../../../middleware/require-logged-in"; import { ExpressWrappedScoreImportMain } from "../../../score-import/framework/express-wrapper"; import ParseDirectManual from "../../../score-import/import-types/ir/direct-manual/parser"; diff --git a/server/src/common/auth.ts b/server/src/common/auth.ts index 6cc77b4e9..e545f1fcf 100644 --- a/server/src/common/auth.ts +++ b/server/src/common/auth.ts @@ -9,9 +9,9 @@ import { import db from "../db/db"; import { GetNextCounterValue } from "./db"; import { InsertResult } from "monk"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; import { FormatUserDoc } from "./user"; -import nodeFetch from "../fetch"; +import nodeFetch from "./fetch"; import { CAPTCHA_SECRET_KEY } from "../secrets"; const logger = CreateLogCtx("auth.ts"); diff --git a/server/src/common/class.ts b/server/src/common/class.ts index f47435240..2858d2104 100644 --- a/server/src/common/class.ts +++ b/server/src/common/class.ts @@ -1,7 +1,7 @@ import { Game, integer, Playtypes, UserGameStats } from "kamaitachi-common"; import { ClassData, gameClassValues } from "kamaitachi-common/js/game-classes"; import db from "../db/db"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; const logger = CreateLogCtx("class.ts"); diff --git a/server/src/common/db.ts b/server/src/common/db.ts index 3a877605e..eeea825d4 100644 --- a/server/src/common/db.ts +++ b/server/src/common/db.ts @@ -1,5 +1,5 @@ import db from "../db/db"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; const logger = CreateLogCtx("db.ts"); import { integer } from "kamaitachi-common"; diff --git a/server/src/fetch.ts b/server/src/common/fetch.ts similarity index 100% rename from server/src/fetch.ts rename to server/src/common/fetch.ts diff --git a/server/src/common/folder.test.ts b/server/src/common/folder.test.ts index f3ff3fd4a..c86f52d6f 100644 --- a/server/src/common/folder.test.ts +++ b/server/src/common/folder.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; import { Testing511SPA } from "../test-utils/test-data"; import { ChartDocument, FolderDocument } from "kamaitachi-common"; import { diff --git a/server/src/common/folder.ts b/server/src/common/folder.ts index 8861761fc..8a74da787 100644 --- a/server/src/common/folder.ts +++ b/server/src/common/folder.ts @@ -1,5 +1,5 @@ import db from "../db/db"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; import { FolderDocument, AnyChartDocument, AnySongDocument } from "kamaitachi-common"; import { FilterQuery } from "mongodb"; import deepmerge from "deepmerge"; diff --git a/server/src/common/goal.test.ts b/server/src/common/goal.test.ts index aa0eb0582..2797b3623 100644 --- a/server/src/common/goal.test.ts +++ b/server/src/common/goal.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import db, { CloseMongoConnection } from "../db/db"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; import ResetDBState from "../test-utils/reset-db-state"; import { EvaluateGoalForUser } from "./goal"; import { GoalDocument } from "kamaitachi-common"; diff --git a/server/src/logger.test.ts b/server/src/common/logger.test.ts similarity index 93% rename from server/src/logger.test.ts rename to server/src/common/logger.test.ts index 23c57b7bf..68342eebd 100644 --- a/server/src/logger.test.ts +++ b/server/src/common/logger.test.ts @@ -1,5 +1,5 @@ import t from "tap"; -import { CloseMongoConnection } from "./db/db"; +import { CloseMongoConnection } from "../db/db"; import CreateLogCtx, { Transports } from "./logger"; t.test("Logger Tests", (t) => { diff --git a/server/src/logger.ts b/server/src/common/logger.ts similarity index 95% rename from server/src/logger.ts rename to server/src/common/logger.ts index 88c00a510..8a2d4e864 100644 --- a/server/src/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/common/tierlist.ts b/server/src/common/tierlist.ts index 330e4951e..c34a69cf8 100644 --- a/server/src/common/tierlist.ts +++ b/server/src/common/tierlist.ts @@ -1,7 +1,7 @@ import crypto from "crypto"; import { AnyChartDocument, Game, Playtypes } from "kamaitachi-common"; import db from "../db/db"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; const logger = CreateLogCtx("tierlist.ts"); diff --git a/server/src/common/user.ts b/server/src/common/user.ts index f8c68515f..0237d551a 100644 --- a/server/src/common/user.ts +++ b/server/src/common/user.ts @@ -1,7 +1,7 @@ import { integer, PublicUserDocument } from "kamaitachi-common"; import { FindOneResult } from "monk"; import db from "../db/db"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "./logger"; const logger = CreateLogCtx("user.ts"); diff --git a/server/src/db/db.ts b/server/src/db/db.ts index f869ab05b..a13a7ea84 100644 --- a/server/src/db/db.ts +++ b/server/src/db/db.ts @@ -25,7 +25,7 @@ import { UserMilestoneDocument, } from "kamaitachi-common"; import monk from "monk"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; const logger = CreateLogCtx("db.ts"); diff --git a/server/src/main.ts b/server/src/main.ts index 919c2c50b..b9b335c99 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -11,7 +11,7 @@ function FormatVersion() { return `v${[major, minor, patch].join(".")} (${name})`; } -import CreateLogCtx from "./logger"; +import CreateLogCtx from "./common/logger"; import server from "./server"; import serverConfig from "./server-config"; import dotenv from "dotenv"; diff --git a/server/src/middleware/prudence-validate.ts b/server/src/middleware/prudence-validate.ts index c0c941f2c..8bc8b8fc8 100644 --- a/server/src/middleware/prudence-validate.ts +++ b/server/src/middleware/prudence-validate.ts @@ -1,5 +1,5 @@ import Prudence, { MiddlewareErrorHandler } from "prudence"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; const logger = CreateLogCtx("prudence-validate.ts"); diff --git a/server/src/middleware/require-logged-in.ts b/server/src/middleware/require-logged-in.ts index 5a2fe2ec1..f67e909db 100644 --- a/server/src/middleware/require-logged-in.ts +++ b/server/src/middleware/require-logged-in.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; const logger = CreateLogCtx("require-logged-in.ts"); diff --git a/server/src/redis/redis-store.ts b/server/src/redis/redis-store.ts index c45862632..2854ffbaa 100644 --- a/server/src/redis/redis-store.ts +++ b/server/src/redis/redis-store.ts @@ -1,6 +1,6 @@ import connectRedis from "connect-redis"; import expressSession from "express-session"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; import redis from "redis"; const logger = CreateLogCtx("redis-store.ts"); 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 8313b8b76..50eb0018a 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 "../../../db/db"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import { prAssert } from "../../../test-utils/asserts"; import { Testing511SPA, diff --git a/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts b/server/src/score-import/framework/calculated-data/game-specific-stats.test.ts index dc514694b..941e71d67 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 @@ -12,7 +12,7 @@ import { CalculateVF5, KaidenPercentile, } from "./game-specific-stats"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import { isApproximately } from "../../../test-utils/asserts"; t.test("#CalculateBPI", (t) => { 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 b59d492d2..ed50ce3ee 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 "../../../db/db"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import { prAssert } from "../../../test-utils/asserts"; import { Testing511SPA, diff --git a/server/src/score-import/framework/common/import-logger.ts b/server/src/score-import/framework/common/import-logger.ts index f4615194a..5e32dcb4a 100644 --- a/server/src/score-import/framework/common/import-logger.ts +++ b/server/src/score-import/framework/common/import-logger.ts @@ -1,7 +1,7 @@ import { ImportTypes, PublicUserDocument } from "kamaitachi-common"; import crypto from "crypto"; import { FormatUserDoc } from "../../../common/user"; -import { rootLogger } from "../../../logger"; +import { rootLogger } from "../../../common/logger"; import { KtLogger } from "../../../types"; export function CreateImportLoggerAndID(userDoc: PublicUserDocument, importType: ImportTypes) { diff --git a/server/src/score-import/framework/common/score-utils.ts b/server/src/score-import/framework/common/score-utils.ts index 1ea420d34..66da0f8d3 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 "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import { InternalFailure, InvalidScoreFailure } from "./converter-failures"; const logger = CreateLogCtx("score-utils.ts"); diff --git a/server/src/score-import/framework/goals/goals.test.ts b/server/src/score-import/framework/goals/goals.test.ts index 0158605ef..68d342381 100644 --- a/server/src/score-import/framework/goals/goals.test.ts +++ b/server/src/score-import/framework/goals/goals.test.ts @@ -19,7 +19,7 @@ import { TestingIIDXFolderSP10, } from "../../../test-utils/test-data"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import crypto from "crypto"; const logger = CreateLogCtx("goals.test.ts"); diff --git a/server/src/score-import/framework/milestones/milestones.test.ts b/server/src/score-import/framework/milestones/milestones.test.ts index 010eb57a5..41e5ccec7 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 "../../../db/db"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { TestingIIDXSPMilestone } from "../../../test-utils/test-data"; import { UpdateUsersMilestones } from "./milestones"; diff --git a/server/src/score-import/framework/pb/create-pb-doc.test.ts b/server/src/score-import/framework/pb/create-pb-doc.test.ts index c572a4bc1..38638483d 100644 --- a/server/src/score-import/framework/pb/create-pb-doc.test.ts +++ b/server/src/score-import/framework/pb/create-pb-doc.test.ts @@ -4,7 +4,7 @@ import ResetDBState from "../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; import { CreatePBDoc } from "./create-pb-doc"; import deepmerge from "deepmerge"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import { KtLogger } from "../../../types"; import { lamps } from "kamaitachi-common/js/config"; diff --git a/server/src/score-import/framework/pb/process-pbs.test.ts b/server/src/score-import/framework/pb/process-pbs.test.ts index 9699e1eb7..60432fa5f 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 "../../../db/db"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { Testing511SPA, TestingIIDXSPScore } from "../../../test-utils/test-data"; import { ProcessPBs } from "./process-pbs"; diff --git a/server/src/score-import/framework/score-importing/insert-score.ts b/server/src/score-import/framework/score-importing/insert-score.ts index ab4f92d34..ffc372106 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 "../../../db/db"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; const logger = CreateLogCtx("insert-score.ts"); 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 c03811be7..504f735cd 100644 --- a/server/src/score-import/framework/score-importing/score-importing.ts +++ b/server/src/score-import/framework/score-importing/score-importing.ts @@ -24,7 +24,7 @@ import { } from "../common/converter-failures"; import { CreateScoreID } from "./score-id"; import db from "../../../db/db"; -import { AppendLogCtx } from "../../../logger"; +import { AppendLogCtx } from "../../../common/logger"; /** * Processes the iterable data into the Kamaitachi database. diff --git a/server/src/score-import/framework/sessions/sessions.ts b/server/src/score-import/framework/sessions/sessions.ts index ecdfa1048..109c2a3a0 100644 --- a/server/src/score-import/framework/sessions/sessions.ts +++ b/server/src/score-import/framework/sessions/sessions.ts @@ -10,7 +10,7 @@ import { Game, } from "kamaitachi-common"; import db from "../../../db/db"; -import { AppendLogCtx } from "../../../logger"; +import { AppendLogCtx } from "../../../common/logger"; import { GenerateRandomSessionName } from "./name-generation"; import crypto from "crypto"; import { CreateSessionCalcData } from "./performance-calc"; diff --git a/server/src/score-import/framework/user-game-stats/classes.test.ts b/server/src/score-import/framework/user-game-stats/classes.test.ts index 93ee0cb82..a28369e97 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 "../../../db/db"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { CalculateClassDeltas, UpdateUGSClasses } from "./classes"; diff --git a/server/src/score-import/framework/user-game-stats/rating.test.ts b/server/src/score-import/framework/user-game-stats/rating.test.ts index 5f34a9a51..13db5fb5c 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 "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import crypto from "crypto"; const logger = CreateLogCtx("rating.test.ts"); 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 42632223c..e606e1a6e 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 "../../../db/db"; -import CreateLogCtx from "../../../logger"; +import CreateLogCtx from "../../../common/logger"; import ResetDBState from "../../../test-utils/reset-db-state"; import { UpdateUsersGamePlaytypeStats } from "./update-ugs"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/import-types/common/api-kai/iidx/parser.ts b/server/src/score-import/import-types/common/api-kai/iidx/parser.ts index bb7a9c6ce..46cc1fabb 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, ParserFunctionReturnsAsync } from "../../../../../types"; -import nodeFetch from "../../../../../fetch"; +import nodeFetch from "../../../../../common/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/parser.ts b/server/src/score-import/import-types/common/api-kai/sdvx/parser.ts index ffdcee372..dd3ddd49b 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, ParserFunctionReturnsAsync } from "../../../../../types"; -import nodeFetch from "../../../../../fetch"; +import nodeFetch from "../../../../../common/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 6b72c4e98..e5a33ae9b 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 "../../../../types"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; -import nodeFetch from "../../../../fetch"; +import nodeFetch from "../../../../common/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 e693a4ac0..b2baf801f 100644 --- a/server/src/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/converter.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import t from "tap"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import { Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; import { ResolveChartFromSong, ResolveMatchTypeToKTData, ConverterBatchManual } from "./converter"; import deepmerge from "deepmerge"; diff --git a/server/src/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/score-import/import-types/common/batch-manual/parser.test.ts index aaf15b1f7..48ab0f725 100644 --- a/server/src/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/score-import/import-types/common/batch-manual/parser.test.ts @@ -1,6 +1,6 @@ import t from "tap"; import { CloseMongoConnection } from "../../../../db/db"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import { ParseBatchManualFromObject as ParserFn } from "./parser"; import { BatchManual } from "./types"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/converter.test.ts index 5c108c4c8..898f9b372 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 "../../../../db/db"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import ConverterFn, { EamScoreConverter, EamScoreConverterWrapper } from "./converter"; import p from "prudence"; diff --git a/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts b/server/src/score-import/import-types/common/eamusement-iidx-csv/parser.test.ts index 621d95e14..aa28c709f 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 "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import ScoreImportFatalError from "../../../framework/score-importing/score-import-error"; import GenericParseEamIIDXCSV, { NaiveCSVParse, ResolveHeaders } from "./parser"; import { CloseMongoConnection } from "../../../../db/db"; 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 858d3d94c..0f945c16e 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 "../../../../db/db"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, diff --git a/server/src/score-import/import-types/file/mer-iidx/parser.test.ts b/server/src/score-import/import-types/file/mer-iidx/parser.test.ts index bae563d5c..9537b9e78 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 "../../../../db/db"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataBuffer, GetKTDataJSON } from "../../../../test-utils/test-data"; diff --git a/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/score-import/import-types/file/solid-state-squad/converter.test.ts index 4e098447a..0e0cc642c 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 db, { CloseMongoConnection } from "../../../../db/db"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; import { ConvertFileS3, ParseDifficulty, ResolveS3Lamp } from "./converter"; 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 4c160494a..d139e65c1 100644 --- a/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts +++ b/server/src/score-import/import-types/file/solid-state-squad/parser.test.ts @@ -2,7 +2,7 @@ import t from "tap"; import { GetMilisecondsSince } from "../../../../common/hrtime"; import { CloseMongoConnection } from "../../../../db/db"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import { MockMulterFile } from "../../../../test-utils/mock-multer"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataBuffer } from "../../../../test-utils/test-data"; diff --git a/server/src/score-import/import-types/ir/fervidex/converter.test.ts b/server/src/score-import/import-types/ir/fervidex/converter.test.ts index 34f4e9453..3c866674c 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 "../../../../db/db"; -import CreateLogCtx from "../../../../logger"; +import CreateLogCtx from "../../../../common/logger"; import ResetDBState from "../../../../test-utils/reset-db-state"; import { GetKTDataJSON, Testing511Song, Testing511SPA } from "../../../../test-utils/test-data"; import { InternalFailure } from "../../../framework/common/converter-failures"; diff --git a/server/src/server.ts b/server/src/server.ts index bd2e52af9..058b5618f 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -1,6 +1,6 @@ import express, { Express } from "express"; import "express-async-errors"; -import CreateLogCtx from "./logger"; +import CreateLogCtx from "./common/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 5dfaa16a5..b28dabd83 100644 --- a/server/src/test-utils/fake-session.ts +++ b/server/src/test-utils/fake-session.ts @@ -1,5 +1,5 @@ import ResetDBState from "./reset-db-state"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; import supertest from "supertest"; const logger = CreateLogCtx("fake-session.ts"); diff --git a/server/src/test-utils/mock-api.ts b/server/src/test-utils/mock-api.ts index 1d4772bf2..3e6f994ae 100644 --- a/server/src/test-utils/mock-api.ts +++ b/server/src/test-utils/mock-api.ts @@ -1,5 +1,5 @@ import supertest from "supertest"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; const logger = CreateLogCtx("mock-api.ts"); diff --git a/server/src/test-utils/mock-fetch.ts b/server/src/test-utils/mock-fetch.ts index 1032c2e21..2c5875640 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 "../fetch"; +import { NodeFetch } from "../common/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 62c44cdc8..57b238067 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 "../db/db"; import fs from "fs"; import path from "path"; -import CreateLogCtx from "../logger"; +import CreateLogCtx from "../common/logger"; const logger = CreateLogCtx("reset-db-state.ts");