From f37e10138f25edd7737441d606da95cdceb985ae Mon Sep 17 00:00:00 2001
From: Gleb Mikhaylov <gm.mikhailov@gmail.com>
Date: Mon, 26 Aug 2019 13:56:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=B3=D0=B5=D1=80=20+=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=201)=20headers=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=B0=20=D0=B2=20=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D1=81=D1=82=D0=B0=D1=82=202)=20=D1=8F=D0=B2=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D1=80=D1=82=D0=BD=D1=83?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=20=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BD=D0=B0=20=D0=B2=20json,=20=D0=BA=D0=B0=D0=BA?=
 =?UTF-8?q?=20=D0=B2=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BA=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/payment/tasks.py | 21 +++++++++++++++++----
 project/views.py      |  5 -----
 2 files changed, 17 insertions(+), 9 deletions(-)

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