Improve creature scores methods & add tests

Author: gc

src/lib/MUser.ts

@@ -2,7 +2,6 @@ import { percentChance } from '@oldschoolgg/rng';
 import { calcWhatPercent, cleanUsername, Emoji, isObject, sumArr, UserError, uniqueArr } from '@oldschoolgg/toolkit';
 import { escapeMarkdown, userMention } from 'discord.js';
 import {
-	addItemToBank,
 	Bank,
 	convertXPtoLVL,
 	EMonster,
@@ -534,11 +533,27 @@ RETURNING (monster_scores->>'${monsterID}')::int AS new_kc;
 		return ActivityManager.minionIsBusy(this.id);
 	}
 
-	async incrementCreatureScore(creatureID: number, amountToAdd = 1) {
-		const stats = await this.fetchStats();
-		await this.statsUpdate({
-			creature_scores: addItemToBank(stats.creature_scores as ItemBank, creatureID, amountToAdd)
-		});
+	async getCreatureScore(creatureID: number): Promise<number> {
+		if (!Number.isInteger(creatureID)) throw new Error('Invalid monsterID');
+		const query = `
+SELECT COALESCE((creature_scores->>'${creatureID}')::int, 0) AS creature_kc
+FROM user_stats
+WHERE user_id = ${this.id};`;
+		const stats = await prisma.$queryRawUnsafe<{ creature_kc: number }[]>(query);
+		return stats[0]?.creature_kc ?? 0;
+	}
+
+	async incrementCreatureScore(creatureID: number, quantityToAdd = 1): Promise<{ newKC: number }> {
+		if (!Number.isInteger(creatureID)) throw new Error('Invalid creatureID');
+		if (!Number.isInteger(quantityToAdd) || quantityToAdd < 1) throw new Error('Invalid quantityToAdd');
+		const query = `
+UPDATE user_stats
+SET creature_scores = add_item_to_bank(creature_scores, '${creatureID}', ${quantityToAdd})
+WHERE user_id = ${this.id}
+RETURNING (creature_scores->>'${creatureID}')::int AS new_kc;
+`;
+		const res = await prisma.$queryRawUnsafe<{ new_kc: number }[]>(query);
+		return { newKC: res[0]?.new_kc ?? 0 };
 	}
 
 	get blowpipe() {
@@ -714,11 +729,6 @@ Charge your items using ${mentionCommand('minion', 'charge')}.`
 		};
 	}
 
-	async getCreatureScore(creatureID: number) {
-		const stats = await this.fetchStats();
-		return (stats.creature_scores as ItemBank)[creatureID] ?? 0;
-	}
-
 	calculateAddItemsToCLUpdates({
 		items,
 		dontAddToTempCL = false

src/tasks/minions/HunterActivity/hunterActivity.ts

@@ -156,7 +156,9 @@ export const hunterTask: MinionTask = {
 			}
 		}
 
-		await user.incrementCreatureScore(creature.id, Math.floor(successfulQuantity));
+		if (successfulQuantity > 0) {
+			await user.incrementCreatureScore(creature.id, Math.floor(successfulQuantity));
+		}
 		await user.transactItems({
 			collectionLog: true,
 			itemsToAdd: loot

tests/integration/hunter/hunter.test.ts

@@ -0,0 +1,29 @@
+import { expect, test } from 'vitest';
+
+import Hunter from '@/lib/skilling/skills/hunter/hunter.js';
+import { minionCommand } from '@/mahoji/commands/minion.js';
+import { createTestUser } from '../util.js';
+
+test('incrementCreatureScore', async () => {
+	const user = await createTestUser();
+
+	await user.incrementCreatureScore(1);
+	expect(await user.getCreatureScore(1)).toEqual(1);
+
+	await user.incrementCreatureScore(1, 10);
+	expect(await user.getCreatureScore(1)).toEqual(11);
+
+	const creatures = Hunter.Creatures.slice(10, 20).map(c => c.id);
+	await Promise.all([
+		...creatures.map(id => user.incrementCreatureScore(id, 3)),
+		...creatures.map(id => user.incrementCreatureScore(id, 3))
+	]);
+
+	for (const id of creatures) {
+		expect(await user.getCreatureScore(id)).toEqual(6);
+	}
+
+	expect(await user.getCreatureScore(1)).toEqual(11);
+	const res = await user.runCommand(minionCommand, { kc: { name: 'Sapphire glacialis' } });
+	expect(res).toEqual('Your Sapphire glacialis KC is: 6.');
+});