diff --git a/src/backend/Components/Raid/RaidManager.ts b/src/backend/Components/Raid/RaidManager.ts index 50e9fa9..7b0b908 100644 --- a/src/backend/Components/Raid/RaidManager.ts +++ b/src/backend/Components/Raid/RaidManager.ts @@ -289,12 +289,14 @@ export class RaidManager .select('*', 's.id as id') .join('raids as r', 's.raidid', '=', 'r.id') .join('characters as c', 's.characterid', '=', 'c.id') + .join('users as u', 'u.id', '=' ,'c.userid') .join(raidInDb.tier + 'tokens as t', 't.characterid', '=', 'c.id') .join('items as i', 'i.itemname', '=', 't.itemname') .where({ 'r.id': raid.id, }) .andWhere(function () { + this.whereNotIn('u.rank', ['Trial', 'Guest']) this.whereNotNull('t.signupid') }) diff --git a/test/backendTest.ts b/test/backendTest.ts index b1eda23..4c09b9d 100644 --- a/test/backendTest.ts +++ b/test/backendTest.ts @@ -73,7 +73,7 @@ const testAccounts: protoAccount[] = [ class: 'Druid', race: 'Night Elf', spec: 'Restoration', - rank: 'Raider' + rank: 'Trial' }, { name: 'Dagger', race: 'Dwarf', @@ -259,8 +259,24 @@ describe('Frontcraft', () => { }) } - Promise.all([ + makePrio( + 'Quick Strike Ring', + { class: 'Warrior', specname: 'Fury' }, + undefined, 2, "str-to-ap bias" + ), + makePrio( + 'Quick Strike Ring', + { class: 'Druid', specname: 'Feral (DPS)' }, + undefined, 2, "str-to-ap bias" + ), + + makePrio( + 'Band of Accuria', + { class: 'Warrior', specname: 'Protection' }, + undefined, 2, "hit bias" + ), + makePrio( 'Bracers of Arcane Accuracy', { class: 'Warlock', specname: 'Demonology' }, @@ -507,7 +523,7 @@ describe('Frontcraft', () => { makePrio( 'Cloak of Draconic Might', { class: 'Druid', specname: 'Feral (DPS)' }, - undefined, 1, "str-to-ap bias" + undefined, 3, "str-to-ap + agi-to-ap bias" ), ]).then(() => { const user = Object.values(users)[0]