Skip to content

Commit 0b8ec7b

Browse files
committed
Fix result codes in GetMessages
1 parent 1ed4862 commit 0b8ec7b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/code/server/grpc/chat/v2/server.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (s *server) GetMessages(ctx context.Context, req *chatpb.GetMessagesRequest
127127
case nil:
128128
case chat.ErrChatNotFound:
129129
return &chatpb.GetMessagesResponse{
130-
Result: chatpb.GetMessagesResponse_MESSAGE_NOT_FOUND,
130+
Result: chatpb.GetMessagesResponse_CHAT_NOT_FOUND,
131131
}, nil
132132
default:
133133
log.WithError(err).Warn("failure getting chat record")
@@ -174,7 +174,11 @@ func (s *server) GetMessages(ctx context.Context, req *chatpb.GetMessagesRequest
174174
query.WithDirection(direction),
175175
query.WithLimit(limit),
176176
)
177-
if err != nil {
177+
if err == chat.ErrMessageNotFound {
178+
return &chatpb.GetMessagesResponse{
179+
Result: chatpb.GetMessagesResponse_MESSAGE_NOT_FOUND,
180+
}, nil
181+
} else if err != nil {
178182
log.WithError(err).Warn("failure getting chat messages")
179183
return nil, status.Error(codes.Internal, "")
180184
}

0 commit comments

Comments
 (0)