Skip to content

CV3-85 Add device downtime to report data #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

CV3-85 Add device downtime to report data #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions api/analytics/all_analytics_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import graphene
from helpers.auth.admin_roles import admin_roles
from helpers.calendar.all_analytics_helper import (
AllAnalyticsHelper, Event, BookingsCount
AllAnalyticsHelper, Event, BookingsCount, DeviceAnalytics
)
from api.role.schema import Role
from helpers.calendar.analytics_helper import CommonAnalytics
from helpers.auth.authentication import Auth
from api.room.schema import Room
from api.devices.schema import Devices
from utilities.utility import percentage_formater
from helpers.auth.user_details import get_user_from_db
from utilities.validator import verify_location_id
Expand Down Expand Up @@ -37,6 +38,7 @@ class AllAnalytics(graphene.ObjectType):
cancellations_percentage = graphene.Float()
app_bookings_percentage = graphene.Float()
bookings_count = graphene.List(BookingsCount)
device_analytics = graphene.List(DeviceAnalytics)


class Query(graphene.ObjectType):
Expand Down Expand Up @@ -69,6 +71,11 @@ def resolve_all_analytics(self, info, **kwargs):
start_date, end_date = CommonAnalytics.all_analytics_date_validation(
self, start_date, end_date
)
device_query = Devices.get_query(info)
device_analytics = AllAnalyticsHelper.get_devices_analytics(
self,
device_query
)
query = Room.get_query(info)
room_analytics, bookings, percentages_dict, bookings_count = \
AllAnalyticsHelper.get_all_analytics(
Expand Down Expand Up @@ -98,6 +105,14 @@ def resolve_all_analytics(self, info, **kwargs):
events=analytic['room_events'],
)
analytics.append(current_analytic)
device_analytics_list = []
for device_object in device_analytics:
device_analytic = DeviceAnalytics(
device_name=device_object['device_name'],
device_id=device_object['device_id'],
down_time=device_object['down_time']
)
device_analytics_list.append(device_analytic)
return AllAnalytics(
bookings=bookings,
checkins_percentage=percentage_formater(
Expand All @@ -117,4 +132,5 @@ def resolve_all_analytics(self, info, **kwargs):
bookings
),
bookings_count=bookings_count,
analytics=analytics)
analytics=analytics,
device_analytics=device_analytics_list)
184 changes: 78 additions & 106 deletions fixtures/analytics/query_all_analytics_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all_analytics_query = '''
all_analytics_query = """
query {
allAnalytics(startDate:"jul 11 2018", endDate:"jul 12 2018", locationId:1) { # noqa: E501
checkinsPercentage
Expand All @@ -25,10 +25,23 @@
totalBookings
period
}
deviceAnalytics{
deviceName
deviceId
}
}
}
'''
all_analytics_query_invalid_locationid = '''
"""
all_analytics_query_down_time = """
query {
allAnalytics(startDate:"jul 11 2018", endDate:"jul 12 2018", locationId:1) { # noqa: E501
deviceAnalytics{
downTime
}
}
}
"""
all_analytics_query_invalid_locationid = """
query {
allAnalytics(startDate:"jul 11 2018", endDate:"jul 12 2018", locationId:10) { # noqa: E501
checkinsPercentage
Expand Down Expand Up @@ -57,84 +70,69 @@
}
}
}
'''
"""

all_analytics_query_response = {
"data": {
"allAnalytics": {
"checkinsPercentage": 0.0,
"appBookingsPercentage": 0.0,
"autoCancellationsPercentage": 0.0,
"cancellationsPercentage": 0.0,
"bookings": 1,
"analytics": [
{
"roomName": "Entebbe",
"cancellations": 0,
"cancellationsPercentage": 0.0,
"autoCancellations": 0,
"numberOfBookings": 1,
"checkins": 0,
"checkinsPercentage": 0.0,
"bookingsPercentageShare": 100.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [
{
"durationInMinutes": 45
}
]
},
{
"roomName": "Tana",
"cancellations": 0,
"cancellationsPercentage": 0.0,
"autoCancellations": 0,
"numberOfBookings": 0,
"checkins": 0,
"checkinsPercentage": 0.0,
"bookingsPercentageShare": 0.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [
{
"durationInMinutes": 0
}
]
}
],
"bookingsCount": [
{
"totalBookings": 1,
"period": "Jul 11 2018"
},
{
'totalBookings': 0,
'period': 'Jul 12 2018'
"data": {
"allAnalytics": {
"checkinsPercentage": 0.0,
"appBookingsPercentage": 0.0,
"autoCancellationsPercentage": 0.0,
"cancellationsPercentage": 0.0,
"bookings": 1,
"analytics": [
{
"roomName": "Entebbe",
"cancellations": 0,
"cancellationsPercentage": 0.0,
"autoCancellations": 0,
"numberOfBookings": 1,
"checkins": 0,
"checkinsPercentage": 0.0,
"bookingsPercentageShare": 100.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [{"durationInMinutes": 45}],
},
{
"roomName": "Tana",
"cancellations": 0,
"cancellationsPercentage": 0.0,
"autoCancellations": 0,
"numberOfBookings": 0,
"checkins": 0,
"checkinsPercentage": 0.0,
"bookingsPercentageShare": 0.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [{"durationInMinutes": 0}],
},
],
"bookingsCount": [
{"totalBookings": 1, "period": "Jul 11 2018"},
{"totalBookings": 0, "period": "Jul 12 2018"},
],
"deviceAnalytics": [
{
"deviceName": "Samsung",
"deviceId": 1,
# "downTime": "this device was seen {}".format(
# downtime_value),
}
],
}
]
}
}
}

all_analytics_query_response_super_admin_with_invalid_locationid = {
"errors": [
{
"message": "Location Id does not exist",
"locations": [
{
"line": 3,
"column": 7
}
],
"path": [
"allAnalytics"
]
"locations": [{"line": 3, "column": 7}],
"path": ["allAnalytics"],
}
],
"data": {
"allAnalytics": None
}
"data": {"allAnalytics": None},
}

all_analytics_query_response_super_admin = {
Expand All @@ -157,11 +155,7 @@
"bookingsPercentageShare": 50.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [
{
"durationInMinutes": 890
}
]
"events": [{"durationInMinutes": 890}],
},
{
"roomName": "Krypton",
Expand All @@ -174,11 +168,7 @@
"bookingsPercentageShare": 25.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [
{
"durationInMinutes": 155
}
]
"events": [{"durationInMinutes": 155}],
},
{
"roomName": "Bujumbura",
Expand All @@ -191,11 +181,7 @@
"bookingsPercentageShare": 25.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [
{
"durationInMinutes": 92
}
]
"events": [{"durationInMinutes": 92}],
},
{
"roomName": "Kampala",
Expand All @@ -208,11 +194,7 @@
"bookingsPercentageShare": 0.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [
{
"durationInMinutes": 0
}
]
"events": [{"durationInMinutes": 0}],
},
{
"roomName": "Algiers",
Expand All @@ -225,28 +207,18 @@
"bookingsPercentageShare": 0.0,
"appBookings": 0,
"appBookingsPercentage": 0.0,
"events": [
{
"durationInMinutes": 0
}
]
}
"events": [{"durationInMinutes": 0}],
},
],
"bookingsCount": [
{
"totalBookings": 7,
"period": "Jul 11 2018"
},
{
"totalBookings": 5,
"period": "Jul 12 2018"
}
]
{"totalBookings": 7, "period": "Jul 11 2018"},
{"totalBookings": 5, "period": "Jul 12 2018"},
],
}
}
}

analytics_query_for_date_ranges = '''
analytics_query_for_date_ranges = """
query {
allAnalytics(startDate:"jul 11 2020", endDate:"jul 12 2018") {
checkinsPercentage
Expand Down Expand Up @@ -275,4 +247,4 @@
}
}
}
'''
"""
6 changes: 3 additions & 3 deletions fixtures/devices/devices_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"allDevices": [
{
"id": "1",
"lastSeen": "2018-06-08T11:17:58.785136", # noqa: E501
"lastSeen": "2019-04-10T13:28:45", # noqa: E501
"dateAdded": "2018-06-08T11:17:58.785136", # noqa: E501
"name": "Samsung",
"location": "Kampala"
Expand All @@ -44,7 +44,7 @@
{
"dateAdded": "2018-06-08T11:17:58.785136",
"id": "1",
"lastSeen": "2018-06-08T11:17:58.785136",
"lastSeen": "2019-04-10T13:28:45",
"location": "Kampala",
"name": "Samsung"
}
Expand All @@ -68,7 +68,7 @@
"data": {
"specificDevice": {
"id": "1",
"lastSeen": "2018-06-08T11:17:58.785136", # noqa: E501
"lastSeen": "2019-04-10T13:28:45", # noqa: E501
"dateAdded": "2018-06-08T11:17:58.785136", # noqa: E501
"name": "Samsung",
"location": "Kampala"
Expand Down
Loading