Skip to content
This repository was archived by the owner on Jun 19, 2019. It is now read-only.

Commit 9d308bf

Browse files
AllenAnthesAllenAnthes
committed
removed logging for all events
1 parent a314d24 commit 9d308bf

File tree

2 files changed

+31
-33
lines changed

2 files changed

+31
-33
lines changed

‎src/app.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
new_event_logger = logging.getLogger(f'{__name__}.new_member')
1111
all_event_logger = logging.getLogger(f'{__name__}.all_events')
1212

13-
1413
# constants
1514
MESSAGE = (
1615
"Hi {real_name},\n\n Welcome to Operation Code! I'm a bot designed to help answer questions and get you on your way in our community.\n\n"
@@ -24,7 +23,6 @@
2423
"All active Operation Code Projects are located on our source control repository. "
2524
"Our projects can be viewed on <https://github.com/OperationCode/START_HERE|Github.>")
2625

27-
2826
PROXY = config('PROXY')
2927
TOKEN = config('TOKEN')
3028
PROXY = PROXY if PROXY else None
@@ -36,25 +34,24 @@ def build_message(message_template, **kwargs):
3634

3735

3836
def event_handler(event_dict):
39-
all_event_logger.info(event_dict)
37+
# all_event_logger.info(event_dict)
4038
if event_dict['type'] == 'team_join':
4139
new_event_logger.info('New member event recieved')
4240
new_member(event_dict)
4341

4442
if event_dict['type'] == 'presence_change':
45-
all_event_logger.info('User {} changed state to {}'.format(user_name_from_id(event_dict['user']), event_dict['presence']))
46-
43+
# all_event_logger.info('User {} changed state to {}'.format(user_name_from_id(event_dict['user']), event_dict['presence']))
44+
pass
4745
# can be used for development to trigger the event instead of the team_join
4846
if event_dict['type'] == 'message' and 'user' in event_dict.keys():
49-
47+
pass
5048
# Will need to be removed. Currently for testing
51-
logger.info('Message event')
49+
# logger.info('Message event')
5250
if event_dict['type'] == 'message' and 'user' in event_dict.keys() and event_dict['text'] == 'test4611':
5351
event_dict['user'] = {'id': event_dict['user']}
5452
new_member(event_dict)
5553

5654

57-
5855
def new_member(event_dict):
5956
new_event_logger.info('Recieved json event: {}'.format(event_dict))
6057

@@ -65,15 +62,13 @@ def new_member(event_dict):
6562
custom_message = build_message(MESSAGE,
6663
real_name=user_name_from_id(user_id))
6764

68-
69-
new_event_logger.info('Built message: {}'.format(event_dict))
65+
new_event_logger.info('Built message: {}'.format(custom_message))
7066
response = slack_client.api_call('chat.postMessage',
7167
channel=user_id,
7268
text=custom_message,
7369
as_user=True)
7470

75-
76-
if response['ok'] == 'true':
71+
if response['ok']:
7772
new_event_logger.info('New Member Slack response: {}'.format(response))
7873
else:
7974
new_event_logger.error('FAILED -- Message to new member returned error: {}'.format(response))
@@ -101,12 +96,12 @@ def user_name_from_id(user_id):
10196
else:
10297
return 'New Member'
10398

99+
104100
def join_channels():
105101
response = slack_client.api_call('channels.join', name='general')
106102
print(response)
107103

108104

109-
110105
# set the defalt to a 1 second delay
111106
def run_bot(delay=1):
112107
setup_logging()

‎tests/test_basic_functionality.py

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,23 @@ def test_event_handler_receives_team_join_calls_new_member(self, mock_new_member
1818
app.event_handler(NEW_MEMBER)
1919
mock_new_member.assert_called_with(NEW_MEMBER)
2020

21-
def test_event_handler_message_event_logs_event(self):
22-
"""
23-
Asserts event handler correctly logs message events.
24-
Will be removed eventually...
25-
"""
26-
with LogCapture() as capture:
27-
app.event_handler(MESSAGE_EVENT)
28-
capture.check(
29-
('src.app.all_events',
30-
'INFO',
31-
"{'type': 'message', 'channel': 'C8DA69KM4', 'user': 'U8DG4B3EK', 'text': "
32-
"'.', 'ts': '1513003671.000412', 'source_team': 'T8CJ90MQV', 'team': "
33-
"'T8CJ90MQV'}"),
34-
('src.app', 'INFO', 'Message event')
35-
)
21+
# All events logging currently disabled
22+
#
23+
# def test_event_handler_message_event_logs_event(self):
24+
# """
25+
# Asserts event handler correctly logs message events.
26+
# Will be removed eventually...
27+
# """
28+
# with LogCapture() as capture:
29+
# app.event_handler(MESSAGE_EVENT)
30+
# capture.check(
31+
# ('src.app.all_events',
32+
# 'INFO',
33+
# "{'type': 'message', 'channel': 'C8DA69KM4', 'user': 'U8DG4B3EK', 'text': "
34+
# "'.', 'ts': '1513003671.000412', 'source_team': 'T8CJ90MQV', 'team': "
35+
# "'T8CJ90MQV'}"),
36+
# ('src.app', 'INFO', 'Message event')
37+
# )
3638

3739

3840
@mock.patch('src.app.slack_client')
@@ -70,7 +72,8 @@ def test_user_name_from_id_no_name_return_new_member(self, mock_client):
7072
@mock.patch('src.app.build_message', return_value=MESSAGE)
7173
class NewMemberTestCase(unittest.TestCase):
7274

73-
@mock.patch('src.app.slack_client.api_call', return_value={'ok': 'true', 'info': 'stuff goes here'})
75+
76+
@mock.patch('src.app.slack_client.api_call', return_value={'ok': True, 'info': 'stuff goes here'})
7477
def test_event_logged(self, mock_client, mock_builder, mock_username_from_id):
7578
"""
7679
Asserts messages are being logged properly when new_member is called
@@ -80,9 +83,9 @@ def test_event_logged(self, mock_client, mock_builder, mock_username_from_id):
8083
capture.check(
8184
('src.app.new_member', 'INFO', 'Recieved json event: {}'.format(NEW_MEMBER)),
8285
('root', 'INFO', 'team_join message'),
83-
('src.app.new_member', 'INFO', 'Built message: {}'.format(NEW_MEMBER)),
86+
('src.app.new_member', 'INFO', 'Built message: {}'.format(MESSAGE)),
8487
('src.app.new_member', 'INFO',
85-
'New Member Slack response: {}'.format({'ok': 'true', 'info': 'stuff goes here'}))
88+
'New Member Slack response: {}'.format({'ok': True, 'info': 'stuff goes here'}))
8689
)
8790

8891
@mock.patch('src.app.slack_client')
@@ -98,7 +101,7 @@ def test_slack_client_called_with_correct_params(self, mock_client, mock_builder
98101
text=MESSAGE, as_user=True)
99102

100103
#
101-
@mock.patch('src.app.slack_client.api_call', return_value={'ok': 'false', 'info': 'stuff goes here'})
104+
@mock.patch('src.app.slack_client.api_call', return_value={'ok': False, 'info': 'stuff goes here'})
102105
def test_slack_client_returns_error(self, mock_builder, mock_unfi, mock_client):
103106
"""
104107
Asserts an ERROR is logged when messaging a new member fails
@@ -107,7 +110,7 @@ def test_slack_client_returns_error(self, mock_builder, mock_unfi, mock_client):
107110
app.new_member(USER_INFO_HAS_REAL_NAME)
108111
capture.check(
109112
('src.app.new_member', 'ERROR',
110-
"FAILED -- Message to new member returned error: {'ok': 'false', 'info': 'stuff goes here'}"))
113+
"FAILED -- Message to new member returned error: {'ok': False, 'info': 'stuff goes here'}"))
111114

112115

113116
class BuildMessageTestCase(unittest.TestCase):

0 commit comments

Comments
 (0)