From a156c8007789bed578b10b8a613f27fb012a4748 Mon Sep 17 00:00:00 2001 From: almostinf Date: Thu, 27 Jun 2024 15:28:16 +0300 Subject: [PATCH] fix cli tests and fix linter --- cmd/cli/telegram_utils.go | 5 ++--- cmd/cli/telegram_utils_test.go | 2 +- senders/telegram/send.go | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cmd/cli/telegram_utils.go b/cmd/cli/telegram_utils.go index 88e3efdae..d03eaf36f 100644 --- a/cmd/cli/telegram_utils.go +++ b/cmd/cli/telegram_utils.go @@ -95,9 +95,8 @@ func downgradeTelegramUsersRecords(logger moira.Logger, database moira.Database) var newValue string - chat := telegram.Chat{} - err = json.Unmarshal([]byte(oldValue), &chat) - if err != nil { + chat := &telegram.Chat{} + if err = json.Unmarshal([]byte(oldValue), chat); err != nil { return err } diff --git a/cmd/cli/telegram_utils_test.go b/cmd/cli/telegram_utils_test.go index 6fd73f3bd..3d5b5eb4b 100644 --- a/cmd/cli/telegram_utils_test.go +++ b/cmd/cli/telegram_utils_test.go @@ -117,7 +117,7 @@ func createNewTelegramUserRecords(database moira.Database) { ctx := d.Context() client.Set(ctx, "moira-telegram-users:some telegram group", `{"type":"group","chatId":-1001494975744}`, -1) - client.Set(ctx, "moira-telegram-users:@durov", `{"type":"private","chatId":1`, -1) + client.Set(ctx, "moira-telegram-users:@durov", `{"type":"private","chatId":1}`, -1) client.Set(ctx, "moira-telegram-users:moira-bot-host:123", "D4VdnzZDTS/xXF87THARWw==", -1) } } diff --git a/senders/telegram/send.go b/senders/telegram/send.go index 345c2ade5..f76becce7 100644 --- a/senders/telegram/send.go +++ b/senders/telegram/send.go @@ -155,15 +155,15 @@ func (sender *Sender) getChatFromDb(contactValue string) (*Chat, error) { return nil, fmt.Errorf("failed to get username chat: %w", err) } - chat := Chat{} - if err := json.Unmarshal([]byte(chatRaw), &chat); err != nil { + chat := &Chat{} + if err := json.Unmarshal([]byte(chatRaw), chat); err != nil { // For Moira < 2.12.0 compatibility // Before 2.12.0 `moira-telegram-users:user` only stored telegram channel IDs // After 2.12.0 `moira-telegram-users:user` stores Chat structure if errors.As(err, &unmarshalTypeError) { - chatID, err := strconv.ParseInt(chatRaw, 10, 64) - if err != nil { - return nil, fmt.Errorf("failed to parse chatRaw: %s as int64: %w", chatRaw, err) + chatID, parseErr := strconv.ParseInt(chatRaw, 10, 64) + if parseErr != nil { + return nil, fmt.Errorf("failed to parse chatRaw: %s as int64: %w", chatRaw, parseErr) } return &Chat{ @@ -174,7 +174,7 @@ func (sender *Sender) getChatFromDb(contactValue string) (*Chat, error) { return nil, fmt.Errorf("failed to unmarshal chat data %s: %w", chatRaw, err) } - return &chat, nil + return chat, nil } func (sender *Sender) getChatFromTelegram(username string) (*Chat, error) {