From 11cd92ddf4b03cbe19c7cb3c491da55debea8250 Mon Sep 17 00:00:00 2001
From: yeon <vantovan7414@gmail.com>
Date: Thu, 5 Dec 2019 16:42:04 +0900
Subject: [PATCH] =?UTF-8?q?[Add]=20=EB=A6=AC=EC=A1=B8=EB=B2=84=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=9E=90=EA=B8=B0=EC=9E=90=EC=8B=A0=EA=B3=BC=20?=
 =?UTF-8?q?=EC=9E=90=EA=B8=B0=20=EC=B9=9C=EA=B5=AC=EB=93=A4=EB=A7=8C=20?=
 =?UTF-8?q?=EC=83=88=EA=B8=80=20=EC=95=8C=EB=A6=BC=EC=9D=84=20=EB=B0=9B?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=ED=95=A8=20#140?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

새글이 피드에 등록되어야 하고 새 피드가 알람이 와야함.
새 글 알림을 payload로 전달받은 등록자와 subscribe 에 등록된 사용자의 email을 비교해서 알림 발송
---
 client/src/composition/Feed/index.tsx |  2 +-
 server/src/api/feed/feed.resolvers.ts | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/src/composition/Feed/index.tsx b/client/src/composition/Feed/index.tsx
index a473eeed..475e0fac 100644
--- a/client/src/composition/Feed/index.tsx
+++ b/client/src/composition/Feed/index.tsx
@@ -25,7 +25,7 @@ const FeedList = () => {
   const { data: myInfo } = useMeQuery();
   const { data, fetchMore, subscribeToMore } = useGetfeedsQuery({
     variables: { first: OFFSET, currentCursor: '9999-12-31T09:29:26.050Z' },
-    notifyOnNetworkStatusChange: true
+    fetchPolicy: 'network-only'
   });
 
   const scrollTop = () => {
diff --git a/server/src/api/feed/feed.resolvers.ts b/server/src/api/feed/feed.resolvers.ts
index 8246d6d2..792b95c3 100644
--- a/server/src/api/feed/feed.resolvers.ts
+++ b/server/src/api/feed/feed.resolvers.ts
@@ -87,7 +87,6 @@ const checkIsFriend = async (friendEmail, myEmail) => {
   });
   const [parsedResult] = ParseResultRecords(result.records);
 
-  console.log('parsedResult ', parsedResult);
   if (parsedResult.isFriend > 0) {
     return true;
   }
@@ -174,23 +173,18 @@ export default {
     feeds: {
       subscribe: withFilter(
         (_, __, { pubsub }) => {
-          console.log('subscribed');
           return pubsub.asyncIterator(NEW_FEED);
         },
-        async (_, variables, context) => {
+        async (payload, _, context) => {
           const myEmail = context.email;
-          const friendEmail = variables.userEmail;
+          const friendEmail = payload.feeds.feedItems[0].searchUser.email;
           const isFriend = await checkIsFriend(friendEmail, myEmail);
-          /* if (isFriend && myEmail === friendEmail) {
+
+          if (isFriend || myEmail === friendEmail) {
             return true;
           } else {
             return false;
-          } */
-
-          console.log(isFriend);
-          console.log('myEmail ', myEmail);
-          console.log('friendEmail ', friendEmail);
-          return true;
+          }
         }
       )
     }