From dd0b5951328fa09ea47ab1e221950b28b082110e Mon Sep 17 00:00:00 2001
From: Kuroshini <o.hayatov@id-east.ru>
Date: Wed, 16 Oct 2019 14:11:07 +0300
Subject: [PATCH] Review fixes

---
 apps/establishment/tasks.py | 4 +++-
 project/settings/base.py    | 8 --------
 requirements/base.txt       | 3 +--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/apps/establishment/tasks.py b/apps/establishment/tasks.py
index 978f29ef..b7a39d2d 100644
--- a/apps/establishment/tasks.py
+++ b/apps/establishment/tasks.py
@@ -2,6 +2,8 @@
 import logging
 
 from celery import shared_task
+from celery.schedules import crontab
+from celery.task import periodic_task
 from django.core import management
 from django_elasticsearch_dsl.management.commands import search_index
 
@@ -23,7 +25,7 @@ def recalculate_price_levels_by_country(country_id):
             establishment.recalculate_price_level(low_price=country.low_price,
                                                   high_price=country.high_price)
 
-@shared_task
+@periodic_task(run_every=crontab(minute=60))
 def rebuild_establishment_indices():
     management.call_command(search_index.Command(), action='rebuild', models=[models.Establishment.__name__],
                             force=True)
diff --git a/project/settings/base.py b/project/settings/base.py
index 8a65c1bb..a8334839 100644
--- a/project/settings/base.py
+++ b/project/settings/base.py
@@ -13,7 +13,6 @@ https://docs.djangoproject.com/en/2.2/ref/settings/
 import os
 import sys
 from datetime import timedelta
-from celery.schedules import crontab
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -100,7 +99,6 @@ EXTERNAL_APPS = [
     'storages',
     'sorl.thumbnail',
     'timezonefinder',
-    'django_celery_beat',
 ]
 
 
@@ -326,12 +324,6 @@ CELERY_ACCEPT_CONTENT = ['application/json']
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_RESULT_SERIALIZER = 'json'
 CELERY_TIMEZONE = TIME_ZONE
-CELERY_BEAT_SCHEDULE = {
-    'send-summary-every-hour': {
-        'task': 'establishment.tasks.rebuild_establishment_indices',
-        'schedule': crontab(hour=1),
-    },
-}
 
 # Django FCM (Firebase push notifications)
 FCM_DJANGO_SETTINGS = {
diff --git a/requirements/base.txt b/requirements/base.txt
index 19c29b7d..c95055de 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -44,5 +44,4 @@ sorl-thumbnail==12.5.0
 # temp solution
 redis==3.2.0
 amqp>=2.4.0
-celery==4.3.0rc2
-django-celery-beat==1.5.0
\ No newline at end of file
+celery==4.3.0rc2
\ No newline at end of file