From f7c5d3ae8ac73dcd5905883c6ea9f4c3fe72d91b Mon Sep 17 00:00:00 2001 From: TBS093A Date: Sun, 30 Aug 2020 11:58:13 +0200 Subject: [PATCH] fix errors in AbstractCRUD & integrate with app --- generalApp/AbstractCRUD.py | 23 ++++++++++++------ .../__pycache__/AbstractCRUD.cpython-36.pyc | Bin 7529 -> 7627 bytes generalApp/__pycache__/methods.cpython-36.pyc | Bin 6128 -> 6035 bytes generalApp/__pycache__/models.cpython-36.pyc | Bin 14463 -> 14460 bytes .../__pycache__/utilities.cpython-36.pyc | Bin 3810 -> 3804 bytes generalApp/__pycache__/views.cpython-36.pyc | Bin 4941 -> 4931 bytes generalApp/methods.py | 8 +++--- generalApp/models.py | 14 +++++------ generalApp/views.py | 4 +-- 9 files changed, 29 insertions(+), 20 deletions(-) mode change 100755 => 100644 generalApp/__pycache__/utilities.cpython-36.pyc mode change 100755 => 100644 generalApp/__pycache__/views.cpython-36.pyc diff --git a/generalApp/AbstractCRUD.py b/generalApp/AbstractCRUD.py index ffb9d3e..5607dea 100644 --- a/generalApp/AbstractCRUD.py +++ b/generalApp/AbstractCRUD.py @@ -5,6 +5,7 @@ from .utilities import * class ValidationUtils(): + @classmethod def fromDict(self, dict): self.__dict__.update(dict) @@ -78,6 +79,7 @@ class AbstractGet(AbstractUtilsCRUD): """ return HttpResponse(self.__getAllByParentID(parentID)) + @classmethod def __getAllByParentID(self, parentID): list = [ x.toDict() @@ -109,12 +111,14 @@ class AbstractCreate(AbstractUtilsCRUD): else: return HttpResponse("No Permission") + @classmethod def _validateUnique(self, userDict): """ use validate in override this method """ return True - + + @classmethod def _saveObject(self, objectDict): """ save object without parent @@ -132,13 +136,14 @@ class AbstractCreate(AbstractUtilsCRUD): object = jsonLoad(request) if checkSession(request, privilige): if self._validateUnique(object): - return self._saveObject(parentID, object) + return self._saveObjectWithParent(parentID, object) else: return HttpResponse("Object Is Already Exist") else: return HttpResponse("No Permission") - - def _saveObject(self, parentID, objectDict): + + @classmethod + def _saveObjectWithParent(self, parentID, objectDict): """ save object with parent & subject + comment & set trigger time """ @@ -152,15 +157,18 @@ class AbstractCreate(AbstractUtilsCRUD): newObject.save() return HttpResponse(f"Add new Object: {newObject.toDict()}") + @classmethod def _createFirstComment(self, newSubject, objectDict): pass - + + @classmethod def _setActualTimeTrigger(self): pass - + class Meta: abstract = True + class AbstractUpdate(AbstractUtilsCRUD): """ This class have a abstract `update` @@ -173,7 +181,8 @@ class AbstractUpdate(AbstractUtilsCRUD): return self._updateObject(object, objectID) else: return HttpResponse("No Permission") - + + @classmethod def _updateObject(self, objectDict, objectID): objectOld = self._objectFactory().objects.get(pk = objectID) objectOld.fromDict(objectDict) diff --git a/generalApp/__pycache__/AbstractCRUD.cpython-36.pyc b/generalApp/__pycache__/AbstractCRUD.cpython-36.pyc index d7506b242a42df12b4f58169d751b5e933fbe377..7b9c0426ac55ad7b0af3d213e03af6ad4eda1a4d 100644 GIT binary patch delta 1153 zcmZ8g-)kII6rOYUPBJ?)yF2@HcC))pvuMZ`Ok3Kt>9#h+q`z33R7HigF~r`nwM|;M zvlQCbT5m7>c5^L5fbmTEhC6rvVlw1`Z8()O4 zL7)`tJAK*^3jzmpo?dg!0iB_@4j8foeecZjQXH>D-E)@|elNy_FMI!rNq_?Gm+Mf) z2XX^Sc+EZy4gACY3|_$N13R+1z!6FeWrpqegQ!=EL^*!!5;zGd{6Ts=UHmXnfewxh zPPvh-Jms_R-pZg2Fp05qAuxd|w5gvs8+COJ|8&|gg{|Z&Y{xH?Gcbd~-GC79x?|AB zU)|e&jnqxi7vsD1Fuw0?gV*tnH%(Um@TaSj=Z3wrdq?^X-5{wOd;^WIRH`_UD9=VxIVx$g?+|yDXLyph zuTqA)#M3HcxJMNVRF*1~r3(2f_nOtr_eAo}b& zz-sS}+#pbr-p((iOa|p6U5MZ0>-A|;f54}(0n2v56)yPT2nVh{hr6>wxR%RfvT!6b zL+dwbnC`L!E)bgVQ_pmuHbpS)bcn=ylHmZuOAKsD^J#jP zTWn;4=pv0cM_^hkO$BoOw4d>%FZBc$Y9AMh3m}!v1?W9r8V1xp(!{wnlxQ|~9-GZNRp}N(PCK+=ay4WV!R~&kPz=TffHU-9?s~^K}*sUGR z&eO^-EHOX2qv!En?eGZyin_tT8PjZ0bFjXB@{)>{NwrxFabLX_Cew{zJUAJYgPaQz H#Mbj4w=&(! delta 1083 zcmZ8gO=uHA6yCSH*-Umf$>u+4jBTQb6|FzDRI65M(bR|m5d?!(suL7cl-c6Ji%JV3 zq9_kVPzr+hTMsp$2M>A@M64%0F$T4)|H@#FylN%%RZ31DKx*Mk9s5B;w0vy2g;q8`mq&uy(&WA$)gLqM# z^nxsTy3sa{Hz!pQ7sMVI#%g2=y75C~6n0?To`oz%TV#`RXo)BF=Z!;VqVm_u)OhDK55E@W5WqovBgSYtC&E1i2%s#+h+& z$qanPFH5#0>U8vxV_0V)R2?g&;WGbGs=~m6DJH2nTRXJ(jBK8ws7s~(oQPGtHD1-r Lc}W{g&=W0Il9wsV? zFcdsEzT$mny@+@a4}uO4y9-iK@gfKc9t7FV_iGWGZsG#@eWi4zIeqlH|HJnCRh@a>RvqZhFKW5eHvbSb(SJ6(8}J~u}Er4 z9`C(lSQZU#Ulns~@UL}umoU;4@+ZB`Vz|U!KPfDt5xSuS1jvz z#hNp-c-1?~GWgkBV&iz?i{OH<$R>D|bLF`oB{_x-Eu764HY|%7UBn?UR93Q)>HUh0r?d>Ql8p468KbZ$8 z)9#>MT@K91c9r_Pv8B2Y?Dobpz{KQMRkAqJcx9(iZCT zO{%KjVxxGVN6!1{?*ask5F*eiGwFnwF~SZ)oG?I05>kX+gh9d(Ax#)3Oc3_L75?@c D+7ZP4 delta 956 zcmZva&1=(e7{~i-+BE5srb(K1X}i8`T5ap7FLPSlWR4+qu(ca1;$?I-Tf0i9X+$Q7 zdQvQW!Xd=|M#X;zdO8Cgw>xS=(Jcgy;D_zwh%B$oR*^e~j9 z)F9SfmX|f7xVWNKjLEf9S=SoIxv8CZ>;~@BN8phVb$@r7df1=~BmsAYVSmhawA|yE zN^l|2JaLl5L8AQZs!?02Rmw(fwb9fgwtClKUpz@NWc8M3LIiuxz%S;6Jr~gDR6=BjN+X>?HQd{y0!SfzftOUj^k_$ zo`h{^H_umft$ao2FeoBqgn|enR74mNMGPPkh$LbNu^*8_97LoM8AKj&3NeN_jhKX1 G@asR!6~@2- diff --git a/generalApp/__pycache__/models.cpython-36.pyc b/generalApp/__pycache__/models.cpython-36.pyc index 7218bef2d7eedcce06f1c806a3ee3902fd77b90a..b7a84e4f3df2f4dea68356cf3a701bb40b0f7d80 100644 GIT binary patch delta 1348 zcma)5OHWfl6z-IVMX1~$Qd%gb77A^lP%4jLh*1f_7oZjpO>8giwOpVN=iXXkKzyXI z5H)Z#y3vG0W1>+*%E}*LVsuC1f`toq#>B*(3lp7lTWCWXW14=MJ9Ex=&i9>}KhfXO zBDYq%*B3wKO)MAvAeyybTUC{GOr=tNWq(P{Kt--scqXX82Vl8epDZ_)6EX%-hcVe# z6Cz|1)=gUsAJ@LG!n}Nv$jxd4XLuf*{iXbA4Aea&A z5s(rtTMh8x;0q$bw8cv({H!;C&y-Ip;Jal&8)G3hHJ!rnX?W+d5Is!RO^|BXs9U#( za660;LBQb65-HV}H_V3wo0fX;WCqsiyBYaWlc@kpn}D+pvXVY)r6Q~;TiEePC?teY z7_31RHoIhLYcC=5 z;BgIS>$(jauAnP{^b1(LP?C8$CefXd*$PuL+6keHEDpTwX62S9V7YBvxt|ZRr0P6W z3?GPUk7Szu2_50BhB@(|v*kDb1Q^%O=$Hddwq1mymIofv!5wOK=+!^@6-vV^>~IK$Uj z!m0-%vUo-Gvul?cVne6hspS59IQOw$`kFCb;}ZLRg1r0KLV0f6k8KZKg7wbm0p+sl bF%1VvQ6M|bfWi6`X%v=Lk%bEWIof$4) delta 1258 zcmaKr$xl;J6vlf?sSFkyu`Q)QTUzJ=0LP+iKXdgn0x33HuCNT}DFZt!ZchCLK`R+OI_voKd zm0zVQ+Dvu^-?zwQJK(WtR;s^~qV>IPgLO-l3=eS;p(7L#l63NiOeRao8D!+PCJ?7w zD4KF-epNULiDgVxj|jO5?~L1wOQuidF&3vFhbOdG)1nwV5-}GOW1Q_%CxS=ZK-42B zVhDQbN|mTV)8I9i!RP8#B0$s^$Z%ThRIGq8la9zE<;t07?fS~7tlUc`aX zHaKq&C?yV0!xuZP6(hA6dFWENf6!4t1Gt`m0Y_O5uV>)7BcjI(z9ey}xe^liM2wl# zIX6fT>^M8EVwzl5(LuISNw+S7sj4zx&$b#fPwEy3;oyYpy0rK>JawhXG^pHd4lKN{ zn45^iLx~s{t|=DO51Sq%nab>X1_-$a-M(v5 zU-R(I7xT@d*aD_fri74?PSJx7Ih5I!9E8vZEDrjc%;NMtgeMJQaqd9kOB+R&90_(49xrb%pvwZ-Wc zWpZ9K>h~g+5r_XsAjeK12~stg zGgMOnq>2MXNP`Gj5TOVnlt6?sh)@L)YCs)njOvpsxE?TSPLAZxV$_*@gxi5b3n&S+ zR(moJk0qntWH+AqYz83phLd0OBnp{=m}VdX>JZb(alDF*=93$Edl_{n^YN()MsXCS r7M7+KmlPL)%qp^&?82ubuMT2rf(RWDp$8(&L4+iT-~xMR5uX(RE1N+z diff --git a/generalApp/__pycache__/views.cpython-36.pyc b/generalApp/__pycache__/views.cpython-36.pyc old mode 100755 new mode 100644 index a3c4c37e0746f59e59e50e9083355e18b4570f2e..caa5f786bb18d743f44c2affda297c9530d97b01 GIT binary patch delta 455 zcmZXQy-UMz5QclTHBD;Tq!qMj?UylC6e<=3QNa&rL5C{X*;a{PAZpr0JBY4M@{TTw zf=dykvmiK#p#MNo!BL0m=BW9F41&vZaK}COa!=Zw#%DxPxGK*sR!%!F^3{i$SLxLg6pfdC@XbdTaUIyL@C57_vifoIh=c!dCbT;Ri)88s1n4=duY!ND@CT zSr7#wOahKR04De1RhS_`N14Z!*zH_?iV;i;TiB5n&@XPI;!8W5V_yVR+Cp9~;iLI7 z+U0D;zSRWoX_4sYXlclXux2eUm{!Pcan_O|;olY|sS9JuqL;d@s4YGy z*LGk#j?^THH9r-?v${{>|19sVOfcwtxr{G=8;RJ#Nxx1g&Xof^`EyRG5KG`zE#Z)j zVx{%3+>n-XT$@^qq?_3Vyl8`tt1l2GotOxWh|J}3SsL~N-8r3)VU8$Aj3dsG;7D?$ PIMN)Q9I{=@6CC^jF2jc0 diff --git a/generalApp/methods.py b/generalApp/methods.py index ecf5bf2..6a58713 100755 --- a/generalApp/methods.py +++ b/generalApp/methods.py @@ -18,11 +18,11 @@ def checkTriggerNotification(): # Exchange POST Methods -def addTrigger(request, userID): - return Triggers.addObject(request, userID, 1) +def addTrigger(request): + return Triggers.addObject(request, 1) -def addTransaction(request, userID): - return Transactions.addObject(request, userID, 1) +def addTransaction(request): + return Transactions.addObject(request, 1) def Prognosis(request, time, price): return ExchangeVO.createActualPrognosis(request, time, price, 1) diff --git a/generalApp/models.py b/generalApp/models.py index 79e0195..4687db8 100755 --- a/generalApp/models.py +++ b/generalApp/models.py @@ -219,7 +219,7 @@ class Threads(AbstractCRUD): # Object Factory for abstract - def objectFactory(): + def _objectFactory(): return Threads # Create Thread (validation) @@ -257,7 +257,7 @@ class Subjects(AbstractCRUD): # Object Factory for abstract - def objectFactory(): + def _objectFactory(): return Subjects # Create Subject ( create new subject + comment ones ) @@ -297,7 +297,7 @@ class Comments(AbstractCRUD): # Object Factory for abstract - def objectFactory(): + def _objectFactory(): return Comments @@ -325,7 +325,7 @@ class Ratings(AbstractCRUD): # Object Factory for abstract - def objectFactory(): + def _objectFactory(): return Ratings # Create Ratings (validate) @@ -368,7 +368,7 @@ class Transactions(AbstractCRUD): # Object Factory for abstract - def objectFactory(): + def _objectFactory(): return Transactions @@ -396,7 +396,7 @@ class Triggers(AbstractCRUD): # Object Factory for abstract - def objectFactory(): + def _objectFactory(): return Triggers # Create Trigger (set actual time) @@ -424,5 +424,5 @@ class Notifications(AbstractCRUD): # Object Factory for abstract - def objectFactory(): + def _objectFactory(): return Notifications diff --git a/generalApp/views.py b/generalApp/views.py index 539fc98..3d29999 100755 --- a/generalApp/views.py +++ b/generalApp/views.py @@ -122,7 +122,7 @@ def transactions(request, userID): if request.method == 'GET': return getUserTransactions(request, userID) elif request.method == 'POST': - return addTransaction(request, userID) + return addTransaction(request) else: return HttpResponse('Bad Request Method') @@ -146,7 +146,7 @@ def triggers(request, userID): if request.method == 'GET': return getUserTriggers(request, userID) elif request.method == 'POST': - return addTrigger(request, userID) + return addTrigger(request) else: return HttpResponse('Bad Request Method')