bugfix: correct unit name / time remaining on training queues

[browser-rts.git] / src / repository / training-queue.ts

diff --git a/src/repository/training-queue.ts b/src/repository/training-queue.ts
index 5d2b58cc1dc871b6d8d898582bb9c486a1913dd4..9f30ca794d25593935aa8c6779e87b5c6673daa8 100644 (file)
--- a/src/repository/training-queue.ts
+++ b/src/repository/training-queue.ts
@@ -18,6 +18,10 @@ export type UnitTrainingQueue = {
     due: number;
 };
 
+export type UnitTrainingQueueWithName = {
+  display: string;
+} & UnitTrainingQueue;
+
 export const FriendlyUnitNames = new Map<Unit, string>();
 FriendlyUnitNames.set(Unit.SOLDIERS, 'Soldiers');
 FriendlyUnitNames.set(Unit.ATTACKERS, 'Attackers');
@@ -44,7 +48,7 @@ export class UnitTrainingQueueRepository extends Repository<UnitTrainingQueue> {
         return data;
     }
 
-    list(owner: string): Promise<UnitTrainingQueue[]> {
-        return this.FindAll({owner}).orderBy('due');
+    list(owner: string): Promise<UnitTrainingQueueWithName[]> {
+      return this.db.raw(`select q.*, u.display from unit_training_queue q join units u on u.slug = q.unit_type where owner = ? order by due`, owner);
     }
-}
\ No newline at end of file
+}