0001-api-add-sms-count-statistics-53856.patch

Valentin Deniaud, 10 mai 2021 15:41

Voir les différences: en ligne côte à côte

Subject: [PATCH] api: add sms count statistics (#53856)

 passerelle/api/urls.py  |  4 ++-
 passerelle/api/views.py | 70 ++++++++++++++++++++++++++++++++++++++++-
 tests/test_api.py       | 41 ++++++++++++++++++++++++
 3 files changed, 113 insertions(+), 2 deletions(-)

     from django.conf.urls import url
     from .views import JobDetailView
     from .views import JobDetailView, SMSStatisticsView, StatisticsListView
     urlpatterns = [
         url(r'jobs/(?P<pk>[\w,-]+)/$', JobDetailView.as_view(), name='api-job'),
         url(r'statistics/$', StatisticsListView.as_view(), name='api-statistics-list'),
         url(r'statistics/sms/$', SMSStatisticsView.as_view(), name='api-statistics-sms'),
+    ]

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import datetime
     from django.core.exceptions import PermissionDenied
     from django.db.models import Count
     from django.db.models.functions import TruncDay
     from django.http import Http404, JsonResponse
     from django.views.generic import DetailView
     from django.urls import reverse
     from django.utils.dateparse import parse_date, parse_datetime
     from django.utils.translation import ugettext_lazy as _
     from django.views.generic import DetailView, View
     from passerelle.base.models import Job
     from passerelle.sms.models import SMSLog
     from passerelle.utils import is_authorized
-...
                 'done_timestamp': job.done_timestamp,
+            }
             return JsonResponse({'err': 0, 'data': data})
     class StatisticsListView(View):
         def get(self, request, *args, **kwargs):
             return JsonResponse(
+                {
                     'data': [
+                        {
                             'name': _('SMS Count'),
                             'url': request.build_absolute_uri(reverse('api-statistics-sms')),
                             'id': 'sms_count',
                             'filters': [
+                                {
                                     'id': 'time_interval',
                                     'label': _('Interval'),
                                     'options': [{'id': 'day', 'label': _('Day')}],
                                     'required': True,
                                     'default': 'day',
                                 },
                             ],
+                        }
+                    ]
+                }
+            )
     class SMSStatisticsView(View):
         def get(self, request, *args, **kwargs):
             if 'time_interval' in request.GET and request.GET['time_interval'] != 'day':
                 return JsonResponse({'err': 1, 'err_desc': 'unsupported time interval'})
             logs = SMSLog.objects
             if 'start' in request.GET:
                 start = datetime.datetime.strptime(request.GET['start'], '%Y-%m-%d')
                 logs = logs.filter(timestamp__gte=start)
             if 'end' in request.GET:
                 end = datetime.datetime.strptime(request.GET['end'], '%Y-%m-%d')
                 logs = logs.filter(timestamp__lte=end)
             logs = logs.annotate(day=TruncDay('timestamp'))
             logs = logs.values('day').annotate(total=Count('id')).order_by('day')
             x_labels, data = [], []
             for log in logs:
                 x_labels.append(log['day'].strftime('%Y-%m-%d'))
                 data.append(log['total'])
             return JsonResponse(
+                {
                     'data': {
                         'x_labels': x_labels,
                         'series': [
+                            {
                                 'label': _('SMS Count'),
                                 'data': data,
+                            }
                         ],
+                    }
+                }
+            )

     from passerelle.apps.ovh.models import OVHSMSGateway
     from passerelle.base.models import AccessRight, ApiUser, Job
     from passerelle.sms.models import SMSLog
     pytestmark = pytest.mark.django_db
-...
         assert resp.json['data']['status'] == 'failed'
         assert resp.json['data']['status_details'] == {'error_summary': 'Exception: my error message'}
         assert resp.json['data']['done_timestamp'] is not None
     def test_api_statistics_list(app):
         resp = app.get('/api/statistics/')
         assert resp.json['data'][0]['name'] == 'SMS Count'
     def test_api_statistics_sms(app, freezer):
         resp = app.get('/api/statistics/')
         url = [x for x in resp.json['data'] if x['id'] == 'sms_count'][0]['url']
         resp = app.get(url)
         assert len(resp.json['data']['series'][0]['data']) == 0
         freezer.move_to('2021-01-01 12:00')
         for _ in range(5):
             SMSLog.objects.create(appname='ovh', slug='sms')
         freezer.move_to('2021-02-03 13:00')
         for _ in range(3):
             SMSLog.objects.create(appname='ovh', slug='sms')
         freezer.move_to('2021-02-06 13:00')
         SMSLog.objects.create(appname='ovh', slug='sms')
         resp = app.get(url + '?time_interval=day')
         assert resp.json['data'] == {
             'x_labels': ['2021-01-01', '2021-02-03', '2021-02-06'],
             'series': [{'label': 'SMS Count', 'data': [5, 3, 1]}],
+        }
         resp = app.get(url + '?start=2021-02-04&end=2021-02-07')
         assert resp.json['data'] == {
             'x_labels': ['2021-02-06'],
             'series': [{'label': 'SMS Count', 'data': [1]}],
+        }
         # invalid time_interval
         resp = app.get(url + '?time_interval=month')
         assert resp.json['err'] == 1
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-api-add-sms-count-statistics-53856.patch