From 5d1839b9283d3da22696039441100bcef785e4b9 Mon Sep 17 00:00:00 2001 From: Dominic Ferrando Date: Mon, 6 Jul 2026 11:47:39 -0400 Subject: [PATCH] Minor code cleanup --- apps/api/src/services/calculator.ts | 9 +++------ packages/calculator/src/index.ts | 12 ++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/apps/api/src/services/calculator.ts b/apps/api/src/services/calculator.ts index 97119bf..653fee8 100644 --- a/apps/api/src/services/calculator.ts +++ b/apps/api/src/services/calculator.ts @@ -10,7 +10,6 @@ export class CalculatorUnavailableError extends Error { export class CalculatorService { private calculator: LevelCalculator | null = null; - private appliedConfigStringified: string | null = null; Standards: StandardsService = new StandardsService(); constructor() { @@ -26,18 +25,16 @@ export class CalculatorService { private async refresh(): Promise { const standardsConfig = await this.Standards.Config.get(); - const standardsConfigStringified = JSON.stringify(standardsConfig); if (this.calculator) { - // avoid instatiating a new Standards object if nothing changed - if (standardsConfigStringified === this.appliedConfigStringified) return; + // avoid instantiating a new Standards object if nothing changed + if (JSON.stringify(standardsConfig) === JSON.stringify(this.calculator.standards.cfg)) return; - this.calculator.Standards = new Standards(standardsConfig); + this.calculator.standards = new Standards(standardsConfig); } else { this.calculator = new LevelCalculator(new Standards(standardsConfig)); } - this.appliedConfigStringified = standardsConfigStringified; } } diff --git a/packages/calculator/src/index.ts b/packages/calculator/src/index.ts index b1db0e2..5f083d8 100644 --- a/packages/calculator/src/index.ts +++ b/packages/calculator/src/index.ts @@ -32,10 +32,10 @@ const metricPriority = (m: NumberMetric) => { }; export class LevelCalculator { - Standards: Standards; + standards: Standards; public constructor(standards: Standards) { - this.Standards = standards; + this.standards = standards; } // ------------------------------------------------------------------------------------------------- @@ -97,7 +97,7 @@ export class LevelCalculator { (Object.values(Attribute) as Attribute[]).forEach((attribute) => { const attrActivityPerformances = activityPerformances.filter( (p) => - this.Standards.byActivity(p.activity).getMetadata() + this.standards.byActivity(p.activity).getMetadata() .attribute === attribute, ); attrLevels[attribute] = this.calculateAttributeLevel( @@ -119,7 +119,7 @@ export class LevelCalculator { if ( activityPerformances.some( (p) => - this.Standards.byActivity(p.activity).getMetadata() + this.standards.byActivity(p.activity).getMetadata() .attribute !== attribute, ) ) { @@ -127,7 +127,7 @@ export class LevelCalculator { } // must perform all of an attributes activities - for (const activity of this.Standards.getAttributeActivities( + for (const activity of this.standards.getAttributeActivities( attribute, )) { const filteredActivites = activityPerformances.map( @@ -142,7 +142,7 @@ export class LevelCalculator { } const activityLevels = activityPerformances.map((p) => { - const interpolatedStandard = this.Standards + const interpolatedStandard = this.standards .byActivity(p.activity) .byMetrics(player.metrics) .getOneInterpolated();