From 3e868ba49f5d46e874b03e5f8b960f6d225c6e94 Mon Sep 17 00:00:00 2001
From: mountain <mountain@action2quare.com>
Date: Mon, 22 Jan 2024 18:29:55 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B9=9C=EA=B5=AC=20=EC=88=98=EB=9D=BD?=
 =?UTF-8?q?=EC=8B=9C=20=EC=83=81=ED=83=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=20=EB=88=84=EB=9D=BD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/invitation.go | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/core/invitation.go b/core/invitation.go
index 2822b6a..7e2948c 100644
--- a/core/invitation.go
+++ b/core/invitation.go
@@ -163,29 +163,22 @@ func (iv *invitation) AcceptInvitation(ctx wshandler.ApiCallContext) {
 		Timestamp: now,
 	}
 
-	// 나한테 상대방을 친구로 만들고
-	if err := iv.f.addFriend(&f1); err == nil {
-		iv.wsh.SendUpstreamMessage(&wshandler.UpstreamMessage{
-			Target: f1.From.Hex(),
-			Body:   []friendDoc{f1},
-			Tag:    friends_tag,
-		})
-	} else {
-		logger.Println("AcceptInvitation failed. addFriend(f1) err :", err)
-		return
-	}
+	// 나한테 상대방을 친구로 만든다
+	// SendUpstreamMessage를 먼저 해야 함
+	iv.wsh.SendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: f1.From.Hex(),
+		Body:   []friendDoc{f1},
+		Tag:    friends_tag,
+	})
+	iv.f.addFriend(&f1)
 
 	// 상대방한테 나를 친구로 만듬
-	if err := iv.f.addFriend(&f2); err == nil {
-		iv.wsh.SendUpstreamMessage(&wshandler.UpstreamMessage{
-			Target: f2.From.Hex(),
-			Body:   []friendDoc{f2},
-			Tag:    friends_tag,
-		})
-	} else {
-		logger.Println("AcceptInvitation failed. addFriend(f2) err :", err)
-		return
-	}
+	iv.wsh.SendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: f2.From.Hex(),
+		Body:   []friendDoc{f2},
+		Tag:    friends_tag,
+	})
+	iv.f.addFriend(&f2)
 
 	iv.mongoClient.Delete(invitation_collection_name, bson.M{"_id": invId})
 }