OpenWF/SpaceNinjaServer
12
6
Fork 15
Code Issues 46 Pull Requests 6 Actions Packages Projects Releases Activity

fix: handle standing limits in fishmongerController #795

Merged
Sainan merged 2 commits from fishmonger into main 2025-01-17 05:43:33 -08:00
Conversation 2 Commits 2 Files Changed 3 +37 -26
3 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/controllers/api/fishmongerController.ts
View File

@ -1,9 +1,10 @@
import { getJSONfromString } from "@/src/helpers/stringHelpers"; import { getJSONfromString } from "@/src/helpers/stringHelpers";
import { addMiscItems, getInventory } from "@/src/services/inventoryService"; import { getMaxStanding } from "@/src/helpers/syndicateStandingHelper";
import { addMiscItems, getInventory, getStandingLimit, updateStandingLimit } from "@/src/services/inventoryService";
import { getAccountIdForRequest } from "@/src/services/loginService"; import { getAccountIdForRequest } from "@/src/services/loginService";
import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes"; import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes";
import { RequestHandler } from "express"; import { RequestHandler } from "express";
import { ExportResources } from "warframe-public-export-plus"; import { ExportResources, ExportSyndicates } from "warframe-public-export-plus";
export const fishmongerController: RequestHandler = async (req, res) => { export const fishmongerController: RequestHandler = async (req, res) => {
const accountId = await getAccountIdForRequest(req); const accountId = await getAccountIdForRequest(req);
@ -11,7 +12,7 @@ export const fishmongerController: RequestHandler = async (req, res) => {
const body = getJSONfromString(String(req.body)) as IFishmongerRequest; const body = getJSONfromString(String(req.body)) as IFishmongerRequest;
const miscItemChanges: IMiscItem[] = []; const miscItemChanges: IMiscItem[] = [];
let syndicateTag: string | undefined; let syndicateTag: string | undefined;
let standingChange = 0; let gainedStanding = 0;
for (const fish of body.Fish) { for (const fish of body.Fish) {
const fishData = ExportResources[fish.ItemType]; const fishData = ExportResources[fish.ItemType];
if (req.query.dissect == "1") { if (req.query.dissect == "1") {
@ -25,21 +26,29 @@ export const fishmongerController: RequestHandler = async (req, res) => {
} }
} else { } else {
syndicateTag = fishData.syndicateTag!; syndicateTag = fishData.syndicateTag!;
standingChange += fishData.standingBonus! * fish.ItemCount; gainedStanding += fishData.standingBonus! * fish.ItemCount;
} }
miscItemChanges.push({ ItemType: fish.ItemType, ItemCount: fish.ItemCount * -1 }); miscItemChanges.push({ ItemType: fish.ItemType, ItemCount: fish.ItemCount * -1 });
} }
addMiscItems(inventory, miscItemChanges); addMiscItems(inventory, miscItemChanges);
if (standingChange && syndicateTag) { if (gainedStanding && syndicateTag) {
const syndicate = inventory.Affiliations.find(x => x.Tag == syndicateTag); let syndicate = inventory.Affiliations.find(x => x.Tag == syndicateTag);
if (syndicate !== undefined) { if (!syndicate) {
syndicate.Standing += standingChange; syndicate = inventory.Affiliations[inventory.Affiliations.push({ Tag: syndicateTag, Standing: 0 }) - 1];
} else {
inventory.Affiliations.push({
Tag: syndicateTag,
Standing: standingChange
});
} }
const syndicateMeta = ExportSyndicates[syndicateTag];
const max = getMaxStanding(syndicateMeta, syndicate.Title ?? 0);
if (syndicate.Standing + gainedStanding > max) {
gainedStanding = max - syndicate.Standing;
}
if (gainedStanding > getStandingLimit(inventory, syndicateMeta.dailyLimitBin)) {
gainedStanding = getStandingLimit(inventory, syndicateMeta.dailyLimitBin);
}
syndicate.Standing += gainedStanding;
updateStandingLimit(inventory, syndicateMeta.dailyLimitBin, gainedStanding);
} }
coderabbitai[bot] commented 2025-01-17 01:14:52 -08:00 (Migrated from github.com)
Review
Copy Link

⚠️ Potential issue

Ensure standingBonus is defined to prevent runtime errors

The use of the non-null assertion operator ! on fishData.standingBonus assumes that this property is always defined. If standingBonus is undefined or null, this could lead to a runtime error. Consider adding a check to ensure standingBonus is defined before using it.

Apply this diff to add a safety check:

            syndicateTag = fishData.syndicateTag!;
-           gainedStanding += fishData.standingBonus! * fish.ItemCount;
+           if (fishData.standingBonus) {
+               gainedStanding += fishData.standingBonus * fish.ItemCount;
+           } else {
+               // Handle undefined standingBonus, e.g., log an error or set a default value
+           }

Committable suggestion skipped: line range outside the PR's diff.

_:warning: Potential issue_ **Ensure `standingBonus` is defined to prevent runtime errors** The use of the non-null assertion operator `!` on `fishData.standingBonus` assumes that this property is always defined. If `standingBonus` is `undefined` or `null`, this could lead to a runtime error. Consider adding a check to ensure `standingBonus` is defined before using it. Apply this diff to add a safety check: ```diff syndicateTag = fishData.syndicateTag!; - gainedStanding += fishData.standingBonus! * fish.ItemCount; + if (fishData.standingBonus) { + gainedStanding += fishData.standingBonus * fish.ItemCount; + } else { + // Handle undefined standingBonus, e.g., log an error or set a default value + } ``` > Committable suggestion skipped: line range outside the PR's diff. <!-- This is an auto-generated comment by CodeRabbit -->
await inventory.save(); await inventory.save();
res.json({ res.json({
@ -47,7 +56,7 @@ export const fishmongerController: RequestHandler = async (req, res) => {
MiscItems: miscItemChanges MiscItems: miscItemChanges
}, },
SyndicateTag: syndicateTag, SyndicateTag: syndicateTag,
StandingChange: standingChange StandingChange: gainedStanding
}); });
}; };

14
src/controllers/api/syndicateStandingBonusController.ts
View File

@ -3,7 +3,8 @@ import { getAccountIdForRequest } from "@/src/services/loginService";
import { addMiscItems, getInventory, getStandingLimit, updateStandingLimit } from "@/src/services/inventoryService"; import { addMiscItems, getInventory, getStandingLimit, updateStandingLimit } from "@/src/services/inventoryService";
import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes"; import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes";
import { IOid } from "@/src/types/commonTypes"; import { IOid } from "@/src/types/commonTypes";
import { ExportSyndicates, ISyndicate } from "warframe-public-export-plus"; import { ExportSyndicates } from "warframe-public-export-plus";
import { getMaxStanding } from "@/src/helpers/syndicateStandingHelper";
export const syndicateStandingBonusController: RequestHandler = async (req, res) => { export const syndicateStandingBonusController: RequestHandler = async (req, res) => {
const accountId = await getAccountIdForRequest(req); const accountId = await getAccountIdForRequest(req);
@ -67,14 +68,3 @@ interface ISyndicateStandingBonusRequest {
}; };
ModularWeaponId: IOid; // Seems to just be "000000000000000000000000", also note there's a "Category" query field ModularWeaponId: IOid; // Seems to just be "000000000000000000000000", also note there's a "Category" query field
} }
const getMaxStanding = (syndicate: ISyndicate, title: number): number => {
if (!syndicate.titles) {
// LibrarySyndicate
return 125000;
}
if (title == 0) {
return syndicate.titles.find(x => x.level == 1)!.minStanding;
}
return syndicate.titles.find(x => x.level == title)!.maxStanding;
};

12
src/helpers/syndicateStandingHelper.ts Normal file
View File

@ -0,0 +1,12 @@
import { ISyndicate } from "warframe-public-export-plus";
export const getMaxStanding = (syndicate: ISyndicate, title: number): number => {
if (!syndicate.titles) {
// LibrarySyndicate
return 125000;
}
if (title == 0) {
return syndicate.titles.find(x => x.level == 1)!.minStanding;
}
return syndicate.titles.find(x => x.level == title)!.maxStanding;
coderabbitai[bot] commented 2025-01-17 01:14:52 -08:00 (Migrated from github.com)
Review
Copy Link

⚠️ Potential issue

Handle cases where the title level is not found

Using the non-null assertion operator ! after find assumes that a matching title will always be found. If no matching title exists, this will result in a runtime error.

Modify the code to handle undefined cases:

     if (title == 0) {
-        return syndicate.titles.find(x => x.level == 1)!.minStanding;
+        const firstTitle = syndicate.titles.find(x => x.level == 1);
+        if (!firstTitle) {
+            throw new Error(`Title level 1 not found for syndicate ${syndicate.key}`);
+        }
+        return firstTitle.minStanding;
     }
-    return syndicate.titles.find(x => x.level == title)!.maxStanding;
+    const currentTitle = syndicate.titles.find(x => x.level == title);
+    if (!currentTitle) {
+        throw new Error(`Title level ${title} not found for syndicate ${syndicate.key}`);
+    }
+    return currentTitle.maxStanding;

Alternatively, you can provide a default value or handle the error gracefully.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

    if (title == 0) {
        const firstTitle = syndicate.titles.find(x => x.level == 1);
        if (!firstTitle) {
            throw new Error(`Title level 1 not found for syndicate ${syndicate.key}`);
        }
        return firstTitle.minStanding;
    }
    const currentTitle = syndicate.titles.find(x => x.level == title);
    if (!currentTitle) {
        throw new Error(`Title level ${title} not found for syndicate ${syndicate.key}`);
    }
    return currentTitle.maxStanding;
_:warning: Potential issue_ **Handle cases where the title level is not found** Using the non-null assertion operator `!` after `find` assumes that a matching title will always be found. If no matching title exists, this will result in a runtime error. Modify the code to handle undefined cases: ```diff if (title == 0) { - return syndicate.titles.find(x => x.level == 1)!.minStanding; + const firstTitle = syndicate.titles.find(x => x.level == 1); + if (!firstTitle) { + throw new Error(`Title level 1 not found for syndicate ${syndicate.key}`); + } + return firstTitle.minStanding; } - return syndicate.titles.find(x => x.level == title)!.maxStanding; + const currentTitle = syndicate.titles.find(x => x.level == title); + if (!currentTitle) { + throw new Error(`Title level ${title} not found for syndicate ${syndicate.key}`); + } + return currentTitle.maxStanding; ``` Alternatively, you can provide a default value or handle the error gracefully. <!-- suggestion_start --> <details> <summary>📝 Committable suggestion</summary> > ‼️ **IMPORTANT** > Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements. `````suggestion if (title == 0) { const firstTitle = syndicate.titles.find(x => x.level == 1); if (!firstTitle) { throw new Error(`Title level 1 not found for syndicate ${syndicate.key}`); } return firstTitle.minStanding; } const currentTitle = syndicate.titles.find(x => x.level == title); if (!currentTitle) { throw new Error(`Title level ${title} not found for syndicate ${syndicate.key}`); } return currentTitle.maxStanding; ````` </details> <!-- suggestion_end --> <!-- This is an auto-generated comment by CodeRabbit -->
};