From 709a996d98168a00f72f397a99ffbd7eae2f883b Mon Sep 17 00:00:00 2001 From: zkldi Date: Tue, 27 Apr 2021 00:44:26 +0100 Subject: [PATCH] general cleanup --- server/src/db/db.ts | 9 ++----- .../framework/core/converter-errors.ts | 15 ----------- .../framework/core/sessions/sessions.ts | 2 +- .../framework/importing/score-importing.ts | 6 ++--- .../file/csv-eamusement-iidx/converter.ts | 2 +- server/src/test-utils/mock-db/adjectives.json | 5 ---- server/src/test-utils/mock-db/nouns.json | 3 --- server/src/test-utils/mock-db/sessions.json | 26 +++++++++++++++++++ 8 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 server/src/test-utils/mock-db/adjectives.json delete mode 100644 server/src/test-utils/mock-db/nouns.json create mode 100644 server/src/test-utils/mock-db/sessions.json diff --git a/server/src/db/db.ts b/server/src/db/db.ts index a062cd98e..4a3c8b34c 100644 --- a/server/src/db/db.ts +++ b/server/src/db/db.ts @@ -1,6 +1,4 @@ import { - ChartDocument, - config, CounterDocument, FolderDocument, Game, @@ -8,11 +6,9 @@ import { IIDXBPIData, IIDXEamusementScoreDocument, ImportDocument, - SongDocument, InviteCodeDocument, MilestoneDocument, NotificationDocument, - Playtypes, PrivateUserDocument, PublicAPIKeyDocument, ScoreDocument, @@ -22,9 +18,8 @@ import { UserGoalDocument, UserMilestoneDocument, } from "kamaitachi-common"; -import monk, { ICollection } from "monk"; +import monk from "monk"; import CreateLogCtx from "../logger"; -import { TextDocument } from "../types"; const logger = CreateLogCtx("db.ts"); @@ -44,7 +39,7 @@ monkDB .then(() => { if (process.env.NODE_ENV !== "test") { let time = process.hrtime(dbtime); - let elapsed = time[0] + time[1] / 1000000; + let elapsed = time[0] + time[1] / 1e6; logger.info(`Database connection successful: took ${elapsed}ms`); } }) diff --git a/server/src/score-import/framework/core/converter-errors.ts b/server/src/score-import/framework/core/converter-errors.ts index 0d6983828..6d58bb1f4 100644 --- a/server/src/score-import/framework/core/converter-errors.ts +++ b/server/src/score-import/framework/core/converter-errors.ts @@ -34,21 +34,6 @@ export class KTDataNotFoundFailure extends Co } } -/** - * ScoreExistsError - A score with this ID already exists. - * Since this error is mostly useless to the end user (people re-import scores all the time!) - * This is not returned from score processing, however, it exists so the reason for the error can be - * sussed out. - */ -export class ScoreExistsFailure extends ConverterFailure { - scoreID: string; - - constructor(message: string | null, scoreID: string) { - super(message); - this.scoreID = scoreID; - } -} - /** * InvalidScoreError - This score provided invalid data that Kamaitachi can not accept. */ diff --git a/server/src/score-import/framework/core/sessions/sessions.ts b/server/src/score-import/framework/core/sessions/sessions.ts index 2180ac3ee..6036bd321 100644 --- a/server/src/score-import/framework/core/sessions/sessions.ts +++ b/server/src/score-import/framework/core/sessions/sessions.ts @@ -249,7 +249,7 @@ export async function LoadScoresIntoSessions( } ); } else { - logger.verbose( + logger.debug( `Creating new session for ${userID} (${game} ${playtype}) around ${startOfGroup} ${endOfGroup}.` ); diff --git a/server/src/score-import/framework/importing/score-importing.ts b/server/src/score-import/framework/importing/score-importing.ts index e92273648..42b638f9d 100644 --- a/server/src/score-import/framework/importing/score-importing.ts +++ b/server/src/score-import/framework/importing/score-importing.ts @@ -52,7 +52,7 @@ export async function ImportAllIterableData( let nonFlatDatapoints = await Promise.all(promises); logger.verbose(`Finished Importing Data (${promises.length} datapoints).`); - logger.verbose(`Flattening returns...`); + logger.debug(`Flattening returns...`); let flatDatapoints = []; @@ -74,7 +74,7 @@ export async function ImportAllIterableData( } } - logger.verbose(`Flattened returns.`); + logger.debug(`Flattened returns.`); logger.verbose(`Recieved ${flatDatapoints.length} returns, from ${promises.length} data.`); @@ -180,7 +180,7 @@ async function ImportFromConverterReturn( return null; } - logger.verbose(`Successfully imported score: ${result.scoreID}`); + logger.debug(`Successfully imported score: ${result.scoreID}`); return { success: true, diff --git a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts index d9b5262f6..a35cf375a 100644 --- a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts +++ b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts @@ -166,7 +166,7 @@ async function EamScoreConverter( } dryScore.scoreData.hitMeta.bp = numBP; } else if (eamScore.bp === "---") { - logger.verbose( + logger.debug( `Skipped assigning BP for score as it had expected null value of ${eamScore.bp}.` ); } else { diff --git a/server/src/test-utils/mock-db/adjectives.json b/server/src/test-utils/mock-db/adjectives.json deleted file mode 100644 index be5127913..000000000 --- a/server/src/test-utils/mock-db/adjectives.json +++ /dev/null @@ -1,5 +0,0 @@ -[{ - "text": "adjective1" -}, { - "text": "adjective2" -}] \ No newline at end of file diff --git a/server/src/test-utils/mock-db/nouns.json b/server/src/test-utils/mock-db/nouns.json deleted file mode 100644 index c45385d3b..000000000 --- a/server/src/test-utils/mock-db/nouns.json +++ /dev/null @@ -1,3 +0,0 @@ -[{ - "text": "noun1" -}] \ No newline at end of file diff --git a/server/src/test-utils/mock-db/sessions.json b/server/src/test-utils/mock-db/sessions.json new file mode 100644 index 000000000..1226c05b3 --- /dev/null +++ b/server/src/test-utils/mock-db/sessions.json @@ -0,0 +1,26 @@ +[ + { + "userID": 1, + "importType": "file/csv:eamusement-iidx", + "name": "adjective1 adjective2 noun1", + "sessionID": "Qe7b00261b1d3ba8e5c9ee4e76e77ea9f07d9493b", + "desc": null, + "game": "iidx", + "playtype": "SP", + "highlight": false, + "scoreInfo": [ + { + "scoreID": "TESTING_SCORE_ID", + "isNewScore": true + } + ], + "timeInserted": 1619454485988, + "timeStarted": 1608346320000, + "timeEnded": 1608369300000, + "calculatedData": { + "scorePerf": 0, + "lampPerf": 0, + "perf": 0 + } + } +] \ No newline at end of file