feat: add USA states api for covidtracking data

leafcoder · leafcoder · commit 1d68f15437e1 · 2020-05-31T00:16:38.000+08:00
diff --git a/django_covid19/filters.py b/django_covid19/filters.py
@@ -1,6 +1,6 @@
 import django_filters
 from django.db.models import Q
-from .models import City, Province, Country
+from . import models
 
 
 class CharInFilter(django_filters.BaseInFilter, django_filters.CharFilter):
@@ -24,7 +24,7 @@ class CityFilter(django_filters.rest_framework.FilterSet):
         field_name='cityName', lookup_expr='exact')
 
     class Meta:
-        model = City
+        model = models.City
         fields = ['provinceShortName', 'provinceName', 'cityName']
 
 
@@ -41,7 +41,7 @@ class ProvinceFilter(django_filters.rest_framework.FilterSet):
         field_name='provinceName', lookup_expr='exact')
 
     class Meta:
-        model = Province
+        model = models.Province
         fields = ['provinceName', 'provinceShortName']
 
 
@@ -55,7 +55,18 @@ class CountryFilter(django_filters.rest_framework.FilterSet):
         field_name='countryName', lookup_expr='in')
 
     class Meta:
-        model = Country
+        model = models.Country
         fields = [
             'continents', 'countryShortCode', 'countryName'
         ]
+
+
+class StateFilter(django_filters.rest_framework.FilterSet):
+
+    states = CharInFilter(field_name='state', lookup_expr='in')
+    stateNames = CharInFilter(
+        field_name='stateName', lookup_expr='in')
+
+    class Meta:
+        model = models.State
+        fields = ['state', 'stateName']
diff --git a/django_covid19/models.py b/django_covid19/models.py
@@ -111,3 +111,43 @@ class Country(models.Model):
     class Meta:
         verbose_name = _('Country')
         verbose_name_plural = _('Country')
+
+class State(models.Model):
+
+    countryShortCode = models.CharField(max_length=20)
+    stateName = models.CharField(max_length=50, null=False)
+    dailyData = models.TextField(default='[]')  # save daily data here
+
+    # fields in covidtracking api
+    state = models.CharField(max_length=10, null=False)
+    positive = models.IntegerField(null=True, blank=True)
+    negative = models.IntegerField(null=True, blank=True)
+    positiveScore = models.IntegerField(null=True, blank=True)
+    negativeScore = models.IntegerField(null=True, blank=True)
+    negativeRegularScore = models.IntegerField(null=True, blank=True)
+    commercialScore = models.IntegerField(null=True, blank=True)
+    score = models.IntegerField(null=True, blank=True)
+    notes = models.TextField(null=True, blank=True)
+    dataQualityGrade = models.CharField(max_length=20, null=True, blank=True)
+    pending = models.IntegerField(null=True, blank=True)
+    hospitalizedCurrently = models.IntegerField(null=True, blank=True)
+    hospitalizedCumulative = models.IntegerField(null=True, blank=True)
+    inIcuCurrently = models.IntegerField(null=True, blank=True)
+    inIcuCumulative = models.IntegerField(null=True, blank=True)
+    onVentilatorCurrently = models.IntegerField(null=True, blank=True)
+    onVentilatorCumulative = models.IntegerField(null=True, blank=True)
+    recovered = models.IntegerField(null=True, blank=True)
+    lastUpdateEt = models.CharField(max_length=20, null=True, blank=True)
+    checkTimeEt = models.CharField(max_length=20, null=True, blank=True)
+    death = models.IntegerField(null=True, blank=True)
+    hospitalized = models.IntegerField(null=True, blank=True)
+    totalTestResults = models.IntegerField(null=True, blank=True)
+    posNeg = models.IntegerField(null=True, blank=True)
+    fips = models.CharField(max_length=20, null=True, blank=True)
+    dateModified = models.CharField(max_length=50, null=True, blank=True)
+    dateChecked = models.CharField(max_length=50, null=True, blank=True)
+    hash = models.CharField(max_length=100, null=True, blank=True)
+
+    class Meta:
+        verbose_name = _('State')
+        verbose_name_plural = _('State')
diff --git a/django_covid19/serializers.py b/django_covid19/serializers.py
@@ -1,5 +1,6 @@
-from .models import Statistics, City, Province, Country
+from . import models
 from rest_framework import serializers
+from django.utils.translation import ugettext_lazy as _
 
 import json
 
@@ -87,15 +88,19 @@ class StatisticsSerializer(serializers.Serializer):
     createTime = serializers.DateTimeField()
 
     class Meta:
-        model = Statistics
-        fields = ('globalStatistics', 'domesticStatistics', 'internationalStatistics', 'modifyTime', 'createTime')
+        model = models.Statistics
+        fields = (
+            'globalStatistics', 'domesticStatistics',
+            'internationalStatistics', 'modifyTime', 'createTime'
+        )
+
 
 class ProvinceSerializer(serializers.HyperlinkedModelSerializer):
 
     provinceName = serializers.CharField(read_only=True)
 
     class Meta:
-        model = Province
+        model = models.Province
         fields = [
             'provinceName', 'provinceShortName',
             'currentConfirmedCount', 'confirmedCount', 'suspectedCount',
@@ -106,7 +111,7 @@ class Meta:
 class CitySerializer(serializers.ModelSerializer):
 
     class Meta:
-        model = City
+        model = models.City
         fields = [
             'provinceName', 'cityName',
             'currentConfirmedCount', 'confirmedCount', 'suspectedCount',
@@ -123,9 +128,52 @@ def to_representation(self, inst):
         return data
 
     class Meta:
-        model = Country
+        model = models.Country
         fields = [
             'continents', 'countryShortCode', 'countryName',
             'countryFullName', 'currentConfirmedCount', 'confirmedCount',
             'suspectedCount', 'curedCount', 'deadCount', 'incrVo'
-        ]
+        ]
+
+class StateSerializer(serializers.ModelSerializer):
+
+    countryShortCode = serializers.CharField()
+    currentConfirmedCount = serializers.SerializerMethodField()
+    confirmedCount = serializers.IntegerField(source='positive')
+    curedCount = serializers.IntegerField(source='recovered')
+    deadCount = serializers.IntegerField(source='death')
+    suspectedCount = serializers.IntegerField(source='pending')
+
+    def get_currentConfirmedCount(self, obj):
+        positive = obj.positive if obj.positive else 0
+        death = obj.death if obj.death else 0
+        recovered = obj.recovered if obj.recovered else 0
+        return positive - death - recovered
+
+    class Meta:
+        model = models.State
+        fields = [
+            'currentConfirmedCount', 'confirmedCount', 'curedCount',
+            'deadCount', 'suspectedCount', 'stateName', 'state',
+            'countryShortCode'
+        ]
+
+
+class StateDailySerializer(serializers.Serializer):
+
+    state = serializers.CharField()
+    date = serializers.CharField()
+    stateName = serializers.CharField()
+    countryShortCode = serializers.CharField()
+
+    currentConfirmedCount = serializers.IntegerField()
+    confirmedCount = serializers.IntegerField()
+    curedCount = serializers.IntegerField()
+    deadCount = serializers.IntegerField()
+    suspectedCount = serializers.IntegerField()
+
+    currentConfirmedIncr = serializers.IntegerField()
+    confirmedIncr = serializers.IntegerField()
+    curedIncr = serializers.IntegerField()
+    deadIncr = serializers.IntegerField()
+    suspectedIncr = serializers.IntegerField()
diff --git a/django_covid19/urls.py b/django_covid19/urls.py
@@ -1,4 +1,6 @@
+from django.conf.urls import url
 from django.urls import include, path
+
 from rest_framework import routers
 from . import views
 
@@ -13,12 +15,20 @@
     path('cities/', views.CityListView.as_view(), name='city-list'),
     path('cities/<int:pk>/', views.CityRetrieveView.as_view(), name='city-detail'),
     path('cities/<str:cityName>/', views.CityRetrieveByNameView.as_view(), name='city-detail-by-name'),
+
     path('provinces/', views.ProvinceListView.as_view(), name='province-list'),
     path('provinces/<int:pk>/', views.ProvinceRetrieveView.as_view(), name='province-detail'),
     path('provinces/<str:provinceShortName>/', views.ProvinceRetrieveByNameView.as_view(), name='province-detail-by-name'),
     path('provinces/<str:provinceShortName>/daily/', views.ProvinceDailyListView.as_view(), name='province-daily-list'),
+
     path('countries/', views.CountryListView.as_view(), name='country-list'),
     path('countries/<int:pk>/', views.CountryRetrieveView.as_view(), name='country-detail'),
     path('countries/<str:countryName>/', views.CountryRetrieveByNameView.as_view(), name='country-detail-by-name'),
     path('countries/<str:countryName>/daily/', views.CountryDailyListView.as_view(), name='country-daily-list'),
+
+    url(r'(?P<countryShortCode>[^/]+)/states/$', views.StateListView.as_view(), name='state-list'),
+    url(r'(?P<countryShortCode>[^/]+)/states/(?P<state>[A-Z]+)/$', views.StateRetrieveView.as_view(), name='state-detail'),
+    url(r'(?P<countryShortCode>[^/]+)/states/(?P<state>[A-Z]+)/daily/$', views.StateDailyListView.as_view(), name='state-daily-list'),
+    url(r'(?P<countryShortCode>[^/]+)/states/(?P<stateName>[^/]+)/$', views.StateRetrieveByNameView.as_view(), name='state-detail-by-name'),
+    url(r'(?P<countryShortCode>[^/]+)/states/(?P<stateName>[^/]+)/daily/$', views.StateDailyListByNameView.as_view(), name='state-daily-list-by-name'),
 ]
diff --git a/django_covid19/views.py b/django_covid19/views.py
