diff --git a/apps/payment/tasks.py b/apps/payment/tasks.py index cc2e2f03..b85b460d 100644 --- a/apps/payment/tasks.py +++ b/apps/payment/tasks.py @@ -1,5 +1,6 @@ import logging import requests +import json from mixpanel import Mixpanel @@ -8,6 +9,7 @@ from django.conf import settings from project.celery import app logger = logging.getLogger(__name__) +logger_roistat = logging.getLogger('roistat') @app.task @@ -53,13 +55,24 @@ def transaction_to_roistat(user_id, payment_id, event_name, amount, time, status }] project = settings.ROISTAT_PROJECT key = settings.ROISTAT_KEY - url = settings.ROISTAT_API_URL + f'/project/add-orders?key={key}&project={project}' - resp = requests.post(url, json=body) + url = settings.ROISTAT_API_URL + \ + f'/project/add-orders?key={key}&project={project}' + + payload = json.dumps(body) + headers = {'content-type': 'application/json'} + + resp = requests.request("POST", url, data=payload, headers=headers) + try: resp_json = resp.json() except: resp_json = None + if resp.status_code != 200 or not resp_json or not resp_json.get('processed'): - logger.error('TRANSACTION_TO_ROISTAT for payment # %d, %s RUB: %s' % (payment_id, amount, resp.text)) + logger.error('TRANSACTION_TO_ROISTAT for payment # %d, %s RUB: %s' % ( + payment_id, amount, resp.text)) + roistat_logger.debug('TRANSACTION_TO_ROISTAT for payment # %d, %s RUB: %s' % ( + payment_id, amount, resp.text)) else: - logger.info('TRANSACTION_TO_ROISTAT: ' + str(resp)) + logger.info('TRANSACTION_TO_ROISTAT: ' + str(resp.text)) + roistat_logger.debug('TRANSACTION_TO_ROISTAT: ' + str(resp.text)) diff --git a/project/views.py b/project/views.py index 24d27c89..9c3ac5b2 100644 --- a/project/views.py +++ b/project/views.py @@ -12,9 +12,6 @@ from apps.course.models import Course from apps.school.models import SchoolSchedule from apps.payment.models import SchoolPayment, UserGiftCertificate, Payment, DrawingCampPayment from apps.content.models import Banner, Package -import logging - -logger_roistat = logging.getLogger('roistat') User = get_user_model() @@ -139,8 +136,6 @@ class IndexView(TemplateView): }) - logger_roistat.debug('hi from home page!') - return context