Skip to content
This repository has been archived by the owner on Oct 5, 2021. It is now read-only.

Commit

Permalink
fix #269
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxMaSk committed Dec 2, 2017
1 parent 664ff98 commit f2c7b3b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
16 changes: 4 additions & 12 deletions django_th/read.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# coding: utf-8
from __future__ import unicode_literals
from __future__ import absolute_import

import arrow
# django
from django.conf import settings
from django.utils.timezone import now

# trigger happy
from django_th.services import default_provider
from django_th.models import TriggerService
Expand Down Expand Up @@ -51,18 +48,13 @@ def reading(self, service):
:param service: service object to read
:type service: object
"""
now = arrow.utcnow().to(settings.TIME_ZONE).format('YYYY-MM-DD HH:mm:ssZZ')
# counting the new data to store to display them in the log
# provider - the service that offer data
# counting the new data to store to display them in the log provider - the service that offer data
provider_token = service.provider.token
default_provider.load_services()
service_provider = default_provider.get_service(str(service.provider.name.name))
# check if the service has already been triggered
# if date_triggered is None, then it's the first run
# so it will be set to "now"
date_triggered = service.date_triggered if service.date_triggered else now
# 1) get the data from the provider service
# get a timestamp of the last triggered of the service
date_triggered = service.date_triggered if service.date_triggered else service.date_created

# get the data from the provider service
kwargs = {'token': provider_token, 'trigger_id': service.id, 'date_triggered': date_triggered}
data = self.provider(service_provider, **kwargs)

Expand Down
7 changes: 1 addition & 6 deletions django_th/tests/test_read_pub.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# coding: utf-8
from unittest.mock import patch
import arrow
from django.conf import settings

from django_th.service_provider import ServiceProvider
from django_th.read import Read
Expand All @@ -23,11 +21,8 @@ class ReadTestCase(MainTest):

def test_reading(self):
from django_th.services import default_provider
now = arrow.utcnow().to(settings.TIME_ZONE).format(
'YYYY-MM-DD HH:mm:ssZZ')
service = self.create_triggerservice()
date_triggered = service.date_triggered if service.date_triggered \
else now
date_triggered = service.date_triggered if service.date_triggered else service.date_created

kwargs = {'token': service.provider.token,
'trigger_id': service.id,
Expand Down

0 comments on commit f2c7b3b

Please sign in to comment.