From 02638a26fe9561f3f449280d36282679bf389e29 Mon Sep 17 00:00:00 2001
From: michail <m.shirokov@id-east.ru>
Date: Wed, 2 Oct 2019 12:09:45 +0500
Subject: [PATCH] added sending through celery

---
 apps/news/admin.py |  4 +---
 apps/news/tasks.py |  2 +-
 docker-compose.yml | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/news/admin.py b/apps/news/admin.py
index dab70ec8..1b869eb2 100644
--- a/apps/news/admin.py
+++ b/apps/news/admin.py
@@ -14,9 +14,7 @@ class NewsTypeAdmin(admin.ModelAdmin):
 def send_email_action(modeladmin, request, queryset):
     news_ids = [n.id for n in queryset]
 
-    send_email_with_news(news_ids)
-
-    # send_email_with_news.delay(news_ids)
+    send_email_with_news.delay(news_ids)
 
     return
 
diff --git a/apps/news/tasks.py b/apps/news/tasks.py
index 7bc2ce23..35f2c644 100644
--- a/apps/news/tasks.py
+++ b/apps/news/tasks.py
@@ -7,7 +7,7 @@ from django.conf import settings
 from smtplib import SMTPException
 
 
-# @shared_task
+@shared_task
 def send_email_with_news(news_ids):
 
     subscribers = Subscriber.objects.filter(state=Subscriber.USABLE)
diff --git a/docker-compose.yml b/docker-compose.yml
index 3fb05f98..2ccd6de3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,8 @@ services:
       - POSTGRES_DB=postgres
     ports:
       - "5436:5432"
-    networks:
-      - db-net
+#    networks:
+#      - db-net
     volumes:
       - gm-db:/var/lib/postgresql/data/
   elasticsearch:
@@ -28,8 +28,8 @@ services:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
       - discovery.type=single-node
       - xpack.security.enabled=false
-    networks:
-      - app-net
+#    networks:
+#      - app-net
   # RabbitMQ
   rabbitmq:
     image: rabbitmq:latest
@@ -83,18 +83,18 @@ services:
       - worker
       - worker_beat
       - elasticsearch
-    networks:
-      - app-net
-      - db-net
+#    networks:
+#      - app-net
+#      - db-net
     volumes:
       - .:/code
       - gm-media:/media-data
     ports:
       - "8000:8000"
 
-networks:
-  app-net:
-  db-net:
+#networks:
+#  app-net:
+#  db-net:
 
 volumes:
   gm-db: