diff --git a/src/customer/tasks.py b/src/customer/tasks.py index c34053e..7534489 100644 --- a/src/customer/tasks.py +++ b/src/customer/tasks.py @@ -59,9 +59,10 @@ def delete_not_activated_users(): @shared_task def send_offer_for_get_bonus(): + user_list = [] today = timezone.now().date() - date_join_start = today - timezone.timedelta(days=9) - date_join_end = today - timezone.timedelta(days=8) + date_join_start = today - timezone.timedelta(days=5) + date_join_end = today - timezone.timedelta(days=4) users = DokUser.objects.filter(profile__active=True, profile__confirmed=True).\ filter(date_joined__gt=date_join_start, date_joined__lt=date_join_end) @@ -69,4 +70,6 @@ def send_offer_for_get_bonus(): licenses = License.objects.filter(company=user.profile).filter(status=2) if not licenses: url = reverse('customer_order_license') + user_list.append(user) emails.send_offer_buy_licence_for_get_bonus.delay(user.email, url) + return user_list diff --git a/src/dokumentor/settings/local.py b/src/dokumentor/settings/local.py index f694048..20bd0c6 100644 --- a/src/dokumentor/settings/local.py +++ b/src/dokumentor/settings/local.py @@ -27,7 +27,3 @@ DATABASES = { EMAIL_BACKEND = 'eml_email_backend.EmailBackend' EMAIL_FILE_PATH = os.path.join(ROOT_DIR, 'tmp_emails') - - -# import django -# django.setup() diff --git a/src/tests/test_tasks.py b/src/tests/test_tasks.py index a729997..0ea226b 100644 --- a/src/tests/test_tasks.py +++ b/src/tests/test_tasks.py @@ -20,6 +20,8 @@ dates_lt_five = [timezone.now() - timezone.timedelta(days=5), timezone.now() - timezone.timedelta(days=1), timezone.now() - timezone.timedelta(days=0)] +dates_bonus = [timezone.now() - timezone.timedelta(days=5)] + @pytest.mark.parametrize('create_date', dates_gte_five) @pytest.mark.django_db @@ -59,8 +61,10 @@ def test_delete_not_activated_users_less_five_day(user, create_date): assert ConfirmEmail.objects.count() == 1 +@pytest.mark.parametrize('create_date', dates_bonus) @pytest.mark.django_db -def test_send_offer_for_get_bonus(user): - send_offer_for_get_bonus() - print(user) - pass +def test_send_offer_for_get_bonus(user, create_date): + user.date_joined = create_date + user.save() + users = send_offer_for_get_bonus() + assert users == [user]