Яндекс деньги

courses/models.py

@@ -264,9 +264,9 @@ class Vertex(models.Model):
     """
 
     course = models.ForeignKey(to=Course)
-    title = models.CharField(verbose_name=u'Название', max_length=255)
+    title = models.CharField(verbose_name='Название', max_length=255)
-    free = models.BooleanField(default=True, verbose_name=u'Привилегии для узла не будут проверяться')
+    free = models.BooleanField(default=True, verbose_name='Привилегии для узла не будут проверяться')
-    description = models.TextField(verbose_name=u'Описание', default='', blank=True, null=True)
+    description = models.TextField(verbose_name='Описание', default='', blank=True, null=True)
     children = models.ManyToManyField(to='Vertex', blank=True)
     content_type = models.ForeignKey(to=ContentType)
     object_id = models.PositiveIntegerField()

csv/load_student_teachers_threads.py

@@ -19,27 +19,44 @@ if __name__ == '__main__':
         comment_reader = csv.DictReader(comment_csv)
         for row in comment_reader:
             if row['type'] == 'task':
+                teacher_action = row['status'] == "Одобрено" or row['status'] == "Отклонено"
                 owner = get_user_model().objects.get(email=row['owner__email'])
                 sub = get_user_model().objects.get(email=row['sub__email'])
+                teacher = owner if teacher_action else sub
+                user = owner if not teacher_action else sub
                 vertex = Vertex.objects.get(object_id=row['object_id'], content_type__model='task')
-                action = 0
+                action = '' + int(not teacher_action)*"try" +\
-                if row['status'] == "Одобрено":
+                              int(row['status'] == "Одобрено")*"yes" +\
-                    action = 1
+                              int(row['status'] == "Отклонено")*"no"
-                    child_thread, is_create = Thread.objects.get_or_create(
+
-                        key="""user_%s__staff_%s""" % (sub.id, owner.id,)
+                try:
-                    )
+                    child_thread = Thread.objects.filter(subscribers=teacher).filter(subscribers=user)[0]
-                elif row['status'] == "Отклонено":
+                except IndexError:
-                    action = 2
+                    child_thread = Thread.objects.create(
-                    child_thread, is_create = Thread.objects.get_or_create(
+                        key="""user_%s__user_%s""" % (teacher.id, user.id,),
-                        key="""user_%s__staff_%s""" % (sub.id, owner.id,)
+                        text="""Приватный диалог %s и %s""" % (teacher.email, user.email,),
-                    )
+                        is_recurse=True,
-                else:
-                    child_thread, is_create = Thread.objects.get_or_create(
-                        key="""user_%s__staff_%s""" % (owner.id, sub.id,)
                     )
 
+                    child_thread.subscribers.add(user)
+                    child_thread.subscribers.add(teacher)
+                    child_thread.parent.add(Thread.objects.get(key="""user_%s""" % user.id))
+                    child_thread.parent.add(Thread.objects.get(key="""user_%s""" % teacher.id))
+
+                child_child_thread, is_create = Thread.objects.get_or_create(
+                    key="""user_%s__vertex_%s""" % (user.id, vertex.id,),
+                    text="""Домашняя работа по курсу %s и теме %s для студента %s""" %
+                         (vertex.course.title, vertex.vertex_set.all()[0].title, user.get_full_name()),
+                )
+
+                if is_create:
+                    child_child_thread.parent.add(thread)
+                    child_child_thread.parent.add(Thread.objects.get(key="""user_%s""" % user.id))
+                    child_child_thread.parent.add(child_thread)
+                    child_child_thread.subscribers.add(user)
+
                 journal = Journal.objects.create(
-                    thread=child_thread,
+                    thread=child_child_thread,
                     user=owner,
                     content_type=ct,
                     object_id=vertex.id,
@@ -48,7 +65,7 @@ if __name__ == '__main__':
                 )
 
                 journal_comment = Journal.objects.create(
-                    thread=child_thread,
+                    thread=child_child_thread,
                     user=owner,
                     content_type=ct,
                     object_id=vertex.id,
@@ -61,7 +78,3 @@ if __name__ == '__main__':
                     if file_id:
                         journal.files.add(Storage.objects.get(id=file_id))
 
-                if is_create:
-                    child_thread.parent.add(thread)
-                    child_thread.subscribers.add(owner)
-                    child_thread.subscribers.add(sub)

finance/migrations/0012_auto_20171110_1302.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-11-10 13:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0011_invoice_yandex_pay'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoice',
+            name='status',
+            field=models.CharField(choices=[('W', 'Ожидание согласия'), ('P', 'На оплате'), ('F', 'Оплачен'), ('C', 'Отклонен')], default='W', max_length=1, verbose_name='Статус'),
+        ),
+    ]

finance/models.py

@@ -41,7 +41,6 @@ class Invoice(models.Model):
         ('P', 'На оплате'),
         ('F', 'Оплачен'),
         ('C', 'Отклонен'),
-        ('H', 'Сгорел')
     )
     status = models.CharField(verbose_name='Статус', max_length=1, default='W', choices=BILL_STATUSES)
     price = models.IntegerField(verbose_name='Сумма', null=True, blank=True)

finance/serializers.py

@@ -9,7 +9,7 @@ class BillSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Bill
-        fields = '__all__'
+        exclude = ('yandex_pay',)
 
     @staticmethod
     def get_user(self):

journals/default_threads.py

@@ -1,5 +1,7 @@
 import os, sys, django
 
+from django.contrib.auth import get_user_model
+
 sys.path.append("../")
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "lms.settings")
 django.setup()
@@ -16,9 +18,8 @@ def main_threads():
 
     admin_thread = Thread.objects.create(
         key='Admin',
-        text='Тред для админов, сюда падают все журналируемые сообщения в системе',
+        text='Тред для админов, сюда падают все журналируемые сообщения в системе, кроме личных переписок',
         is_staff=True,
-        is_recurse=True,
         x=500,
         y=75,
     )
@@ -29,7 +30,6 @@ def main_threads():
         key='Project_management',
         text='Тред для проджект-менеджеров, сюда падает статистика разного рода',
         is_staff=True,
-        is_recurse=True,
     )
 
     management_thread.groups.add(Group.objects.get(name='project_managers'))
@@ -39,7 +39,6 @@ def main_threads():
         key='Support',
         text='Тред сапортов, занимаются поддержкой клиента',
         is_staff=True,
-        is_recurse=True,
         y=500,
     )
 
@@ -50,7 +49,6 @@ def main_threads():
         key='Sale_lead',
         text='Тред лидов, сейлзов',
         is_staff=True,
-        is_recurse=True,
         x=700,
     )
 
@@ -79,6 +77,13 @@ def main_threads():
 
     st_tch.parent.add(support_thread)
 
+    for i in get_user_model().objects.all():
+        Thread.objects.create(
+            key="""user_%s""" % i.id,
+            text="""Приватный тред пользователя %s""" % i.email,
+            is_recurse=True,
+        )
+
 
 if __name__ == '__main__':
     main_threads()

journals/migrations/0009_auto_20171110_1302.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-11-10 13:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journals', '0008_remove_journal_children'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='thread',
+            name='key',
+            field=models.CharField(max_length=200, unique=True),
+        ),
+    ]

journals/migrations/0010_auto_20171110_1646.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-11-10 16:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journals', '0009_auto_20171110_1302'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='journal',
+            name='action_type',
+            field=models.CharField(choices=[('try', 'попытался сдать'), ('yes', 'одобрил'), ('no', 'отклонил'), ('favorite', 'добавил в избранное'), ('watch', 'просмотрел'), ('like', 'лайкнул'), ('dislike', 'дизлайкнул'), ('comment', 'оставил комментарий'), ('start', 'начал прохождение'), ('end', 'закончил прохождение'), ('create', 'создал'), ('update', 'обновил'), ('delete', 'удалил')], max_length=31),
+        ),
+        migrations.AlterField(
+            model_name='thread',
+            name='key',
+            field=models.CharField(editable=False, max_length=200, unique=True),
+        ),
+    ]

journals/models.py

@@ -6,25 +6,26 @@ from django.contrib.auth.models import Group
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.db import connection
 
 from courses.models import Achievements, Course, CourseMap, Diploma
 from finance.models import Bill
 from storage.models import Storage
 
 ACTION_CHOICES = (
-    (0, 'try'),
+    ('try', 'попытался сдать'),
-    (1, 'yes'),
+    ('yes', 'одобрил'),
-    (2, 'no'),
+    ('no', 'отклонил'),
-    (3, 'favorite'),
+    ('favorite', 'добавил в избранное'),
-    (4, 'watch'),
+    ('watch', 'просмотрел'),
-    (5, 'like'),
+    ('like', 'лайкнул'),
-    (6, 'dislike'),
+    ('dislike', 'дизлайкнул'),
-    (7, 'comment'),
+    ('comment', 'оставил комментарий'),
-    (8, 'start'),
+    ('start', 'начал прохождение'),
-    (9, 'end'),
+    ('end', 'закончил прохождение'),
-    (10, 'create'),
+    ('create', 'создал'),
-    (11, 'update'),
+    ('update', 'обновил'),
-    (12, 'delete'),
+    ('delete', 'удалил'),
 )
 
 
@@ -37,7 +38,7 @@ class Journal(models.Model):
     extra_data = models.TextField(null=True, blank=True)
     object_id = models.PositiveIntegerField()
     content_object = GenericForeignKey('content_type', 'object_id')
-    action_type = models.SmallIntegerField(choices=ACTION_CHOICES)
+    action_type = models.CharField(max_length=31, choices=ACTION_CHOICES)
     date = models.DateTimeField(auto_now=True)
     files = models.ManyToManyField(to=Storage, blank=True)
 
@@ -46,7 +47,7 @@ class Journal(models.Model):
 
 
 class Thread(models.Model):
-    key = models.CharField(max_length=200)
+    key = models.CharField(max_length=200, unique=True, editable=False)
     text = models.TextField(default='', verbose_name='Описание треда')
     is_staff = models.BooleanField(default=False, verbose_name='Админская ли табличка')
     is_recurse = models.BooleanField(default=False, verbose_name='Поле аптимизации поиска')
@@ -57,38 +58,43 @@ class Thread(models.Model):
     x = models.SmallIntegerField(default=300)
     y = models.SmallIntegerField(default=300)
 
-    def get_journals(self, **filter_extra):
+    def check_status(self):
-        threads = [i for i in self.thread_set.all()].append(self)
+        # Определяет статус треда если такой есть.
-        return Journal.objects.filter(thread_in=threads, **filter_extra).order_by('-date')
+        # Возможно, костыль.
+        res = None
+        for i in self.journal_set.all():
+            if i.action_type in ['try', 'yes', 'no']:
+                res = i.action_type
+        return res
 
     def check_perm(self, user):
-        return (user in self.subscribers.all()) or bool(sum([int(i.check_perm(user)) for i in self.parent.all()]))
+        res = user in self.subscribers.all()
+        for i in self.groups.all():
+            res = res or i in user.groups
+        return res or sum([int(i.check_perm(user)) for i in self.parent.all()])
 
     def child_thread_count(self):
-
+        # cursor = connection.cursor()
-        if self.is_recurse:
+        # if self.is_recurse:
-            return self.thread_set.count()
+        #     cursor.execute("""
-
+        #     WITH RECURSIVE temp1 (to_thread_id, from_thread_id) AS (
-        return sum([i.child_thread_count() for i in self.thread_set.all()])
+        #           SELECT T1.to_thread_id, T1.from_thread_id
+        #           FROM journals_thread_parent T1
+        #           WHERE to_thread_id = %s
+        #         UNION
+        #           SELECT T2.to_thread_id, T2.from_thread_id
+        #           FROM journals_thread_parent T2
+        #           INNER JOIN temp1 ON(T2.from_thread_id = temp1.to_thread_id)
+        #         )
+        #     SELECT COUNT(*) FROM temp1
+        #     """, [self.id])
+        #     count = cursor.fetchone()
+        #     return int(count[0])
+
+        return self.thread_set.count()
 
     def journals_count(self):
-        children = list(self.get_children())
+        return self.journal_set.count()
-        children.append(self)
-        return Journal.objects.filter(thread__in=children).count()
-
-    def get_children(self):
-        children = self.thread_set.filter(is_staff=False)
-
-        if self.is_recurse:
-            list(children).append(self)
-            return children
-
-        res = [self]
-
-        for child in children:
-            res += child.get_children()
-
-        return res
 
     def __str__(self):
         return self.key

journals/serilizers.py

@@ -10,17 +10,26 @@ class JournalSerializer(serializers.ModelSerializer):
         exclude = ('content_type', 'object_id')
 
 
-class ThreadSerializer(serializers.ModelSerializer):
+class ThreadDetailSerializer(serializers.ModelSerializer):
+    journals = serializers.SerializerMethodField()
 
     class Meta:
         model = Thread
-        exclude = ('is_staff', )
+        fields = ('journals', 'id', 'text')
 
+    @staticmethod
+    def get_journals(self):
+        return [JournalSerializer(i).data for i in self.journal_set.all()]
 
-class ThreadAdminSerializer(ThreadSerializer):
+
+class ThreadAdminSerializer(serializers.ModelSerializer):
     count_children = serializers.SerializerMethodField()
     count_journals = serializers.SerializerMethodField()
 
+    class Meta:
+        model = Thread
+        exclude = ('is_staff', )
+
     @staticmethod
     def get_count_children(self):
         return self.child_thread_count()
@@ -31,12 +40,7 @@ class ThreadAdminSerializer(ThreadSerializer):
 
 
 class ThreadUserSerializer(serializers.ModelSerializer):
-    journals = serializers.SerializerMethodField()
 
     class Meta:
         model = Thread
-        fields = ('journals', 'key')
+        fields = ('id', 'text')
-
-    @staticmethod
-    def get_journals(self):
-        return [JournalSerializer(i).data for i in self.journal_set.all()]

journals/urls.py

@@ -2,6 +2,7 @@ from django.conf.urls import url
 from journals import views as views
 
 urlpatterns = [
-    url(r'thread/$', views.ThreadListView.as_view()),
+    url(r'thread/$', views.ThreadAdminListView.as_view()),
+    url(r'thread/teacher/$', views.TeacherThreadListView.as_view()),
     url(r'thread/(?P<key>[-\w]+)/$', views.ThreadDetailView.as_view()),
 ]

journals/views.py

@@ -1,12 +1,14 @@
 from rest_framework.views import APIView
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
+from django.db.models import Q
+from lms.global_decorators import transaction_decorator
 
 from journals.models import Thread
 from journals.serilizers import ThreadUserSerializer, ThreadAdminSerializer
 
 
-class ThreadListView(APIView):
+class ThreadAdminListView(APIView):
     renderer_classes = (JSONRenderer,)
     status_code = 200
 
@@ -40,12 +42,12 @@ class ThreadDetailView(APIView):
             return Response("Thread not found", status=404)
 
 
-# class FindThreadView(APIView):
+class TeacherThreadListView(APIView):
-#     renderer_classes = (JSONRenderer,)
+    renderer_classes = (JSONRenderer,)
-#     status_code = 200
+
-#
+    @transaction_decorator
-#     def get(self, request):
+    def get(self, request):
-#         is_full = request.GET.get('full', True)
+        if not request.user.is_authenticated and not 'teachers' in request.user.groups:
-#         if is_full:
+            return Response("Permission denied", status=403)
-#             key = request.GET['key']
+        threads = Thread.objects.filter(Q(subscribers=request.user) | Q(groups__user=request.user))
-#             return Response(ThreadSerializer(Thread.objects.get(key=key)).data, self.status_code)
+        return Response([ThreadUserSerializer(i).data for i in threads])

requirements.txt

@@ -1,19 +1,36 @@
-unidecode
-environ
 amqp==2.2.2
+Babel==2.5.1
 billiard==3.5.0.3
 celery==4.1.0
+certifi==2017.11.5
+chardet==3.0.4
 Django==1.11.6
 django-appconf==1.0.2
 django-celery-beat==1.0.1
 django-celery-email==2.0.0
 django-celery-results==1.0.1
+django-environ==0.4.4
+django-redis==4.8.0
+django-redis-sessions==0.6.1
+django-yandex-money==1.1.2
 djangorestframework==3.7.0
+environ==1.0
+flower==0.9.2
+future==0.16.0
+idna==2.6
 kombu==4.1.0
+lxml==4.1.1
 olefile==0.44
 Pillow==4.3.0
 pkg-resources==0.0.0
 psycopg2==2.7.3.1
 pytz==2017.2
 raven==6.2.1
+redis==2.10.6
+requests==2.18.4
+six==1.11.0
+tornado==4.5.2
+Unidecode==0.4.21
+urllib3==1.22
 vine==1.1.4
+yandex-money-sdk==0.1.3