Merge pull request #264 from fga-eps-mds/feature_#263

Feature #263
fga-eps-mds · Nov 12, 2018 · c5d0a59 · c5d0a59
2 parents 1008b9c + 6e6848a
commit c5d0a59
Show file tree

Hide file tree

Showing 18 changed files with 439 additions and 479 deletions.
diff --git a/CrossData/API/fixtures/data.json b/CrossData/API/fixtures/data.json
diff --git a/CrossData/API/models.py b/CrossData/API/models.py
diff --git a/CrossData/API/objects_attrs.py b/CrossData/API/objects_attrs.py
@@ -1,6 +1,6 @@
-from CrossData.importdata.models import *
+from CrossData.API.models import *
 
 steam_attrs = list(vars(InfoSteam()).keys())
 youtube_attrs = list(vars(InfoYoutube()).keys())
 twitch_attrs = list(vars(InfoTwitch()).keys())
-streams_attrs = list(vars(TwitchStream()).keys())
+streams_attrs = list(vars(TwitchStream()).keys())
diff --git a/CrossData/importdata/serializers.py → CrossData/API/serializers.py b/CrossData/importdata/serializers.py → CrossData/API/serializers.py
diff --git a/CrossData/API/tests.py b/CrossData/API/tests.py
@@ -1,7 +1,7 @@
 from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APITestCase
-from CrossData.importdata.models import *
+from CrossData.API.models import *
 
 class EndpointPOSTTestCase(APITestCase):
 

diff --git a/CrossData/API/tests_get_data.py b/CrossData/API/tests_get_data.py
@@ -1,7 +1,7 @@
 from django.urls import reverse
 from rest_framework import status
 from rest_framework.test import APITestCase
-from CrossData.importdata.models import *
+from CrossData.API.models import *
 
 class EndpointGETTestCase(APITestCase):
 

diff --git a/CrossData/API/views.py b/CrossData/API/views.py
@@ -3,8 +3,8 @@
 from rest_framework.response import Response
 from rest_framework import status
 from rest_framework.views import APIView
-from CrossData.importdata.models import *
-from CrossData.importdata.serializers import *
+from CrossData.API.models import *
+from CrossData.API.serializers import *
 from .objects_attrs import *
 from urllib.parse import unquote
 from operator import itemgetter
@@ -548,7 +548,7 @@ def save_palettes(self, screenshot_data, screenshot):
 	def get_release_data(self, str_date):
 		if str_date == None:
 			return
-        
+
 		tmp_datetime = dateutil.parser.parse(str_date)
 
 		return tmp_datetime.date()

diff --git a/CrossData/importdata/__init__.py b/CrossData/importdata/__init__.py
diff --git a/CrossData/importdata/admin.py b/CrossData/importdata/admin.py
diff --git a/CrossData/importdata/apps.py b/CrossData/importdata/apps.py
diff --git a/CrossData/importdata/fixtures/data.json b/CrossData/importdata/fixtures/data.json