Send update or remove match event for match list (when user leaves)

arielger · Apr 28, 2020 · dc23d77 · dc23d77
1 parent 04efae2
commit dc23d77
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/client/src/screens/Match/Match.js b/client/src/screens/Match/Match.js
@@ -82,7 +82,6 @@ function Match({ history, user, match: urlMatch }) {
   const matchId = urlMatch.params.matchId;
 
   const [showCreatorLeft, setShowCreatorLeft] = React.useState(false);
-  const [isSubscriptionSet, setIsSubscriptionSet] = React.useState(false);
 
   const {
     loading,

diff --git a/client/src/screens/Match/WaitingState/WaitingState.js b/client/src/screens/Match/WaitingState/WaitingState.js
@@ -77,6 +77,7 @@ export default function WaitingState({
   const [joinMatch] = useMutation(JOIN_MATCH, { variables: { matchId } });
   const [leaveMatch] = useMutation(LEAVE_MATCH, { variables: { matchId } });
 
+  // @TODO: Fix React.useEffect, sometimes it is not executing leaveMatch
   React.useEffect(() => {
     return () => {
       if (joinedMatch && !showCreatorLeft) {
@@ -88,7 +89,7 @@ export default function WaitingState({
   return (
     <>
       <Prompt
-        when={!showCreatorLeft}
+        when={joinedMatch && !showCreatorLeft}
         message={`Estas seguro que deseas abandonar la partida?`}
       />
       <CreatorLeftModal isVisible={showCreatorLeft} history={history} />

diff --git a/client/src/screens/Matches/Matches.js b/client/src/screens/Matches/Matches.js
@@ -55,21 +55,21 @@ const handleMatchUpdates = (
 ) => {
   const { type, ...matchData } = matchListUpdated;
   switch (type) {
-    case "NEW_MATCH": {
+    case "MATCH_ADDED": {
       return {
         ...prev,
         matches: [...prev.matches, matchData],
       };
     }
-    case "UPDATED_MATCH": {
+    case "MATCH_UPDATED": {
       return {
         ...prev,
         matches: prev.matches.map((match) =>
           matchData.id === match.id ? matchData : match
         ),
       };
     }
-    case "DELETED_MATCH": {
+    case "MATCH_REMOVED": {
       return {
         ...prev,
         matches: R.reject(R.propEq("id", matchData.id))(prev.matches),

diff --git a/server/src/datasources/match.js b/server/src/datasources/match.js
@@ -201,7 +201,7 @@ class MatchAPI extends DataSource {
 
     pubsub.publish(events.MATCH_ADDED, {
       matchListUpdated: {
-        type: "NEW_MATCH",
+        type: events.MATCH_ADDED,
         ...newMatchData,
       },
     });
@@ -287,10 +287,13 @@ class MatchAPI extends DataSource {
       });
     }
 
+    const event = startGame ? events.MATCH_REMOVED : events.MATCH_UPDATED;
+
     // If the match is full remove it from the list of matches
-    pubsub.publish(startGame ? events.MATCH_REMOVED : events.MATCH_UPDATED, {
+    pubsub.publish(event, {
       matchListUpdated: {
-        type: startGame ? "DELETED_MATCH" : "UPDATED_MATCH",
+        // @TODO: There is no need to send the whole match if it's removed from list
+        type: event,
         ...updatedMatch,
       },
     });
@@ -342,21 +345,31 @@ class MatchAPI extends DataSource {
       R.reject(R.equals(userId))
     )(updatedMatch.players || []);
 
-    const event = isCreator
+    const matchDetailEvent = isCreator
       ? events.CREATOR_LEFT_GAME
       : events.PLAYER_LEFT_GAME;
 
     otherPlayersInGame.forEach((playerId) => {
-      pubsub.publish(event, {
+      pubsub.publish(matchDetailEvent, {
         userId: playerId,
         matchUpdated: {
           ...updatedMatch,
-          type: event,
+          type: matchDetailEvent,
         },
       });
     });
 
-    // @TODO: If creator remove match from matches list
+    const matchListEvent = isCreator
+      ? events.MATCH_REMOVED
+      : events.MATCH_UPDATED;
+
+    pubsub.publish(matchListEvent, {
+      matchListUpdated: {
+        // @TODO: There is no need to send the whole match if it's removed from list
+        type: matchListEvent,
+        ...updatedMatch,
+      },
+    });
 
     return {
       success: true,

diff --git a/server/src/schema/matches.graphql b/server/src/schema/matches.graphql
@@ -107,9 +107,9 @@ type PlayerMatch {
 }
 
 enum MatchListUpdateType {
-  NEW_MATCH
-  UPDATED_MATCH
-  DELETED_MATCH
+  MATCH_ADDED
+  MATCH_UPDATED
+  MATCH_REMOVED
 }
 
 type MatchListUpdate {

diff --git a/server/src/subscriptions.js b/server/src/subscriptions.js
@@ -3,6 +3,7 @@ const { PubSub } = require("apollo-server");
 module.exports = {
   pubsub: new PubSub(),
   events: {
+    // Matches list
     MATCH_ADDED: "MATCH_ADDED",
     MATCH_UPDATED: "MATCH_UPDATED",
     MATCH_REMOVED: "MATCH_REMOVED",