Skip to content

Commit 6f530b2

Browse files
authored
Merge pull request #12 from aitormagan/develop
Develop
2 parents 114ce01 + 6b4bb05 commit 6f530b2

File tree

3 files changed

+35
-4
lines changed

3 files changed

+35
-4
lines changed

serverless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ custom:
3232
pro: "vaccine-notifications-pro"
3333
throughput:
3434
dev: 1
35-
pro: 10
35+
pro: 2
3636
update_centres_time:
3737
dev: 21600
3838
pro: 1200

src/message_handler.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ def handle_generic_message(update):
132132
if age >= min_years:
133133
message = "‼️ ¡Ey! Parece que el sistema ya te permite pedir cita. Hazlo ya en 🔗 " \
134134
"https://autocitavacuna.sanidadmadrid.org/ohcitacovid/"
135+
elif age < 12:
136+
message = "Lo siento 🥺, pero no hay vacunas 💉 aprobadas para menores de 12 años y por tanto no parece " \
137+
"que el sistema te vaya a permitir en algún momento solicitar cita. Aún así, siempre puedes " \
138+
"consultar /currentage para obtener la edad mínima con la que el sistema de autocita permite " \
139+
"pedir citas."
135140
else:
136141
user_notification = db.get_user_notification(user_id)
137142
db.save_notification(user_id, user_name, age)

tests/unit/test_message_handler.py

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,32 @@ def test_given_age_above_min_years_when_handle_generic_then_you_can_already_join
4444
get_min_years_mock.assert_called_once_with()
4545

4646

47+
@patch("src.message_handler.db.get_min_years", return_value=45)
48+
@patch("src.message_handler.get_age", return_value=11)
49+
@patch("src.message_handler.db")
50+
def test_given_age_above_min_years_when_handle_generic_then_you_can_already_join(db_mock, get_age_mock,
51+
get_min_years_mock):
52+
text = MagicMock()
53+
user_id = MagicMock()
54+
first_name = "Aitor"
55+
56+
result = message_handler.handle_generic_message({
57+
"message": {
58+
"text": text,
59+
"from": {
60+
"id": user_id,
61+
"first_name": first_name
62+
}
63+
}
64+
})
65+
66+
assert "aprobadas para menores de 12 años" in result
67+
68+
get_age_mock.assert_called_once_with(text)
69+
get_min_years_mock.assert_called_once_with()
70+
db_mock.save_notification.assert_not_called()
71+
72+
4773
@patch("src.message_handler.db.get_min_years", return_value=45)
4874
@patch("src.message_handler.get_age", return_value=None)
4975
def test_given_no_age_when_handle_generic_then_not_understood(get_age_mock, get_min_years_mock):
@@ -69,7 +95,7 @@ def test_given_no_age_when_handle_generic_then_not_understood(get_age_mock, get_
6995

7096
@freeze_time("2021-06-23")
7197
@patch("src.message_handler.db.get_min_years", return_value=45)
72-
@patch("src.message_handler.get_age", return_value=44)
98+
@patch("src.message_handler.get_age", return_value=12)
7399
@patch("src.message_handler.db")
74100
def test_given_below_when_handle_generic_then_subscription(db_mock, get_age_mock, get_min_years_mock):
75101
text = MagicMock()
@@ -87,12 +113,12 @@ def test_given_below_when_handle_generic_then_subscription(db_mock, get_age_mock
87113
}
88114
})
89115

90-
assert "permita pedir cita a gente nacida en 1977" in result
116+
assert "permita pedir cita a gente nacida en 2009" in result
91117
assert "Ya tenías" not in result
92118

93119
get_age_mock.assert_called_once_with(text)
94120
get_min_years_mock.assert_called_once_with()
95-
db_mock.save_notification.assert_called_once_with(user_id, first_name, 44)
121+
db_mock.save_notification.assert_called_once_with(user_id, first_name, 12)
96122

97123

98124
@freeze_time("2021-06-23")

0 commit comments

Comments
 (0)