mitri4
/
skill-back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ограничение на журналы (тем, уроков, курсов)

Browse Source
feature/fix_generate_pass
Andrey 8 years ago
parent f6de736878
commit d7c1f136c4
9 changed files with 157 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      access/serializers.py
  2. 43
      access/views.py
  3. 3
      course_service/courses/views.py
  4. 55
      csv/load_bills.py
  5. 2
      finance/migrations/0001_initial.py
  6. 20
      finance/migrations/0002_auto_20171225_1142.py
  7. 2
      finance/models.py
  8. 5
      finance/serializers.py
  9. 158
      finance/signals.py

2
access/serializers.py
Unescape View File

@ -109,7 +109,7 @@ class UserSearchSerializer(serializers.ModelSerializer):
@staticmethod @staticmethod
def get_phone(self): def get_phone(self):
return self.account.phone return None if self.account.phone is None else self.account.phone.raw_input
@staticmethod @staticmethod
def get_pay(self): def get_pay(self):

43
access/views.py
Unescape View File

@ -12,9 +12,8 @@ from rest_framework.renderers import JSONRenderer
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.views import APIView from rest_framework.views import APIView
from access.models.other import Invite, Progress, ResetPassword from access.models.other import Invite, Progress, ResetPassword, PivotProgressVertex
from access.serializers import UserSelfSerializer, UserSearchSerializer from access.serializers import UserSelfSerializer, UserSearchSerializer, PivotProgressSerializer
from course_service.courses.models import Vertex
class TeacherListView(APIView): class TeacherListView(APIView):
@ -231,10 +230,6 @@ class LogoutView(APIView):
class UpdateProgress(APIView): class UpdateProgress(APIView):
"""
Переводит ученика на следующую стадию прохождения курса
Запрос идёт синхронно возвращает id нового объекта прогресса
"""
renderer_classes = (JSONRenderer,) renderer_classes = (JSONRenderer,)
@staticmethod @staticmethod
@ -242,23 +237,31 @@ class UpdateProgress(APIView):
""" """
На вход обязательно передаётся параметр id (id узла). На вход обязательно передаётся параметр id (id узла).
""" """
pk = int(request.JSON.get('id')) token = request.JSON.get('token', None)
res_403 = Response('Permission denied', status=403) course = request.JSON.get('slug', None)
if token is None or course is None:
return Response('Не передан слаг курса или токен урока', status=400)
try: try:
vertex = Vertex.objects.get(id=pk) p = Progress.objects.get(user=request.user, course=course)
except Vertex.DoesNotExist: try:
return Response("Объект не найден", status=404) pv = PivotProgressVertex.objects.get(
progress=p,
vertex=token,
)
if vertex.content_type.model == 'task': except PivotProgressVertex.DoesNotExist:
return res_403 pv = PivotProgressVertex.objects.create(
date=datetime.datetime.now(),
teacher=p.teacher,
progress=p,
vertex=token,
)
pv.status = 2
pv.save()
return Response(PivotProgressSerializer(pv).data, status=200)
try:
progress = Progress.objects.get(user=request.user, course=vertex.course)
progress.add_vertex(vertex)
return Response(status=204)
except Progress.DoesNotExist: except Progress.DoesNotExist:
return res_403 return Response('Не найден прогресс по заданным параметрам', status=404)
class UserGuardView(APIView): class UserGuardView(APIView):

3
course_service/courses/views.py
Unescape View File

@ -37,7 +37,6 @@ class VertexDetail(APIView):
@staticmethod @staticmethod
def get(request, token): def get(request, token):
status = int(request.GET.get('status', '200'))
try: try:
vertex = Vertex.objects.get(token=token) vertex = Vertex.objects.get(token=token)
@ -61,4 +60,4 @@ class VertexDetail(APIView):
# except Thread.DoesNotExist or Vertex.DoesNotExist: # except Thread.DoesNotExist or Vertex.DoesNotExist:
# res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data # res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data
return Response(res, status=200) if status == 200 else Response(status=204) return Response(res, status=200)

55
csv/load_bills.py
Unescape View File

@ -1,4 +1,7 @@
import csv import csv
import random
import string
import django import django
import os import os
import sys import sys
@ -43,33 +46,37 @@ if __name__ == '__main__':
bill_kwarg['comment'] = row.pop('comment', None) bill_kwarg['comment'] = row.pop('comment', None)
bill_kwarg['description'] = row.pop('description', None) bill_kwarg['description'] = row.pop('description', None)
try: try:
bill = Bill.objects.create(**bill_kwarg) bill = Bill.objects.create(**bill_kwarg)
method = row.pop('bill_method', None) except IntegrityError:
try: pass
price = int(row.pop('price', None)) method = row.pop('bill_method', None)
except ValueError: try:
price = None price = int(row.pop('price', None))
except ValueError:
price = None
try: try:
real_price = int(row.pop('real_price', None)) real_price = int(row.pop('real_price', None))
except ValueError: except ValueError:
real_price = None real_price = None
inv = Invoice.objects.create(bill=bill, method=method, price=price, real_price=real_price, **row) key = row.pop('key', None)
inv.date = row['date'] if not key:
inv.save() key = ''.join(random.choice(string.ascii_letters) for x in range(16))
if method == 'Y' and not row['status'] == 'W': inv = Invoice.objects.create(bill=bill, method=method, price=price, real_price=real_price, key=key, **row)
row['yandex_pay'], _is_create = Payment.objects.get_or_create( inv.date = row['date']
order_amount=price, inv.save()
order_number=inv.id,
customer_number=bill.user.id,
user=bill.user,
cps_email=bill.user.email,
shop_amount=real_price,
status='Processed' if 'P' else ('Success' if 'F' else 'Fail')
)
except IntegrityError: if method == 'Y' and not row['status'] == 'W' and price:
pass row['yandex_pay'], _is_create = Payment.objects.get_or_create(
order_amount=price,
order_number=inv.id,
customer_number=bill.user.id,
user=bill.user,
cps_email=bill.user.email,
shop_amount=real_price,
status='Processed' if 'P' else ('Success' if 'F' else 'Fail')
)

2
finance/migrations/0001_initial.py
Unescape View File

@ -13,7 +13,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('yandex_money', '0002_auto_20171128_1150'), ('yandex_money', '0001_initial'),
] ]
operations = [ operations = [

20
finance/migrations/0002_auto_20171225_1142.py
Unescape View File

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.6 on 2017-12-25 11:42
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('finance', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='invoice',
name='price',
field=models.IntegerField(blank=True, editable=False, null=True, verbose_name='Сумма'),
),
]

2
finance/models.py
Unescape View File

@ -43,7 +43,7 @@ class Invoice(models.Model):
('C', 'Отклонен'), ('C', 'Отклонен'),
) )
status = models.CharField(verbose_name='Статус', max_length=1, default='W', choices=BILL_STATUSES) status = models.CharField(verbose_name='Статус', max_length=1, default='W', choices=BILL_STATUSES)
price = models.IntegerField(verbose_name='Сумма', editable=False) price = models.IntegerField(verbose_name='Сумма', editable=False, null=True, blank=True)
real_price = models.IntegerField(verbose_name='Полученная сумма', null=True, blank=True, real_price = models.IntegerField(verbose_name='Полученная сумма', null=True, blank=True,
help_text='Сумма, минус комиссия', editable=False) help_text='Сумма, минус комиссия', editable=False)
method = models.CharField(verbose_name='Способ оплаты', max_length=2, default='Y', choices=BILL_METHOD) method = models.CharField(verbose_name='Способ оплаты', max_length=2, default='Y', choices=BILL_METHOD)

5
finance/serializers.py
Unescape View File

@ -6,7 +6,6 @@ from finance.models import Bill, Invoice
class BillSerializer(serializers.ModelSerializer): class BillSerializer(serializers.ModelSerializer):
opener = serializers.SerializerMethodField() opener = serializers.SerializerMethodField()
user = serializers.SerializerMethodField() user = serializers.SerializerMethodField()
course = serializers.SerializerMethodField()
invoices = serializers.SerializerMethodField() invoices = serializers.SerializerMethodField()
class Meta: class Meta:
@ -17,10 +16,6 @@ class BillSerializer(serializers.ModelSerializer):
def get_user(self): def get_user(self):
return self.user.email return self.user.email
@staticmethod
def get_course(self):
return self.course.title
@staticmethod @staticmethod
def get_invoices(self): def get_invoices(self):
return [InvoiceSerializer(i).data for i in self.invoice_set.all()] return [InvoiceSerializer(i).data for i in self.invoice_set.all()]

158
finance/signals.py
Unescape View File

@ -1,79 +1,79 @@
from django.core.mail import EmailMessage # from django.core.mail import EmailMessage
from django.db.models.signals import pre_save, post_save # from django.db.models.signals import pre_save, post_save
from django.dispatch import receiver # from django.dispatch import receiver
from yandex_money.models import Payment # from yandex_money.models import Payment
#
from finance.models import Invoice # from finance.models import Invoice
from access.models.other import Progress # from access.models.other import Progress
from course_service.maps.api import OutApiRoute # from course_service.maps.api import OutApiRoute
#
api = OutApiRoute # api = OutApiRoute
#
#
@receiver(pre_save, sender=Invoice) # @receiver(pre_save, sender=Invoice)
def invoice_signal(instance, **kwargs): # def invoice_signal(instance, **kwargs):
"""Отправка сообщения после сохранения платежа""" # """Отправка сообщения после сохранения платежа"""
if instance.yandex_pay and instance.method == 'Y' and instance.status == 'P': # if instance.yandex_pay and instance.method == 'Y' and instance.status == 'P':
msg = EmailMessage( # msg = EmailMessage(
'Вам выставлен новый счёт', # 'Вам выставлен новый счёт',
'''Вам выставлен счёт, для оплаты перейдите по ссылке # '''Вам выставлен счёт, для оплаты перейдите по ссылке
https://go.skillbox.ru/api/v1/finance/payment/%s/''' % instance.yandex_pay.id, # https://go.skillbox.ru/api/v1/finance/payment/%s/''' % instance.yandex_pay.id,
'robo@skillbox.ru', # 'robo@skillbox.ru',
[instance.yandex_pay.cps_email], # [instance.yandex_pay.cps_email],
[instance.bill.opener.email], # [instance.bill.opener.email],
reply_to=[instance.bill.opener.email], # reply_to=[instance.bill.opener.email],
) # )
msg.send() # msg.send()
#
if instance.status == 'F': # if instance.status == 'F':
if instance.is_open: # if instance.is_open:
Progress.objects.get_or_create( # Progress.objects.get_or_create(
route=instance.bill.route, # route=instance.bill.route,
user=instance.bill.user, # user=instance.bill.user,
) # )
msg = EmailMessage( # msg = EmailMessage(
'Ваш платёж прошёл успешно', # 'Ваш платёж прошёл успешно',
'''Вам открыт доступ к курсу "%s", вы можете перейти по ссылке и # '''Вам открыт доступ к курсу "%s", вы можете перейти по ссылке и
ознакомиться с материалами https://go.skillbox.ru/course/%s''' # ознакомиться с материалами https://go.skillbox.ru/course/%s'''
% (api.get_route(instance.bill.route).name, api.get_route(instance.bill.route).course.slug), # % (api.get_route(instance.bill.route).name, api.get_route(instance.bill.route).course.slug),
'robo@skillbox.ru', # 'robo@skillbox.ru',
[instance.bill.user.email], # [instance.bill.user.email],
cc=[instance.bill.opener.email], # cc=[instance.bill.opener.email],
reply_to=[instance.bill.opener.email], # reply_to=[instance.bill.opener.email],
) # )
else: # else:
msg = EmailMessage( # msg = EmailMessage(
'Ваш платёж прошёл успешно', # 'Ваш платёж прошёл успешно',
'''Курс "%s" был забронирован''' % instance.bill.course.title, # '''Курс "%s" был забронирован''' % instance.bill.course.title,
'robo@skillbox.ru', # 'robo@skillbox.ru',
[instance.yandex_pay.cps_email], # [instance.yandex_pay.cps_email],
cc=[instance.bill.opener.email], # cc=[instance.bill.opener.email],
reply_to=[instance.bill.opener.email], # reply_to=[instance.bill.opener.email],
) # )
msg.send() # msg.send()
#
if instance.status == 'C': # if instance.status == 'C':
msg = EmailMessage( # msg = EmailMessage(
'Ошибка платежа!' # 'Ошибка платежа!'
"""Внимание не прошёл платёж пользавателю %s, # """Внимание не прошёл платёж пользавателю %s,
по курсу "%s" ID платежа: %s. Если не получается # по курсу "%s" ID платежа: %s. Если не получается
решить проблему самостоятельно, ответьте на это письмо, # решить проблему самостоятельно, ответьте на это письмо,
постарайтесь подробно описать последовательность действий, # постарайтесь подробно описать последовательность действий,
которая привела к ошибке""" # которая привела к ошибке"""
% (instance.bill.user.get_full_name(), api.get_route(instance.bill.route).course.title, instance.id), # % (instance.bill.user.get_full_name(), api.get_route(instance.bill.route).course.title, instance.id),
instance.bill.opener.email, # instance.bill.opener.email,
reply_to=["it@skillbox.ru"] # reply_to=["it@skillbox.ru"]
) # )
msg.send() # msg.send()
#
#
@receiver(post_save, sender=Payment) # @receiver(post_save, sender=Payment)
def access_pay(instance, **kwargs): # def access_pay(instance, **kwargs):
if instance.status == 'success': # if instance.status == 'success':
instance.invoice.status = "F" # instance.invoice.status = "F"
instance.invoice.real_price = instance.shop_amount # instance.invoice.real_price = instance.shop_amount
instance.invoice.save() # instance.invoice.save()
#
if instance.status == 'fail': # if instance.status == 'fail':
instance.invoice.status = "C" # instance.invoice.status = "C"
instance.invoice.save() # instance.invoice.save()

Write Preview
Loading…
Cancel
Save