feat: response incrVo field from country api

Author: leafcoder

ncovapi/models.py

@@ -42,6 +42,7 @@ class Meta:
         verbose_name = '统计数据'
         verbose_name_plural = '统计数据'
 
+
 class Notice(models.Model):
 
     remarks = ListCharField(
@@ -58,6 +59,7 @@ class Meta:
         verbose_name = '注意信息'
         verbose_name_plural = '注意信息'
 
+
 class WHOArticle(models.Model):
 
     title = models.CharField(max_length=100)
@@ -72,6 +74,7 @@ class Meta:
         verbose_name = 'WHO 文章'
         verbose_name_plural = 'WHO 文章'
 
+
 class Recommend(models.Model):
 
     CONTENT_TYPES = [
@@ -108,6 +111,7 @@ class Meta:
         verbose_name = '防护知识'
         verbose_name_plural = '防护知识'
 
+
 class Timeline(models.Model):
 
     pubDate = models.IntegerField()
@@ -125,6 +129,7 @@ class Meta:
         verbose_name = '时间线事件'
         verbose_name_plural = '时间线事件'
 
+
 class Wiki(models.Model):
 
     title = models.CharField(max_length=100)
@@ -140,6 +145,7 @@ class Meta:
         verbose_name = 'Wiki'
         verbose_name_plural = 'Wiki'
 
+
 class GoodsGuide(models.Model):
 
     title = models.CharField(max_length=100)
@@ -156,6 +162,7 @@ class Meta:
         verbose_name = '购物指南'
         verbose_name_plural = '购物指南'
 
+
 class Rumor(models.Model):
 
     title = models.CharField(max_length=100)
@@ -174,6 +181,7 @@ class Meta:
         verbose_name = '辟谣与防护'
         verbose_name_plural = '辟谣与防护'
 
+
 class Province(models.Model):
 
     locationId = models.IntegerField()

ncovapi/serializers.py

@@ -1,6 +1,8 @@
 from .models import City, Province, Country
 from rest_framework import serializers
 
+import json
+
 
 class StatisticsGroupSerializer(serializers.Serializer):
 
@@ -119,10 +121,18 @@ class Meta:
 
 class CountrySerializer(serializers.HyperlinkedModelSerializer):
 
+    def to_representation(self, inst):
+        data = super().to_representation(inst)
+        incrVo = data.get('incrVo')
+        print(incrVo)
+        if incrVo:
+            data['incrVo'] = json.loads(incrVo)
+        return data
+
     class Meta:
         model = Country
         fields = [
             'continents', 'countryShortCode', 'countryName',
             'countryFullName', 'currentConfirmedCount', 'confirmedCount',
-            'suspectedCount', 'curedCount', 'deadCount'
+            'suspectedCount', 'curedCount', 'deadCount', 'incrVo'
         ]

spider/nCoV/spiders/dxy.py

@@ -2,7 +2,7 @@
 # @Author: zhanglei3
 # @Date:   2020-04-08 09:08:13
 # @Last Modified by:   leafcoder
-# @Last Modified time: 2020-04-27 21:05:52
+# @Last Modified time: 2020-04-29 13:51:25
 
 """丁香园数据源"""
 
@@ -71,6 +71,7 @@ def parse(self, response):
             country.pop('provinceId')
             country.pop('provinceName')
             country.pop('provinceShortName')
+            country['incrVo'] = json.dumps(country['incrVo'])
             yield items.CountryItem(**country)
 
         # 时间线事件，id=“getTimelineService2” 为英文内容