chore: use inventory projection for updateChallengeProgress (#1313)
Reviewed-on: OpenWF/SpaceNinjaServer#1313
This commit is contained in:
		
							parent
							
								
									e65393f433
								
							
						
					
					
						commit
						4afc8bc8c6
					
				@ -1,16 +1,23 @@
 | 
			
		||||
import { RequestHandler } from "express";
 | 
			
		||||
import { getJSONfromString } from "@/src/helpers/stringHelpers";
 | 
			
		||||
import { getAccountIdForRequest } from "@/src/services/loginService";
 | 
			
		||||
import { updateChallengeProgress } from "@/src/services/inventoryService";
 | 
			
		||||
import { IUpdateChallengeProgressRequest } from "@/src/types/requestTypes";
 | 
			
		||||
import { addChallenges, addSeasonalChallengeHistory, getInventory } from "@/src/services/inventoryService";
 | 
			
		||||
import { IChallengeProgress, ISeasonChallenge } from "@/src/types/inventoryTypes/inventoryTypes";
 | 
			
		||||
 | 
			
		||||
const updateChallengeProgressController: RequestHandler = async (req, res) => {
 | 
			
		||||
    const payload = getJSONfromString<IUpdateChallengeProgressRequest>(String(req.body));
 | 
			
		||||
export const updateChallengeProgressController: RequestHandler = async (req, res) => {
 | 
			
		||||
    const challenges = getJSONfromString<IUpdateChallengeProgressRequest>(String(req.body));
 | 
			
		||||
    const accountId = await getAccountIdForRequest(req);
 | 
			
		||||
 | 
			
		||||
    await updateChallengeProgress(payload, accountId);
 | 
			
		||||
    const inventory = await getInventory(accountId, "ChallengeProgress SeasonChallengeHistory");
 | 
			
		||||
    addChallenges(inventory, challenges.ChallengeProgress);
 | 
			
		||||
    addSeasonalChallengeHistory(inventory, challenges.SeasonChallengeHistory);
 | 
			
		||||
    await inventory.save();
 | 
			
		||||
 | 
			
		||||
    res.status(200).end();
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export { updateChallengeProgressController };
 | 
			
		||||
interface IUpdateChallengeProgressRequest {
 | 
			
		||||
    ChallengeProgress: IChallengeProgress[];
 | 
			
		||||
    SeasonChallengeHistory: ISeasonChallenge[];
 | 
			
		||||
    SeasonChallengeCompletions: ISeasonChallenge[];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -28,7 +28,7 @@ import {
 | 
			
		||||
    IUpgradeClient
 | 
			
		||||
} from "@/src/types/inventoryTypes/inventoryTypes";
 | 
			
		||||
import { IGenericUpdate, IUpdateNodeIntrosResponse } from "../types/genericUpdate";
 | 
			
		||||
import { IMissionInventoryUpdateRequest, IUpdateChallengeProgressRequest } from "../types/requestTypes";
 | 
			
		||||
import { IMissionInventoryUpdateRequest } from "../types/requestTypes";
 | 
			
		||||
import { logger } from "@/src/utils/logger";
 | 
			
		||||
import { convertInboxMessage, fromStoreItem, getExalted, getKeyChainItems } from "@/src/services/itemDataService";
 | 
			
		||||
import {
 | 
			
		||||
@ -1205,18 +1205,6 @@ export const addFocusXpIncreases = (inventory: TInventoryDatabaseDocument, focus
 | 
			
		||||
    inventory.FocusXP.AP_WARD += focusXpPlus[FocusType.AP_WARD];
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const updateChallengeProgress = async (
 | 
			
		||||
    challenges: IUpdateChallengeProgressRequest,
 | 
			
		||||
    accountId: string
 | 
			
		||||
): Promise<void> => {
 | 
			
		||||
    const inventory = await getInventory(accountId);
 | 
			
		||||
 | 
			
		||||
    addChallenges(inventory, challenges.ChallengeProgress);
 | 
			
		||||
    addSeasonalChallengeHistory(inventory, challenges.SeasonChallengeHistory);
 | 
			
		||||
 | 
			
		||||
    await inventory.save();
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const addSeasonalChallengeHistory = (
 | 
			
		||||
    inventory: TInventoryDatabaseDocument,
 | 
			
		||||
    itemsArray: ISeasonChallenge[] | undefined
 | 
			
		||||
 | 
			
		||||
@ -25,12 +25,6 @@ export interface IAffiliationChange {
 | 
			
		||||
    Title: number;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export interface IUpdateChallengeProgressRequest {
 | 
			
		||||
    ChallengeProgress: IChallengeProgress[];
 | 
			
		||||
    SeasonChallengeHistory: ISeasonChallenge[];
 | 
			
		||||
    SeasonChallengeCompletions: ISeasonChallenge[];
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export type IMissionInventoryUpdateRequest = {
 | 
			
		||||
    MiscItems?: ITypeCount[];
 | 
			
		||||
    Recipes?: ITypeCount[];
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user