From 29f17f55ebe11d5852206b3c2979326e87a06027 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 11 Jul 2024 17:54:33 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1560576 -> 1560576 bytes
 .../__pycache__/consumers.cpython-310.pyc     | Bin 5436 -> 4599 bytes
 osinaweb/osinacore/consumers.py               |  34 ++++--------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 1d2e9538ac786c1bf431cdb8f6ca4971f9218956..6b245f4bb7b2f19904f3f9be80577dfacf23ed54 100644
GIT binary patch
delta 370
zcmZoz5Z|yMeu6aP`H3>ljORBdMCJ3CSeY7I8Jp=D8=Dz7AIon)md^;pOhC*G#4JF}
z3dC$c%nrmHK+FlmT-%T3bFccti_mRuX3}1p!?V3MhgYSU$H?5u&_vI|!qU*dZ2Q{x
zyx|L&<Cp}evrpiYWdhPF6ZqzBKQe*Omr+HP*_X+%%%apRt;jqxtE4KsvNXB4Ji|P>
zGB4FM-6*fXs5G(NbP^vB^8>K}5DNma5D*J*H=QJMK9|{=Jz^@mXekRv2S>-|#)7SE
zjB3;Oo)uNt9>y-3eoTRo>C^R(h;H#Hb1b!rFi$mbElAAw45_RvH8J!`GfT@faLl*V
z_02ZXHFYy_uB>vl%n0=|$u2fBFf!3KFxNFQRWL*igq!C?+i#u|+kW$$xH=;M$oqe<

delta 342
zcmZoz5Z|yMeu6aPiHS1Kj3+iGMCJ1sTNxT#nVRSsSXvl0AIon)md^;pOhC*G#4JF}
z3dC$c%nrmHK+FlmT-%T3bFcct3)F35WniplVq#=w)Lxszv%NNlSEZT9(A3JrNYBjJ
z#M0b!``Y)s;R~2!naroNPvDcCt~P;h-u6Qi`1~1FIHVcWl1fstO3X9O4U0<COH#|t
zDpD#l(~|NEk}7hFvQ5o1+f66&0Wm)i3jnbo5DNjZ@OINlBIk3NZP<;bvWu3oup4o7
zY;G*r#Kxk^?8~&>j9s+-*mNMNFx^3tQ*^q-dC~bECCO1%KFOhZxdEkS#=+U<-nuy<
zp>7^!CZ5TK;i37Ze!fwDd6t2GKCa&01+M8v21X{j2Ijg(rV79?LiXs*bE54x&xvin
Jc}`rN5def;bF2UW

diff --git a/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc b/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc
index 5a02ceb15767952dc0c1aa720b8cc74b4f70799d..26ed036c0ed023056fbb54fa3d7f456814b02f26 100644
GIT binary patch
delta 1740
zcmZ`(TW=dh6yDj3y<V?xiPN+svD)-Px23s}($YFmiV{exx<Q2s%7e9dC(TCAZZxw=
zNtMV*6>n4s4ZJ~VC0_hOxIEG~{>A(O1W$+;-hgw)P8_1d)_j_obKUcuGtbZceKH^C
za*hVS!M{FV{Gsq;{vDDha5P}O35!pQpR(sCH?^nfXByE0?T+RdHEFJK%A^}d%`l>M
zJaEsJ7H`C>l-Xb>TKc@(Ceq}zx!BfNpZHyWV7nl3iDQU$<D28sX~a=P8%Y>P(hWi|
zR!16umA_8KsCki;#QSDts1NLzf_~UZr>8t1zA(RZJfecmd08>8kK9rRX*PYHuouwu
zD8ex`O?6UcLwHjF@N`z%k#<7t#$go@42w^#TcT33#V4*g#_=j3fgX}Al4zUSGFjFi
zk-*p_kMwSNOejyXu}Wn{Y&(@2%U~3Pr7%hsKsxtXytZ2BGzz-WrA60il<bd>`JIBr
zks;GE|Aop8WU5tkrO0^+HlenqCy>*o9_WwtEdz5(^rr^oWCZ5d`ZE$(k4ZPTR89Pn
zS!lI&>8OZxm8iLttTchFOhP|S>Vcp5p2;lmjr2u8$1(?stYB?rm4igp>l}#Ld4w^9
z|1-qS!reG5j*OecHEg28zxdC?$=gv=eCyox%4l{10c)zbP-c5vb(j#9?2)u%r)}HK
zimTaQt5^+1aj&Kf<FFh;9-)Y^FDDE*BdTsV`zq|(X3tvYI*edj`7BU=+TFf5et;*;
zdRF}5em?^IVYjn005Zc9KUw4TFz|@f!$553K5Q}Mh+!?fEE~oBNz^s`W|JYeonB4d
zQKr(kPZL#nHi@z+gqH!l^q#8E;_Vv<*aU}?Ad3-wkgs=>Qgq)GPx9C2r_t&n!Yc?p
zBIfbft6Hc0cy|e)3X9{%+L}#(ixj&gX0jt<uCPQdi|xYcvsX~{u*%;<;Z=Z#qhh5v
zBnFEoCeWp)*Vs*z%^<vv(8~a)UG<2Mn`>gJ_?-!}en#X=!-R`JQ^&5M@(v5v)n4jj
z6KdG^Ig(Db8S<nNudKcnf+p7i%Hm$>3b`P@DqU{92xnQ``=$YvTxI8F6c^HJ#y(u_
z^4Ov9Z7}S06Z7Ecr8<O7pidJ=N@jb{9cK$@qGo9KYYR+0ZfQmvG+d{PKhO0YC9N7N
zqBcAs7jUn}O_{5va@i5Q9RyHuD0>Uf*kmd>X~!&}tp3r)L4CzA^_^TX9cd+T;BT<I
zXb<B(bntxNMzQ#<|GkAno9SItQF^;y*daubdIO{%z*0|}>Zr7Bxh}gQJ}ZxtDe=5K
beQFpzq!F<H7@F*%RC(<e<$=@2RC(k-6GK;f

delta 2576
zcmZ`)-ESL35Wn5~^!e<>Y5Eb;q$+6<E;KFB(hs7FmNfl<hLofr5{h&6UR+zQ&)vK9
zOJ^Aokl-N#v^=&_f)FS#REXEU!2{(5^>zOPo{&I-7eLIclh_Hxr<<Fd*_oZ4`OWyx
zp$Gf2VJ72h@SFbelev$#ew)2WniQ4>ysy9;y$>YODjFkw@GX#-R`iMi62j;rSu&Tk
z21y7XN(g8zrh~>R*bH}A1qbO;YFQ&%%~h7JvecQmNO6ChhP7A8ED&Y^mtCMlyO?N8
zU1$Q|Zu~NBQp?-p(wL6|zCySIAx({~P{l|qtX0dkKzglj0XIeYoHV0iSP#@5Q8ETz
zkVe&yV(AvcS}iEX<*>%n;7EF`3_F!9VA6>E8-cWnJn-W{JS69K=P3w->YUsX+$u+L
zxmGH)U94z)Kn&8G+nxYd9_b|pv4{f?@YJQ^9=+GadqBsxAn64nruD<5Uwo<$_79*;
zkwM_3+m2+Xc&L9q%Tpj8%cpr3H+CWEMuG|8IV8&K5OV4eypTGCV?24v``1+)&*D#k
zVn{qPE;O<FCcLWJ4}giGwo9~C*NV<mof|YEz~f^q(j|kL%Y<pn`jGZ%4Lvp!x<G*H
z3uL?2FqqAp5441iY73-cmb8Wiubmj9+U3566I+Q>u~}+?@{z=9E;)&_Oo(=Ucvazo
z;!I+9$Ww{E06SPZu@fsXnRnM{q+*0py5a$JG6^_a#YuL23Lt`s7=!!ccRGiKFGN95
zD-_C6ZN6H)<L+ORS+!sA_9AC)ot*^ccdStfuy@%)U{@d+pV8}dvQ?-x(9tqmp^^?C
zY~_7pa-};`1*8<iYxNTc(IqxiuXg8{_{rRRczC257X4~;0+_X3va2{B#o@Jp*LgTs
zt^%5)*q@tQTMdeSd$5@|q!Hh)2QsIW9Wab!@0x=R((cZlD3n>mJqRVAX#+~?ezmGl
zC7qD7fETXZhE9RNq<z(o{5a;TZRR)Y^`OS2S?A?i%q?)lw*irEiHGxb$Zw71U4=NA
zZg)sD-Lo1*r)*0&H-}x@8SQjW6!JJ=oict5k2#9u$P`k9xio_t0fewI>k9JEfI4~>
zhzlLKlXR0TbflsB(F2J~=z9)@AHm1^%eBN0=12wGOu>H?n1rZN2e9wcn0}WwXsp3F
zqd2k}INo3cF6l6?^n^eo*d=Y5GUu)i4Ut+zl;X5<$N3TPr6LCyuJdBVn%J){wW3Q`
zU8A5%YFv%4Ra*)oQ*m%BE-*j#^QO3O?Km&>QV{2jRy&_U#~3ajL$WCghe3wdh%i$Y
zwTShPXE^G<F6sVTSoX}=F0{)d!7-o`$I-6Cm-32JiQ7PMMnni5M}y&(b8N@)`o!1v
z_a`#AMa`piK=AD-+kvDH2y~;GLYv~m7$(J6PWkj3xXI`MRHg+eoQ6JU$`kaRa`H5K
z-Q)=`G9#u^-)!d?r%XY2#PborJx};BNW?C8rU_Lzjm9cxXMo!<R*$1<eYQ$#Qn}!-
zp%}*lKZoQzl2?J`?T%8si_#e+?;v@6WyEi8FY$$)K6UN_?ixq(I+AuVW^viRT)PAl
zpuj9em}pf3$Ful^Sg{Ah{q$9GQS9*c4&n6Ts!7^DR0Z*bIw~)TS?}b*H-XL5aef6w
zZy|Xb$tEMr>P?hSi$~s<Cf^4<4#`967;LeY#eU=ttS{R^KL@fV%AW_rUo*$aX|XSR
zwD}^6R9EBq`IJhkG^?Qx(`nQHoJxNiS1+T1)yn)?;H7~r!cPL*@~Apv<2|I!gJMv=
z5hSoH+NOQ?N4AGFi|Z!XDqO+A<GYc65{PmPqY&5af8CdG`4})Ll&r;tAxJY0nSYy?
z(cp1#a8+3ts6P^4bYGhIUqqD91McgnPCLUsC_;E6guQ}=?U<g&eQ_ptfSeaMbBFfq
XL1S!Tjv(S_@*iK~=iFZXZ12FovMVAH

diff --git a/osinaweb/osinacore/consumers.py b/osinaweb/osinacore/consumers.py
index d0c0850d..db47e615 100644
--- a/osinaweb/osinacore/consumers.py
+++ b/osinaweb/osinacore/consumers.py
@@ -10,14 +10,7 @@ import threading
 class OnlineUserConsumer(WebsocketConsumer):
     def connect(self):
         self.user = self.scope['user']
-        existing_connection = Connection.objects.filter(user=self.user).last()
-        if existing_connection:
-            self.connection = existing_connection
-            self.connection.online = True
-            self.connection.disconnected = False
-            self.connection.save()
-        else:
-            self.connection = Connection.objects.create(user=self.user, online=True)
+
 
         async_to_sync(self.channel_layer.group_add)(
             'online_users', self.channel_name
@@ -41,25 +34,11 @@ class OnlineUserConsumer(WebsocketConsumer):
         self.modify_online_user()
 
     def modify_online_user(self):
-        connections = Connection.objects.all()
-        online_connections = connections.filter(online=True)
-        offline_connections = connections.filter(online=False, last_seen__isnull=False).order_by('-last_seen')[:5]
-        sorted_connections = list(online_connections) + list(offline_connections)
-        online_users_ids = [connection.user.id for connection in online_connections]
-        customer_connections = []
-        staff_connections = []
-        for connection in sorted_connections:
-            if hasattr(connection.user, 'customerprofile'):
-                customer_connections.append(connection)
-            elif hasattr(connection.user, 'staffprofile'):
-                staff_connections.append(connection)
-
-        print(staff_connections)
+
+
+
         event = {
             'type': 'online_user_connection_handler',
-            'staff_connections': staff_connections,
-            'customer_connections': customer_connections,
-            'online_users_ids': online_users_ids
         }
         async_to_sync(self.channel_layer.group_send)(
             'online_users', event
@@ -67,14 +46,13 @@ class OnlineUserConsumer(WebsocketConsumer):
 
     def online_user_connection_handler(self, event):
         context = {
-            'staff_connections': event['staff_connections'],
-            'customer_connections': event['customer_connections'],
+
         }
         html = render_to_string("details_templates/partials/recently-online.html", context=context)
         self.send(text_data=json.dumps({
             'event_type': 'online_user_status',
             'html': html,
-            'online_users_ids': event.get('online_users_ids', []) 
+
         }))