feature: delete friend

Monify-Dev · Jun 29, 2024 · f9c1494 · f9c1494
1 parent 304a98a
commit f9c1494
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 72 deletions.
diff --git a/protobuf/friend.proto b/protobuf/friend.proto
@@ -43,6 +43,7 @@ service FriendService{
             delete: "/v1/friend/reject_invitation/{invite_id}"
         };
     }
+
 }
 
 message DeleteFriendRequest{
@@ -56,6 +57,7 @@ message ListFriendResponse{
 message Friend{
     string friend_id = 1;
     string name = 2;
+    string relation_id = 3;
 }
 
 message InviteFriendRequest{

diff --git a/protobuf/gen/go/friend.pb.go b/protobuf/gen/go/friend.pb.go
diff --git a/services/api/controllers/friend/delete_friend.go b/services/api/controllers/friend/delete_friend.go
@@ -0,0 +1,30 @@
+package friend
+
+import (
+	"context"
+	"database/sql"
+	"monify/lib"
+	monify "monify/protobuf/gen/go"
+
+	"github.com/google/uuid"
+	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+func (s Service) DeleteFriend(ctx context.Context, req *monify.DeleteFriendRequest) (*monify.FriendEmpty, error) {
+	logger := ctx.Value(lib.LoggerContextKey{}).(*zap.Logger)
+	_, ok := ctx.Value(lib.UserIdContextKey{}).(uuid.UUID)
+	if !ok {
+		return nil, status.Error(codes.Unauthenticated, "Unauthorized.")
+	}
+	db := ctx.Value(lib.DatabaseContextKey{}).(*sql.DB)
+
+	_, err := db.ExecContext(ctx, `DELETE FROM friend WHERE relation_id = $1`, req.RelationId)
+	if err != nil {
+		logger.Error("Delete friend error.", zap.Error(err))
+		return nil, status.Error(codes.Internal, "")
+	}
+	return &monify.FriendEmpty{}, nil
+
+}
diff --git a/services/api/controllers/friend/friend_invite.go b/services/api/controllers/friend/friend_invite.go
@@ -15,7 +15,6 @@ import (
 func (s Service) InviteFriend(ctx context.Context, req *monify.InviteFriendRequest) (*monify.InviteFriendResponse, error) {
 
 	logger := ctx.Value(lib.LoggerContextKey{}).(*zap.Logger)
-	userId := ctx.Value(lib.UserIdContextKey{}).(uuid.UUID)
 	userId, ok := ctx.Value(lib.UserIdContextKey{}).(uuid.UUID)
 	if !ok {
 		return nil, status.Error(codes.Unauthenticated, "Unauthorized.")

diff --git a/services/api/controllers/friend/list_friend.go b/services/api/controllers/friend/list_friend.go
@@ -20,7 +20,7 @@ func (s Service) ListFriend(ctx context.Context, req *monify.FriendEmpty) (*moni
 	}
 	db := ctx.Value(lib.DatabaseContextKey{}).(*sql.DB)
 	query, err := db.QueryContext(ctx, `
-		SELECT user1_id, user2_id, name
+		SELECT user1_id, user2_id, name, relation_id
 		FROM friend, user_identity
 		WHERE (user1_id = $1 AND user2_id = user_id) OR (user2_id = $2 AND user1_id = user_id)`, userId, userId)
 	if err != nil {
@@ -37,7 +37,7 @@ func (s Service) ListFriend(ctx context.Context, req *monify.FriendEmpty) (*moni
 		var friend monify.Friend
 		var user1Id uuid.UUID
 		var user2Id uuid.UUID
-		if err = query.Scan(&user1Id, &user2Id, &friend.Name); err != nil {
+		if err = query.Scan(&user1Id, &user2Id, &friend.Name, &friend.RelationId); err != nil {
 			logger.Error("Scan error.", zap.Error(err))
 			return nil, status.Error(codes.Internal, "")
 		}

diff --git a/services/api/test/friend_invite_test.go b/services/api/test/friend_invite_test.go
@@ -53,4 +53,15 @@ func TestInviteFriend(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, len(friends.GetFriends()), 2)
 
+	// test delete friend
+	var friendS_relationId []string
+	for _, friend := range friends.GetFriends() {
+		friendS_relationId = append(friendS_relationId, friend.RelationId)
+	}
+	_, err = client.DeleteFriend(context.TODO(), &monify.DeleteFriendRequest{RelationId: friendS_relationId[0]})
+	assert.NoError(t, err)
+	friends, err = client.ListFriend(context.TODO(), &monify.FriendEmpty{})
+	assert.NoError(t, err)
+	assert.Equal(t, len(friends.GetFriends()), 1)
+
 }