Merge branch 'main' of https://github.com/EOS-uiux-Solutions/user-story into bugs/notif

Author: SundeepChand

src/components/Vote.js

@@ -1,8 +1,7 @@
 import React, { useState, useEffect } from 'react'
-import axios from 'axios'
-import { apiURL } from '../config.json'
 import Modal from './Modal'
 import { Link } from '@reach/router'
+import userStory from '../services/user_story'
 
 const Vote = (props) => {
   const { story } = props
@@ -40,52 +39,18 @@ const Vote = (props) => {
       let updatedFollowerIds = followers.filter(
         (id) => id !== JSON.stringify(userId)
       )
-      const response = await axios.post(
-        `${apiURL}/graphql`,
-        {
-          query: `
-        mutation {
-          updateUserStory(input: {where: {id: "${story.id}"} data: {followers: [${updatedFollowerIds}]}}){
-            userStory{
-              followers {
-                id
-              }
-            }
-          }
-        }
-        `
-        },
-        {
-          withCredentials: true
-        }
-      )
+      const response = await userStory.updateVotes(story.id, updatedFollowerIds)
       updatedFollowerIds = response.data.data.updateUserStory.userStory.followers.map(
         (follower) => JSON.stringify(follower.id)
       )
       setFollowers(updatedFollowerIds)
       setVoted(false)
       setVotes((votes) => votes - 1)
     } else {
-      const response = await axios.post(
-        `${apiURL}/graphql`,
-        {
-          query: `
-        mutation {
-          updateUserStory(input: {where: {id: "${story.id}"} data: {followers: [${followers}, "${userId}"]}}){
-            userStory{
-              followers {
-                id
-              }
-            }
-          }
-        }
-        `
-        },
-        {
-          withCredentials: true
-        }
-      )
-      const updatedFollowerIds = response.data.data.updateUserStory.userStory.followers.map(
+      followers.push(JSON.stringify(userId))
+      let updatedFollowerIds = followers
+      const response = await userStory.updateVotes(story.id, updatedFollowerIds)
+      updatedFollowerIds = response.data.data.updateUserStory.userStory.followers.map(
         (follower) => JSON.stringify(follower.id)
       )
       setFollowers(updatedFollowerIds)

src/services/user_story.js

@@ -328,6 +328,22 @@ const userStory = {
   },
   postCommentReply: (data) => {
     return apiCall('/user-story-comment-threads', data)
+  },
+  updateVotes: (storyId, updatedFollowerIds) => {
+    const updateVotesQuery = {
+      query: `
+      mutation {
+        updateUserStory(input: {where: {id: "${storyId}"} data: {followers: [${updatedFollowerIds}]}}){
+          userStory{
+            followers {
+              id
+            }
+          }
+        }
+      }
+      `
+    }
+    return apiCall('/graphql', updateVotesQuery)
   }
 }