From 570e1bb3475ba33a1c36b1da54cfa5cfdfe80a6d Mon Sep 17 00:00:00 2001
From: baoliang <j2eer@163.com>
Date: Mon, 1 Feb 2021 09:35:29 +0800
Subject: [PATCH] refactor message

---
 .../views/__pycache__/message.cpython-38.pyc  | Bin 2974 -> 3235 bytes
 polls/views/__pycache__/task.cpython-38.pyc   | Bin 3742 -> 3770 bytes
 polls/views/message.py                        |  21 +++++++++++++++---
 polls/views/task.py                           |  11 ++++-----
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/polls/views/__pycache__/message.cpython-38.pyc b/polls/views/__pycache__/message.cpython-38.pyc
index 3da72f718b77f480653fc8b4636392f7df985525..7f5877189fefbcb64e1a884f207c0f91993ba0f0 100644
GIT binary patch
literal 3235
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
AssI20

delta 1634
zcmZ`(&2Jk;6yMqJUGLiK*s&AaNlGY!Z39SrUQ9)x<WQ*`pd4xySx#q?*w}G8yO9c7
z%ZN}oMGyuKNPrx1K#{206B0K#bKt&5Bq})a7r=Y7Zfk;AX@B~?d2eRt_dfR9#c!(l
zw|w7K;Q1){rTx5rly8vlkIr9xgD6y?cE2zPTEU>$DiVd6%%Ki-KU5CL0cp)iJ4d~#
zU6Qs>^HaMl?E(#^_WV)GT{X2Xvnc9pGjWYPSFqu`I=rvK8@)`#&rVJJNY0HD?V|Gb
zy^#?+2g=Bd-Nfi=2P846)l`7zfZ0tY_Ig&&2HU63A(`Zlm64TLy#jb$h_iZu<T<&g
z2&<lCbHIGbO2G1xm4Ou`n+G-yB&`4~N>=5+CCX$0K2_~49+O>_;vpsJs{t!ZR{xZ6
zcN$lpiJO<+#$<_Bj!{GvY<;qvn8$=DH#XuGx{&B}@hg?qX#G%qQ&Gc)xT-ztq-vL@
zdi?I5xUJoOvH(d+twEN)jT4gUQD=*VXHs*(;+-Mo8V2b55#zihKGs7o)uNd5GA#3)
z_*GvyTR~bySU^}rs3Fu58VJk6H<n&pL3#$^5rEW&bGG8{fTd<<Z;$O#j#Ufo)Z*;M
zJ_BzFV*}AKDhnwYrY2|6em_pFJwDv(_SuQTo8kv!ySM>yisllR*u*0hqKixB5;4V&
z*&r9hE%WPVLOjVw$Rh**sR5FPeBT59`zIgV`{M4OpMUwsojd$djHrq$*6LWQd>ZYd
zTtvW(@l}A(<&PuB4Dlxr@F;!`0hMrUM1CG1HLr8liJ24>8vF%x$Q^hQnY)(1JLH2-
zf7-~riH;?SFX0Kr2olte+0D2;E!LWtvqQ2jn)VXe6hAq2X!1bZvX^yiTybJI*5rL2
zs7~GK&UTkd0UMdr$Kd>sh`;R8ILw`vBugN(_fVIEcSBu#4X<Xho82gmLOs(Zcf5iQ
zryI31Unb|FngVzrBlNzO3lJWa70k<nGU{YbHHrGStMb=i{W<}-|NLvjKLhdMI8mc!
zY*2&3JVVpNEMwEhCQP%QsF;$GmS{bDq{j}dxrv^TUXHql>coQ?Hxh%tAN%0RCj{aO
zG<T?8Q%B~=lBasJr-uIP{8UGcQSpDXnpIqt4aespBvfVLVE{YPJ6FQsbiV(ug|Y_3
zf2vG+HX8Vc<5-Q<A8)g`J>>0aqv1q^_DrM6>z&1T*>V?glQ!J!rB=3so-UC$Tc67i
z9^rIn<uPH(pgbf`Oq@1&xp@hkVMV-``)<7z&`z|oIqY!y)L=+iKjQM@ISAocYQBzu
dRpq#C=F?e=h;47R7LY(wiAua>iGf5P@gJ((UU~ok

diff --git a/polls/views/__pycache__/task.cpython-38.pyc b/polls/views/__pycache__/task.cpython-38.pyc
index 2ff5b5b6308c8cd866e22ae865c984077d599a3a..7d2f74640f7d300384e788e58af5198ecdc18699 100644
GIT binary patch
delta 355
zcmbOyyGxcgl$V!_0SLA&6HA!0kvEftQFL=TOFSc|NR7w@#v-j6k;(U2|8jDq7v+~0
z#Al{#e#GX)C@NZ{1=Lfd3?!oXlZ#RlOHzyCCmV89$=_lHtGvZpTAW%`e2cNP$N;G5
z7JETaep+Tu>g4?#6{1WWjC_nBEW#)RBn2477>mL;`*6NvWQ>?>%{@yh5@dK3NFOi6
z@RazZN}%OMF_YhOE6GHIq-8;bCXmqNg*Zk6BoHxKmq*q*2FSd{SagfAAc{M)I6f^i
zFS9r!HKiyFq{IkL7=x5?q^Fj|mn0Tv`vG~yZj)Pij3w9@Ss0l9voQ$(UC71A1B4tv
yR~98qKE;#CTLMzY1SA;PixM|G@G>)UhXXl92_PbIvLBy2rzR646C;lb6C(h>8C7ur

delta 296
zcmdlbJ5QE3l$V!_0SLPO|BA2K$eYQ+D6+YnC7zL!sfK9+W06)3)8zZCf7w{mi}Fhg
zHa}%^V&oMm(gJEIQU(&Y*eBa?REZSXgV?O4#i>Qbw-`%{41nCpS2-#~nK>Bw7(rNs
zQ3yy1Fp4o2g>6pae8<QbJ~@zk7Fz_!q{zu1xrG^{C$sV>Sw(>aWI==`kkI6X*d+lH
z2nP{XAVLpB=z|E5O+|(vB6@Nnk2s_M<VqeHHh-W%vBTuqJjOyoKubj!xfpqXkORmr
wil6+9CzH1rq=E@ZFt8UTY>we&X5<b7a*E<XM8f1OK6g$nCPpSk9wjD50LS+{Z2$lO

diff --git a/polls/views/message.py b/polls/views/message.py
index 5f4f84a..0e86951 100644
--- a/polls/views/message.py
+++ b/polls/views/message.py
@@ -5,7 +5,7 @@ import datetime
 
 from polls.decorators import polls_login_required
 from django.core.exceptions import ObjectDoesNotExist
-from polls.models import Message, TaskRecord
+from polls.models import Message, Task, TaskRecord
 from dashboard.models import Group_user, Userprofile
 
 
@@ -18,10 +18,24 @@ def last_messages(request):
     group_id = request.GET.get('group_id')
     messages = Message.objects.filter(send_to_id=group_id)[:100]
     results = []
+    filter_dict = dict()
+    for m in messages:
+        if m.type == 4 or m.type == 1:
+            task_id = m.task_id
+            if task_id:
+                if task_id in filter_dict:
+                    c = filter_dict[task_id]
     for o in messages:
         result = dict()
+        t = o.type
+        if t == 4:
+            continue
         result['id'] = str(o.id)
-        result['type'] = o.type
+        result['type'] = t
+        if t == 1:
+            t_id = o.task_id
+            task = Task.objects.get(id=t_id)
+            result['title'] = task.content
         profile = Userprofile.objects.filter(user_id=o.send_from_id).first()
         result['user_name'] = profile.name
         result['organization'] = profile.organization.name
@@ -70,7 +84,7 @@ def is_read_message(request):
         return JsonResponse({'status': 'success', 'message': False}, safe=False)
 
     is_exists = TaskRecord.objects.filter(
-        task__message__id=message_id).exists()
+        task__message__id=message_id, user_id=id).exists()
     return JsonResponse({'status': 'success', 'message': is_exists}, safe=False)
 
 
@@ -81,6 +95,7 @@ def read_message(request):
         return HttpResponse(status=405)
     user = request.user
     message_id = request.POST.get('message_id')
+    print(message_id)
     if not message_id:
         return JsonResponse({'status': 'success', 'message': False}, safe=False)
     message = Message.objects.get(id=message_id)
diff --git a/polls/views/task.py b/polls/views/task.py
index 067bb46..649d147 100644
--- a/polls/views/task.py
+++ b/polls/views/task.py
@@ -38,7 +38,7 @@ def create_task(request):
     if request.method == 'GET':
         return HttpResponse(status=405)
     user = request.user
-    profile = user.userprofile_set.first()
+    creater_profile = user.userprofile_set.first()
     content = request.POST.get('content')
     if not content:
         return JsonResponse({'status': 'error', 'message': '内容不能为空'})
@@ -63,16 +63,15 @@ def create_task(request):
     if picture:
         pictureAddtion = TaskAddition.objects.create(
             task=task, category=2, image=picture)
-
     for group in groups:
         users = Group_user.objects.filter(group_id=group)
         for u in users:
             g = Group.objects.get(id=group)
             profile = Userprofile.objects.filter(user_id=u.user_id).first()
             if profile and profile.status == 1:
-                content = '%s在群组“%s”发布了任务，请查收消息' % (profile, g.name)
+                content = '%s在群组“%s”发布了任务，请查收消息' % (creater_profile, g.name)
                 Notice.create_normal_notice(u.user_id, content, group)
-                # send_tnps([u.username], content)
+                send_tnps([u.username], content)
     return JsonResponse({'status': 'success'})
 
 
@@ -102,7 +101,8 @@ def get_task(request):
     for r in records:
         p = dict()
         p['id'] = r.user_id
-        is_finished = TaskRecord.objects.filter(user_id=r.user_id, task_id=task_id)
+        is_finished = TaskRecord.objects.filter(
+            user_id=r.user_id, task_id=task_id)
         p['status'] = '完成' if is_finished else '未完成'
         profile = Userprofile.objects.filter(user_id=r.user_id).first()
         p['name'] = profile.name
@@ -112,6 +112,7 @@ def get_task(request):
     result['added'] = task.added.strftime("%Y-%m-%d %H:%M:%S")
     return JsonResponse({'status': 'success', 'message': result})
 
+
 @csrf_exempt
 def create_test_task(request):
     # if request.method == 'GET':