From b9bc226a0252cc0d8ffdb4f54d026295ff1a00c3 Mon Sep 17 00:00:00 2001 From: zkldi Date: Sun, 20 Jun 2021 17:30:58 +0100 Subject: [PATCH] replace all instances of hitData with judgements --- .../scripts/__KT_DATABASE_MIGRATION/scores.ts | 214 +++++++++--------- server/src/external/mongo/schemas.ts | 4 +- .../framework/orphans/orphans.test.ts | 2 +- .../framework/pb/create-pb-doc.test.ts | 2 +- .../framework/pb/create-pb-doc.ts | 2 +- .../api/arc-ddr/converter.test.ts | 2 +- .../import-types/api/arc-ddr/converter.ts | 2 +- .../api/arc-iidx/converter.test.ts | 2 +- .../import-types/api/arc-iidx/converter.ts | 2 +- .../api/arc-sdvx/converter.test.ts | 2 +- .../import-types/api/arc-sdvx/converter.ts | 2 +- .../common/api-kai/iidx/converter.test.ts | 2 +- .../common/api-kai/iidx/converter.ts | 2 +- .../common/api-kai/sdvx/converter.test.ts | 2 +- .../common/api-kai/sdvx/converter.ts | 2 +- .../common/batch-manual/converter.test.ts | 2 +- .../common/batch-manual/parser.test.ts | 16 +- .../common/batch-manual/parser.ts | 2 +- .../common/eamusement-iidx-csv/converter.ts | 2 +- .../file/mer-iidx/converter.test.ts | 4 +- .../import-types/file/mer-iidx/converter.ts | 2 +- .../file/solid-state-squad/converter.test.ts | 2 +- .../file/solid-state-squad/converter.ts | 6 +- .../ir/barbatos/converter.test.ts | 2 +- .../import-types/ir/barbatos/converter.ts | 2 +- .../import-types/ir/beatoraja/converter.ts | 6 +- .../ir/fervidex-static/converter.ts | 2 +- .../ir/fervidex/converter.test.ts | 2 +- .../import-types/ir/fervidex/converter.ts | 2 +- .../import-types/ir/usc/converter.ts | 2 +- .../src/server/router/ir/usc/router.test.ts | 2 +- server/src/server/router/ir/usc/usc.test.ts | 2 +- server/src/server/router/ir/usc/usc.ts | 6 +- server/src/test-utils/mock-db/scores.json | 2 +- .../test-data/tachi/gitadora-dryscore.json | 2 +- .../test-data/tachi/iidx-dryscore.json | 2 +- .../test-data/tachi/iidx-score.json | 2 +- .../test-data/tachi/iidx-scorepb.json | 2 +- .../test-data/tachi/sdvx-dryscore.json | 2 +- 39 files changed, 160 insertions(+), 160 deletions(-) diff --git a/server/scripts/__KT_DATABASE_MIGRATION/scores.ts b/server/scripts/__KT_DATABASE_MIGRATION/scores.ts index b9f844093..b058ccfd4 100644 --- a/server/scripts/__KT_DATABASE_MIGRATION/scores.ts +++ b/server/scripts/__KT_DATABASE_MIGRATION/scores.ts @@ -12,133 +12,133 @@ const logger = CreateLogCtx(__filename); // HERE. WE. GO! function ConditionalAssign(base: any, baseProp: string, other: any, otherProp: string) { - if (Object.prototype.hasOwnProperty.call(other, otherProp)) { - base[baseProp] = other[otherProp]; - } + if (Object.prototype.hasOwnProperty.call(other, otherProp)) { + base[baseProp] = other[otherProp]; + } } function ConvertFn(c: any): ScoreDocument | null { - if (!supportedGames.includes(c.game)) { - logger.warn(`Ignored game ${c.game}`); - return null; - } + if (!supportedGames.includes(c.game)) { + logger.warn(`Ignored game ${c.game}`); + return null; + } - if (["popn", "jubeat", "gitadora", "usc"].includes(c.game)) { - return null; - } + if (["popn", "jubeat", "gitadora", "usc"].includes(c.game)) { + return null; + } - if (validPlaytypes[c.game].includes(c.playtype)) { - logger.warn(`Ignored game pt ${c.game}, ${c.playtype}`); - } + if (validPlaytypes[c.game].includes(c.playtype)) { + logger.warn(`Ignored game pt ${c.game}, ${c.playtype}`); + } - const base: Omit = { - userID: c.userID, - songID: c.songID, - playtype: c.scoreData.playtype, - chartID: c.chartID, - game: c.game, - timeAdded: c.timeAdded, - timeAchieved: Number.isNaN(c.timeAchieved) ? null : c.timeAchieved, - comment: c.comment ?? null, - highlight: c.highlight ?? false, - service: c.service, - importType: null, - calculatedData: c.calculatedData, - scoreData: { - esd: c.scoreData.esd ?? null, - grade: c.scoreData.grade, - gradeIndex: grades[c.game].indexOf(c.scoreData.grade), - lamp: c.scoreData.lamp, - lampIndex: lamps[c.game].indexOf(c.scoreData.lamp), - percent: c.scoreData.percent, - score: c.scoreData.score, - hitData: c.scoreData.hitData, - hitMeta: c.scoreData.hitMeta, - }, - scoreMeta: {}, - }; + const base: Omit = { + userID: c.userID, + songID: c.songID, + playtype: c.scoreData.playtype, + chartID: c.chartID, + game: c.game, + timeAdded: c.timeAdded, + timeAchieved: Number.isNaN(c.timeAchieved) ? null : c.timeAchieved, + comment: c.comment ?? null, + highlight: c.highlight ?? false, + service: c.service, + importType: null, + calculatedData: c.calculatedData, + scoreData: { + esd: c.scoreData.esd ?? null, + grade: c.scoreData.grade, + gradeIndex: grades[c.game].indexOf(c.scoreData.grade), + lamp: c.scoreData.lamp, + lampIndex: lamps[c.game].indexOf(c.scoreData.lamp), + percent: c.scoreData.percent, + score: c.scoreData.score, + judgements: c.scoreData.judgements, + hitMeta: c.scoreData.hitMeta, + }, + scoreMeta: {}, + }; - if (c.scoreMeta) { - if (base.game === "iidx") { - ConditionalAssign(base.scoreMeta, "random", c.scoreMeta, "optionsRandom"); - ConditionalAssign(base.scoreMeta, "gauge", c.scoreMeta, "optionsGauge"); - ConditionalAssign(base.scoreMeta, "assist", c.scoreMeta, "optionsAssist"); - ConditionalAssign(base.scoreMeta, "range", c.scoreMeta, "optionsRange"); - ConditionalAssign(base.scoreMeta, "pacemaker", c.scoreMeta, "pacemaker"); - ConditionalAssign(base.scoreMeta, "pacemakerName", c.scoreMeta, "pacemakerName"); - ConditionalAssign(base.scoreMeta, "pacemakerTarget", c.scoreMeta, "pacemakerTarget"); + if (c.scoreMeta) { + if (base.game === "iidx") { + ConditionalAssign(base.scoreMeta, "random", c.scoreMeta, "optionsRandom"); + ConditionalAssign(base.scoreMeta, "gauge", c.scoreMeta, "optionsGauge"); + ConditionalAssign(base.scoreMeta, "assist", c.scoreMeta, "optionsAssist"); + ConditionalAssign(base.scoreMeta, "range", c.scoreMeta, "optionsRange"); + ConditionalAssign(base.scoreMeta, "pacemaker", c.scoreMeta, "pacemaker"); + ConditionalAssign(base.scoreMeta, "pacemakerName", c.scoreMeta, "pacemakerName"); + ConditionalAssign(base.scoreMeta, "pacemakerTarget", c.scoreMeta, "pacemakerTarget"); - if (base.playtype === "DP" && !Array.isArray(base.scoreMeta.random)) { - base.scoreMeta.random = null; - } + if (base.playtype === "DP" && !Array.isArray(base.scoreMeta.random)) { + base.scoreMeta.random = null; + } - // @ts-expect-error asdf - if (base.scoreMeta.range === "") { - // @ts-expect-error asdf - base.scoreMeta.range = "NONE"; - } - } else if (base.game === "bms") { - ConditionalAssign(base.scoreMeta, "random", c.scoreMeta, "optionsRandom"); - ConditionalAssign(base.scoreMeta, "inputDevice", c.scoreData.hitMeta, "inputDevice"); - } - } + // @ts-expect-error asdf + if (base.scoreMeta.range === "") { + // @ts-expect-error asdf + base.scoreMeta.range = "NONE"; + } + } else if (base.game === "bms") { + ConditionalAssign(base.scoreMeta, "random", c.scoreMeta, "optionsRandom"); + ConditionalAssign(base.scoreMeta, "inputDevice", c.scoreData.hitMeta, "inputDevice"); + } + } - // @ts-expect-error shut - if (base.scoreData.hitMeta.bp === -1 || Number.isNaN(base.scoreData.hitMeta.bp)) { - // @ts-expect-error shut - base.scoreData.hitMeta.bp = null; - } + // @ts-expect-error shut + if (base.scoreData.hitMeta.bp === -1 || Number.isNaN(base.scoreData.hitMeta.bp)) { + // @ts-expect-error shut + base.scoreData.hitMeta.bp = null; + } - if (base.game === "iidx") { - // @ts-expect-error nope - if (base.scoreData.hitMeta.gauge > 200) { - // @ts-expect-error nope - base.scoreData.hitMeta.gauge = null; - } + if (base.game === "iidx") { + // @ts-expect-error nope + if (base.scoreData.hitMeta.gauge > 200) { + // @ts-expect-error nope + base.scoreData.hitMeta.gauge = null; + } - // @ts-expect-error nope - if (base.scoreData.hitMeta.gaugeHistory) { - // @ts-expect-error nope - base.scoreData.hitMeta.gaugeHistory = base.scoreData.hitMeta.gaugeHistory.map((e) => - e > 200 ? null : e - ); - } - } else if (base.game === "bms") { - // @ts-expect-error shut - if (base.scoreData.hitMeta.gauge === -1) { - // @ts-expect-error shut - base.scoreData.hitMeta.gauge = null; - } + // @ts-expect-error nope + if (base.scoreData.hitMeta.gaugeHistory) { + // @ts-expect-error nope + base.scoreData.hitMeta.gaugeHistory = base.scoreData.hitMeta.gaugeHistory.map((e) => + e > 200 ? null : e + ); + } + } else if (base.game === "bms") { + // @ts-expect-error shut + if (base.scoreData.hitMeta.gauge === -1) { + // @ts-expect-error shut + base.scoreData.hitMeta.gauge = null; + } - // @ts-expect-error shut - delete base.scoreData.hitMeta.inputDevice; - } else if (base.game === "sdvx" || base.game === "usc") { - ConditionalAssign(base.scoreData.hitData, "miss", base.scoreData.hitData, "error"); + // @ts-expect-error shut + delete base.scoreData.hitMeta.inputDevice; + } else if (base.game === "sdvx" || base.game === "usc") { + ConditionalAssign(base.scoreData.judgements, "miss", base.scoreData.judgements, "error"); - //@ts-expect-error yea - delete base.scoreData.hitData.error; - } else if (base.game === "chunithm") { - if (base.scoreData.percent === 101) { - base.scoreData.grade === "SSS"; - } - } + //@ts-expect-error yea + delete base.scoreData.judgements.error; + } else if (base.game === "chunithm") { + if (base.scoreData.percent === 101) { + base.scoreData.grade === "SSS"; + } + } - if (base.service === "mm") { - base.service = "maimagic"; - } + if (base.service === "mm") { + base.service = "maimagic"; + } - const scoreID = CreateScoreID(base.userID, base, base.chartID); + const scoreID = CreateScoreID(base.userID, base, base.chartID); - const score: ScoreDocument = { - ...base, - scoreID, - }; + const score: ScoreDocument = { + ...base, + scoreID, + }; - return score; + return score; } (async () => { - await MigrateRecords(db.scores, "scores", ConvertFn); + await MigrateRecords(db.scores, "scores", ConvertFn); - process.exit(0); + process.exit(0); })(); diff --git a/server/src/external/mongo/schemas.ts b/server/src/external/mongo/schemas.ts index 6b040b0b3..eebace3d6 100644 --- a/server/src/external/mongo/schemas.ts +++ b/server/src/external/mongo/schemas.ts @@ -67,7 +67,7 @@ export const PR_SCORE_GENERIC = { grade: "string", lampIndex: p.isPositiveInteger, gradeIndex: p.isPositiveInteger, - hitData: {}, + judgements: {}, hitMeta: {}, }, scoreMeta: {}, @@ -118,7 +118,7 @@ const CreateGameScoreData = (game: Game, hitMetaMerge: PrudenceSchema) => ({ p.isPositiveInteger, (self, parent) => grades[game][self as number] === parent.grade ), - hitData: Object.fromEntries(validHitData[game].map((e) => [e, optionalPositiveInt])), + judgements: Object.fromEntries(validjudgements[game].map((e) => [e, optionalPositiveInt])), hitMeta: deepmerge( { fast: nullableAndOptionalPosInt, diff --git a/server/src/lib/score-import/framework/orphans/orphans.test.ts b/server/src/lib/score-import/framework/orphans/orphans.test.ts index d3109ddd5..72f3a1efb 100644 --- a/server/src/lib/score-import/framework/orphans/orphans.test.ts +++ b/server/src/lib/score-import/framework/orphans/orphans.test.ts @@ -141,7 +141,7 @@ t.test("#ReprocessOrphan", (t) => { score: 500, grade: "E", percent: 31.806615776081426, - hitData: {}, + judgements: {}, hitMeta: {}, }, highlight: false, 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 997e74c11..503b665d1 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 @@ -44,7 +44,7 @@ t.test("#CreatePBDoc", (t) => { esd: IIDXScore.scoreData.esd, grade: IIDXScore.scoreData.grade, gradeIndex: IIDXScore.scoreData.gradeIndex, - hitData: IIDXScore.scoreData.hitData, + judgements: IIDXScore.scoreData.judgements, lamp: "FULL COMBO", lampIndex: lamps.indexOf("FULL COMBO"), hitMeta: { bp: 1 }, 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 6359230d4..ad5ba8938 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 @@ -141,7 +141,7 @@ async function MergeScoreLampIntoPB( gradeIndex: scorePB.scoreData.gradeIndex, lamp: lampPB.scoreData.lamp, lampIndex: lampPB.scoreData.lampIndex, - hitData: scorePB.scoreData.hitData, + judgements: scorePB.scoreData.judgements, hitMeta: scorePB.scoreData.hitMeta, // this will probably be overrode by game-specific fns }, calculatedData: scorePB.calculatedData, diff --git a/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts b/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts index 2d8964c03..700ff70a9 100644 --- a/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts +++ b/server/src/lib/score-import/import-types/api/arc-ddr/converter.test.ts @@ -32,7 +32,7 @@ t.test("#ConvertAPIArcDDR", (t) => { grade: "AAA", percent: 99.976, score: 807, - hitData: { + judgements: { marvelous: 236, perfect: 24, great: 0, diff --git a/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts b/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts index dceb130eb..f8415b1b1 100644 --- a/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts +++ b/server/src/lib/score-import/import-types/api/arc-ddr/converter.ts @@ -90,7 +90,7 @@ export const ConvertAPIArcDDR: ConverterFunction = async ( grade, percent, score: score.ex_score, - hitData: { + judgements: { marvelous: score.judgments.marvelous, perfect: score.judgments.perfect, great: score.judgments.great, diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts b/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts index dbf5385ac..c03e31aac 100644 --- a/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts +++ b/server/src/lib/score-import/import-types/api/arc-iidx/converter.test.ts @@ -29,7 +29,7 @@ t.test("#ConvertAPIArcIIDX", (t) => { scoreData: { grade: "A", score: 1200, - hitData: {}, + judgements: {}, hitMeta: { bp: 43, }, diff --git a/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts b/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts index e0eb8cf05..998baa8fe 100644 --- a/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts +++ b/server/src/lib/score-import/import-types/api/arc-iidx/converter.ts @@ -78,7 +78,7 @@ export const ConvertAPIArcIIDX: ConverterFunction = async grade, percent, score: score.ex_score, - hitData: {}, + judgements: {}, hitMeta: { bp: score.miss_count, }, diff --git a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts index 12ddcb639..4e7040a65 100644 --- a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts +++ b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.test.ts @@ -34,7 +34,7 @@ t.test("#ConvertAPIArcSDVX", (t) => { grade: "AA", percent: 93.125, score: 9312500, - hitData: { + judgements: { critical: 946, near: 45, miss: 49, diff --git a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts index 446ce1782..504fd34e6 100644 --- a/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts +++ b/server/src/lib/score-import/import-types/api/arc-sdvx/converter.ts @@ -74,7 +74,7 @@ export const ConvertAPIArcSDVX: ConverterFunction = async grade, percent, score: score.score, - hitData: { + judgements: { critical: score.critical, near: score.near, miss: score.error, diff --git a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts index 6f9a7ae08..48104f40b 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.test.ts @@ -35,7 +35,7 @@ t.test("#ConvertAPIKaiIIDX", (t) => { // percent: 99.87277353689568 floating point, score: 1570, lamp: "HARD CLEAR", - hitData: {}, + judgements: {}, hitMeta: { fast: null, slow: null, diff --git a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts index ed1f5c698..fb9e8a813 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/iidx/converter.ts @@ -108,7 +108,7 @@ export const ConvertAPIKaiIIDX: ConverterFunction = async ( percent, score: score.ex_score, lamp, - hitData: {}, + judgements: {}, hitMeta: { fast: score.fast_count, slow: score.slow_count, diff --git a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts index 2604280cb..2632d1475 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts @@ -35,7 +35,7 @@ t.test("#ConvertAPIKaiSDVX", (t) => { // percent: 93.10699, floating point score: 9310699, lamp: "EXCESSIVE CLEAR", - hitData: {}, + judgements: {}, hitMeta: { fast: 70, slow: 42, diff --git a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts index cab33607d..25f8074b6 100644 --- a/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts +++ b/server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.ts @@ -85,7 +85,7 @@ export const ConvertAPIKaiSDVX: ConverterFunction = async ( percent, score: score.score, lamp, - hitData: {}, + judgements: {}, hitMeta: { fast: score.early, slow: score.late, diff --git a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts index 0414a0a27..09b2b19e1 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/converter.test.ts @@ -364,7 +364,7 @@ t.test("#ConverterFn", (t) => { score: 500, grade: "E", // percent: 31.5, -- ish, FPA is hard. - hitData: {}, + judgements: {}, hitMeta: {}, }, scoreMeta: {}, diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts index d5628844d..451a31d84 100644 --- a/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts +++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.test.ts @@ -272,9 +272,9 @@ t.test("#ParserFn", (t) => { t.end(); }); - t.test("Valid HitData", (t) => { + t.test("Valid judgements", (t) => { const res = ParserFn( - dm({ hitData: { pgreat: 1, great: null, bad: 0 } }), + dm({ judgements: { pgreat: 1, great: null, bad: 0 } }), "file/batch-manual", logger ); @@ -294,7 +294,7 @@ t.test("#ParserFn", (t) => { identifier: "123", playtype: "SP", difficulty: "ANOTHER", - hitData: { + judgements: { pgreat: 1, great: null, bad: 0, @@ -424,18 +424,18 @@ t.test("#ParserFn", (t) => { t.end(); }); - t.test("Invalid HitData", (t) => { + t.test("Invalid judgements", (t) => { const fn = () => - ParserFn(dm({ hitData: { not_key: 123 } }), "file/batch-manual", logger); + ParserFn(dm({ judgements: { not_key: 123 } }), "file/batch-manual", logger); - t.throws(fn, mockErr("body[0].hitData | Invalid Key not_key")); + t.throws(fn, mockErr("body[0].judgements | Invalid Key not_key")); const fn2 = () => - ParserFn(dm({ hitData: { pgreat: "123" } }), "file/batch-manual", logger); + ParserFn(dm({ judgements: { pgreat: "123" } }), "file/batch-manual", logger); t.throws( fn2, - mockErr("body[0].hitData | Key pgreat had an invalid value of 123 [string]") + mockErr("body[0].judgements | Key pgreat had an invalid value of 123 [string]") ); t.end(); 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 f97e49ffa..bafe2a095 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 @@ -74,7 +74,7 @@ const PR_BatchManualScore = (game: Game, playtype: Playtypes[Game]): PrudenceSch (typeof self === "number" && self > 1_000_000_000_000) || "Expected a number greater than 1 Trillion - did you pass unix seconds instead of miliseconds?" ), - hitData: optNull((self) => { + judgements: optNull((self) => { if (typeof self !== "object" || self === null) { return "Not a valid object."; } 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 e5047db44..67374b09a 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 @@ -141,7 +141,7 @@ const ConvertEamIIDXCSV: ConverterFunction { // percent: 63.61, approximately, fpa impossible. grade: "B", lamp: "CLEAR", - hitData: {}, + judgements: {}, hitMeta: { bp: 21, }, @@ -76,7 +76,7 @@ t.test("#ConvertFileMerIIDX", (t) => { // percent: 63.61, approximately, fpa impossible. grade: "B", lamp: "CLEAR", - hitData: {}, + judgements: {}, hitMeta: { bp: 21, }, diff --git a/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts b/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts index 86c868939..51a45bab6 100644 --- a/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts +++ b/server/src/lib/score-import/import-types/file/mer-iidx/converter.ts @@ -64,7 +64,7 @@ export const ConvertFileMerIIDX: ConverterFunction = asyn percent, grade, lamp, - hitData: {}, + judgements: {}, hitMeta: { bp: data.miss_count === -1 ? null : data.miss_count, }, diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts index fe42228b0..dfd530b46 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.test.ts @@ -38,7 +38,7 @@ t.test("#ConvertFileS3", (t) => { grade: "F", score: 100, lamp: "FULL COMBO", - hitData: { + judgements: { pgreat: 25, great: 50, good: 0, diff --git a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts index 772dff01d..8e4ef9a2a 100644 --- a/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts +++ b/server/src/lib/score-import/import-types/file/solid-state-squad/converter.ts @@ -142,9 +142,9 @@ export const ConvertFileS3: ConverterFunction = async ( const timeAchieved = ParseDateFromString(data.date); - let hitData = {}; + let judgements = {}; if (data.scorebreakdown) { - hitData = { + judgements = { pgreat: data.scorebreakdown.justgreats, great: data.scorebreakdown.greats, good: data.scorebreakdown.good, @@ -163,7 +163,7 @@ export const ConvertFileS3: ConverterFunction = async ( grade: grade as Grades["iidx:SP" | "iidx:DP"], score: data.exscore, lamp, - hitData, + judgements, hitMeta: {}, }, scoreMeta: {}, diff --git a/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts b/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts index 1b8f67be1..680a359f5 100644 --- a/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/converter.test.ts @@ -61,7 +61,7 @@ t.test("#ConverterIRBarbatos", (t) => { percent: 90, grade: "A+", lamp: "CLEAR", - hitData: { + judgements: { critical: 100, near: 50, miss: 5, diff --git a/server/src/lib/score-import/import-types/ir/barbatos/converter.ts b/server/src/lib/score-import/import-types/ir/barbatos/converter.ts index 4266d0423..a78080c1c 100644 --- a/server/src/lib/score-import/import-types/ir/barbatos/converter.ts +++ b/server/src/lib/score-import/import-types/ir/barbatos/converter.ts @@ -71,7 +71,7 @@ export const ConverterIRBarbatos: ConverterFunction percent, grade, lamp: LAMP_LOOKUP[data.clear_type] as Lamps["sdvx:Single"], - hitData: { + judgements: { critical: data.critical, near: data.near_total, miss: data.error, diff --git a/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts b/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts index 1cd7cb289..990d0675a 100644 --- a/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts +++ b/server/src/lib/score-import/import-types/ir/beatoraja/converter.ts @@ -73,7 +73,7 @@ export const ConverterIRBeatoraja: ConverterFunction["scoreData"]["hitData"] = {}; + let judgements: DryScore<"bms:7K" | "bms:14K">["scoreData"]["judgements"] = {}; // if NOT CN mode we can assign judgements properly if (data.lntype === 0) { @@ -95,7 +95,7 @@ export const ConverterIRBeatoraja: ConverterFunction = a percent, score: data.score, lamp: DeriveLamp(data, logger), - hitData: { + judgements: { critical: data.crit, near: data.near, miss: data.error, diff --git a/server/src/server/router/ir/usc/router.test.ts b/server/src/server/router/ir/usc/router.test.ts index f733311d0..9bae5d32a 100644 --- a/server/src/server/router/ir/usc/router.test.ts +++ b/server/src/server/router/ir/usc/router.test.ts @@ -124,7 +124,7 @@ const USC_SCORE_PB: PBScoreDocument = { lamp: "EXCESSIVE CLEAR", lampIndex: 2, gradeIndex: 4, // idk, lazy - hitData: { + judgements: { critical: 50, near: 30, miss: 10, diff --git a/server/src/server/router/ir/usc/usc.test.ts b/server/src/server/router/ir/usc/usc.test.ts index 8adc5cfa8..0dde1289d 100644 --- a/server/src/server/router/ir/usc/usc.test.ts +++ b/server/src/server/router/ir/usc/usc.test.ts @@ -28,7 +28,7 @@ const mockScorePB: PBScoreDocument<"usc:Single"> = { esd: null, grade: "AAA+", gradeIndex: 7, - hitData: { + judgements: { critical: 100, miss: 15, }, diff --git a/server/src/server/router/ir/usc/usc.ts b/server/src/server/router/ir/usc/usc.ts index b3eda4903..0baac54b3 100644 --- a/server/src/server/router/ir/usc/usc.ts +++ b/server/src/server/router/ir/usc/usc.ts @@ -69,9 +69,9 @@ export async function TachiScoreToServerScore( return { score: tachiScore.scoreData.score, timestamp: MStoS(tachiScore.timeAchieved ?? 0), - crit: tachiScore.scoreData.hitData.critical ?? 0, - near: tachiScore.scoreData.hitData.near ?? 0, - error: tachiScore.scoreData.hitData.miss ?? 0, + crit: tachiScore.scoreData.judgements.critical ?? 0, + near: tachiScore.scoreData.judgements.near ?? 0, + error: tachiScore.scoreData.judgements.miss ?? 0, ranking: tachiScore.rankingData.rank, lamp: TACHI_LAMP_TO_USC[tachiScore.scoreData.lamp], username: userDoc.username, diff --git a/server/src/test-utils/mock-db/scores.json b/server/src/test-utils/mock-db/scores.json index 98d2e0094..5df71a616 100644 --- a/server/src/test-utils/mock-db/scores.json +++ b/server/src/test-utils/mock-db/scores.json @@ -13,7 +13,7 @@ "esd": 30, "gradeIndex": 3, "lampIndex": 4, - "hitData": { + "judgements": { "pgreat": 50, "great": 10 }, diff --git a/server/src/test-utils/test-data/tachi/gitadora-dryscore.json b/server/src/test-utils/test-data/tachi/gitadora-dryscore.json index 9bf73ef72..d251c2f49 100644 --- a/server/src/test-utils/test-data/tachi/gitadora-dryscore.json +++ b/server/src/test-utils/test-data/tachi/gitadora-dryscore.json @@ -7,7 +7,7 @@ "percent": 70.76, "grade": "B", "esd": 30, - "hitData": {}, + "judgements": {}, "hitMeta": {} }, "scoreMeta": {}, diff --git a/server/src/test-utils/test-data/tachi/iidx-dryscore.json b/server/src/test-utils/test-data/tachi/iidx-dryscore.json index 301f58b1b..0749d176a 100644 --- a/server/src/test-utils/test-data/tachi/iidx-dryscore.json +++ b/server/src/test-utils/test-data/tachi/iidx-dryscore.json @@ -6,7 +6,7 @@ "lamp": "CLEAR", "percent": 50, "grade": "C", - "hitData": { + "judgements": { "pgreat": 50, "great": 10 }, diff --git a/server/src/test-utils/test-data/tachi/iidx-score.json b/server/src/test-utils/test-data/tachi/iidx-score.json index fec2287db..9737097c4 100644 --- a/server/src/test-utils/test-data/tachi/iidx-score.json +++ b/server/src/test-utils/test-data/tachi/iidx-score.json @@ -12,7 +12,7 @@ "esd": 30, "gradeIndex": 3, "lampIndex": 4, - "hitData": { + "judgements": { "pgreat": 50, "great": 10 }, diff --git a/server/src/test-utils/test-data/tachi/iidx-scorepb.json b/server/src/test-utils/test-data/tachi/iidx-scorepb.json index 1a7b42dcd..749bda24d 100644 --- a/server/src/test-utils/test-data/tachi/iidx-scorepb.json +++ b/server/src/test-utils/test-data/tachi/iidx-scorepb.json @@ -24,7 +24,7 @@ "gradeIndex": -1, "lamp": "EX HARD CLEAR", "lampIndex": 6, - "hitData": { + "judgements": { "pgreat": 697, "great": 85 }, diff --git a/server/src/test-utils/test-data/tachi/sdvx-dryscore.json b/server/src/test-utils/test-data/tachi/sdvx-dryscore.json index 18631e476..d8ae04cb3 100644 --- a/server/src/test-utils/test-data/tachi/sdvx-dryscore.json +++ b/server/src/test-utils/test-data/tachi/sdvx-dryscore.json @@ -7,7 +7,7 @@ "percent": 95, "grade": "AA+", "esd": null, - "hitData": {}, + "judgements": {}, "hitMeta": {} }, "scoreMeta": {},