From 71d191098838c3d23380e6038bc2c04aa223e234 Mon Sep 17 00:00:00 2001 From: ydb5755 Date: Mon, 16 Sep 2024 14:23:24 +0300 Subject: [PATCH] ambassador map and replace relationships with integer fields --- app/__pycache__/__init__.cpython-310.pyc | Bin 1928 -> 2056 bytes .../__pycache__/models.cpython-310.pyc | Bin 0 -> 1241 bytes app/campaigns/models.py | 14 +++++++++++--- app/main/__pycache__/models.cpython-310.pyc | Bin 0 -> 1105 bytes app/main/models.py | 6 ++++-- app/users/__pycache__/models.cpython-310.pyc | Bin 1666 -> 1839 bytes app/users/__pycache__/routes.cpython-310.pyc | Bin 2568 -> 2973 bytes app/users/models.py | 3 ++- 8 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 app/campaigns/__pycache__/models.cpython-310.pyc create mode 100644 app/main/__pycache__/models.cpython-310.pyc diff --git a/app/__pycache__/__init__.cpython-310.pyc b/app/__pycache__/__init__.cpython-310.pyc index 3bab4735ac86e2ef75e380d94ba900dd657c1067..477112f9ad31adf890d259b3f426c3046e6ba2c9 100644 GIT binary patch delta 750 zcmeC+?-1b4=jG*MU|?W)^80z(ijBOrjC>$2D+2=qGXn!dvCZTej7{|nIU>2DObm<+ zxni9Rj0`C(DGWK{xe^eOS|+H7WUdrcgqe|{ggZ;Rogs}eg*An(g`=6VmL-L~ggag) zg(Za}M>bcqmKCgvGe<60s+JAR=E{-Jm8fM0v$=B=ausVi7#V697AQH?ur6eTFl*T0 zEOt1H1IkiP;aSL-!kfa^!qCiE%UQ!v!kWeu%%I6Xc|DW1b21~ypHR#M^`J1wlTr)} z3>^$v3|Wi|m}(dnGS)KIFcxvwFa|TEFa$GbGWuyU-(m?ZPA!@&%Ph;klJORIX>n>% zd~SY9YEJQFduAIhO^`7h3=9l>lUtdWsYx?1FccvO83qQ1TLML?Mfs&AsqsmP#i{Y7 zMLG7916d3iRVFvHY_*aDsbGT`cuOR)pg=D?dZHkWNI?&Foy_DA Gb`tREF{az#5C z7#T{qv&7mN(il_NQrKHKni*@EQaDPusmW`32hGBt14f8@qD2oNoVuiEVpe)4{Ua^IYDSRpXEey?!wd^$v zC9G*o!3>%LlW#I&=ews{^-I--si$oY07$z4p+i7He8gVsUm6D3pspsicU7frWvgNNw^Xw)p~@AXjLE2ptfiJ9#3z So+wBsQXqmIDLwfLy9of)HH26I diff --git a/app/campaigns/__pycache__/models.cpython-310.pyc b/app/campaigns/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..805d85ba625375bebb2cf37c390b8b039fd7d292 GIT binary patch literal 1241 zcmd1j<>g{vU|_f-@*=H~nStRkh=Yt-7#J8F7#J9edl(oPQW#Pga~N_NqZk=MY^EHh zT;?cdFq=7tC6_gd70hPIVasKYV$bD>;>hKU;>_iW;sW!zqquWBP8Qd9C*i$%K7*aS=8M6eNnWKc<8B#b?xLO!exS%4!DXhT^ zn%plz?$l(w#gvky$#{!9xwNP#HLoN-v7kVc@fHt^TUwl2q{)7ZCB!u%k;^HWN5Ky04)_`=e}9H#Q}3!5y*ofMS`GI!CI18l9TFI zBm&~F6{VJx7Ud-~BE>m~&CI~S;0($tLJSNHH4Iq{vl&ttYZ$T^XEV%Y4rb6~@~dK2 z&{fc60-IbU&%nT-$#{#UI5j5?5q3o~AS*cH>yh? zKm;g?i$GC)i#e;jq=*|N#seaFL0)I|1*HdYoP#Y!awOQzknpjAq*gmnxEF&Wiid%R Rk%v)*k%Li$QHWWL0{|Da8u|bL literal 0 HcmV?d00001 diff --git a/app/campaigns/models.py b/app/campaigns/models.py index 4a52dd0..d7bdcd7 100644 --- a/app/campaigns/models.py +++ b/app/campaigns/models.py @@ -6,12 +6,20 @@ import jwt from datetime import datetime, timezone, timedelta +class AmbassadorMap(db.Model): + __tablename__ = 'ambassador_map' + id = Column('id', INTEGER(), primary_key=True) + campaign_id = Column('campaign_id', INTEGER(), nullable=False) + user_id = Column('user_id', INTEGER(), nullable=False) + + class Campaign(db.Model): __tablename__ = 'campaign' - id = Column('id', INTEGER(), primary_key=True) - title = Column('title', TEXT(), nullable=False) - donations = db.relationship('Donation', backref='campaign', lazy='dynamic') + id = Column('id', INTEGER(), primary_key=True) + title = Column('title', TEXT(), nullable=False) + + # donations = db.relationship('Donation', backref='campaign', lazy='dynamic') def __repr__(self) -> str: return f"{self.id} - {self.title}" diff --git a/app/main/__pycache__/models.cpython-310.pyc b/app/main/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..436cc8acfb611892f981641a0ea7347c345e8e87 GIT binary patch literal 1105 zcmd1j<>g{vU|@JF{31<&g@NHQh=Yt-7#J8F7#J9e>lhdqQW#Pga~N_NqZk=MY^EHh zT;?cdFq=7tC6_gdHJ2@l4a{fBVbA4=;>hKU;>_iW;>zWY;s*11qIhz7qjCU1)~HR8Qd9C*i$%K7*aS=8MB0%nWKbLSc4ffIbVWYrpb7V zDJ4mh@fLS-X;D#XUP*jnL4hXIEzZ#5)FR)^ip;!QJTRHk;?yEd_FF6=t`Q-(*qrlo zN^|pWu{-7G=cFd)-Qse~FG|f!&+|^LEMj9|V7SHZ=@;Va?izH9JMafsS(TrcdW#dpN=eNrNlXSg2^oV70tZ+D0|P@ULlk2QLljdAV-#~L zOA1peYcoR%a|&|`OD{_lTPjNmYbtv)Lke38doOboM=DDS2UrD!&zZ`S!imJ^N@Ypm zLgI6$aHsO5F{SXN@V2l-@uu(vGidVP;&92&ODxIE&%4Eu0%I{{ri5rR-Qq4N%FInH zs*KN0t-QsXSXz>wnU`FYnwy$ea*G!dWXYBBC6xuKZkmj@IPyw!auSnrQg5*(=H{2? zmE2+n1!sI_$}R5X#N2|!%=A1Ehpi~Jq_ik6nGq=zKx|e91_ozP%8_DVV5nipVwla4 z!dSzQ#R#RDW;4tM#VV6u6|;h_f+lm3AOizKkqC$oV_;y=WW2>voSKuilA%bNfq~(d zfqq7QZmND|W^qw|YL1bi* z_@dN;qWE}_nZ-;D3=C3?Rf4ea(SynQY4U-T<|XE)#>d~{ijU9DPbtj-v3cU-3riDo zpfbGi@g<<}fN+c0K@J6F9*Da^@s4nOkvK?J0+gtji%W`%WI@5HcV!eg*~x zPEaTbFfcH1Ft9KRF$zGT5Ni=gR#W5_b7Db35y<_wSkrP6i?fTEK?ZY!+3`8~>6v*& zpnO^c3i4ZA#f3SEImsERxsX&1aVQ7KGLS_@U?+2f3}DVGFDc>yN$`RQK9CrzFDUrH m7DHT#a5Tuhw>WGdp<@S%;$n~%9tIvp0Y()@4n`41F=hZe3J&K0 literal 0 HcmV?d00001 diff --git a/app/main/models.py b/app/main/models.py index 55502fa..45021a0 100644 --- a/app/main/models.py +++ b/app/main/models.py @@ -11,9 +11,11 @@ class Donation(db.Model): id = Column('id', INTEGER(), primary_key=True, autoincrement=True) currency_type = Column('currency_type', TEXT(), nullable=False) amount = Column('amount', INTEGER(), nullable=False) + user_id = Column('user_id', INTEGER(), nullable=False) + campaign_id = Column('campaign_id', INTEGER(), nullable=False) - user_id = Column(INTEGER, ForeignKey('user.id')) - campaign_id = Column(INTEGER, ForeignKey('campaign.id')) + # user_id = Column(INTEGER, ForeignKey('user.id')) + # campaign_id = Column(INTEGER, ForeignKey('campaign.id')) def __repr__(self) -> str: return f"{self.id} - {self.currency_type} - {self.amount}" diff --git a/app/users/__pycache__/models.cpython-310.pyc b/app/users/__pycache__/models.cpython-310.pyc index 85688687b87342565a5ee981e393eed577e6c91e..bfd061829269fd6fdef60d00ff1d5768284b61e0 100644 GIT binary patch delta 538 zcmZqTUC+mt&&$ijz`($;TKGlUFSd<*{)~*%CdV-rY4WD>rZJ`PrSP|~MDeAFr3j`7 zwJ=8UrwXJ9r--yLG&4pCricbJXo^pM&6r<*i>)ZNq_ik6nGs|d6oc5T3=9m;3=9m# zQVa|XH4Iq{vl&ttYZ$T^p)}KMhPkZ444O=SRm=*y3YyGCf(#4{MZzFLl!1XklkpZy zacWN5N`@jC1_p*-hWZ)#xvBb!G2OH;l4f9FxW$!PQIJ`bSdy8acZ<6ywK%mTz9c_8H4khJ zgpdWP<4;d5iAR!`nmmtroq#F>1H(&Dz!fQiT&gxXhDAzB8RTA$A`Or>wv^Q5{FKxp zW{|YbFaf zxFoS8GdVZ4BqKki$O0seFcr)Kxw(j+fq{V&6bKRw3=A9$EQ|tRC2TNs)d zqxe&Vf*CYLCjVs2pRCS&Q~4H4acWN5Ew0pxg3O}ClFaEQX$R^Ch#WcBsEtyey@*OsL O0kA3rp);AAT?GJe%u}iW diff --git a/app/users/__pycache__/routes.cpython-310.pyc b/app/users/__pycache__/routes.cpython-310.pyc index 7e8960317dd524c88107452297e160c55104ef54..1bac2aab920e3c762a0f8247f53ba31b0cef2dc0 100644 GIT binary patch delta 1424 zcmeAWnJdnh&&$ijz`(%pkThq6-;QMN-64#G#@JVAT>()siVvAn_uiGdZy&HKhn*0mv%$$&#$H^->_FG>A}RU|_h#l9E`GSR@1D3xW6? z1&PJQ<@rS^MIg(H_(2jHAc7Yp%aT}>UVMu=J+-6=>{{j`U635erMEcqQY%X03lh^) zi{wCpU_u_Gi!~=dJu?qvak1Rwt*lCnrju{5=DBNw{L4}#2vQ8T4B=F;UIYO)g)JvP zJ-@U>hk=2in2mvffsL7ik%zI!Y;rH#X-3t_k?h%QARiSOPCmu15eqWBN~kC`J+rtZ zwJ07Grg|AAxj983{hFdh93WfuK?Dnk06DG*9x6o!ATe;DfE{KI;#z0-GSo7Zu%L-Bmaw9UFqN>?Ff}tWGL*2VFxN2D zFxD`ou=KJ7Gib8bWIs5dRx*Q~ev2aontpF_B*RiQM-f_}frAPZ zDMhT{2rnqg%!4G6A_q{2p+zMx$d=5!^!TFu(vnn9kk4d6sZWSWh*5}>*eOBq~;VuEaV4C=9NFN6&JC822PfPjK9Dy4dJqZ9WZ)EgORzk(D7z}P zG+nPaHMz7Xv!t>JA0=a@wg1JIbLb<|G!eDXs9FbhnDA8Q8C^0afBS$<} zJW3qQ=FE|Zl1ODh9VIV!2u#TCo?lENw708FlaK}VlORDEsD=fDH3I1U|7jeBt6-d*^!ZNay_#s zqwM6V%%2#ACwH)HR05fCOCYm2KC!eUBQ>uiGdZy&HKhn*AjnkK$( zU|_h#l9E`GSR@JJ3xN0>1&PJQ<@rS^MWFC6;sr^lf(UMqEK6chdhsph^wg3fu