more renaming impacts

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");

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");
 

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");

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");

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();

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;
 

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
 

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<integer> {

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");

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!
 

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) {

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);

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,

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,