From 1b3b550eabde579088ea89d12a8ddfdfee0629e6 Mon Sep 17 00:00:00 2001
From: Nazar Kotjuk <kotzillla@gmail.com>
Date: Wed, 4 Nov 2015 14:35:01 +0200
Subject: [PATCH] newsletter sending fix

---
 .../management/commands/newsletter_create_announce.py      | 2 +-
 .../newsletter/management/commands/send_newsletter.py      | 5 +++--
 emencia/django/newsletter/models.py                        | 7 ++-----
 emencia/django/newsletter/settings.py                      | 2 +-
 expobanner/management/commands/banner_log_update.py        | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/emencia/django/newsletter/management/commands/newsletter_create_announce.py b/emencia/django/newsletter/management/commands/newsletter_create_announce.py
index 85d8f99d..eccc1db5 100644
--- a/emencia/django/newsletter/management/commands/newsletter_create_announce.py
+++ b/emencia/django/newsletter/management/commands/newsletter_create_announce.py
@@ -10,5 +10,5 @@ class Command(NoArgsCommand):
 
     def handle(self, *args, **options):
         announce_list = MailingList.objects.get(id=1)
-        day = date.today() - timedelta(days=2)
+        day = date.today() - timedelta(days=1)
         announce_list.generate_announce_newsletter(day)
\ No newline at end of file
diff --git a/emencia/django/newsletter/management/commands/send_newsletter.py b/emencia/django/newsletter/management/commands/send_newsletter.py
index 77bb17c5..e069d2f9 100644
--- a/emencia/django/newsletter/management/commands/send_newsletter.py
+++ b/emencia/django/newsletter/management/commands/send_newsletter.py
@@ -3,8 +3,7 @@ from django.conf import settings
 from django.utils.translation import activate
 from django.core.management.base import NoArgsCommand
 
-from emencia.django.newsletter.mailer import Mailer
-from emencia.django.newsletter.models import Newsletter
+
 
 
 class Command(NoArgsCommand):
@@ -12,6 +11,8 @@ class Command(NoArgsCommand):
     help = 'Send the newsletter in queue'
 
     def handle_noargs(self, **options):
+        from emencia.django.newsletter.mailer import Mailer
+        from emencia.django.newsletter.models import Newsletter
         verbose = int(options['verbosity'])
 
         if verbose:
diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py
index 4efb81a8..ead9d23b 100644
--- a/emencia/django/newsletter/models.py
+++ b/emencia/django/newsletter/models.py
@@ -306,7 +306,7 @@ class MailingList(models.Model):
                 id__in=unsubscribers_id)
         else:
             return self.subscribers.valid_subscribers().exclude(
-                id__in=unsubscribers_id).filter(contactsettings__theme__isnull=False)
+                id__in=unsubscribers_id).filter(contactsettings__theme__isnull=False).distinct()
 
     def __unicode__(self):
         return self.name
@@ -554,11 +554,8 @@ class WorkGroup(models.Model):
         verbose_name_plural = _('workgroups')
 
 
-from theme.models import Theme
-
-
 class PopupCount(models.Model):
-    theme = models.ForeignKey(Theme, null=True)
+    theme = models.ForeignKey('theme.Theme', null=True)
     date = models.DateField(auto_created=True)
     cnt = models.PositiveIntegerField(default=0)
 
diff --git a/emencia/django/newsletter/settings.py b/emencia/django/newsletter/settings.py
index 3486bcd7..2df5679d 100644
--- a/emencia/django/newsletter/settings.py
+++ b/emencia/django/newsletter/settings.py
@@ -33,7 +33,7 @@ TRACKING_IMAGE = getattr(settings, 'NEWSLETTER_TRACKING_IMAGE',
                          BASE64_IMAGES[TRACKING_IMAGE_FORMAT])
 
 SLEEP_BETWEEN_SENDING = getattr(
-    settings, 'NEWSLETTER_SLEEP_BETWEEN_SENDING', 10)
+    settings, 'NEWSLETTER_SLEEP_BETWEEN_SENDING', 0)
 RESTART_CONNECTION_BETWEEN_SENDING = getattr(
     settings, 'NEWSLETTER_RESTART_CONNECTION_BETWEEN_SENDING', False)
 
diff --git a/expobanner/management/commands/banner_log_update.py b/expobanner/management/commands/banner_log_update.py
index be596e38..99f389ec 100644
--- a/expobanner/management/commands/banner_log_update.py
+++ b/expobanner/management/commands/banner_log_update.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from datetime import date
+from datetime import date, timedelta
 from django.core.management.base import BaseCommand