From 4e0f3c9a4d83fdc68cac0919219f9d1e2b1d904d Mon Sep 17 00:00:00 2001
From: alex <birukov.system@gmail.com>
Date: Mon, 28 Oct 2019 10:59:28 +0300
Subject: [PATCH] with address

---
 apps/establishment/admin.py                   |  1 +
 .../migrations/0005_auto_20191025_0914.py     | 20 +++++++++++++++++++
 .../migrations/0006_merge_20191027_1758.py    | 14 +++++++++++++
 .../migrations/0023_merge_20191028_0725.py    | 14 +++++++++++++
 .../migrations/0030_merge_20191028_0725.py    | 14 +++++++++++++
 apps/transfer/serializers/establishment.py    |  7 +++++--
 docker-compose.mysql.yml                      | 10 ++++++++++
 7 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 apps/gallery/migrations/0005_auto_20191025_0914.py
 create mode 100644 apps/gallery/migrations/0006_merge_20191027_1758.py
 create mode 100644 apps/main/migrations/0023_merge_20191028_0725.py
 create mode 100644 apps/news/migrations/0030_merge_20191028_0725.py

diff --git a/apps/establishment/admin.py b/apps/establishment/admin.py
index 50c21b90..4b845c60 100644
--- a/apps/establishment/admin.py
+++ b/apps/establishment/admin.py
@@ -53,6 +53,7 @@ class EstablishmentAdmin(admin.ModelAdmin):
     inlines = [
         AwardInline, ContactPhoneInline, ContactEmailInline,
         ReviewInline, CommentInline]
+    raw_id_fields = ('address',)
 
 
 @admin.register(models.Position)
diff --git a/apps/gallery/migrations/0005_auto_20191025_0914.py b/apps/gallery/migrations/0005_auto_20191025_0914.py
new file mode 100644
index 00000000..61c158b6
--- /dev/null
+++ b/apps/gallery/migrations/0005_auto_20191025_0914.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.4 on 2019-10-25 09:14
+
+from django.db import migrations
+import sorl.thumbnail.fields
+import utils.methods
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gallery', '0004_merge_20191025_0906'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='image',
+            name='image',
+            field=sorl.thumbnail.fields.ImageField(upload_to=utils.methods.image_path, verbose_name='image file'),
+        ),
+    ]
diff --git a/apps/gallery/migrations/0006_merge_20191027_1758.py b/apps/gallery/migrations/0006_merge_20191027_1758.py
new file mode 100644
index 00000000..5fca7c74
--- /dev/null
+++ b/apps/gallery/migrations/0006_merge_20191027_1758.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-27 17:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gallery', '0005_auto_20191027_0756'),
+        ('gallery', '0005_auto_20191025_0914'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/main/migrations/0023_merge_20191028_0725.py b/apps/main/migrations/0023_merge_20191028_0725.py
new file mode 100644
index 00000000..e551fe2e
--- /dev/null
+++ b/apps/main/migrations/0023_merge_20191028_0725.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-28 07:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0020_merge_20191025_0423'),
+        ('main', '0022_auto_20191023_1113'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/news/migrations/0030_merge_20191028_0725.py b/apps/news/migrations/0030_merge_20191028_0725.py
new file mode 100644
index 00000000..671e06d7
--- /dev/null
+++ b/apps/news/migrations/0030_merge_20191028_0725.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-28 07:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0029_merge_20191025_0906'),
+        ('news', '0023_merge_20191025_0423'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/transfer/serializers/establishment.py b/apps/transfer/serializers/establishment.py
index 9735f5fb..bfc89bd5 100644
--- a/apps/transfer/serializers/establishment.py
+++ b/apps/transfer/serializers/establishment.py
@@ -3,7 +3,7 @@ from django.db import transaction
 from rest_framework import serializers
 
 from establishment.models import Establishment, ContactEmail, ContactPhone, EstablishmentType
-# from location.models import Address
+from location.models import Address
 from timetable.models import Timetable
 from utils.legacy_parser import parse_legacy_schedule_content
 from utils.slug_generator import generate_unique_slug
@@ -86,8 +86,11 @@ class EstablishmentSerializer(serializers.ModelSerializer):
 
     @staticmethod
     def get_address(address):
-        # return Address.objects.filter(old_id=address).first()
+        address = Address.objects.filter(old_id=address).first()
+        if address:
+            return address.id
         return None
+        # return None
 
     @staticmethod
     def get_type(data):
diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
index cabb3808..3c891dce 100644
--- a/docker-compose.mysql.yml
+++ b/docker-compose.mysql.yml
@@ -54,6 +54,8 @@ services:
     image: redis:2.8.23
     ports:
       - "6379:6379"
+    networks:
+      - redis_network
 
   # RabbitMQ
   #rabbitmq:
@@ -78,6 +80,8 @@ services:
       - db
 #      - rabbitmq
       - redis
+    networks:
+      - redis_network
 
   worker_beat:
     build: .
@@ -95,6 +99,9 @@ services:
       - db
 #      - rabbitmq
       - redis
+    networks:
+      - redis_network
+
   # App: G&M
   gm_app:
     build: .
@@ -120,6 +127,7 @@ services:
     ports:
       - "8000:8000"
     networks:
+      - redis_network
       - database_network
       - mysql_network
       - elasticsearch_network
@@ -143,3 +151,5 @@ networks:
     driver: bridge
   elasticsearch_network:
     driver: bridge
+  redis_network:
+    driver: bridge