entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 13 Releases Wiki Activity

dataviz: move statistic list update code (#50891)

This commit is contained in:
Valentin Deniaud 2021-02-17 10:39:02 +01:00
parent c8cf439f59
commit 452e671c7b
2 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
combo/apps/dataviz/__init__.py
View File

@ -15,13 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import django.apps
from django.core import checks
from django.conf import settings
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from combo.utils import requests
class AppConfig(django.apps.AppConfig):
name = 'combo.apps.dataviz'
@ -33,51 +28,10 @@ class AppConfig(django.apps.AppConfig):
return urls.urlpatterns
def hourly(self):
self.update_available_statistics()
def update_available_statistics(self):
from .models import Statistic, ChartNgCell
if not settings.KNOWN_SERVICES:
return
start_update = timezone.now()
for provider in settings.STATISTICS_PROVIDERS:
if isinstance(provider, dict):
url = provider['url']
sites = {provider['id']: {'title': provider['name']}}
provider = provider['id']
else:
sites = settings.KNOWN_SERVICES.get(provider, {})
url = '/visualization/json/' if provider == 'bijoe' else '/api/statistics/'
for site_key, site_dict in sites.items():
site_title = site_dict.pop('title', '')
response = requests.get(
url, remote_service=site_dict, without_user=True, headers={'accept': 'application/json'}
)
if response.status_code != 200:
continue
result = response.json()
if isinstance(result, dict):
result = result['data'] # detect new api
for stat in result:
Statistic.objects.update_or_create(
slug=stat.get('slug') or stat['id'],
site_slug=site_key,
service_slug=provider,
defaults={
'label': stat['name'],
'url': stat.get('data-url') or stat['url'],
'site_title': site_title,
'filters': stat.get('filters', []),
'available': True,
},
)
Statistic.objects.filter(last_update__lt=start_update).update(available=False)
from .models import ChartNgCell
from .utils import update_available_statistics
update_available_statistics()
for cell in ChartNgCell.objects.all():
cell.check_validity()

51
combo/apps/dataviz/utils.py Normal file
View File

@ -0,0 +1,51 @@
from django.conf import settings
from django.utils import timezone
from combo.utils import requests
from .models import Statistic
def update_available_statistics():
if not settings.KNOWN_SERVICES:
return
start_update = timezone.now()
for provider in settings.STATISTICS_PROVIDERS:
if isinstance(provider, dict):
url = provider['url']
sites = {provider['id']: {'title': provider['name']}}
provider = provider['id']
else:
sites = settings.KNOWN_SERVICES.get(provider, {})
url = '/visualization/json/' if provider == 'bijoe' else '/api/statistics/'
for site_key, site_dict in sites.items():
response = requests.get(
url,
timeout=5,
remote_service=site_dict if provider in settings.KNOWN_SERVICES else {},
without_user=True,
headers={'accept': 'application/json'},
)
if response.status_code != 200:
continue
result = response.json()
if isinstance(result, dict):
result = result['data'] # detect new api
for stat in result:
Statistic.objects.update_or_create(
slug=stat.get('slug') or stat['id'],
site_slug=site_key,
service_slug=provider,
defaults={
'label': stat['name'],
'url': stat.get('data-url') or stat['url'],
'site_title': site_dict.get('title', ''),
'filters': stat.get('filters', []),
'available': True,
},
)
Statistic.objects.filter(last_update__lt=start_update).update(available=False)