Fixed problems with pool

Author: Casassarnau

app/settings.py

@@ -437,7 +437,10 @@
 
 # Messages services config
 MESSAGES_SERVICES = {
-    'SlackMessageService': {}
+    'SlackMessageService': {
+        'ACCESS_TOKEN': os.environ.get('SLACK_ACCESS_TOKEN', None),
+        'ANNOUNCEMENT_CHANNEL': os.environ.get('SLACK_ANNOUNCEMENT_CHANNEL', '#announcements')
+    }
 }
 
 if len(MESSAGES_SERVICES) > 0:

event/messages/apps.py

@@ -7,4 +7,4 @@ class MessagesConfig(AppConfig):
     label = 'event_messages'
 
     def ready(self):
-        from . import signals
+        pass

event/messages/forms.py

@@ -25,11 +25,8 @@ class Meta:
         model = Announcement
         exclude = ('id', )
         widgets = {
-            'message': forms.Textarea(attrs={'rows': 4})
+            'message': forms.Textarea(attrs={'rows': 4}),
         }
         labels = {
             'sent': _('Message sent')
         }
-        help_texts = {
-            'sent': _('The message will be sent immediately if you modify this field to sent status!')
-        }

event/messages/management/commands/send_announcements.py

@@ -8,6 +8,8 @@ class Command(BaseCommand):
     help = 'Send announcements from the database'
 
     def handle(self, *args, **kwargs):
-        for announcement in Announcement.objects.filter(datetime__lte=timezone.now(), sent=False):
-            announcement.sent = True
+        for announcement in Announcement.objects.filter(datetime__lte=timezone.now(),
+                                                        status=Announcement.STATUS_PENDING):
+            announcement.status = Announcement.STATUS_SENT
             announcement.save()
+            announcement.send()

event/messages/services/slack.py

@@ -46,4 +46,4 @@ def make_announcement(self, message: str) -> bool:
             return True
         except SlackApiError as e:
             self.logger.error(e)
-            raise self.ServiceException(e)
+            raise self.ServiceException(str(getattr(e, 'response', e)))

event/messages/signals.py

@@ -30,6 +30,7 @@ def post(self, request, **kwargs):
         announcement = get_object_or_404(Announcement, id=request.POST.get('send'))
         announcement.status = announcement.STATUS_SENT
         announcement.save()
+        announcement.send()
         return redirect(reverse('announcement_list'))