85032655

Build Type

github

Committed by GitHub

Commit Message

Merge c17ea693d into 27f32b6c2

Pull Request Pull Request #93: Working on internationalization

Run Details

86 of 505 branches covered (17.03%)

Branch coverage included in aggregate %.

88 of 200 new or added lines in 27 files covered. (44.0%)

8 existing lines in 2 files now uncovered.

498 of 1041 relevant lines covered (47.84%)

1.09 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

28.21

/server/src/bots/telegram/botResponse/subscribeResponse.ts

import {
    noSubscriptionsResponseMessage,
    showMySubscriptionMessage,
    subscribeError,
    subscriptionManagerResponseMessage,
    subscriptionResultMessage,
} from '../../../messages/feature/subscribeMessages';
import { CustomSubscriptions, UserRegExps } from '../../../models/constants';
import { subscribeOn } from '../../../services/domain/subscriptions';
import { catchAsyncError } from '../../../utils/catchError';
import { getSubscriptionMessageInlineKeyboard } from '../services/keyboard';
import { getTelegramActiveUserSubscriptions } from '../services/storage';
import { getUserMessageFromIKorText } from '../utils/getUserMessageFromIKorText';
import { UserSubscription } from '../../../models/subscription.models';
import { removeCommandFromMessageIfExist } from '../../../utils/removeCommandFromMessageIfExist';
import * as TelegramBot from 'node-telegram-bot-api';
import { CallBackQueryHandlerWithCommandArgument } from '../models';

// TODO: Take a look in all handlers and remove unneeded parameters where they are not used
export const subscriptionManagerResponse = async (
    bot,
    message,
    chatId
): Promise<TelegramBot.Message> => {
    return bot.sendMessage(
        chatId,
        subscriptionManagerResponseMessage(),
        getSubscriptionMessageInlineKeyboard()
    );
};

export const showExistingSubscriptionsResponse = async (
    bot,
    message,
    chatId
): Promise<TelegramBot.Message> => {
    const activeUserSubscription: UserSubscription = await getTelegramActiveUserSubscriptions(
        chatId
    );
    if (!activeUserSubscription?.subscriptionsOn?.length) {
        return bot.sendMessage(chatId, noSubscriptionsResponseMessage());
    }

    return bot.sendMessage(
        chatId,
        showMySubscriptionMessage(activeUserSubscription)
    );
};

// If it's called from InlineKeyboard, then @param ikCbData will be available
// otherwise @param ikCbData will be null
export const subscribingStrategyResponse: CallBackQueryHandlerWithCommandArgument = async (
    bot: TelegramBot,
    message: TelegramBot.Message,
    chatId: number,
    commandParameter?: string
): Promise<TelegramBot.Message> => {
    if (!commandParameter) {
        return showExistingSubscriptionsResponse(bot, message, chatId);
    }

    const [err, result] = await catchAsyncError<string>(
        subscribeOn(
            message.chat,
            removeCommandFromMessageIfExist(
                getUserMessageFromIKorText(
                    message,
                    CustomSubscriptions.SubscribeMeOn,
                    ''
                ),
                UserRegExps.Subscribe
            )
        )
    );
    if (err) {
        return bot.sendMessage(chatId, subscribeError(err.message));
    }

    return bot.sendMessage(chatId, subscriptionResultMessage(result));
};

1	import {	1✔
2	noSubscriptionsResponseMessage,
3	showMySubscriptionMessage,
4	subscribeError,
5	subscriptionManagerResponseMessage,
6	subscriptionResultMessage,
7	} from '../../../messages/feature/subscribeMessages';
8	import { CustomSubscriptions, UserRegExps } from '../../../models/constants';	1✔
9	import { subscribeOn } from '../../../services/domain/subscriptions';	1✔
10	import { catchAsyncError } from '../../../utils/catchError';	1✔
11	import { getSubscriptionMessageInlineKeyboard } from '../services/keyboard';	1✔
12	import { getTelegramActiveUserSubscriptions } from '../services/storage';	1✔
13	import { getUserMessageFromIKorText } from '../utils/getUserMessageFromIKorText';	1✔
14	import { UserSubscription } from '../../../models/subscription.models';
15	import { removeCommandFromMessageIfExist } from '../../../utils/removeCommandFromMessageIfExist';	1✔
16	import * as TelegramBot from 'node-telegram-bot-api';
17	import { CallBackQueryHandlerWithCommandArgument } from '../models';
18
19	// TODO: Take a look in all handlers and remove unneeded parameters where they are not used
20	export const subscriptionManagerResponse = async (	1✔
21	bot,
22	message,
23	chatId
NEW 24	): Promise<TelegramBot.Message> => {	×
NEW 25	return bot.sendMessage(	×
26	chatId,
27	subscriptionManagerResponseMessage(),
28	getSubscriptionMessageInlineKeyboard()
29	);
30	};
31
32	export const showExistingSubscriptionsResponse = async (	1✔
33	bot,
34	message,
35	chatId
NEW 36	): Promise<TelegramBot.Message> => {	×
NEW 37	const activeUserSubscription: UserSubscription = await getTelegramActiveUserSubscriptions(	×
38	chatId
39	);
40	if (!activeUserSubscription?.subscriptionsOn?.length) {	×
41	return bot.sendMessage(chatId, noSubscriptionsResponseMessage());	×
42	}
43
NEW 44	return bot.sendMessage(	×
45	chatId,
46	showMySubscriptionMessage(activeUserSubscription)
47	);
48	};
49
50	// If it's called from InlineKeyboard, then @param ikCbData will be available
51	// otherwise @param ikCbData will be null
52	export const subscribingStrategyResponse: CallBackQueryHandlerWithCommandArgument = async (	1✔
53	bot: TelegramBot,
54	message: TelegramBot.Message,
55	chatId: number,
56	commandParameter?: string
57	): Promise<TelegramBot.Message> => {	×
58	if (!commandParameter) {	×
59	return showExistingSubscriptionsResponse(bot, message, chatId);	×
60	}
61
NEW 62	const [err, result] = await catchAsyncError<string>(	×
63	subscribeOn(
64	message.chat,
65	removeCommandFromMessageIfExist(
66	getUserMessageFromIKorText(
67	message,
68	CustomSubscriptions.SubscribeMeOn,
69	''
70	),
71	UserRegExps.Subscribe
72	)
73	)
74	);
75	if (err) {	×
76	return bot.sendMessage(chatId, subscribeError(err.message));	×
77	}
78
79	return bot.sendMessage(chatId, subscriptionResultMessage(result));	×
80	};

danbilokha / covid19liveupdates / 85032655

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous