From d11dfc54850f78ebda3fda0b692cc6dc5f891393 Mon Sep 17 00:00:00 2001 From: Sainan Date: Sun, 19 Jan 2025 16:56:01 +0100 Subject: [PATCH] no point trying for fine-grained import, it's gonna become a mess, either way --- src/controllers/custom/importController.ts | 4 +--- src/services/importService.ts | 21 ++------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/controllers/custom/importController.ts b/src/controllers/custom/importController.ts index 3730472b..c1511444 100644 --- a/src/controllers/custom/importController.ts +++ b/src/controllers/custom/importController.ts @@ -8,12 +8,10 @@ export const importController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); const inventory = await getInventory(accountId); const request = JSON.parse(String(req.body)) as IImportRequest; - importInventory(inventory, request.inventory, request.replace, request.update); + importInventory(inventory, request.inventory); res.json(await inventory.save()); }; interface IImportRequest { inventory: IInventoryResponse; - replace: boolean; - update: boolean; } diff --git a/src/services/importService.ts b/src/services/importService.ts index cc020fe8..04158c50 100644 --- a/src/services/importService.ts +++ b/src/services/importService.ts @@ -24,27 +24,10 @@ const convertEquipment = (client: IEquipmentClient): IEquipmentDatabase => { }; }; -export const importInventory = ( - db: TInventoryDatabaseDocument, - client: IInventoryResponse, - replace: boolean = false, - update: boolean = true -): void => { +export const importInventory = (db: TInventoryDatabaseDocument, client: IInventoryResponse): void => { const clientSuitsInDbFormat = client.Suits.map(x => convertEquipment(x)); - if (replace) { - db.Suits.splice(0, db.Suits.length); - } + db.Suits.splice(0, db.Suits.length); clientSuitsInDbFormat.forEach(suitToImport => { - if (update) { - const index = db.Suits.findIndex(x => x._id == suitToImport._id); - if (index != -1) { - db.Suits.splice(index, 1); - } - } else { - if (db.Suits.id(suitToImport._id)) { - return; - } - } db.Suits.push(suitToImport); }); };