Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

apps/location/transfer_data.py

@@ -1,11 +1,11 @@
-from django.db.models import Q, QuerySet
-
 from transfer.serializers.location import CountrySerializer, RegionSerializer, \
     CitySerializer, AddressSerializer, \
     Country
 from transfer.models import Cities, Locations
 from pprint import pprint
 
+from requests import get
+
 
 def transfer_countries():
     queryset = Cities.objects.raw("""
@@ -135,10 +135,14 @@ def transfer_addresses():
 
 def update_flags():
     queryset = Country.objects.only("id", "code", "svg_image").filter(old_id__isnull=False)
+    link_to_request = "https://s3.eu-central-1.amazonaws.com/gm-test.com/media"
 
     for query in queryset:
-        query.svg_image = f"/image/image/10-31-2019/{query.code}.svg"
-        query.save()
+        svg_link = f"/svg/country/10-31-2019/{query.code}.svg"
+        resp = get(f"{link_to_request}{svg_link}")
+        if resp.status_code == 200:
+            query.svg_image = svg_link
+            query.save()
 
 
 data_types = {

apps/utils/methods.py

@@ -64,7 +64,7 @@ def image_path(instance, filename):
 def svg_image_path(instance, filename):
     """Determine SVG path method."""
     filename = '%s.svg' % generate_code()
-    return 'image/svg/%s/%s/%s' % (
+    return 'svg/%s/%s/%s' % (
         instance._meta.model_name,
         datetime.now().strftime(settings.REST_DATE_FORMAT),
         filename)

project/settings/development.py

@@ -61,3 +61,7 @@ DATABASES = {
         'PASSWORD': os.environ.get('MYSQL_PASSWORD')
     }
 }
+
+BROKER_URL = 'redis://localhost:6379/1'
+CELERY_RESULT_BACKEND = BROKER_URL
+CELERY_BROKER_URL = BROKER_URL