feat(actions): better, more robust action handling. closes #57

client/src/app/services/actions.service.ts

@@ -1,8 +1,9 @@
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
+import { environment } from '@environment';
 import { INotification, INotificationAction } from '@interfaces';
 import { Store } from '@ngxs/store';
-import { GameplayService } from '@services/gameplay.service';
 import { NotificationsService } from '@services/notifications.service';
 import { ClearNotificationActions } from '@stores/notifications/notifications.actions';
 
@@ -13,8 +14,8 @@ export class ActionsService {
   constructor(
     private store: Store,
     private router: Router,
+    private http: HttpClient,
     private notificationService: NotificationsService,
-    private gameplayService: GameplayService,
   ) {}
 
   doAction(action: INotificationAction, notification?: INotification) {
@@ -27,18 +28,10 @@ export class ActionsService {
       this.router.navigate([action.actionData.url]);
     }
 
-    if (action.action === 'wave') {
-      this.gameplayService.wave(action.actionData.player.userId).subscribe();
-    }
-
-    if (action.action === 'waveback') {
-      this.gameplayService
-        .wave(action.actionData.player.userId, true)
+    if (action.url) {
+      this.http
+        .post(`${environment.apiUrl}/${action.url}`, action.urlData || {})
         .subscribe();
     }
-
-    if (action.action === 'collectible' || action.action === 'item') {
-      this.gameplayService.takeitem().subscribe();
-    }
   }
 }

client/src/app/services/gameplay.service.ts

@@ -30,8 +30,4 @@ export class GameplayService {
       isWaveBack,
     });
   }
-
-  takeitem() {
-    return this.http.post(`${environment.apiUrl}/gameplay/takeitem`, {});
-  }
 }

server/src/modules/player/gameplay.service.ts

@@ -341,6 +341,11 @@ export class GameplayService {
               actionData: {
                 player,
               },
+              url: 'gameplay/wave',
+              urlData: {
+                targetUserId: userId,
+                isWaveBack: true,
+              },
             },
           ],
         },

server/src/modules/player/player.service.ts

@@ -204,6 +204,8 @@ export class PlayerService {
       actionData: {
         player: randomPlayer,
       },
+      url: 'gameplay/wave',
+      urlData: {},
     });
   }
 
@@ -258,6 +260,8 @@ export class PlayerService {
       actionData: {
         item: randomCollectibleForLocation,
       },
+      url: 'gameplay/takeitem',
+      urlData: {},
     });
   }
 
@@ -280,6 +284,8 @@ export class PlayerService {
       actionData: {
         item: randomItemForLocation,
       },
+      url: 'gameplay/takeitem',
+      urlData: {},
     });
   }
 }

shared/interfaces/notifications.ts

@@ -2,6 +2,8 @@ export interface INotificationAction {
   text: string;
   action: string;
   actionData: any;
+  url?: string;
+  urlData?: any;
 }
 
 export interface INotification {