Merge pull request #35 from qsweber/quinn/feature_notify_in_channel

feature notify in channel

Author: qsweber

lunch_buddies/actions/auth.py

@@ -6,14 +6,22 @@
 from lunch_buddies.clients.slack import SlackClient
 from lunch_buddies.clients.http import HttpClient
 from lunch_buddies.dao.teams import TeamsDao
+from lunch_buddies.dao.team_settings import TeamSettingsDao
 from lunch_buddies.models.teams import Team
+from lunch_buddies.models.team_settings import TeamSettings
 from lunch_buddies.types import Auth
 
 
 logger = logging.getLogger(__name__)
 
 
-def auth(request_form: Auth, teams_dao: TeamsDao, slack_client: SlackClient, http_client: HttpClient) -> None:
+def auth(
+    request_form: Auth,
+    teams_dao: TeamsDao,
+    team_settings_dao: TeamSettingsDao,
+    slack_client: SlackClient,
+    http_client: HttpClient,
+) -> None:
     response = json.loads(http_client.get(
         url='https://slack.com/api/oauth.access',
         params={
@@ -33,6 +41,11 @@ def auth(request_form: Auth, teams_dao: TeamsDao, slack_client: SlackClient, htt
 
     teams_dao.create(team)
 
+    team_settings_dao.create(TeamSettings(
+        team_id=team.team_id,
+        feature_notify_in_channel=True,
+    ))
+
     slack_client.post_message(
         team=team,
         channel=response['user_id'],

lunch_buddies/actions/notify_group.py

@@ -3,8 +3,11 @@
 from lunch_buddies.clients.slack import SlackClient
 from lunch_buddies.dao.polls import PollsDao
 from lunch_buddies.dao.teams import TeamsDao
+from lunch_buddies.dao.team_settings import TeamSettingsDao
 from lunch_buddies.dao.groups import GroupsDao
 from lunch_buddies.models.groups import Group
+from lunch_buddies.models.teams import Team
+from lunch_buddies.models.polls import Poll, Choice
 from lunch_buddies.types import GroupsToNotifyMessage
 
 
@@ -13,41 +16,85 @@ def notify_group(
     slack_client: SlackClient,
     polls_dao: PollsDao,
     teams_dao: TeamsDao,
+    team_settings_dao: TeamSettingsDao,
     groups_dao: GroupsDao,
 ) -> None:
     team = teams_dao.read('team_id', message.team_id)[0]
-    poll = polls_dao.find_by_callback_id(message.team_id, message.callback_id)
+    poll: Poll = polls_dao.find_by_callback_id(message.team_id, message.callback_id)
     choice = [
         choice
         for choice in poll.choices
         if choice.key == message.response
     ][0]
 
+    group = Group(
+        callback_id=message.callback_id,
+        user_ids=message.user_ids,
+        response_key=message.response,
+    )
+
+    groups_dao.create(group)
+
+    team_settings_search = team_settings_dao.read('team_id', message.team_id)
+    if team_settings_search and team_settings_search[0].feature_notify_in_channel:
+        _notify_in_channel(message, slack_client, team, poll, choice)
+    else:
+        _notify_private_group(message, slack_client, team, choice)
+
+    return
+
+
+def _notify_private_group(
+    message: GroupsToNotifyMessage,
+    slack_client: SlackClient,
+    team: Team,
+    choice: Choice,
+):
     user_in_charge = random.choice(message.user_ids)
     text = (
-        'Hello! This is your lunch group for today. ' +
+        'Hello! This is your group for today. ' +
         'You all should meet somewhere at `{}`. '.format(choice.time) +
         'I am selecting <@{}> to be in charge of picking the location.'.format(user_in_charge)
     )
-
     conversation = slack_client.open_conversation(
         team=team,
         users=','.join(message.user_ids),
     )
-
-    group = Group(
-        callback_id=message.callback_id,
-        user_ids=message.user_ids,
-        response_key=message.response,
+    slack_client.post_message(
+        team=team,
+        channel=conversation['channel']['id'],
+        as_user=True,
+        text=text,
     )
 
-    groups_dao.create(group)
 
+def _notify_in_channel(
+    message: GroupsToNotifyMessage,
+    slack_client: SlackClient,
+    team: Team,
+    poll: Poll,
+    choice: Choice,
+):
+    users_formatted = ', '.join([
+        '<@{}>'.format(user_id)
+        for user_id in message.user_ids
+    ])
+    text = (
+        'Hey {}!'.format(users_formatted) +
+        ' This is your group for today.' +
+        ' You all should meet somewhere at `{}`.'.format(choice.time)
+    )
+    result = slack_client.post_message(
+        team=team,
+        channel=poll.channel_id,
+        as_user=True,
+        text=text,
+    )
+    text = '<@{}> should pick the location.'.format(random.choice(message.user_ids))
     slack_client.post_message(
         team=team,
-        channel=conversation['channel']['id'],
+        channel=poll.channel_id,
         as_user=True,
         text=text,
+        thread_ts=result['ts']
     )
-
-    return

lunch_buddies/actions/tests/test_auth.py

@@ -7,6 +7,7 @@
 from lunch_buddies.clients.http import HttpClient
 from lunch_buddies.clients.slack import SlackClient
 from lunch_buddies.dao.teams import TeamsDao
+from lunch_buddies.dao.team_settings import TeamSettingsDao
 from lunch_buddies.models.teams import Team
 from lunch_buddies.types import Auth
 
@@ -33,11 +34,12 @@ def test_auth(mocker):
         auto_spec=True,
         return_value=True,
     )
-    mocker.patch.object(
-        teams_dao,
-        '_read_internal',
+    team_settings_dao = TeamSettingsDao()
+    mocked_team_settings_dao_create_internal = mocker.patch.object(
+        team_settings_dao,
+        '_create_internal',
         auto_spec=True,
-        return_value=[]
+        return_value=True,
     )
     http_client = HttpClient()
     mocked_http_get = mocker.patch.object(
@@ -75,6 +77,7 @@ def test_auth(mocker):
     module.auth(
         Auth(code='test_code'),
         teams_dao,
+        team_settings_dao,
         slack_client,
         http_client,
     )
@@ -88,6 +91,12 @@ def test_auth(mocker):
             'created_at': Decimal(created_at.timestamp()),
         },
     )
+    mocked_team_settings_dao_create_internal.assert_called_with(
+        {
+            'team_id': 'fake_team_id',
+            'feature_notify_in_channel': 1,
+        },
+    )
     mocked_slack_client_post_message.assert_called_with(
         team=expected_team,
         channel='fake_user_id',

lunch_buddies/actions/tests/test_notify_group.py

@@ -6,6 +6,7 @@
 from lunch_buddies.clients.slack import SlackClient
 from lunch_buddies.dao.polls import PollsDao
 from lunch_buddies.dao.teams import TeamsDao
+from lunch_buddies.dao.team_settings import TeamSettingsDao
 from lunch_buddies.dao.groups import GroupsDao
 from lunch_buddies.models.teams import Team
 import lunch_buddies.actions.notify_group as module
@@ -28,6 +29,13 @@ def test_notify_group(mocker):
             'created_at': created_at.timestamp(),
         }]
     )
+    team_settings_dao = TeamSettingsDao()
+    mocker.patch.object(
+        team_settings_dao,
+        '_read_internal',
+        auto_spec=True,
+        return_value=[]
+    )
     polls_dao = PollsDao()
     mocker.patch.object(
         polls_dao,
@@ -79,6 +87,7 @@ def test_notify_group(mocker):
         slack_client,
         polls_dao,
         teams_dao,
+        team_settings_dao,
         groups_dao,
     )
 
@@ -104,5 +113,123 @@ def test_notify_group(mocker):
         ),
         channel='new_group_message_channel',
         as_user=True,
-        text='Hello! This is your lunch group for today. You all should meet somewhere at `11:45`. I am selecting <@user_id_two> to be in charge of picking the location.',
+        text='Hello! This is your group for today. You all should meet somewhere at `11:45`. I am selecting <@user_id_two> to be in charge of picking the location.',
+    )
+
+
+def test_notify_group_feature_notify_in_channel(mocker):
+    slack_client = SlackClient()
+    teams_dao = TeamsDao()
+    created_at = datetime.now()
+    mocker.patch.object(
+        teams_dao,
+        '_read_internal',
+        auto_spec=True,
+        return_value=[{
+            'team_id': '123',
+            'access_token': 'fake-token',
+            'name': 'fake-team-name',
+            'bot_access_token': 'fake-bot-token',
+            'created_at': created_at.timestamp(),
+        }]
+    )
+    team_settings_dao = TeamSettingsDao()
+    mocker.patch.object(
+        team_settings_dao,
+        '_read_internal',
+        auto_spec=True,
+        return_value=[{
+            'team_id': '123',
+            'feature_notify_in_channel': 1,
+        }]
     )
+    polls_dao = PollsDao()
+    mocker.patch.object(
+        polls_dao,
+        '_read_internal',
+        auto_spec=True,
+        return_value=[
+            {
+                'team_id': '123',
+                'created_at': datetime.now().timestamp(),
+                'channel_id': 'test_channel_id',
+                'created_by_user_id': 'foo',
+                'callback_id': 'f0d101f9-9aaa-4899-85c8-aa0a2dbb07cb',
+                'state': polls_constants.CREATED,
+                'choices': '[{"key": "yes_1145", "is_yes": true, "time": "11:45", "display_text": "Yes (11:45)"}, {"key": "no", "is_yes": false, "time": "", "display_text": "No"}]',
+                'group_size': polls_constants.DEFAULT_GROUP_SIZE,
+            },
+        ]
+    )
+
+    groups_dao = GroupsDao()
+    mocked_groups_dao_create_internal = mocker.patch.object(
+        groups_dao,
+        '_create_internal',
+        auto_spec=True,
+        return_value=True,
+    )
+
+    mocked_post_message = mocker.patch.object(
+        slack_client,
+        'post_message',
+        auto_spec=True,
+        return_value={
+            'ts': 'fake_thread_ts',
+        },
+    )
+    random.seed(0)
+
+    module.notify_group(
+        GroupsToNotifyMessage(
+            team_id='123',
+            callback_id=UUID('f0d101f9-9aaa-4899-85c8-aa0a2dbb07cb'),
+            response='yes_1145',
+            user_ids=['user_id_one', 'user_id_two'],
+        ),
+        slack_client,
+        polls_dao,
+        teams_dao,
+        team_settings_dao,
+        groups_dao,
+    )
+
+    expected_group = {
+        'callback_id': 'f0d101f9-9aaa-4899-85c8-aa0a2dbb07cb',
+        'user_ids': '["user_id_one", "user_id_two"]',
+        'response_key': 'yes_1145',
+    }
+
+    mocked_groups_dao_create_internal.assert_called_with(
+        expected_group,
+    )
+
+    assert mocked_post_message.call_count == 2
+
+    mocked_post_message.assert_has_calls([
+        mocker.call(
+            team=Team(
+                team_id='123',
+                access_token='fake-token',
+                name='fake-team-name',
+                bot_access_token='fake-bot-token',
+                created_at=created_at,
+            ),
+            channel='test_channel_id',
+            as_user=True,
+            text='Hey <@user_id_one>, <@user_id_two>! This is your group for today. You all should meet somewhere at `11:45`.',
+        ),
+        mocker.call(
+            team=Team(
+                team_id='123',
+                access_token='fake-token',
+                name='fake-team-name',
+                bot_access_token='fake-bot-token',
+                created_at=created_at,
+            ),
+            channel='test_channel_id',
+            as_user=True,
+            thread_ts='fake_thread_ts',
+            text='<@user_id_two> should pick the location.',
+        )
+    ])

lunch_buddies/app/handlers.py

@@ -14,6 +14,7 @@
 from lunch_buddies.dao.polls import PollsDao
 from lunch_buddies.dao.poll_responses import PollResponsesDao
 from lunch_buddies.dao.teams import TeamsDao
+from lunch_buddies.dao.team_settings import TeamSettingsDao
 from lunch_buddies.dao.groups import GroupsDao
 from lunch_buddies.actions.check_sqs_ping_sns import check_sqs_and_ping_sns as check_sqs_and_ping_sns_action
 from lunch_buddies.actions.create_poll import create_poll as create_poll_action
@@ -35,6 +36,7 @@
 polls_dao = PollsDao()
 poll_responses_dao = PollResponsesDao()
 groups_dao = GroupsDao()
+team_settings_dao = TeamSettingsDao()
 
 
 def captureErrors(func):
@@ -106,7 +108,7 @@ def notify_groups_from_queue(event: dict, context: dict) -> None:
         GROUPS_TO_NOTIFY,
         None,
         notify_group_action,
-        [slack_client, polls_dao, teams_dao, groups_dao]
+        [slack_client, polls_dao, teams_dao, team_settings_dao, groups_dao]
     )
     groups_to_notify_queue_handler.run()
 

lunch_buddies/app/http.py

@@ -13,6 +13,7 @@
 from lunch_buddies.dao.polls import PollsDao
 from lunch_buddies.dao.poll_responses import PollResponsesDao
 from lunch_buddies.dao.teams import TeamsDao
+from lunch_buddies.dao.team_settings import TeamSettingsDao
 from lunch_buddies.dao.groups import GroupsDao
 from lunch_buddies.actions.auth import auth as auth_action
 from lunch_buddies.actions.bot import bot as bot_action, parse_raw_request
@@ -40,6 +41,7 @@
 sns_client = SnsClient()
 http_client = HttpClient()
 teams_dao = TeamsDao()
+team_settings_dao = TeamSettingsDao()
 polls_dao = PollsDao()
 poll_responses_dao = PollResponsesDao()
 groups_dao = GroupsDao()
@@ -166,7 +168,7 @@ def auth_http() -> str:
         code=request.args['code'],
     )
 
-    auth_action(request_form, teams_dao, slack_client, http_client)
+    auth_action(request_form, teams_dao, team_settings_dao, slack_client, http_client)
 
     return redirect('http://lunchbuddies.quinnweber.com/registration/')