updates

chenkie · chenkie · commit aa78517ead1b · 2020-11-04T15:27:24.000-05:00
diff --git a/server/prisma/dev.db b/server/prisma/dev.db
diff --git a/server/src/index.js b/server/src/index.js
@@ -9,12 +9,35 @@ const prisma = new PrismaClient();
 const server = new ApolloServer({
   typeDefs,
   resolvers,
-  context: ({ req }) => ({
-    prisma,
-    userId: req.headers.authorization
-      ? getUserId(req)
-      : null
-  })
+  context: async ({ req, connection }) => {
+    if (connection) {
+      return connection.context;
+    } else {
+      return {
+        prisma,
+        userId: req.headers.authorization
+          ? getUserId(req)
+          : null
+      };
+    }
+  },
+  subscriptions: {
+    onConnect: (connectionParams) => {
+      if (connectionParams.authToken) {
+        return {
+          prisma,
+          userId: getUserId(
+            null,
+            connectionParams.authToken
+          )
+        };
+      } else {
+        return {
+          prisma
+        };
+      }
+    }
+  }
 });
 
 server.listen(process.env.PORT || 4000).then(({ port }) => {
diff --git a/server/src/pubsub.js b/server/src/pubsub.js
@@ -0,0 +1,5 @@
+const { PubSub } = require('apollo-server');
+
+const pubsub = new PubSub();
+
+module.exports = { pubsub };
diff --git a/server/src/resolvers/Link.js b/server/src/resolvers/Link.js
@@ -9,6 +9,7 @@ const postedBy = async (parent, args, context) => {
       where: { id: link.userId }
     });
   } catch (err) {
+    console.log('the err', err);
     throw new ApolloError(err);
   }
 };
diff --git a/server/src/resolvers/Mutation.js b/server/src/resolvers/Mutation.js
@@ -5,32 +5,38 @@ const {
   ApolloError,
   AuthenticationError
 } = require('apollo-server');
+const { pubsub } = require('./../pubsub');
 
 const createPost = async (
   parent,
   { url, description },
   context
 ) => {
   try {
+    let data = {};
     if (!context.userId) {
-      return await context.prisma.link.create({
-        data: {
-          url,
-          description
-        }
-      });
-    }
-    return await context.prisma.link.create({
-      data: {
+      data = {
+        url,
+        description
+      };
+    } else {
+      data = {
         url,
         description,
         postedBy: {
           connect: {
             id: context.userId
           }
         }
-      }
+      };
+    }
+    const newLink = await context.prisma.link.create({
+      data
+    });
+    pubsub.publish('POST_CREATED', {
+      newLink
     });
+    return newLink;
   } catch (err) {
     throw new ApolloError(err);
   }
@@ -116,7 +122,7 @@ const vote = async (parent, args, context) => {
       );
     }
 
-    return await context.prisma.vote.create({
+    const newVote = await context.prisma.vote.create({
       data: {
         link: {
           connect: {
@@ -130,6 +136,12 @@ const vote = async (parent, args, context) => {
         }
       }
     });
+
+    pubsub.publish('VOTE', {
+      newVote
+    });
+
+    return newVote;
   } catch (err) {
     throw new ApolloError(err);
   }
diff --git a/server/src/resolvers/Subscription.js b/server/src/resolvers/Subscription.js
@@ -1,31 +1,10 @@
-const { PubSub } = require('apollo-server');
-
-const pubsub = new PubSub();
-
-function newLinkSubscribe(parent, args, context, info) {
-  return context.prisma.$subscribe
-    .link({ mutation_in: ['CREATED'] })
-    .node();
-}
+const { pubsub } = require('./../pubsub');
 
 const newLink = {
-  subscribe: () => pubsub.asyncIterator(['CREATED']),
-  resolve: (payload) => {
-    return payload;
-  }
+  subscribe: () => pubsub.asyncIterator(['POST_CREATED'])
 };
-
-function newVoteSubscribe(parent, args, context, info) {
-  return context.prisma.$subscribe
-    .vote({ mutation_in: ['CREATED'] })
-    .node();
-}
-
 const newVote = {
-  subscribe: newVoteSubscribe,
-  resolve: (payload) => {
-    return payload;
-  }
+  subscribe: () => pubsub.asyncIterator(['VOTE'])
 };
 
 module.exports = {
diff --git a/server/src/resolvers/Vote.js b/server/src/resolvers/Vote.js
@@ -2,9 +2,9 @@ const { ApolloError } = require('apollo-server');
 
 const link = async (parent, args, context) => {
   try {
-    return context.prisma.link.findMany({
+    return await context.prisma.link.findOne({
       where: {
-        userId: parent.userId
+        id: parent.linkId
       }
     });
   } catch (err) {
diff --git a/server/src/utils.js b/server/src/utils.js
@@ -1,11 +1,23 @@
 const jwt = require('jsonwebtoken');
 const APP_SECRET = 'GraphQL-is-aw3some';
 
-function getUserId(req) {
+function getTokenPayload(token) {
+  return jwt.verify(token, APP_SECRET);
+}
+
+function getUserId(req, authToken) {
+  if (authToken) {
+    const { userId } = getTokenPayload(authToken);
+    return userId;
+  }
+
   const authHeader = req.headers.authorization;
   if (authHeader) {
     const token = authHeader.replace('Bearer ', '');
-    const { userId } = jwt.verify(token, APP_SECRET);
+    if (!token) {
+      throw new Error('No token found');
+    }
+    const { userId } = getTokenPayload(token);
     return userId;
   }
 
diff --git a/src/components/CreateLink.js b/src/components/CreateLink.js
@@ -1,8 +1,8 @@
-import React, { Component, useState } from 'react';
-import { FEED_QUERY } from './LinkList';
-import { LINKS_PER_PAGE } from '../constants';
-import { useMutation, gql } from '@apollo/client';
+import React, { useState } from 'react';
+import { gql, useMutation } from '@apollo/client';
 import { useHistory } from 'react-router';
+import { LINKS_PER_PAGE } from '../constants';
+import { FEED_QUERY } from './LinkList';
 
 const CREATE_LINK_MUTATION = gql`
   mutation PostMutation(
diff --git a/src/components/Link.js b/src/components/Link.js
@@ -1,9 +1,8 @@
 import React from 'react';
-import { FEED_QUERY } from './LinkList';
-import { AUTH_TOKEN } from '../constants';
+import { gql, useMutation } from '@apollo/client';
+import { AUTH_TOKEN, LINKS_PER_PAGE } from '../constants';
 import { timeDifferenceForDate } from '../utils';
-
-import { useMutation, gql } from '@apollo/client';
+import { FEED_QUERY } from './LinkList';
 
 const VOTE_MUTATION = gql`
   mutation VoteMutation($linkId: ID!) {
@@ -27,38 +26,50 @@ const VOTE_MUTATION = gql`
 const Link = (props) => {
   const { link } = props;
   const authToken = localStorage.getItem(AUTH_TOKEN);
-  const [vote, { loading, error, data }] = useMutation(
-    VOTE_MUTATION,
-    {
-      variables: {
-        linkId: link.id
-      },
-      update(cache, { data: { vote } }) {
-        const { feed } = cache.readQuery({
-          query: FEED_QUERY
-        });
 
-        const updatedLinks = feed.links.map((feedLink) => {
-          if (feedLink.id === link.id) {
-            return {
-              ...feedLink,
-              votes: [...feedLink.votes, vote]
-            };
-          }
-          return feedLink;
-        });
+  const take = LINKS_PER_PAGE;
+  const skip = 0;
+  const orderBy = 'createdAt_DESC';
+
+  const [vote] = useMutation(VOTE_MUTATION, {
+    variables: {
+      linkId: link.id
+    },
+    update(cache, { data: { vote } }) {
+      const { feed } = cache.readQuery({
+        query: FEED_QUERY,
+        variables: {
+          take,
+          skip,
+          orderBy
+        }
+      });
 
-        cache.writeQuery({
-          query: FEED_QUERY,
-          data: {
-            feed: {
-              links: updatedLinks
-            }
+      const updatedLinks = feed.links.map((feedLink) => {
+        if (feedLink.id === link.id) {
+          return {
+            ...feedLink,
+            votes: [...feedLink.votes, vote]
+          };
+        }
+        return feedLink;
+      });
+
+      cache.writeQuery({
+        query: FEED_QUERY,
+        data: {
+          feed: {
+            links: updatedLinks
           }
-        });
-      }
+        },
+        variables: {
+          take,
+          skip,
+          orderBy
+        }
+      });
     }
-  );
+  });
   return (
     <div className="flex mt2 items-start">
       <div className="flex items-center">
diff --git a/src/components/LinkList.js b/src/components/LinkList.js
diff --git a/src/components/Login.js b/src/components/Login.js
diff --git a/src/index.js b/src/index.js

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ const postedBy = async (parent, args, context) => {`
`9`	`9`	`where: { id: link.userId }`
`10`	`10`	`});`
`11`	`11`	`} catch (err) {`
	`12`	`+ console.log('the err', err);`
`12`	`13`	`throw new ApolloError(err);`
`13`	`14`	`}`
`14`	`15`	`};`