From d9a50bada9467b5a044d2f447beae46ef2bf6c6e Mon Sep 17 00:00:00 2001 From: zkldi Date: Thu, 13 May 2021 09:37:36 +0100 Subject: [PATCH] more renaming impacts --- .../__KT_DATABASE_MIGRATION/other/museca-tierlist.ts | 2 +- server/scripts/__KT_DATABASE_MIGRATION/scores.ts | 2 +- server/scripts/iidx-tierlist/get-sp12-data.ts | 6 +++--- server/scripts/iidx-tierlist/parse-iidxkr-data.ts | 6 +++--- server/scripts/init-folder-cache/folder-cache.ts | 2 +- server/src/common/auth.ts | 2 +- server/src/common/captcha.ts | 2 +- server/src/common/db.ts | 2 +- server/src/common/folder.test.ts | 2 +- server/src/common/folder.ts | 2 +- server/src/common/format-user.ts | 2 +- server/src/common/goal.test.ts | 2 +- server/src/common/tierlist.ts | 2 +- server/src/common/user.ts | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts b/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts index 75fba5373..a5f2a1cbc 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/other/museca-tierlist.ts @@ -1,6 +1,6 @@ import db from "../../../src/db/db"; import { TierlistDataDocument } from "kamaitachi-common"; -import { CalculateTierlistDataID } from "../../../src/core/tierlist-core"; +import { CalculateTierlistDataID } from "../../../src/common/tierlist"; import { oldKTDB } from "../old-db"; import CreateLogCtx from "../../../src/logger"; const logger = CreateLogCtx("museca-tierlist.ts"); diff --git a/server/scripts/__KT_DATABASE_MIGRATION/scores.ts b/server/scripts/__KT_DATABASE_MIGRATION/scores.ts index 52259ca9d..937b61797 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/scores.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/scores.ts @@ -5,7 +5,7 @@ import { grades, lamps, supportedGames, validPlaytypes } from "kamaitachi-common import db from "../../src/db/db"; import MigrateRecords from "./migrate"; import CreateLogCtx from "../../src/logger"; -import { CreateScoreID } from "../../src/score-import/framework/core/score-id"; +import { CreateScoreID } from "../../src/score-import/framework/common/score-utils"; const logger = CreateLogCtx("scores.ts"); diff --git a/server/scripts/iidx-tierlist/get-sp12-data.ts b/server/scripts/iidx-tierlist/get-sp12-data.ts index d15585cff..d256c2de2 100644 --- a/server/scripts/iidx-tierlist/get-sp12-data.ts +++ b/server/scripts/iidx-tierlist/get-sp12-data.ts @@ -2,11 +2,11 @@ /* eslint-disable no-param-reassign */ import db from "../../src/db/db"; import fetch from "node-fetch"; -import { FindSongOnTitle } from "../../src/score-import/database-lookup/song-title"; -import { FindChartWithPTDF } from "../../src/score-import/database-lookup/chart-ptdf"; +import { FindSongOnTitle } from "../../src/common/database-lookup/song"; +import { FindChartWithPTDF } from "../../src/common/database-lookup/chart"; import { Difficulties, TierlistDataDocument } from "kamaitachi-common"; -import { CalculateTierlistDataID } from "../../src/core/tierlist-core"; +import { CalculateTierlistDataID } from "../../src/common/tierlist"; import CreateLogCtx from "../../src/logger"; const logger = CreateLogCtx("get-sp12-data.ts"); diff --git a/server/scripts/iidx-tierlist/parse-iidxkr-data.ts b/server/scripts/iidx-tierlist/parse-iidxkr-data.ts index e986fab39..7c46a7f16 100644 --- a/server/scripts/iidx-tierlist/parse-iidxkr-data.ts +++ b/server/scripts/iidx-tierlist/parse-iidxkr-data.ts @@ -1,10 +1,10 @@ import db from "../../src/db/db"; import fs from "fs"; import path from "path"; -import { CalculateTierlistDataID } from "../../src/core/tierlist-core"; -import { FindSongOnTitle } from "../../src/score-import/database-lookup/song-title"; +import { CalculateTierlistDataID } from "../../src/common/tierlist"; +import { FindSongOnTitle } from "../../src/common/database-lookup/song"; import CreateLogCtx from "../../src/logger"; -import { FindChartWithPTDF } from "../../src/score-import/database-lookup/chart-ptdf"; +import { FindChartWithPTDF } from "../../src/common/database-lookup/chart"; import { Difficulties } from "kamaitachi-common"; const logger = CreateLogCtx("parse-iidxkr-data.ts"); diff --git a/server/scripts/init-folder-cache/folder-cache.ts b/server/scripts/init-folder-cache/folder-cache.ts index 09684ebb9..b3da18a9e 100644 --- a/server/scripts/init-folder-cache/folder-cache.ts +++ b/server/scripts/init-folder-cache/folder-cache.ts @@ -1,3 +1,3 @@ -import { InitaliseFolderChartLookup } from "../../src/core/folder-core"; +import { InitaliseFolderChartLookup } from "../../src/common/folder"; InitaliseFolderChartLookup(); diff --git a/server/src/common/auth.ts b/server/src/common/auth.ts index 33ffd9f77..019b855b0 100644 --- a/server/src/common/auth.ts +++ b/server/src/common/auth.ts @@ -12,7 +12,7 @@ import { InsertResult } from "monk"; import CreateLogCtx from "../logger"; import { FormatUserDoc } from "./format-user"; -const logger = CreateLogCtx("auth-core.ts"); +const logger = CreateLogCtx("auth.ts"); const BCRYPT_SALT_ROUNDS = 12; diff --git a/server/src/common/captcha.ts b/server/src/common/captcha.ts index cdecf3862..c133b6470 100644 --- a/server/src/common/captcha.ts +++ b/server/src/common/captcha.ts @@ -2,7 +2,7 @@ import nodeFetch from "../fetch"; import CreateLogCtx from "../logger"; import { CAPTCHA_SECRET_KEY } from "../secrets"; -const logger = CreateLogCtx("captcha-core.ts"); +const logger = CreateLogCtx("captcha.ts"); // shrug diff --git a/server/src/common/db.ts b/server/src/common/db.ts index 399193b4e..3a877605e 100644 --- a/server/src/common/db.ts +++ b/server/src/common/db.ts @@ -1,6 +1,6 @@ import db from "../db/db"; import CreateLogCtx from "../logger"; -const logger = CreateLogCtx("db-core.ts"); +const logger = CreateLogCtx("db.ts"); import { integer } from "kamaitachi-common"; export async function GetNextCounterValue(counterName: string): Promise { diff --git a/server/src/common/folder.test.ts b/server/src/common/folder.test.ts index 4e2f38867..7006c8573 100644 --- a/server/src/common/folder.test.ts +++ b/server/src/common/folder.test.ts @@ -12,7 +12,7 @@ import db, { CloseMongoConnection } from "../db/db"; import ResetDBState from "../test-utils/reset-db-state"; import deepmerge from "deepmerge"; -const logger = CreateLogCtx("folder-core.test.ts"); +const logger = CreateLogCtx("folder.test.ts"); t.todo("#CreateFolderChartLookup"); t.todo("#GetFolderCharts"); diff --git a/server/src/common/folder.ts b/server/src/common/folder.ts index eec997027..c4c7f05b1 100644 --- a/server/src/common/folder.ts +++ b/server/src/common/folder.ts @@ -4,7 +4,7 @@ import { FolderDocument, AnyChartDocument, AnySongDocument } from "kamaitachi-co import { FilterQuery } from "mongodb"; import deepmerge from "deepmerge"; -const logger = CreateLogCtx("folder-core.ts"); +const logger = CreateLogCtx("folder.ts"); // overloads! diff --git a/server/src/common/format-user.ts b/server/src/common/format-user.ts index 71e0ca345..58a280496 100644 --- a/server/src/common/format-user.ts +++ b/server/src/common/format-user.ts @@ -2,7 +2,7 @@ import { PublicUserDocument } from "kamaitachi-common"; /** * Returns a formatted string indicating the user. This is used for logging. - * (This is not in user-core.ts to avoid a circular reference issue with logger.ts<->db.ts) + * (This is not in user.ts to avoid a circular reference issue with logger.ts<->db.ts) * @param userdoc The user document to format. */ export function FormatUserDoc(userdoc: PublicUserDocument) { diff --git a/server/src/common/goal.test.ts b/server/src/common/goal.test.ts index 2d50b764c..c342df77f 100644 --- a/server/src/common/goal.test.ts +++ b/server/src/common/goal.test.ts @@ -13,7 +13,7 @@ import { } from "../test-utils/test-data"; import { CreateFolderChartLookup } from "./folder"; -const logger = CreateLogCtx("goal-core.test.ts"); +const logger = CreateLogCtx("goal.test.ts"); t.test("#EvaluateGoalForUser", (t) => { t.beforeEach(ResetDBState); diff --git a/server/src/common/tierlist.ts b/server/src/common/tierlist.ts index 0bc7e142b..42dc3d5b5 100644 --- a/server/src/common/tierlist.ts +++ b/server/src/common/tierlist.ts @@ -3,7 +3,7 @@ import { AnyChartDocument, Game, Playtypes } from "kamaitachi-common"; import db from "../db/db"; import CreateLogCtx from "../logger"; -const logger = CreateLogCtx("tierlist-core.ts"); +const logger = CreateLogCtx("tierlist.ts"); export function CalculateTierlistDataID( chartID: string, diff --git a/server/src/common/user.ts b/server/src/common/user.ts index 8a86751ab..5cd6049bf 100644 --- a/server/src/common/user.ts +++ b/server/src/common/user.ts @@ -3,7 +3,7 @@ import { FindOneResult } from "monk"; import db from "../db/db"; import CreateLogCtx from "../logger"; -const logger = CreateLogCtx("user-core.ts"); +const logger = CreateLogCtx("user.ts"); const OMIT_PRIVATE_USER_RETURNS = { password: 0,