From b0c1d8c5df7c39f24759758a03928edfc0190875 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 31 Oct 2023 16:47:42 +0100 Subject: [PATCH] release fixes --- rowers/emails.py | 14 +++++++++++++- rowers/models.py | 7 +++++++ rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4000 bytes 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/rowers/emails.py b/rowers/emails.py index 87583c48..bf64c90a 100644 --- a/rowers/emails.py +++ b/rowers/emails.py @@ -27,7 +27,7 @@ from rowsandall_app.settings import SITE_URL from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV from rowsandall_app.settings import PROGRESS_CACHE_SECRET from rowsandall_app.settings import SETTINGS_NAME - +from rowers.models import UserMessage, Rower, User import pandas as pd @@ -112,6 +112,18 @@ def send_template_email(from_email, to_email, subject, else: emailbounced = False + try: + usr = User.objects.get(email=to_email) + umsg = UserMessage( + receiver = usr.rower, + datetime = timezone.now(), + text = text_content, + subject=subject, + ) + umsg.save() + except User.DoesNotExist: + pass + if not emailbounced: res = msg.send() else: # pragma: no cover diff --git a/rowers/models.py b/rowers/models.py index b2053e0c..5ab064b3 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1241,6 +1241,13 @@ class DeleteUserForm(forms.ModelForm): model = User fields = [] +class UserMessage(models.Model): + receiver = models.ForeignKey(Rower, on_delete=models.CASCADE) + datetime = models.DateTimeField() + isread = models.BooleanField(default=False) + text = models.CharField(max_length=1000) + subject = models.CharField(max_length=100,default='Message') + # requestor is user diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 56e9599466dbd7db9dcf05b17767d00ebe566edf..121a02f7cef58959ddcb6f3c507efcedd7b51754 100644 GIT binary patch delta 3905 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 z z@1Y{@&Nv{@=yg$w>htrFcZ7-*JBfx_=cYv{OP+5*p6Vh`)lBiU56P4hohgSXC4Dz+ z=Ognh6_K|lCZ%2_^CTt|Brh`}A1flC%sD|0s_={}YR9|zkhiWL@(9LRB$do3tRY|6cNb?wo+={m3_6_?2c0iD&s%7t{V3#vi6mANo`tNQ< zzK!;S1lqEl(2pvjARvlR*fT+^&Vk~LT&xyPZ6_HPRIuojruOOC;(pj3( zXpa?A^Bfou3qdkjZ2VOJJlPyc$&WLe z;$(FD7Ns2~?~E4=nkX$37PaT+M7|<>K3iyPRr5SEnm7^i*yj1`$#c%VWkAw+a?*=Z zGV9v9=C>b(ycl2zDw!858nJ2Q$06@cND_}4@{XI#-;g}lLmt6MfS_uU;kl^H`=;BE zLY@s<6xBQ*xTuEbo6L_w-WiN2Dw&Uewy5{E$^1Cvx4E~f7HGC?Mdhu?WAot+kAnX`GH!El-Q~x|JDKQH!mJJR9$HQCb^g$()=yk*}x5hI8(%^N50 z3DFT2)$Qj*zNXPW8bA!1_`G8(T1D+!e0~h_IrlbT(Dc1^mWt-y&WU_~MfN;dLk?Lr z&kIc^_m*4z{2+O6&?2cudq+j>`5BRSR1x{yIe}Qy-`;sHI?vCEd_}r_($+YlYSl6q zxJ7AaKwb=hsJfiH$Sq1c{n4Ji5z%!*^w7xPlzc_Hy#>QwRGu7;SH1L z-2GJLz4gfwj4cCm^5n&TcW~~oRK|WQGDJ8W06slljGCdVkbhrHXmN7 zhrD2}rB$tI;iYK({G4RICJj&6cp=pI@Vs*+{r0n(=PR=3ll*cdRgI1Ju2odtkbFf^ zT8RdjKsDM2HyPc&d2a{E%RZp-N*|t&MOPu8mCQ>;@|H}b>eqj71l*NpaoLQ#8uPNRLOhdh$87NaKXI&f?=AqUx3sT+!7@=j6ThR1bNA+#8EEo}5s2jY^?LeiZU-kaRsTLnyjx z*__DNG|!WmAQ&}&8JHnr(aa2*(LC=fA|H$-nb%ZWM4%?~Q;*fjKBKWrs?3at+{jNo zVw1>QL+PK2JQZEXCfA>~%#0Dp`<#cT>W3G(=sGrHXVm?)Ci2k)hfyW-g|o42>w7x} zc}vELuDU7~&c>S4y0jHVX_Nd4D|LJ4iduDZB43dw#|A@xkwBAgAH6R++Pk(E^%&%L zxwpD`K7^uH-JHl*EqR4fvKOgC1MI>p}Fv2ojPC zeNqj1B1V0GllnpQxt%E?>(Dz})V7m0*N=kU8Y`&s;UaixQh!7AR1tcgTV#1up$~2{ zQePQ*cJ-i7cA5YZUgQqA>Rk0x5BONYP}HSVZ+^Tt4*l=X-lt{(+Gp@~GGO3-4O&YEV;hd+$on!w8H z8)i3|rfDrpXBfRV-U_QUe70rRxuI5bHwOBgVJWDquV*RSPKBD9Hwt<-0vL5t@4{pT zd~69?gXo>Hs9Vbr*~g-d)2P|?qo9w5B3hk>AIgSrxOwx&KyNAc&(eAGIL4;tO@F|D zw_-q)g;y3~GV%J_lCdia+S;VCA;qXdPt@l6>7y4gQMqt2TBf3ryXM0m2R)nUkaXxR zPiA?u=ExmJzipZ5Rcf9U+gv)+cjRtcCZgBP^-d;}pw-ec2hfLY%S6yEd4twVGw!Bt z*N5CP(TbqTk!wS%zPTy-P!al&J80>Dx@y>1HhjZvz#juWqG1-Nl6rx%%hmIY)I6vN zz1_A}P^o!RxQ)`B>g#Pq=)EDU4B84qQE#4Y1O6E32@Db=tI%7R%-V*{n>UPpTVzeD zczv=6T9Ne(q~7JO8c~PdQBmWrb=4RLeaKSpbpyWV$w+-0@CVT|njox;*GsT}MK$~u zv>gY%H4YI~T{R@y=FOYFBbUALOjZ@Nb>JqGs?pTELG;N^vkrAxIu2bM@TZ=em(a5j z%1#;$dYVoNMr)%qjNTawInh#so@STG; z*UtdG7$U8j=b>ffPQCCd7?FD(a0S%HE$I3!LVS^NxitDsTxhq8wEWj(>vX zXA^{Uk-PMwl+^HZCyIuDegyQ+c(zgH(g_Yrx^!lRUMfN#^P0AxlX{Ou2Yla3FvdVH zWSqsI%F+p;Xr=9~(6^eqVf2!#Z-Oc#H^icqwznGaTQ8kq^dYZltBc%4D7x6$tTg;u zvUCKtD_H}2l_NKzOva@Ht#95S`t3^Ax^?a%l?~cLo9jnG?{oEkjS@Zk$*gYK=K4YO zc_nK`QhD>D^+l_1sP)Yo1wC&UF;^LPQDR%&a^l{+jNawKDzCch$@XcbkE`|Z%dYRzdAr@)m8g6=?%=`e z{?*yVmDl9K`T5D}sO!^DzkD$+&;8ZO(sw_-UY)$W{JFn>rS~x%dgbAK*z&adPr77w z7F_-O^=_+m+U(`ie%lR~kM@i6AG}C6efaD0WZ7+&i9`PM;n7{WuY)Ju`uOpq!=ImJ zHrqdU+kZ)K@w3;be=O6T0o()F{eQ5y^2P4SZy(d)oh|CsIz5Mn3FY$QQF