diff --git a/apps/payment/management/commands/send_transactions_to_roistat.py b/apps/payment/management/commands/send_transactions_to_roistat.py index f82d2313..76131857 100644 --- a/apps/payment/management/commands/send_transactions_to_roistat.py +++ b/apps/payment/management/commands/send_transactions_to_roistat.py @@ -5,6 +5,9 @@ from paymentwall.pingback import Pingback from apps.payment.tasks import transaction_to_roistat from apps.payment.models import Payment +import logging +logger = logging.getLogger(__name__) + class Command(BaseCommand): help = 'Send ' @@ -17,18 +20,20 @@ class Command(BaseCommand): def handle(self, *args, **options): start_id = options.get('start_id') + print('start_id=' + str(start_id)) + payments = Payment.objects.filter(id__gte=start_id, status__in=Payment.PW_PAID_STATUSES) for payment in payments: - pingback = Pingback(payment.data) - splitted = pingback.get_product().get_id().split('_') - product_type_name, payment_id = '_'.join(splitted[:-1]), splitted[-1] - transaction_to_roistat.delay( + print('TRANSACTION: ' + str(payment.id)) + + result = transaction_to_roistat( payment.user.id, payment.id, - f'{product_type_name.title()} payment', + f'Payment {payment.id}', payment.amount, payment.update_at.strftime('%Y-%m-%d %H:%M:%S'), - pingback.get_type(), - product_type_name, + f'PINGBACK_TYPE_REGULAR', + f'Payment {payment.id}', payment.roistat_visit, ) + print('RESULT' + str(result.json())) diff --git a/apps/payment/tasks.py b/apps/payment/tasks.py index 58abb7b2..824e7272 100644 --- a/apps/payment/tasks.py +++ b/apps/payment/tasks.py @@ -56,4 +56,4 @@ def transaction_to_roistat(user_id, payment_id, event_name, amount, time, status url = settings.ROISTAT_API_URL + f'/project/add-orders?key={key}&project={project}' resp = requests.post(url, json=body) logger.info('TRANSACTION_TO_ROISTAT: ' + str(resp)) - print('TRANSACTION_TO_ROISTAT', str(resp.json())) + return resp diff --git a/docker/conf/nginx/conf.d/default.conf b/docker/conf/nginx/conf.d/default.conf index b20174f6..f78513ae 100644 --- a/docker/conf/nginx/conf.d/default.conf +++ b/docker/conf/nginx/conf.d/default.conf @@ -1,3 +1,24 @@ +server { + listen 80; + server_name ~^flower.+; + + root /dev/null; + + access_log off; + error_log /dev/stdout; + + log_not_found off; + + location / { + proxy_pass http://127.0.0.1:5555; + proxy_set_header Host $host; + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } +} + server { listen 80 default_server; diff --git a/docker/conf/supervisor/flower.conf b/docker/conf/supervisor/flower.conf new file mode 100644 index 00000000..d89b494d --- /dev/null +++ b/docker/conf/supervisor/flower.conf @@ -0,0 +1,14 @@ +[program:flower] +command=/usr/local/bin/flower -A project +directory=/app/ +environment=HOME="/var/www" +autostart=true +autorestart=true +user=www-data +redirect_stderr=true +stopsignal=KILL +stopasgroup=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stdout +stderr_logfile_maxbytes=0 diff --git a/docker/docker-compose-review.yml b/docker/docker-compose-review.yml index 9413f978..69540427 100644 --- a/docker/docker-compose-review.yml +++ b/docker/docker-compose-review.yml @@ -48,7 +48,7 @@ services: - internal - review labels: - - traefik.frontend.rule=Host:${REVIEW_HOST} + - traefik.frontend.rule=Host:${REVIEW_HOST},flower-${REVIEW_HOST} - traefik.docker.network=review networks: