From 74c4099b8b3dd25bc494c26ba7ead13b1722f996 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Jul 2024 15:29:12 +0200
Subject: [PATCH] Test-Deployment improvements

---
 caprover_create_app.py         |   8 ++++++--
 env_secrets/local_daniel.env   | Bin 1281 -> 1512 bytes
 server/config/settings/base.py |   6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/caprover_create_app.py b/caprover_create_app.py
index 24dba123..e137bcf1 100644
--- a/caprover_create_app.py
+++ b/caprover_create_app.py
@@ -93,8 +93,12 @@ def main(app_name, image_name, environment_file):
             "AWS_S3_SECRET_ACCESS_KEY": env.str("AWS_S3_SECRET_ACCESS_KEY", ""),
             "AWS_S3_REGION_NAME": "eu-central-1",
             "AWS_STORAGE_BUCKET_NAME": "myvbv-dev.iterativ.ch",
-            "DATATRANS_HMAC_KEY": env.str("DATATRANS_HMAC_KEY", ""),
-            "DATATRANS_BASIC_AUTH_KEY": env.str("DATATRANS_BASIC_AUTH_KEY", ""),
+            "DATATRANS_HMAC_KEY": env.str("PIPELINES_DATATRANS_HMAC_KEY", ""),
+            "DATATRANS_BASIC_AUTH_KEY": env.str(
+                "PIPELINES_DATATRANS_BASIC_AUTH_KEY", ""
+            ),
+            "DATATRANS_API_ENDPOINT": "https://api.sandbox.datatrans.com",
+            "DATATRANS_PAY_URL": "https://pay.sandbox.datatrans.com",
             "FILE_UPLOAD_STORAGE": "s3",
             "IT_DJANGO_DEBUG": "false",
             "IT_SERVE_VUE": "false",
diff --git a/env_secrets/local_daniel.env b/env_secrets/local_daniel.env
index 7ae4f656c72a7fda433d8e81db09bbca0a48052d..703bd5e90348bdc749c714a4a40b8b13b4a5f3fb 100644
GIT binary patch
literal 1512
zcmV<E1sD1NM@dveQdv+`05m|e=o>C-quY~NB@>Kjv9hwx!L<9@4IcztOcYMjf4dlr
zN{=(4ZmZ=LJHWAVZg_dR8SFER-T^A(E;wTNd_Ffaoqjxx6dA~Bk<FQLncRa9U+7yw
zV8?Hn@Bc1dd761g{$uVn{(W5uu9t;#non!4xB1+wO`h309Dxd_K&XSCsl)X8#9&7j
zD-kKv(yg;Sk?m}iA&Fl&!hjrDV!DqwzLCUm%Mwi~ww$}uI{1AXRCoTK5gi59fzi<m
z$zmo_l))9X)h54lg0ajzmHaAO2~f07)MQNkZu}O`8_mdBIaZ`upJ57It!y|G980LR
zg`{2O1)BZucCE2o@C{Y`OeAov=RV)xFD)-(XhqP0cm!&#c+~S{%EIDLbnXQK6F}=+
zXh2Prpjq0(U!w;+fdoTLiOgD^_QPrbe|Iz<CDoNe=O_*)g-1P}hm*=L4yb}b>VTKf
zlDptT5_GKrzV^HV*6xpqTef^(SKk1azu@5Y=)vc$qN7^Qfhr2&q|tt)f8;+-*kRnZ
zCi#e@ID~vZZq{ZtYbjuRPa};}^4{Nu2h<Shx><y*%*yZeOp|QNtUw>dJl#GK+Rk29
zmXQUTC#j&e=T)}L+&hx-O^+1%oNDlhsa#ZzmfkV^rDKxArU`3r#3(qgL!Nef?>PU(
zz;EOB8BsWUX9ioh(kY1{3ZTWjWJ!5)U5p7PunF431sD?PnCB2rrg<?%fUyg+(p7M$
z(p-d3qRn7v+xFf0JI=dItC;s$jR!U#nN2vF6|{~!An1Z95*hExVWJ2gPQ*g|?895j
zl*-9T)kh$B@u9f30*aOx?ZS@|Nyd)4VAVJbUJ0O~1TSjkam3hwBqD~MPv=6<d#Efa
zWzi_&?7h^S9NCa+d9^B@c}`aQ?#A{TI?|h(G!Ey2s;P~D&^4tE@YQp8bi`+v$JSz!
z)tN(u=Z49ZBhMUvXLR}rPq3XeMkDl<GW&Hbv0?VUr!3tLXHnS?hMqeC8%ebpR@KhM
z0=~w!7LWw{dRJQ;UYEuBKewjNx--q|9Gfu4h^_ij%8sc>eCkGMCNN^$;u@3WS?GSE
zWPjq5k=b?&LI7L_9D>x~woW(*o47LD_5fH!WAkthP0hh6-L$PXy8fLU4W+;g2JO<I
zB(CgsS0-sRG`b2fTkUc;uU8~a6nvVZGP61YcTKz%__H4dRyyutknV-0uAp=&O-_x-
zZctQn4Jyc*wTq7n3ydDn>5aTvX$W&n@l!KbzgjdqI0skZC~XHbFz&!>OA1D{nRWDH
z=*?R+sETm?u)6H!xf?>X*z6-eT6jy~W(hVO9NU_<)f*^p%<CJt(yhF#3rwW{0L-oT
ztWvL_-qNJrf57(AvqN{MR>^{(aCXWZgCMGFeBYur-DF#>Z|#fVPZzSze8e<^AOz7h
zDhue^YZ>bCt8K*ywu;II74)@HlX8G>>$?S%Qsd`n?dkh+N{jfgB6jw!Q*T>WH1jdN
zM7?Dd*%d4Gp+jx|vYw69X64f}<MjxMWYIZ8MF)22@gJzhccu5<H^`-)C+u8PK-<Iq
ztOc6CZ-%a#L4?rcrWA~v4;R}VMp|E90?2LnR$$^EfrJD(fynpZXJqCrAx+z6Z}K1c
zX3^G+)5l2Qv>CKbx#qp{WTL-CD1ttmkP2rEI|K!5SyR3tpKuc-qW#&(Adey5U&$9^
zRw)ZhN``&1dSqd9n4s9=i;Eb0<2qK3Q#U4dfG6=0!Tqh@=9X#w)CiUDTDABYoPZOH
zq27Nv=l=sOWe5~s<XULKaX=448`@&R#5!LufbuIxVyppKz*Jg1m4u)>nBc(n5^PAO
zBF>DO`i))}nopj_CGh-b@b{}#Hkj77l(Ljr14+SP5qsnUfD5^EJ4w^DD!G>4A+a2=
zY+^R0N)P>FMjOrsLihd7Pwl_)le$doDXh%}J}a|Jcahl6fO8Nfq3{}Mj;UFAt7!OU
O%0;Y)orw|(_Ix()nD*WP

literal 1281
zcmV+c1^)T~M@dveQdv+`0K~zt1aShaqph1>SC&gOXbPlOPt<_H_XF=zFMrBbRB&HK
z>zIo@$>_iMEgH;_Jj`zfn7Q}W)m%2RD@&QnOlSeUhGQ^Ie&karq-#%x2ArcCTcMye
zacXtbU;>n5<LHE087#GoYw=3r<C$A+XesalkLztTzY)0SL8no7+C3&ANTO`{HB4kZ
zc;}UA`K2-DoZA9noyU+Do%LzSc*PK*kHg`kHs{z(KLidl^k|VJl~2(k{EaNuJ8q|!
zQuz&{%QjGoG88E`lm%Sl!J##^Sn>v|($s-;&(Jfw)#UCp0<qWez__?D&*s8_z8xRI
zysRtff^W{XQ6C|A1uPA?u|ORB+fXH_1;FZmg15K89uqv^^BQZg#awtof<=46Vi^C~
zxKQtZN|izUX@f>(*k!b2*IepL9U)KT4ok{a(-lNo^<zBvbMj7{g%(!!_KxRSOQ1!N
zt_&>u>?9P{CBUfv{I0GWg3vdtjSuJWUSy!9g6La*G)ut$7C8A-A-jfV@Sh<32q9E^
z^aSA0{3U^xSj4G$P$J}d-j0dX+895O2$b(tW^u@#rM+SPG;nnMI7;lfZZn)&S+7*$
zhPCb4wn**kjS>3mN-m3g+K=Y4HX8I&Yb#sAtB<yIZ6tp5{G0C;Z^<|$5}u15rWAY|
z3uu3$em*CoMC6lpAK8|)LeqD&OTB{Hv{WF8_LDNGjzF&vnP+~DJdAwbi%_t<DE&cR
z%{V=<8r#MxoQ!8XeIG4xi~wMd&cjb{#akC6{~;U6v+a9RPFi%EyeKzHWP_mxFsopi
zE==Ytz|s<*D13Xwt9uSE*)P!N88YN!b+ts7xqMo68{M6$bF{{1*S~Lx3goQdI};Xy
zPKx~`?33&-qp38^+FRs#QT8I^A$9@BiD>l=8Izg%+s;X(L(g(7+wI7Spvf#p8(@E+
zA^+tv>NM|Nx2-8=)l0f?;3OwesAAcBR&M5NhEE$jS&MZNw3-7=Kg<G;Da(PBVlH!&
zZI%9!s$k$odfQ|OJw&dS*eaVgp5G(a9-=EI)2!>RZ4WwVD5C%ws150Btv7VWX<v6A
zVuF||roNdG8*3)dIv=-VTfW7TVFn4&-E$*5Vom>E)*qrxAX<49+iiA!d({XH8<HAp
zph3;RG!nFRkYnC)%H~7oE{4TnS9`7|c%)i{M#GoDn{~F<RRvW7gs9HtB|fmT;@$=4
zz4yr>mVo?|Ib^C*o!H}|w06GKhmDtLW5>3|`;~w?0$$=`uz4%K6&;U=kqC`g$@^@=
zH0>%!Pnty${^#e6aEIEaqkb;!`I9bXJVpqp;7v+Ft@e|5rI#mUb7mBd#6n*L`8y5e
z&622!O$B@CMGSQ!7+`IWiEHW+hkM-9&dyJ(s3^HMc&Yc5^_dcvNUtJl5QNW3s&6vO
z0s!Al4hPApLt597{9c|>j^z}Y7EWtTiNeie8J^pi+M`>ew=U&|<{e-O3J@p%irfD{
z?kVNTGtlLFC|}U~P^dL#O%L?PQ6P}loH~0Jn<rbKw2QjyB~Hr~#KqgU>fB~~OspUf
zhQVS^tE<wpQ5g@l&!s|I(G>$t32l`>PytLxr&zUh*+V-hME-e=(KHmw&Xkvj*xkvA
rA0#!9aELc67R}V0cnQxU;m+5b$i>2A4)aHay0f|KeTBvxI>C);#ZG?e

diff --git a/server/config/settings/base.py b/server/config/settings/base.py
index a4fda6fd..6533d160 100644
--- a/server/config/settings/base.py
+++ b/server/config/settings/base.py
@@ -682,10 +682,12 @@ if APP_ENVIRONMENT.startswith("prod"):
     DATATRANS_PAY_URL = "https://pay.datatrans.com"
 else:
     DATATRANS_API_ENDPOINT = env(
-        "DATATRANS_API_ENDPOINT", default="https://api.sandbox.datatrans.com"
+        "DATATRANS_API_ENDPOINT",
+        default="http://localhost:8000/server/fakeapi/datatrans/api",
     )
     DATATRANS_PAY_URL = env(
-        "DATATRANS_PAY_URL", default="https://pay.sandbox.datatrans.com"
+        "DATATRANS_PAY_URL",
+        default="http://localhost:8000/server/fakeapi/datatrans/pay",
     )
 
 # default settings for python sftpserver test-server