Split FocusSchool and ArtifactPolarity

src/controllers/api/upgradesController.ts

@@ -1,6 +1,10 @@
 import { RequestHandler } from "express";
 import { IUpgradesRequest } from "@/src/types/requestTypes";
-import { FocusSchool, IEquipmentDatabase, EquipmentFeatures } from "@/src/types/inventoryTypes/commonInventoryTypes";
+import {
+    ArtifactPolarity,
+    IEquipmentDatabase,
+    EquipmentFeatures
+} from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { addMiscItems, getInventory, updateCurrency } from "@/src/services/inventoryService";
@@ -133,7 +137,7 @@ export const upgradesController: RequestHandler = async (req, res) => {
     res.json({ InventoryChanges });
 };
 
-const setSlotPolarity = (item: IEquipmentDatabase, slot: number, polarity: FocusSchool): void => {
+const setSlotPolarity = (item: IEquipmentDatabase, slot: number, polarity: ArtifactPolarity): void => {
     item.Polarity ??= [];
     const entry = item.Polarity.find(entry => entry.Slot == slot);
     if (entry) {

src/types/inventoryTypes/commonInventoryTypes.ts

@@ -3,19 +3,19 @@ import { Types } from "mongoose";
 
 export interface IPolarity {
     Slot: number;
-    Value: FocusSchool;
+    Value: ArtifactPolarity;
 }
 
-export enum FocusSchool {
-    ApAny = "AP_ANY",
-    ApAttack = "AP_ATTACK",
-    ApDefense = "AP_DEFENSE",
-    ApPower = "AP_POWER",
-    ApPrecept = "AP_PRECEPT",
-    ApTactic = "AP_TACTIC",
-    ApUmbra = "AP_UMBRA",
-    ApUniversal = "AP_UNIVERSAL",
-    ApWard = "AP_WARD"
+export enum ArtifactPolarity {
+    Any = "AP_ANY",
+    Attack = "AP_ATTACK",
+    Defense = "AP_DEFENSE",
+    Power = "AP_POWER",
+    Precept = "AP_PRECEPT",
+    Tactic = "AP_TACTIC",
+    Umbra = "AP_UMBRA",
+    Universal = "AP_UNIVERSAL",
+    Ward = "AP_WARD"
 }
 
 export interface IColor {

src/types/inventoryTypes/inventoryTypes.ts

@@ -2,8 +2,8 @@
 import { Document, Types } from "mongoose";
 import { IOid, IMongoDate } from "../commonTypes";
 import {
+    ArtifactPolarity,
     IColor,
-    FocusSchool,
     IItemConfig,
     IOperatorConfigClient,
     IEquipmentSelection,
@@ -597,6 +597,14 @@ export interface ILoadOutPresets {
     OPERATOR_ADULT: ILoadoutConfigClient[];
 }
 
+export enum FocusSchool {
+    Attack = "AP_ATTACK",
+    Defense = "AP_DEFENSE",
+    Power = "AP_POWER",
+    Tactic = "AP_TACTIC",
+    Ward = "AP_WARD"
+}
+
 export interface ILoadoutConfigClient {
     FocusSchool?: FocusSchool;
     PresetIcon?: string;
@@ -705,7 +713,7 @@ export interface IUpgradeFingerprint {
     compat: string;
     lim: number;
     lvlReq: number;
-    pol: FocusSchool;
+    pol: ArtifactPolarity;
     buffs: IBuff[];
     curses: IBuff[];
 }

src/types/requestTypes.ts

@@ -1,5 +1,5 @@
 import { IOid } from "./commonTypes";
-import { IPolarity, FocusSchool, IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
+import { ArtifactPolarity, IPolarity, IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import {
     IBooster,
     IChallengeProgress,
@@ -97,6 +97,6 @@ export interface IUpgradeOperation {
     OperationType: string;
     UpgradeRequirement: string; // uniqueName of item being consumed
     PolarizeSlot: number;
-    PolarizeValue: FocusSchool;
+    PolarizeValue: ArtifactPolarity;
     PolarityRemap: IPolarity[];
 }