From 38d673b89bec8da25076aee726540dd1c04a67d2 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Fri, 12 Jul 2024 14:33:32 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1560576 -> 1560576 bytes
 .../__pycache__/settings.cpython-310.pyc      | Bin 3093 -> 3141 bytes
 osinaweb/osinaweb/settings.py                 |  10 +++++---
 osinaweb/static/js/tickets/tickets-room.js    |   2 +-
 .../__pycache__/consumers.cpython-310.pyc     | Bin 7299 -> 7759 bytes
 osinaweb/support/consumers.py                 |  22 +++++++++++++++---
 .../partials/ticket-online-users.html         |   6 ++---
 7 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index ee4f9e009543c655af863f6c54844303187b618e..3d47071ce5eff1819e7f07954c65aed88d880cef 100644
GIT binary patch
delta 1179
zcmaKpO-vI(6vt=Vr9-LgYv~Rp!9x#zKnP`bTiQ|*Qv?++1~0~V;OpQ?PkQrUHzq|Q
zLOspJgdVUQyht!C(U>S!1P+Fi(Zul4kbnu{BQb_>Fuv|29_)t0KmUK`H*e;>nM{5l
zlOM=6N{i1<cT0;igG0^I^z1@&R`M)2+;c}=eCCFtJ{oQr8E%nKE|eQ3qpDCI6h&2|
zyr>$K4|U2KZmAtCD!QK1W2u-H(b{84ePngN7NwxTTHW`@()C^_5cmzdP=asp1&Z(n
zUO~a~Yk@nGmDK}b<rX!sRuQkuOZKSQE7A@%uZXlw&C4QfQS*{WC2IDFv`Niwkv6D#
zQKWThc8Rn$mk!8%vI_SJ_vbxLmX-_j0Q0ydS0kAgRuJ}LWOOoss<TEXgAe+!?Rf%6
zZ~!~7fsL=i61<0b%YP6ow|y8ilwRs~xyT+_wta^z*}hFa+rC8>Z7-2ewr`T6?HlBy
z?dxR0_BHb1wJK|P-wJ_a_yv1-V+nr1SG;otpGmc!N$pYi%3CQumsaI84)mDt!92r(
zGU`p>e|F^%m)=Q3b2(K$aI3y1PBZLG)s*kHue^sH)jaGp&wEIh<n1yvBi5=VT6H6g
zpBFV!S|SpQ8(Lg%bV3Q;NOr_K&2x^`ctAAL5l!mt$rG#3UT`eeQhIwNkw|KK$BE_j
zd}xd@e*A=m;9t|CGaepeZ550CxLEh!&Q3GPua7g8&yKN%N?0f0p(6|k*!I+^(l6j$
zM+gGGbcBk4KM_`p;2(FG>l!Xrw(ct*!}!!V3su4z0ZWe1D`0rSsj^zYen&_JeC`N6
UWvKG+6P0sib1a*yFXTe$zfr|8TmS$7

delta 1218
zcmaKqzi-n(6vxl8<HT`e$3HHq6p#Y6LQ$3UVmoo;Qk06yFhN;RVd$@+8xj%&0|N;^
zQUyvIBqV1*Y6iqYm#U~<P*oxRfNqG6Y)owzR8<VTi^YO1EPdbm>OOw&-ksg-FEslL
z-8|EJbM6|`+Fo2LGQFKI#Wut54?kqhn74gL(w{AltuBu-pcse+aiBPe2PHsBkN`@7
zM9`4GJeFSkDv`QFOvkj!m5OauR}YTTAPFS<2S*vJ!J`a9@-M$YloiG!M9KQ?ic*m7
zVHY7ZCoqgo%`Gq*H7*#Hnkj)16v$P`Ly$`VG8Bw}k*Udpk*HC@q#>t}5EIbhZbRW_
zIaPj&yiA`TWw+!lpLCTO87Hp7TQ3t+5T7Tm@GKL{quy#~Qvs=dXH$DT8_av^7mhVL
z@398+o@j=2gKls=ODCDeBE(5O1+l6L5XaRd#G;abcxi}-cs>({n3Fk(io`;MCy5Tx
z{wJLy!6s*LDf-}2bb2ZJj8v<;w5jRRrX`m)y-a&v9JF)?E!{y&m$nq?;d!*b+t9fN
z9QZBr7W;UV?Z_RUH1#=I1&$uM=mn$)aaM?-p7;ARv$EUOxnoup_q;?CkHq)HqF96q
ze42Vf5aPa}X@;3Lh+&n8T_RSYVmicfOtWm&Crq=(yJ2RPtF_vMS%LCiRJrL`^|ECf
z#IpWZ4j+iS8>%;)3$0-umId^8=ZaAvHvD&vVU=yWZX31yWGm|}tzqn)y}~(})ErWE
zsuN{GtZKdP71r>0XmK7E)qmccY-!%@b*y_kYj`*e)c~GELM4FXucIn60lXgx<p6$+
zgi-*10t_7?vmSA-o3I!jU8HTW_kJDc!Y~!UACXW9U|}PwG8w@6NSFxVyGY1WsC(Zx
Q!slvtal4!S(9Jde0IhKhkN^Mx

diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc
index b8299840b7bfe28b21a8d69a2ecd9eb8d007cd45..5045caab02ddc51af56427c76e84d08331aec063 100644
GIT binary patch
delta 307
zcmbO#aa4jgpO=@50SE*ICZ?^M$ScdJHc@+eeTqanV<uyY<Q%3<#wgJg(G;mv_7rJp
zh7=jFh**kjiX2d0HbovxDu7AFOvZGUDDf1fD2Wv1D9IG|C@CP8PEm=HNoCFwTp$EA
zLv<ljI%AY<idvK$Tugl-Q<Qv)MwCK|W|U%zR+LhTsCJZcicXYDif)uD&<M2@=3oX*
zz0H1%M_B!<RFg9j^YT)2isOq?Q!<P7lJkpF^@2c5XNZJPVr6R4E!K?u;*w%brdymj
z`N@enAYSHc2?hpDrXmiYf1}u({r%iL-6z|!TQUl4E@xlI%w_@<FEW{|&0WS=GI<fV
Y5ibi9BO4Rbf0lnN|C#tE-{rOd0JN=BQvd(}

delta 259
zcmX>qF;#*$pO=@50SH>(PDqQN$ScbzH&J_feI{cjW0Yu$Xo^HCdy1qqLyFWKCZLE|
zigb!hCL@rP1(R}MQa+P0oh3><MIlNeMKMY;g*{3Nh^14MqGVE;vji6i0nJce$dt|)
zC7YrWB?lK%UC0zApQ09}kfI)?n4%G-l%g4>oT3$_lESMUr3y4cErmIlK~raQ7~>IE
z?II4KE2~tJGZORiQge#+auO?3i;DF;^L$ft^NT8-A>uwD(aD+YmW+Ix7qhQpW-|in
fDl(cJ&Rxb>F!>y}5hpVXBh!DD|4iJId3h`Vl)FUL

diff --git a/osinaweb/osinaweb/settings.py b/osinaweb/osinaweb/settings.py
index a43e4b4b..259ccc44 100644
--- a/osinaweb/osinaweb/settings.py
+++ b/osinaweb/osinaweb/settings.py
@@ -92,10 +92,14 @@ TEMPLATES = [
 
 ASGI_APPLICATION = 'osinaweb.asgi.application'
 
+
 CHANNEL_LAYERS = {
-    'default':{
-        "BACKEND": "channels.layers.InMemoryChannelLayer",
-    }
+    "default": {
+        "BACKEND": "channels_redis.core.RedisChannelLayer",
+        "CONFIG": {
+            "hosts": [("localhost", 6379)],
+        },
+    },
 }
 
 
diff --git a/osinaweb/static/js/tickets/tickets-room.js b/osinaweb/static/js/tickets/tickets-room.js
index 8736bd93..0a794b5e 100644
--- a/osinaweb/static/js/tickets/tickets-room.js
+++ b/osinaweb/static/js/tickets/tickets-room.js
@@ -63,7 +63,7 @@ function app(socket) {
 
 function initializeWebSocket() {
     const ticketId = document.getElementById('ticketId').textContent.trim();
-    const wsUrl = `wss://${window.location.host}/ws/ticketroom/${ticketId}/`;
+    const wsUrl = `ws://${window.location.host}/ws/ticketroom/${ticketId}/`;
     const socket = new WebSocket(wsUrl);
 
     socket.onopen = () => {
diff --git a/osinaweb/support/__pycache__/consumers.cpython-310.pyc b/osinaweb/support/__pycache__/consumers.cpython-310.pyc
index 662c87d759d3e0ef4548e1c26b71bdf05cfafcd5..244f82f04023a53da8b4be4964448eedfc3168f8 100644
GIT binary patch
delta 1247
zcmZ{jO>7%g5P)~yuGedO?f9qZI*v;PN~^e(QXzzBlqQ98wkq1RYC{N?*LJ+Dz3$s}
z1*wB61_>%vs2Y$sL{)nOi3>8~&>r{`=ctvqtUxM=3lf~TK&c8d+mxQz)%$kd%)B>m
z=FN@{ZOv!AbULZf^IhR`^Zk9FWxm%SJN`vm0@y#E(?3w*nekTQI)IB8Q$NBdxMnWG
zdHmS?9NrnPq~`!m;YXQo;36(h^oBZZbd-jFh7c$YIAWkUstvZdBsRcSX{I@`h<e0$
zM8noLH9KbOZz}_MK^cJ^-&8k5kRWT)NsWNM=0J=DD7JE3sTkE06(J`mh|Cf~tM51D
zY8_{@`JpB=tTI^Dt#uk<ve}k?uo}q;x3(?TfxI3(f`mAY<23vegqAW;R`zbd036C9
zq6k#}+R8}C=}1GFJd_;03pRNUow%GKbNs4tO<|QSHnq#*te|77q3H*;X0s=~X4`F4
zE1F!PVDe=`7;ATGt%l5zTuI0T>mM59Yc;<X1X8ZD{uM%~_N5znhl#fDH9gs>1r-r4
ziUS8jt?qTZvckR*_VI$`yxaDJy4UF~d_i-cE2k?$*YD~u19{Ny>i?`C!mqP?P9K<e
zy?V{{7f5)prlQKHc|$%~nBoA9deHW|ekCm}HWV3CjOb#b4EQSKON{%upp)GVEj*Gg
z?%7M)PigpNLLP+Bg%14EIY`v*=zk`2cq2QX{I9F#5OR+`LA?NhxT@OvK&3tr*T6O|
z!FFdPs<Or5I6AdR3m0?GKXN7&^#|2H==<^*+h1fXF;3!h`NFPc62GN!zbbr^d!}Z9
zpf`IDzswC_88cQfW{}SWp3YCJmNf9NRYuJJ47c!Hp$%QUU3dyYEbRC@7F`sUC%-af
zjiW@>SjFEaXZ1eMPhn~22yWw*ohM6ctY|YF#^a2Gj3I}#ToP~6_=95`iUEdU>e8j)
zyWmw^ww_IN$WT$MGJ#tq%WO%nPaQ@&+2h=jyx|?5p2Z)mg@R;nQI&78%4a;uZg`}q
zrRWD!WI($0$M7esIBpe}U^42t=+x)f`!&Yvcyr2vb^LXzSBeshoX)dpz}QaGFU{;8
z@%%6&>I;*lcNrUuH*hUg##^N+VF3PK>ivH;-s5UaT%bjN@xnJ57x2pThdNh?#EfO(
PvGV@7stmJ7cg+3^%~2pQ

delta 845
zcmZvYJxmi}7=Z8ndc7X)^~ch)e+LGl(n4YkL4yQAWiT#iV(4I_QaEaVu&v*nC|IIN
zT{LmfR}%(}gNuoisTyHYMwhy{G;wp$;3A8Ok@&qA0}fvDKKK6re67*OkwDe&_e$bB
z9=xC5?0XsbBtx+IMV<l}XpSfkU2v$`>R1CP<6YlpNMk`8hb4Tjy@K1#^ZpTl46X#$
z;SOelwUe@FG$F(q7O<rflvrIVxlAzGJ+=&{OIUIpO!={Enb~e(DJ4$>#9ytm1_Q~I
z&Pr)F4uw()7atN$c!xmSH(RY#=4S0;wPK|^@cXU=Cc{a{;xT_LzF%a#5MqS{!oZje
z43ytqH`?J*@AgXlxEAi|vcXgu@OO}Bl4nJYGb7D-7S+xZV{KL_3PTZrw!6lQ6`M~{
zQhFQxq@5FZBgCTDQ<wtEmL_X}E1mTbiv5%CR60ef2n47oBA`ktsD|oQ534~zx7w@u
zo=rvo*73An1QS>FLHK|h`maD+v+P_xU*pw$aefXrcE1a?J%yZ=vu*Bd&&&8Wno{Oz
za0bVX7;Z(&@DWR~%&80HyhxZP3=j?yt`T<5+F5f(1l|kTq<x(=RZZbDcqU>np2NQQ
zFwEj~d|zsgI^+pEZJa}C$T#v|5?I=U2jWp&(0hWsAnY`o<VzGRVoNuCKS(W6UN7Y}
z2NN04%j9&<xlCG>P{Sw5C|tqU$y$Pw!%4D8vkBYR@9n)o_EAERpb>5nt`Zgma4eR<
vr$&tZlyKFk>HmGD2i-=9FN*B1RCb-Ph^4Ma3cZj}-Q5!&Cfy7TMN)qNB<i%w

diff --git a/osinaweb/support/consumers.py b/osinaweb/support/consumers.py
index 9c50761e..702c3af0 100644
--- a/osinaweb/support/consumers.py
+++ b/osinaweb/support/consumers.py
@@ -11,6 +11,7 @@ import json
 from django.template.loader import render_to_string
 from asgiref.sync import async_to_sync
 
+
 class TicketRoomConsumer(WebsocketConsumer):
     def connect(self): 
         self.user = self.scope['user']
@@ -172,8 +173,20 @@ class TicketRoomConsumer(WebsocketConsumer):
         connections = TicketConnection.objects.filter(ticket=self.ticket, terminated_at__isnull=True)
         event = {
             'type': 'user_connection_handler',
-            'user': self.user,
-            'connections': connections,
+            'user': {
+            'id': self.user.id,
+            'username': self.user.username,
+            'first_name': self.user.first_name,
+            'last_name': self.user.last_name,
+            },
+            'connections': [
+                {
+                    'first_name': conn.user.first_name,
+                    'last_name': conn.user.last_name,
+                    'image': conn.user.staffprofile.image.url if hasattr(conn.user, 'staffprofile') and conn.user.staffprofile.image else None,
+                    'date': conn.date.isoformat() if conn.date else None,
+                } for conn in connections
+            ]
         }
         async_to_sync(self.channel_layer.group_send)(
             self.ticket_number, event
@@ -185,7 +198,10 @@ class TicketRoomConsumer(WebsocketConsumer):
             'user': event['user']
         }
         html = render_to_string("details_templates/partials/ticket-online-users.html", context=context)
-        print('hi')
+        self.send(text_data=json.dumps({
+            'event_type': 'user_status',
+            'html': html
+        })) 
 
 
 
diff --git a/osinaweb/support/templates/details_templates/partials/ticket-online-users.html b/osinaweb/support/templates/details_templates/partials/ticket-online-users.html
index 0d8b28fc..2c3cfe3b 100644
--- a/osinaweb/support/templates/details_templates/partials/ticket-online-users.html
+++ b/osinaweb/support/templates/details_templates/partials/ticket-online-users.html
@@ -1,11 +1,11 @@
 {% load static %}
 {% for connection in connections %}
 <div class="w-[35px] h-[35px] rounded-full {% if not forloop.first %} -ml-5 {% endif %} ">
-    {% if connection.user.staffprofile.image %}
-        <img src="{{ connection.user.staffprofile.image.url }}" class="w-full h-full rounded-full object-cover">
+    {% if connection.image %}
+        <img src="{{ connection.image}}" class="w-full h-full rounded-full object-cover">
     {% else %}
         <div class="w-full h-full border border-osiblue bg-osiblue text-white uppercase rounded-full flex justify-center items-center p-1 shadow-md">
-            {{ connection.user.first_name.0 }}{{ connection.user.last_name.0 }}
+            {{ connection.first_name.0 }}{{ connection.last_name.0 }}
         </div>
     {% endif %}
 </div>