Skip to content

Commit fd18d12

Browse files
committed
CON-337-fix(remote-rooms): return all rooms when there is no location
- return all rooms when the location is not available in the map filter [Delivers CON-337]
1 parent 3b9cf01 commit fd18d12

File tree

3 files changed

+46
-3
lines changed

3 files changed

+46
-3
lines changed

api/room/schema_query.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,9 @@ def resolve_all_rooms(self, info, **kwargs):
280280
def resolve_all_remote_rooms(self, info, return_all=None):
281281
page_token = None
282282
filter = map_remote_room_location_to_filter()
283-
location = 'all' if return_all else get_user_from_db().location
283+
location = get_user_from_db().location
284+
if not filter.get(location) or return_all:
285+
location = 'all'
284286
remote_rooms = []
285287
while True:
286288
calendar_list = get_google_api_calendar_list(pageToken=page_token)

fixtures/room/query_room_fixtures.py

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,37 @@
1515
"data": {
1616
"allRemoteRooms": {
1717
"rooms": []
18-
}
1918
}
2019
}
20+
}
21+
22+
all_remote_rooms_query_with_returnAll_True = '''
23+
query{
24+
allRemoteRooms(returnAll: true){
25+
rooms{
26+
calendarId
27+
name
28+
}
29+
}
30+
}
31+
'''
32+
33+
all_remote_rooms_response_with_returnAll_True = {
34+
"data": {
35+
"allRemoteRooms": {
36+
"rooms": [
37+
{
38+
"calendarId": "andela.com_1886vcahg842gg6ahj6kdkskq1enu6gb74p38d1g60qjge9i70@resource.calendar.google.com",
39+
"name": "Kigali-5-KGL - Test 1 (2)"
40+
},
41+
{
42+
"calendarId": "andela.com_1886tq9d1ftg2gl3lutolmrm0gt0i6gb74p36dpg64q3achn6o@resource.calendar.google.com",
43+
"name": "Kigali-5-KGL - Test 2 (6)"
44+
}
45+
]
46+
}
47+
}
48+
}
2149

2250
paginated_rooms_query = '''
2351
query {

tests/test_rooms/test_query_rooms.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
room_query_with_non_existant_id_response,
1616
all_remote_rooms_query,
1717
paginated_rooms_query_blank_page,
18-
all_dummy_rooms_response
18+
all_dummy_rooms_response,
19+
all_remote_rooms_query2,
20+
all_remote_rooms_response2
1921
)
2022
from helpers.calendar.credentials import get_google_api_calendar_list
2123

@@ -78,6 +80,17 @@ def test_calendar_list_function(self, mocked_method):
7880
get_google_api_calendar_list()
7981
assert mocked_method.called
8082

83+
def test_all_remote_rooms_with_argument_returnAll_true(self):
84+
"""
85+
returning all remote rooms with true as
86+
a value to the returnAll argument
87+
"""
88+
CommonTestCases.admin_token_assert_equal(
89+
self,
90+
all_remote_rooms_query2,
91+
all_remote_rooms_response2
92+
)
93+
8194
def test_query_room_with_id(self):
8295
response = self.app_test.post('/mrm?query='+room_query_by_id)
8396
actual_response = json.loads(response.data)

0 commit comments

Comments
 (0)