From a032f89ac77cf4847f1f63ec4f66211900603107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 13:56:42 +0200 Subject: [PATCH 01/14] feat: Simple price calculation based on subscription range --- .../solutions/adrianliz/java/.editorconfig | 11 ++ .../java/.github/workflows/workflow.yml | 22 +++ .../solutions/adrianliz/java/.gitignore | 9 + .../solutions/adrianliz/java/Makefile | 10 + .../solutions/adrianliz/java/README.md | 7 + .../solutions/adrianliz/java/build.gradle | 36 ++++ .../java/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + .../solutions/adrianliz/java/gradlew | 172 ++++++++++++++++++ .../solutions/adrianliz/java/gradlew.bat | 84 +++++++++ .../tv/codely/checkout/TieredPricing.java | 19 ++ .../checkout/api/CheckoutApplication.java | 11 ++ .../api/Controller/ExampleGetController.java | 21 +++ .../java/src/main/resources/log4j2.properties | 34 ++++ .../codely/checkout/TieredPricingShould.java | 59 ++++++ .../tv/codely/checkout/api/ApiTestCase.java | 67 +++++++ .../ExampleGetControllerShould.java | 16 ++ .../java/src/test/resources/log4j2.properties | 33 ++++ .../solutions/adrianliz/java/var/log/.gitkeep | 0 19 files changed, 616 insertions(+) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/.editorconfig create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/.github/workflows/workflow.yml create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/.gitignore create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/Makefile create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/README.md create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/build.gradle create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/gradle/wrapper/gradle-wrapper.jar create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/gradle/wrapper/gradle-wrapper.properties create mode 100755 exercises/tiered_pricing/solutions/adrianliz/java/gradlew create mode 100755 exercises/tiered_pricing/solutions/adrianliz/java/gradlew.bat create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/CheckoutApplication.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/Controller/ExampleGetController.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/resources/log4j2.properties create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/ApiTestCase.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/Controller/ExampleGetControllerShould.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/resources/log4j2.properties create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/var/log/.gitkeep diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/.editorconfig b/exercises/tiered_pricing/solutions/adrianliz/java/.editorconfig new file mode 100644 index 00000000..219e4cd1 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.java] +indent_size = 4 +indent_style = space diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/.github/workflows/workflow.yml b/exercises/tiered_pricing/solutions/adrianliz/java/.github/workflows/workflow.yml new file mode 100644 index 00000000..38c6ded2 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/.github/workflows/workflow.yml @@ -0,0 +1,22 @@ +name: Main Workflow + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Assemble + run: ./gradlew assemble --warning-mode all + + - name: Check + run: ./gradlew check --warning-mode all + diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/.gitignore b/exercises/tiered_pricing/solutions/adrianliz/java/.gitignore new file mode 100644 index 00000000..165da6e1 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/.gitignore @@ -0,0 +1,9 @@ +# Gradle +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +var/log/* +!var/log/.gitkeep diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/Makefile b/exercises/tiered_pricing/solutions/adrianliz/java/Makefile new file mode 100644 index 00000000..9bd15395 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/Makefile @@ -0,0 +1,10 @@ +.PHONY: all +all: build + +.PHONY: build +build: + @./gradlew assemble --warning-mode all + +.PHONY: test +test: + @./gradlew check --warning-mode all diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/README.md b/exercises/tiered_pricing/solutions/adrianliz/java/README.md new file mode 100644 index 00000000..fd0ee890 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/README.md @@ -0,0 +1,7 @@ +# Tiered pricing: Java + +Java codebase for [Tiered pricing](../../README.md) exercise. + +# Testing + +Run all tests with `make test` diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/build.gradle b/exercises/tiered_pricing/solutions/adrianliz/java/build.gradle new file mode 100644 index 00000000..66c49dd6 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/build.gradle @@ -0,0 +1,36 @@ +plugins { + id 'org.springframework.boot' version '2.6.3' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'tv.codely' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.apache.logging.log4j:log4j-core:2.17.1' + implementation 'com.vlkan.log4j2:log4j2-logstash-layout:1.0.5' + implementation 'org.springframework.boot:spring-boot-starter-web:2.6.4' + implementation 'org.json:json:20211205' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' + testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.4' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/gradle/wrapper/gradle-wrapper.jar b/exercises/tiered_pricing/solutions/adrianliz/java/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..87b738cbd051603d91cc39de6cb000dd98fe6b02 GIT binary patch literal 55190 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 z ze;^F?mwdU?K+=fBabokSls^6_6At#1Sh7W*y?r6Ss*dmZP{n;VB^LDxM1QWh;@H0J z!4S*_5j_;+@-NpO1KfQd&;C7T`9ak;X8DTRz$hDNcjG}xAfg%gwZSb^zhE~O);NMO zn2$fl7Evn%=Lk!*xsM#(y$mjukN?A&mzEw3W5>_o+6oh62kq=4-`e3B^$rG=XG}Kd zK$blh(%!9;@d@3& zGFO60j1Vf54S}+XD?%*uk7wW$f`4U3F*p7@I4Jg7f`Il}2H<{j5h?$DDe%wG7jZQL zI{mj?t?Hu>$|2UrPr5&QyK2l3mas?zzOk0DV30HgOQ|~xLXDQ8M3o#;CNKO8RK+M; zsOi%)js-MU>9H4%Q)#K_me}8OQC1u;f4!LO%|5toa1|u5Q@#mYy8nE9IXmR}b#sZK z3sD395q}*TDJJA9Er7N`y=w*S&tA;mv-)Sx4(k$fJBxXva0_;$G6!9bGBw13c_Uws zXks4u(8JA@0O9g5f?#V~qR5*u5aIe2HQO^)RW9TTcJk28l`Syl>Q#ZveEE4Em+{?%iz6=V3b>rCm9F zPQQm@-(hfNdo2%n?B)u_&Qh7^^@U>0qMBngH8}H|v+Ejg*Dd(Y#|jgJ-A zQ_bQscil%eY}8oN7ZL+2r|qv+iJY?*l)&3W_55T3GU;?@Om*(M`u0DXAsQ7HSl56> z4P!*(%&wRCb?a4HH&n;lAmr4rS=kMZb74Akha2U~Ktni>>cD$6jpugjULq)D?ea%b zk;UW0pAI~TH59P+o}*c5Ei5L-9OE;OIBt>^(;xw`>cN2`({Rzg71qrNaE=cAH^$wP zNrK9Glp^3a%m+ilQj0SnGq`okjzmE7<3I{JLD6Jn^+oas=h*4>Wvy=KXqVBa;K&ri z4(SVmMXPG}0-UTwa2-MJ=MTfM3K)b~DzSVq8+v-a0&Dsv>4B65{dBhD;(d44CaHSM zb!0ne(*<^Q%|nuaL`Gb3D4AvyO8wyygm=1;9#u5x*k0$UOwx?QxR*6Od8>+ujfyo0 zJ}>2FgW_iv(dBK2OWC-Y=Tw!UwIeOAOUUC;h95&S1hn$G#if+d;*dWL#j#YWswrz_ zMlV=z+zjZJ%SlDhxf)vv@`%~$Afd)T+MS1>ZE7V$Rj#;J*<9Ld=PrK0?qrazRJWx) z(BTLF@Wk279nh|G%ZY7_lK7=&j;x`bMND=zgh_>>-o@6%8_#Bz!FnF*onB@_k|YCF z?vu!s6#h9bL3@tPn$1;#k5=7#s*L;FLK#=M89K^|$3LICYWIbd^qguQp02w5>8p-H z+@J&+pP_^iF4Xu>`D>DcCnl8BUwwOlq6`XkjHNpi@B?OOd`4{dL?kH%lt78(-L}eah8?36zw9d-dI6D{$s{f=M7)1 zRH1M*-82}DoFF^Mi$r}bTB5r6y9>8hjL54%KfyHxn$LkW=AZ(WkHWR;tIWWr@+;^^ zVomjAWT)$+rn%g`LHB6ZSO@M3KBA? z+W7ThSBgpk`jZHZUrp`F;*%6M5kLWy6AW#T{jFHTiKXP9ITrMlEdti7@&AT_a-BA!jc(Kt zWk>IdY-2Zbz?U1)tk#n_Lsl?W;0q`;z|t9*g-xE!(}#$fScX2VkjSiboKWE~afu5d z2B@9mvT=o2fB_>Mnie=TDJB+l`GMKCy%2+NcFsbpv<9jS@$X37K_-Y!cvF5NEY`#p z3sWEc<7$E*X*fp+MqsOyMXO=<2>o8)E(T?#4KVQgt=qa%5FfUG_LE`n)PihCz2=iNUt7im)s@;mOc9SR&{`4s9Q6)U31mn?}Y?$k3kU z#h??JEgH-HGt`~%)1ZBhT9~uRi8br&;a5Y3K_Bl1G)-y(ytx?ok9S*Tz#5Vb=P~xH z^5*t_R2It95=!XDE6X{MjLYn4Eszj9Y91T2SFz@eYlx9Z9*hWaS$^5r7=W5|>sY8}mS(>e9Ez2qI1~wtlA$yv2e-Hjn&K*P z2zWSrC~_8Wrxxf#%QAL&f8iH2%R)E~IrQLgWFg8>`Vnyo?E=uiALoRP&qT{V2{$79 z%9R?*kW-7b#|}*~P#cA@q=V|+RC9=I;aK7Pju$K-n`EoGV^-8Mk=-?@$?O37evGKn z3NEgpo_4{s>=FB}sqx21d3*=gKq-Zk)U+bM%Q_}0`XGkYh*+jRaP+aDnRv#Zz*n$pGp zEU9omuYVXH{AEx>=kk}h2iKt!yqX=EHN)LF}z1j zJx((`CesN1HxTFZ7yrvA2jTPmKYVij>45{ZH2YtsHuGzIRotIFj?(8T@ZWUv{_%AI zgMZlB03C&FtgJqv9%(acqt9N)`4jy4PtYgnhqev!r$GTIOvLF5aZ{tW5MN@9BDGu* zBJzwW3sEJ~Oy8is`l6Ly3an7RPtRr^1Iu(D!B!0O241Xua>Jee;Rc7tWvj!%#yX#m z&pU*?=rTVD7pF6va1D@u@b#V@bShFr3 zMyMbNCZwT)E-%L-{%$3?n}>EN>ai7b$zR_>=l59mW;tfKj^oG)>_TGCJ#HbLBsNy$ zqAqPagZ3uQ(Gsv_-VrZmG&hHaOD#RB#6J8&sL=^iMFB=gH5AIJ+w@sTf7xa&Cnl}@ zxrtzoNq>t?=(+8bS)s2p3>jW}tye0z2aY_Dh@(18-vdfvn;D?sv<>UgL{Ti08$1Q+ zZI3q}yMA^LK=d?YVg({|v?d1|R?5 zL0S3fw)BZazRNNX|7P4rh7!+3tCG~O8l+m?H} z(CB>8(9LtKYIu3ohJ-9ecgk+L&!FX~Wuim&;v$>M4 zUfvn<=Eok(63Ubc>mZrd8d7(>8bG>J?PtOHih_xRYFu1Hg{t;%+hXu2#x%a%qzcab zv$X!ccoj)exoOnaco_jbGw7KryOtuf(SaR-VJ0nAe(1*AA}#QV1lMhGtzD>RoUZ;WA?~!K{8%chYn?ttlz17UpDLlhTkGcVfHY6R<2r4E{mU zq-}D?+*2gAkQYAKrk*rB%4WFC-B!eZZLg4(tR#@kUQHIzEqV48$9=Q(~J_0 zy1%LSCbkoOhRO!J+Oh#;bGuXe;~(bIE*!J@i<%_IcB7wjhB5iF#jBn5+u~fEECN2* z!QFh!m<(>%49H12Y33+?$JxKV3xW{xSs=gxkxW-@Xds^|O1`AmorDKrE8N2-@ospk z=Au%h=f!`_X|G^A;XWL}-_L@D6A~*4Yf!5RTTm$!t8y&fp5_oqvBjW{FufS`!)5m% z2g(=9Ap6Y2y(9OYOWuUVGp-K=6kqQ)kM0P^TQT{X{V$*sN$wbFb-DaUuJF*!?EJPl zJev!UsOB^UHZ2KppYTELh+kqDw+5dPFv&&;;C~=u$Mt+Ywga!8YkL2~@g67}3wAQP zrx^RaXb1(c7vwU8a2se75X(cX^$M{FH4AHS7d2}heqqg4F0!1|Na>UtAdT%3JnS!B)&zelTEj$^b0>Oyfw=P-y-Wd^#dEFRUN*C{!`aJIHi<_YA2?piC%^ zj!p}+ZnBrM?ErAM+D97B*7L8U$K zo(IR-&LF(85p+fuct9~VTSdRjs`d-m|6G;&PoWvC&s8z`TotPSoksp;RsL4VL@CHf z_3|Tn%`ObgRhLmr60<;ya-5wbh&t z#ycN_)3P_KZN5CRyG%LRO4`Ot)3vY#dNX9!f!`_>1%4Q`81E*2BRg~A-VcN7pcX#j zrbl@7`V%n z6J53(m?KRzKb)v?iCuYWbH*l6M77dY4keS!%>}*8n!@ROE4!|7mQ+YS4dff1JJC(t z6Fnuf^=dajqHpH1=|pb(po9Fr8it^;2dEk|Ro=$fxqK$^Yix{G($0m-{RCFQJ~LqUnO7jJcjr zl*N*!6WU;wtF=dLCWzD6kW;y)LEo=4wSXQDIcq5WttgE#%@*m><@H;~Q&GniA-$in z`sjWFLgychS1kIJmPtd-w6%iKkj&dGhtB%0)pyy0M<4HZ@ZY0PWLAd7FCrj&i|NRh?>hZj*&FYnyu%Ur`JdiTu&+n z78d3n)Rl6q&NwVj_jcr#s5G^d?VtV8bkkYco5lV0LiT+t8}98LW>d)|v|V3++zLbHC(NC@X#Hx?21J0M*gP2V`Yd^DYvVIr{C zSc4V)hZKf|OMSm%FVqSRC!phWSyuUAu%0fredf#TDR$|hMZihJ__F!)Nkh6z)d=NC z3q4V*K3JTetxCPgB2_)rhOSWhuXzu+%&>}*ARxUaDeRy{$xK(AC0I=9%X7dmc6?lZNqe-iM(`?Xn3x2Ov>sej6YVQJ9Q42>?4lil?X zew-S>tm{=@QC-zLtg*nh5mQojYnvVzf3!4TpXPuobW_*xYJs;9AokrXcs!Ay z;HK>#;G$*TPN2M!WxdH>oDY6k4A6S>BM0Nimf#LfboKxJXVBC=RBuO&g-=+@O-#0m zh*aPG16zY^tzQLNAF7L(IpGPa+mDsCeAK3k=IL6^LcE8l0o&)k@?dz!79yxUquQIe($zm5DG z5RdXTv)AjHaOPv6z%99mPsa#8OD@9=URvHoJ1hYnV2bG*2XYBgB!-GEoP&8fLmWGg z9NG^xl5D&3L^io&3iYweV*qhc=m+r7C#Jppo$Ygg;jO2yaFU8+F*RmPL` zYxfGKla_--I}YUT353k}nF1zt2NO?+kofR8Efl$Bb^&llgq+HV_UYJUH7M5IoN0sT z4;wDA0gs55ZI|FmJ0}^Pc}{Ji-|#jdR$`!s)Di4^g3b_Qr<*Qu2rz}R6!B^;`Lj3sKWzjMYjexX)-;f5Y+HfkctE{PstO-BZan0zdXPQ=V8 zS8cBhnQyy4oN?J~oK0zl!#S|v6h-nx5to7WkdEk0HKBm;?kcNO*A+u=%f~l&aY*+J z>%^Dz`EQ6!+SEX$>?d(~|MNWU-}JTrk}&`IR|Ske(G^iMdk04)Cxd@}{1=P0U*%L5 zMFH_$R+HUGGv|ju2Z>5x(-aIbVJLcH1S+(E#MNe9g;VZX{5f%_|Kv7|UY-CM(>vf= z!4m?QS+AL+rUyfGJ;~uJGp4{WhOOc%2ybVP68@QTwI(8kDuYf?#^xv zBmOHCZU8O(x)=GVFn%tg@TVW1)qJJ_bU}4e7i>&V?r zh-03>d3DFj&@}6t1y3*yOzllYQ++BO-q!)zsk`D(z||)y&}o%sZ-tUF>0KsiYKFg6 zTONq)P+uL5Vm0w{D5Gms^>H1qa&Z##*X31=58*r%Z@Ko=IMXX{;aiMUp-!$As3{sq z0EEk02MOsgGm7$}E%H1ys2$yftNbB%1rdo@?6~0!a8Ym*1f;jIgfcYEF(I_^+;Xdr z2a>&oc^dF3pm(UNpazXgVzuF<2|zdPGjrNUKpdb$HOgNp*V56XqH`~$c~oSiqx;8_ zEz3fHoU*aJUbFJ&?W)sZB3qOSS;OIZ=n-*#q{?PCXi?Mq4aY@=XvlNQdA;yVC0Vy+ z{Zk6OO!lMYWd`T#bS8FV(`%flEA9El;~WjZKU1YmZpG#49`ku`oV{Bdtvzyz3{k&7 zlG>ik>eL1P93F zd&!aXluU_qV1~sBQf$F%sM4kTfGx5MxO0zJy<#5Z&qzNfull=k1_CZivd-WAuIQf> zBT3&WR|VD|=nKelnp3Q@A~^d_jN3@$x2$f@E~e<$dk$L@06Paw$);l*ewndzL~LuU zq`>vfKb*+=uw`}NsM}~oY}gW%XFwy&A>bi{7s>@(cu4NM;!%ieP$8r6&6jfoq756W z$Y<`J*d7nK4`6t`sZ;l%Oen|+pk|Ry2`p9lri5VD!Gq`U#Ms}pgX3ylAFr8(?1#&dxrtJgB>VqrlWZf61(r`&zMXsV~l{UGjI7R@*NiMJLUoK*kY&gY9kC@^}Fj* zd^l6_t}%Ku<0PY71%zQL`@}L}48M!@=r)Q^Ie5AWhv%#l+Rhu6fRpvv$28TH;N7Cl z%I^4ffBqx@Pxpq|rTJV)$CnxUPOIn`u278s9#ukn>PL25VMv2mff)-RXV&r`Dwid7}TEZxXX1q(h{R6v6X z&x{S_tW%f)BHc!jHNbnrDRjGB@cam{i#zZK*_*xlW@-R3VDmp)<$}S%t*@VmYX;1h zFWmpXt@1xJlc15Yjs2&e%)d`fimRfi?+fS^BoTcrsew%e@T^}wyVv6NGDyMGHSKIQ zC>qFr4GY?#S#pq!%IM_AOf`#}tPoMn7JP8dHXm(v3UTq!aOfEXNRtEJ^4ED@jx%le zvUoUs-d|2(zBsrN0wE(Pj^g5wx{1YPg9FL1)V1JupsVaXNzq4fX+R!oVX+q3tG?L= z>=s38J_!$eSzy0m?om6Wv|ZCbYVHDH*J1_Ndajoh&?L7h&(CVii&rmLu+FcI;1qd_ zHDb3Vk=(`WV?Uq;<0NccEh0s`mBXcEtmwt6oN99RQt7MNER3`{snV$qBTp={Hn!zz z1gkYi#^;P8s!tQl(Y>|lvz{5$uiXsitTD^1YgCp+1%IMIRLiSP`sJru0oY-p!FPbI)!6{XM%)(_Dolh1;$HlghB-&e><;zU&pc=ujpa-(+S&Jj zX1n4T#DJDuG7NP;F5TkoG#qjjZ8NdXxF0l58RK?XO7?faM5*Z17stidTP|a%_N z^e$D?@~q#Pf+708cLSWCK|toT1YSHfXVIs9Dnh5R(}(I;7KhKB7RD>f%;H2X?Z9eR z{lUMuO~ffT!^ew= z7u13>STI4tZpCQ?yb9;tSM-(EGb?iW$a1eBy4-PVejgMXFIV_Ha^XB|F}zK_gzdhM z!)($XfrFHPf&uyFQf$EpcAfk83}91Y`JFJOiQ;v5ca?)a!IxOi36tGkPk4S6EW~eq z>WiK`Vu3D1DaZ}515nl6>;3#xo{GQp1(=uTXl1~ z4gdWxr-8a$L*_G^UVd&bqW_nzMM&SlNW$8|$lAfo@zb+P>2q?=+T^qNwblP*RsN?N zdZE%^Zs;yAwero1qaoqMp~|KL=&npffh981>2om!fseU(CtJ=bW7c6l{U5(07*e0~ zJRbid6?&psp)ilmYYR3ZIg;t;6?*>hoZ3uq7dvyyq-yq$zH$yyImjfhpQb@WKENSP zl;KPCE+KXzU5!)mu12~;2trrLfs&nlEVOndh9&!SAOdeYd}ugwpE-9OF|yQs(w@C9 zoXVX`LP~V>%$<(%~tE*bsq(EFm zU5z{H@Fs^>nm%m%wZs*hRl=KD%4W3|(@j!nJr{Mmkl`e_uR9fZ-E{JY7#s6i()WXB0g-b`R{2r@K{2h3T+a>82>722+$RM*?W5;Bmo6$X3+Ieg9&^TU(*F$Q3 zT572!;vJeBr-)x?cP;^w1zoAM`nWYVz^<6N>SkgG3s4MrNtzQO|A?odKurb6DGZffo>DP_)S0$#gGQ_vw@a9JDXs2}hV&c>$ zUT0;1@cY5kozKOcbN6)n5v)l#>nLFL_x?2NQgurQH(KH@gGe>F|$&@ zq@2A!EXcIsDdzf@cWqElI5~t z4cL9gg7{%~4@`ANXnVAi=JvSsj95-7V& zME3o-%9~2?cvlH#twW~99=-$C=+b5^Yv}Zh4;Mg-!LS zw>gqc=}CzS9>v5C?#re>JsRY!w|Mtv#%O3%Ydn=S9cQarqkZwaM4z(gL~1&oJZ;t; zA5+g3O6itCsu93!G1J_J%Icku>b3O6qBW$1Ej_oUWc@MI)| zQ~eyS-EAAnVZp}CQnvG0N>Kc$h^1DRJkE7xZqJ0>p<>9*apXgBMI-v87E0+PeJ-K& z#(8>P_W^h_kBkI;&e_{~!M+TXt@z8Po*!L^8XBn{of)knd-xp{heZh~@EunB2W)gd zAVTw6ZZasTi>((qpBFh(r4)k zz&@Mc@ZcI-4d639AfcOgHOU+YtpZ)rC%Bc5gw5o~+E-i+bMm(A6!uE>=>1M;V!Wl4 z<#~muol$FsY_qQC{JDc8b=$l6Y_@_!$av^08`czSm!Xan{l$@GO-zPq1s>WF)G=wv zDD8j~Ht1pFj)*-b7h>W)@O&m&VyYci&}K|0_Z*w`L>1jnGfCf@6p}Ef*?wdficVe_ zmPRUZ(C+YJU+hIj@_#IiM7+$4kH#VS5tM!Ksz01siPc-WUe9Y3|pb4u2qnn zRavJiRpa zq?tr&YV?yKt<@-kAFl3s&Kq#jag$hN+Y%%kX_ytvpCsElgFoN3SsZLC>0f|m#&Jhu zp7c1dV$55$+k78FI2q!FT}r|}cIV;zp~#6X2&}22$t6cHx_95FL~T~1XW21VFuatb zpM@6w>c^SJ>Pq6{L&f9()uy)TAWf;6LyHH3BUiJ8A4}od)9sriz~e7}l7Vr0e%(=>KG1Jay zW0azuWC`(|B?<6;R)2}aU`r@mt_#W2VrO{LcX$Hg9f4H#XpOsAOX02x^w9+xnLVAt z^~hv2guE-DElBG+`+`>PwXn5kuP_ZiOO3QuwoEr)ky;o$n7hFoh}Aq0@Ar<8`H!n} zspCC^EB=6>$q*gf&M2wj@zzfBl(w_@0;h^*fC#PW9!-kT-dt*e7^)OIU{Uw%U4d#g zL&o>6`hKQUps|G4F_5AuFU4wI)(%9(av7-u40(IaI|%ir@~w9-rLs&efOR@oQy)}{ z&T#Qf`!|52W0d+>G!h~5A}7VJky`C3^fkJzt3|M&xW~x-8rSi-uz=qBsgODqbl(W#f{Ew#ui(K)(Hr&xqZs` zfrK^2)tF#|U=K|_U@|r=M_Hb;qj1GJG=O=d`~#AFAccecIaq3U`(Ds1*f*TIs=IGL zp_vlaRUtFNK8(k;JEu&|i_m39c(HblQkF8g#l|?hPaUzH2kAAF1>>Yykva0;U@&oRV8w?5yEK??A0SBgh?@Pd zJg{O~4xURt7!a;$rz9%IMHQeEZHR8KgFQixarg+MfmM_OeX#~#&?mx44qe!wt`~dd zqyt^~ML>V>2Do$huU<7}EF2wy9^kJJSm6HoAD*sRz%a|aJWz_n6?bz99h)jNMp}3k ztPVbos1$lC1nX_OK0~h>=F&v^IfgBF{#BIi&HTL}O7H-t4+wwa)kf3AE2-Dx@#mTA z!0f`>vz+d3AF$NH_-JqkuK1C+5>yns0G;r5ApsU|a-w9^j4c+FS{#+7- zH%skr+TJ~W_8CK_j$T1b;$ql_+;q6W|D^BNK*A+W5XQBbJy|)(IDA=L9d>t1`KX2b zOX(Ffv*m?e>! zS3lc>XC@IqPf1g-%^4XyGl*1v0NWnwZTW?z4Y6sncXkaA{?NYna3(n@(+n+#sYm}A zGQS;*Li$4R(Ff{obl3#6pUsA0fKuWurQo$mWXMNPV5K66V!XYOyc})^>889Hg3I<{V^Lj9($B4Zu$xRr=89-lDz9x`+I8q(vEAimx1K{sTbs|5x7S zZ+7o$;9&9>@3K;5-DVzGw=kp7ez%1*kxhGytdLS>Q)=xUWv3k_x(IsS8we39Tijvr z`GKk>gkZTHSht;5q%fh9z?vk%sWO}KR04G9^jleJ^@ovWrob7{1xy7V=;S~dDVt%S za$Q#Th%6g1(hiP>hDe}7lcuI94K-2~Q0R3A1nsb7Y*Z!DtQ(Ic<0;TDKvc6%1kBdJ z$hF!{uALB0pa?B^TC}#N5gZ|CKjy|BnT$7eaKj;f>Alqdb_FA3yjZ4CCvm)D&ibL) zZRi91HC!TIAUl<|`rK_6avGh`!)TKk=j|8*W|!vb9>HLv^E%t$`@r@piI(6V8pqDG zBON7~=cf1ZWF6jc{qkKm;oYBtUpIdau6s+<-o^5qNi-p%L%xAtn9OktFd{@EjVAT% z#?-MJ5}Q9QiK_jYYWs+;I4&!N^(mb!%4zx7qO6oCEDn=8oL6#*9XIJ&iJ30O`0vsFy|fEVkw}*jd&B6!IYi+~Y)qv6QlM&V9g0 zh)@^BVDB|P&#X{31>G*nAT}Mz-j~zd>L{v{9AxrxKFw8j;ccQ$NE0PZCc(7fEt1xd z`(oR2!gX6}R+Z77VkDz^{I)@%&HQT5q+1xlf*3R^U8q%;IT8-B53&}dNA7GW`Ki&= z$lrdH zDCu;j$GxW<&v_4Te7=AE2J0u1NM_7Hl9$u{z(8#%8vvrx2P#R7AwnY|?#LbWmROa; zOJzU_*^+n(+k;Jd{e~So9>OF>fPx$Hb$?~K1ul2xr>>o@**n^6IMu8+o3rDp(X$cC z`wQt9qIS>yjA$K~bg{M%kJ00A)U4L+#*@$8UlS#lN3YA{R{7{-zu#n1>0@(#^eb_% zY|q}2)jOEM8t~9p$X5fpT7BZQ1bND#^Uyaa{mNcFWL|MoYb@>y`d{VwmsF&haoJuS2W7azZU0{tu#Jj_-^QRc35tjW~ae&zhKk!wD}#xR1WHu z_7Fys#bp&R?VXy$WYa$~!dMxt2@*(>@xS}5f-@6eoT%rwH zv_6}M?+piNE;BqaKzm1kK@?fTy$4k5cqYdN8x-<(o6KelwvkTqC3VW5HEnr+WGQlF zs`lcYEm=HPpmM4;Ich7A3a5Mb3YyQs7(Tuz-k4O0*-YGvl+2&V(B&L1F8qfR0@vQM-rF<2h-l9T12eL}3LnNAVyY_z51xVr$%@VQ-lS~wf3mnHc zoM({3Z<3+PpTFCRn_Y6cbxu9v>_>eTN0>hHPl_NQQuaK^Mhrv zX{q#80ot;ptt3#js3>kD&uNs{G0mQp>jyc0GG?=9wb33hm z`y2jL=J)T1JD7eX3xa4h$bG}2ev=?7f>-JmCj6){Upo&$k{2WA=%f;KB;X5e;JF3IjQBa4e-Gp~xv- z|In&Rad7LjJVz*q*+splCj|{7=kvQLw0F@$vPuw4m^z=B^7=A4asK_`%lEf_oIJ-O z{L)zi4bd#&g0w{p1$#I&@bz3QXu%Y)j46HAJKWVfRRB*oXo4lIy7BcVl4hRs<%&iQ zr|)Z^LUJ>qn>{6y`JdabfNNFPX7#3`x|uw+z@h<`x{J4&NlDjnknMf(VW_nKWT!Jh zo1iWBqT6^BR-{T=4Ybe+?6zxP_;A5Uo{}Xel%*=|zRGm1)pR43K39SZ=%{MDCS2d$~}PE-xPw4ZK6)H;Zc&0D5p!vjCn0wCe&rVIhchR9ql!p2`g0b@JsC^J#n_r*4lZ~u0UHKwo(HaHUJDHf^gdJhTdTW z3i7Zp_`xyKC&AI^#~JMVZj^9WsW}UR#nc#o+ifY<4`M+?Y9NTBT~p`ONtAFf8(ltr*ER-Ig!yRs2xke#NN zkyFcaQKYv>L8mQdrL+#rjgVY>Z2_$bIUz(kaqL}cYENh-2S6BQK-a(VNDa_UewSW` zMgHi<3`f!eHsyL6*^e^W7#l?V|42CfAjsgyiJsA`yNfAMB*lAsJj^K3EcCzm1KT zDU2+A5~X%ax-JJ@&7>m`T;;}(-e%gcYQtj}?ic<*gkv)X2-QJI5I0tA2`*zZRX(;6 zJ0dYfMbQ+{9Rn3T@Iu4+imx3Y%bcf2{uT4j-msZ~eO)5Z_T7NC|Nr3)|NWjomhv=E zXaVin)MY)`1QtDyO7mUCjG{5+o1jD_anyKn73uflH*ASA8rm+S=gIfgJ);>Zx*hNG z!)8DDCNOrbR#9M7Ud_1kf6BP)x^p(|_VWCJ+(WGDbYmnMLWc?O4zz#eiP3{NfP1UV z(n3vc-axE&vko^f+4nkF=XK-mnHHQ7>w05$Q}iv(kJc4O3TEvuIDM<=U9@`~WdKN* zp4e4R1ncR_kghW}>aE$@OOc~*aH5OOwB5U*Z)%{LRlhtHuigxH8KuDwvq5{3Zg{Vr zrd@)KPwVKFP2{rXho(>MTZZfkr$*alm_lltPob4N4MmhEkv`J(9NZFzA>q0Ch;!Ut zi@jS_=0%HAlN+$-IZGPi_6$)ap>Z{XQGt&@ZaJ(es!Po5*3}>R4x66WZNsjE4BVgn z>}xm=V?F#tx#e+pimNPH?Md5hV7>0pAg$K!?mpt@pXg6UW9c?gvzlNe0 z3QtIWmw$0raJkjQcbv-7Ri&eX6Ks@@EZ&53N|g7HU<;V1pkc&$3D#8k!coJ=^{=vf z-pCP;vr2#A+i#6VA?!hs6A4P@mN62XYY$#W9;MwNia~89i`=1GoFESI+%Mbrmwg*0 zbBq4^bA^XT#1MAOum)L&ARDXJ6S#G>&*72f50M1r5JAnM1p7GFIv$Kf9eVR(u$KLt z9&hQ{t^i16zL1c(tRa~?qr?lbSN;1k;%;p*#gw_BwHJRjcYPTj6>y-rw*dFTnEs95 z`%-AoPL!P16{=#RI0 zUb6#`KR|v^?6uNnY`zglZ#Wd|{*rZ(x&Hk8N6ob6mpX~e^qu5kxvh$2TLJA$M=rx zc!#ot+sS+-!O<0KR6+Lx&~zgEhCsbFY{i_DQCihspM?e z-V}HemMAvFzXR#fV~a=Xf-;tJ1edd}Mry@^=9BxON;dYr8vDEK<<{ zW~rg(ZspxuC&aJo$GTM!9_sXu(EaQJNkV9AC(ob#uA=b4*!Uf}B*@TK=*dBvKKPAF z%14J$S)s-ws9~qKsf>DseEW(ssVQ9__YNg}r9GGx3AJiZR@w_QBlGP>yYh0lQCBtf zx+G;mP+cMAg&b^7J!`SiBwC81M_r0X9kAr2y$0(Lf1gZK#>i!cbww(hn$;fLIxRf? z!AtkSZc-h76KGSGz%48Oe`8ZBHkSXeVb!TJt_VC>$m<#}(Z}!(3h631ltKb3CDMw^fTRy%Ia!b&at`^g7Ew-%WLT9(#V0OP9CE?uj62s>`GI3NA z!`$U+i<`;IQyNBkou4|-7^9^ylac-Xu!M+V5p5l0Ve?J0wTSV+$gYtoc=+Ve*OJUJ z$+uIGALW?}+M!J9+M&#bT=Hz@{R2o>NtNGu1yS({pyteyb>*sg4N`KAD?`u3F#C1y z2K4FKOAPASGZTep54PqyCG(h3?kqQQAxDSW@>T2d!n;9C8NGS;3A8YMRcL>b=<<%M zMiWf$jY;`Ojq5S{kA!?28o)v$;)5bTL<4eM-_^h4)F#eeC2Dj*S`$jl^yn#NjJOYT zx%yC5Ww@eX*zsM)P(5#wRd=0+3~&3pdIH7CxF_2iZSw@>kCyd z%M}$1p((Bidw4XNtk&`BTkU{-PG)SXIZ)yQ!Iol6u8l*SQ1^%zC72FP zLvG>_Z0SReMvB%)1@+et0S{<3hV@^SY3V~5IY(KUtTR{*^xJ^2NN{sIMD9Mr9$~(C$GLNlSpzS=fsbw-DtHb_T|{s z9OR|sx!{?F``H!gVUltY7l~dx^a(2;OUV^)7 z%@hg`8+r&xIxmzZ;Q&v0X%9P)U0SE@r@(lKP%TO(>6I_iF{?PX(bez6v8Gp!W_nd5 z<8)`1jcT)ImNZp-9rr4_1MQ|!?#8sJQx{`~7)QZ75I=DPAFD9Mt{zqFrcrXCU9MG8 zEuGcy;nZ?J#M3!3DWW?Zqv~dnN6ijlIjPfJx(#S0cs;Z=jDjKY|$w2s4*Xa1Iz953sN2Lt!Vmk|%ZwOOqj`sA--5Hiaq8!C%LV zvWZ=bxeRV(&%BffMJ_F~~*FdcjhRVNUXu)MS(S#67rDe%Ler=GS+WysC1I2=Bmbh3s6wdS}o$0 zz%H08#SPFY9JPdL6blGD$D-AaYi;X!#zqib`(XX*i<*eh+2UEPzU4}V4RlC3{<>-~ zadGA8lSm>b7Z!q;D_f9DT4i)Q_}ByElGl*Cy~zX%IzHp)@g-itZB6xM70psn z;AY8II99e6P2drgtTG5>`^|7qg`9MTp%T~|1N3tBqV}2zgow3TFAH{XPor0%=HrkXnKyxyozHlJ6 zd3}OWkl?H$l#yZqOzZbMI+lDLoH48;s10!m1!K87g;t}^+A3f3e&w{EYhVPR0Km*- zh5-ku$Z|Ss{2?4pGm(Rz!0OQb^_*N`)rW{z)^Cw_`a(_L9j=&HEJl(!4rQy1IS)>- zeTIr>hOii`gc(fgYF(cs$R8l@q{mJzpoB5`5r>|sG zBpsY}RkY(g5`bj~D>(;F8v*DyjX(#nVLSs>)XneWI&%Wo>a0u#4A?N<1SK4D}&V1oN)76 z%S>a2n3n>G`YY1>0Hvn&AMtMuI_?`5?4y3w2Hnq4Qa2YH5 zxKdfM;k467djL31Y$0kd9FCPbU=pHBp@zaIi`Xkd80;%&66zvSqsq6%aY)jZacfvw ztkWE{ZV6V2WL9e}Dvz|!d96KqVkJU@5ryp#rReeWu>mSrOJxY^tWC9wd0)$+lZc%{ zY=c4#%OSyQJvQUuy^u}s8DN8|8T%TajOuaY^)R-&8s@r9D`(Ic4NmEu)fg1f!u`xUb;9t#rM z>}cY=648@d5(9A;J)d{a^*ORdVtJrZ77!g~^lZ9@)|-ojvW#>)Jhe8$7W3mhmQh@S zU=CSO+1gSsQ+Tv=x-BD}*py_Ox@;%#hPb&tqXqyUW9jV+fonnuCyVw=?HR>dAB~Fg z^vl*~y*4|)WUW*9RC%~O1gHW~*tJb^a-j;ae2LRNo|0S2`RX>MYqGKB^_ng7YRc@! zFxg1X!VsvXkNuv^3mI`F2=x6$(pZdw=jfYt1ja3FY7a41T07FPdCqFhU6%o|Yb6Z4 zpBGa=(ao3vvhUv#*S{li|EyujXQPUV;0sa5!0Ut)>tPWyC9e0_9(=v*z`TV5OUCcx zT=w=^8#5u~7<}8Mepqln4lDv*-~g^VoV{(+*4w(q{At6d^E-Usa2`JXty++Oh~on^ z;;WHkJsk2jvh#N|?(2PLl+g!M0#z_A;(#Uy=TzL&{Ei5G9#V{JbhKV$Qmkm%5tn!CMA? z@hM=b@2DZWTQ6>&F6WCq6;~~WALiS#@{|I+ucCmD6|tBf&e;$_)%JL8$oIQ%!|Xih1v4A$=7xNO zZVz$G8;G5)rxyD+M0$20L$4yukA_D+)xmK3DMTH3Q+$N&L%qB)XwYx&s1gkh=%qGCCPwnwhbT4p%*3R)I}S#w7HK3W^E%4w z2+7ctHPx3Q97MFYB48HfD!xKKb(U^K_4)Bz(5dvwyl*R?)k;uHEYVi|{^rvh)w7}t z`tnH{v9nlVHj2ign|1an_wz0vO)*`3RaJc#;(W-Q6!P&>+@#fptCgtUSn4!@b7tW0&pE2Qj@7}f#ugu4*C)8_}AMRuz^WG zc)XDcOPQjRaGptRD^57B83B-2NKRo!j6TBAJntJPHNQG;^Oz}zt5F^kId~miK3J@l ztc-IKp6qL!?u~q?qfGP0I~$5gvq#-0;R(oLU@sYayr*QH95fnrYA*E|n%&FP@Cz`a zSdJ~(c@O^>qaO`m9IQ8sd8!L<+)GPJDrL7{4{ko2gWOZel^3!($Gjt|B&$4dtfTmBmC>V`R&&6$wpgvdmns zxcmfS%9_ZoN>F~azvLFtA(9Q5HYT#A(byGkESnt{$Tu<73$W~reB4&KF^JBsoqJ6b zS?$D7DoUgzLO-?P`V?5_ub$nf1p0mF?I)StvPomT{uYjy!w&z$t~j&en=F~hw|O(1 zlV9$arQmKTc$L)Kupwz_zA~deT+-0WX6NzFPh&d+ly*3$%#?Ca9Z9lOJsGVoQ&1HNg+)tJ_sw)%oo*DK)iU~n zvL``LqTe=r=7SwZ@LB)9|3QB5`0(B9r(iR}0nUwJss-v=dXnwMRQFYSRK1blS#^g(3@z{`=8_CGDm!LESTWig zzm1{?AG&7`uYJ;PoFO$o8RWuYsV26V{>D-iYTnvq7igWx9@w$EC*FV^vpvDl@i9yp zPIqiX@hEZF4VqzI3Y)CHhR`xKN8poL&~ak|wgbE4zR%Dm(a@?bw%(7(!^>CM!^4@J z6Z)KhoQP;WBq_Z_&<@i2t2&xq>N>b;Np2rX?yK|-!14iE2T}E|jC+=wYe~`y38g3J z8QGZquvqBaG!vw&VtdXWX5*i5*% zJP~7h{?&E|<#l{klGPaun`IgAJ4;RlbRqgJz5rmHF>MtJHbfqyyZi53?Lhj=(Ku#& z__ubmZIxzSq3F90Xur!1)Vqe6b@!ueHA!93H~jdHmaS5Q^CULso}^poy)0Op6!{^9 zWyCyyIrdBP4fkliZ%*g+J-A!6VFSRF6Liu6G^^=W>cn81>4&7(c7(6vCGSAJ zQZ|S3mb|^Wf=yJ(h~rq`iiW~|n#$+KcblIR<@|lDtm!&NBzSG-1;7#YaU+-@=xIm4 zE}edTYd~e&_%+`dIqqgFntL-FxL3!m4yTNt<(^Vt9c6F(`?9`u>$oNxoKB29<}9FE zgf)VK!*F}nW?}l95%RRk8N4^Rf8)Xf;drT4<|lUDLPj^NPMrBPL;MX&0oGCsS za3}vWcF(IPx&W6{s%zwX{UxHX2&xLGfT{d9bWP!g;Lg#etpuno$}tHoG<4Kd*=kpU z;4%y(<^yj(UlG%l-7E9z_Kh2KoQ19qT3CR@Ghr>BAgr3Vniz3LmpC4g=g|A3968yD2KD$P7v$ zx9Q8`2&qH3&y-iv0#0+jur@}k`6C%7fKbCr|tHX2&O%r?rBpg`YNy~2m+ z*L7dP$RANzVUsG_Lb>=__``6vA*xpUecuGsL+AW?BeSwyoQfDlXe8R1*R1M{0#M?M zF+m19`3<`gM{+GpgW^=UmuK*yMh3}x)7P738wL8r@(Na6%ULPgbPVTa6gh5Q(SR0f znr6kdRpe^(LVM;6Rt(Z@Lsz3EX*ry6(WZ?w>#ZRelx)N%sE+MN>5G|Z8{%@b&D+Ov zPU{shc9}%;G7l;qbonIb_1m^Qc8ez}gTC-k02G8Rl?7={9zBz8uRX2{XJQ{vZhs67avlRn| zgRtWl0Lhjet&!YC47GIm%1gdq%T24_^@!W3pCywc89X4I5pnBCZDn(%!$lOGvS*`0!AoMtqxNPFgaMR zwoW$p;8l6v%a)vaNsesED3f}$%(>zICnoE|5JwP&+0XI}JxPccd+D^gx`g`=GsUc0 z9Uad|C+_@_0%JmcObGnS@3+J^0P!tg+fUZ_w#4rk#TlJYPXJiO>SBxzs9(J;XV9d{ zmTQE1(K8EYaz9p^XLbdWudyIPJlGPo0U*)fAh-jnbfm@SYD_2+?|DJ-^P+ojG{2{6 z>HJtedEjO@j_tqZ4;Zq1t5*5cWm~W?HGP!@_f6m#btM@46cEMhhK{(yI&jG)fwL1W z^n_?o@G8a-jYt!}$H*;{0#z8lANlo!9b@!c5K8<(#lPlpE!z86Yq#>WT&2} z;;G1$pD%iNoj#Z=&kij5&V1KHIhN-h<;{HC5wD)PvkF>CzlQOEx_0;-TJ*!#&{Wzt zKcvq^SZIdop}y~iouNqtU7K7+?eIz-v_rfNM>t#i+dD$s_`M;sjGubTdP)WI*uL@xPOLHt#~T<@Yz>xt50ZoTw;a(a}lNiDN-J${gOdE zx?8LOA|tv{Mb}=TTR=LcqMqbCJkKj+@;4Mu)Cu0{`~ohix6E$g&tff)aHeUAQQ%M? zIN4uSUTzC1iMEWL*W-in1y)C`E+R8j?4_?X4&2Zv5?QdkNMz(k} zw##^Ikx`#_s>i&CO_mu@vJJ*|3ePRDl5pq$9V^>D;g0R%l>lw;ttyM6Sy`NBF{)Lr zSk)V>mZr96+aHY%vTLLt%vO-+juw6^SO_ zYGJaGeWX6W(TOQx=5oTGXOFqMMU*uZyt>MR-Y`vxW#^&)H zk0!F8f*@v6NO@Z*@Qo)+hlX40EWcj~j9dGrLaq%1;DE_%#lffXCcJ;!ZyyyZTz74Q zb2WSly6sX{`gQeToQsi1-()5EJ1nJ*kXGD`xpXr~?F#V^sxE3qSOwRSaC9x9oa~jJ zTG9`E|q zC5Qs1xh}jzb5UPYF`3N9YuMnI7xsZ41P;?@c|%w zl=OxLr6sMGR+`LStLvh)g?fA5p|xbUD;yFAMQg&!PEDYxVYDfA>oTY;CFt`cg?Li1 z0b})!9Rvw&j#*&+D2))kXLL z0+j=?7?#~_}N-qdEIP>DQaZh#F(#e0WNLzwUAj@r694VJ8?Dr5_io2X49XYsG^ zREt0$HiNI~6VV!ycvao+0v7uT$_ilKCvsC+VDNg7yG1X+eNe^3D^S==F3ByiW0T^F zH6EsH^}Uj^VPIE&m)xlmOScYR(w750>hclqH~~dM2+;%GDXT`u4zG!p((*`Hwx41M z4KB+`hfT(YA%W)Ve(n+Gu9kuXWKzxg{1ff^xNQw>w%L-)RySTk9kAS92(X0Shg^Q? zx1YXg_TLC^?h6!4mBqZ9pKhXByu|u~gF%`%`vdoaGBN3^j4l!4x?Bw4Jd)Z4^di}! zXlG1;hFvc>H?bmmu1E7Vx=%vahd!P1#ZGJOJYNbaek^$DHt`EOE|Hlij+hX>ocQFSLVu|wz`|KVl@Oa;m2k6b*mNK2Vo{~l9>Qa3@B7G7#k?)aLx;w6U ze8bBq%vF?5v>#TspEoaII!N}sRT~>bh-VWJ7Q*1qsz%|G)CFmnttbq$Ogb{~YK_=! z{{0vhlW@g!$>|}$&4E3@k`KPElW6x#tSX&dfle>o!irek$NAbDzdd2pVeNzk4&qgJ zXvNF0$R96~g0x+R1igR=Xu&X_Hc5;!Ze&C)eUTB$9wW&?$&o8Yxhm5s(S`;?{> z*F?9Gr0|!OiKA>Rq-ae=_okB6&yMR?!JDer{@iQgIn=cGxs-u^!8Q$+N&pfg2WM&Z zulHu=Uh~U>fS{=Nm0x>ACvG*4R`Dx^kJ65&Vvfj`rSCV$5>c04N26Rt2S?*kh3JKq z9(3}5T?*x*AP(X2Ukftym0XOvg~r6Ms$2x&R&#}Sz23aMGU&7sU-cFvE3Eq`NBJe84VoftWF#v7PDAp`@V zRFCS24_k~;@~R*L)eCx@Q9EYmM)Sn}HLbVMyxx%{XnMBDc-YZ<(DXDBYUt8$u5Zh} zBK~=M9cG$?_m_M61YG+#|9Vef7LfbH>(C21&aC)x$^Lg}fa#SF){RX|?-xZjSOrn# z2ZAwUF)$VB<&S;R3FhNSQOV~8w%A`V9dWyLiy zgt7G=Z4t|zU3!dh5|s(@XyS|waBr$>@=^Dspmem8)@L`Ns{xl%rGdX!R(BiC5C7Vo zXetb$oC_iXS}2x_Hy}T(hUUNbO47Q@+^4Q`h>(R-;OxCyW#eoOeC51jzxnM1yxBrp zz6}z`(=cngs6X05e79o_B7@3K|Qpe3n38Py_~ zpi?^rj!`pq!7PHGliC$`-8A^Ib?2qgJJCW+(&TfOnFGJ+@-<<~`7BR0f4oSINBq&R z2CM`0%WLg_Duw^1SPwj-{?BUl2Y=M4e+7yL1{C&&f&zjF06#xf>VdLozgNye(BNgSD`=fFbBy0HIosLl@JwCQl^s;eTnc( z3!r8G=K>zb`|bLLI0N|eFJk%s)B>oJ^M@AQzqR;HUjLsOqW<0v>1ksT_#24*U@R3HJu*A^#1o#P3%3_jq>icD@<`tqU6ICEgZrME(xX#?i^Z z%Id$_uyQGlFD-CcaiRtRdGn|K`Lq5L-rx7`vYYGH7I=eLfHRozPiUtSe~Tt;IN2^gCXmf2#D~g2@9bhzK}3nphhG%d?V7+Zq{I2?Gt*!NSn_r~dd$ zqkUOg{U=MI?Ehx@`(X%rQB?LP=CjJ*V!rec{#0W2WshH$X#9zep!K)tzZoge*LYd5 z@g?-j5_mtMp>_WW`p*UNUZTFN{_+#m*bJzt{hvAdkF{W40{#L3w6gzPztnsA_4?&0 z(+>pv!zB16rR-(nm(^c>Z(its{ny677vT8sF564^mlZvJ!h65}OW%Hn|2OXbOQM%b z{6C54Z2v;^hyMQ;UH+HwFD2!F!VlQ}6Z{L0_9g5~CH0@Mqz?ZC`^QkhOU#$Lx<4`B zyZsa9uPF!rZDo8ZVfzzR#raQ>5|)k~_Ef*wDqG^76o)j!C4 zykvT*o$!-MBko@?{b~*Zf2*YMlImrK`cEp|#D7f%Twm<|C|dWD \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/gradlew.bat b/exercises/tiered_pricing/solutions/adrianliz/java/gradlew.bat new file mode 100755 index 00000000..6d57edc7 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java new file mode 100644 index 00000000..c38bc228 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -0,0 +1,19 @@ +package tv.codely.checkout; + +public class TieredPricing { + + public int getTotalPrice(int subscriptions) { + switch (subscriptions) { + case 1, 2: + return 299 * subscriptions; + case 3, 4, 5, 6, 7, 8, 9, 10: + return 239 * subscriptions; + case 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25: + return 219 * subscriptions; + case 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50: + return 199 * subscriptions; + default: + return 149 * subscriptions; + } + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/CheckoutApplication.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/CheckoutApplication.java new file mode 100644 index 00000000..89c23ee9 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/CheckoutApplication.java @@ -0,0 +1,11 @@ +package tv.codely.checkout.api; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CheckoutApplication { + public static void main(String[] args) { + SpringApplication.run(CheckoutApplication.class, args); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/Controller/ExampleGetController.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/Controller/ExampleGetController.java new file mode 100644 index 00000000..15b2681e --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/api/Controller/ExampleGetController.java @@ -0,0 +1,21 @@ +package tv.codely.checkout.api.Controller; + +import org.json.JSONException; +import org.json.JSONObject; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; + +@RestController +public class ExampleGetController { + + @GetMapping("/") + public ResponseEntity response(@RequestParam String name, HttpServletResponse response) throws JSONException { + response.addHeader("content-type", "application/json"); + + return ResponseEntity.ok(new JSONObject().put("hello", name).toString()); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/resources/log4j2.properties b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/resources/log4j2.properties new file mode 100644 index 00000000..1d009f67 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/resources/log4j2.properties @@ -0,0 +1,34 @@ +name = CodelyTvJavaBasicSkeleton +property.filename = logs +appenders = console, file + +status = warn + +appender.console.name = CONSOLE +appender.console.type = CONSOLE +appender.console.target = SYSTEM_OUT + +appender.console.logstash.type = LogstashLayout +appender.console.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ +appender.console.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json +appender.console.logstash.prettyPrintEnabled = true +appender.console.logstash.stackTraceEnabled = true + +appender.file.type = File +appender.file.name = LOGFILE +appender.file.fileName=var/log/java-basic-skeleton.log +appender.file.logstash.type=LogstashLayout +appender.file.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ +appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json +appender.file.logstash.prettyPrintEnabled = false +appender.file.logstash.stackTraceEnabled = true + +loggers = file +logger.file.name = tv.codely.java_basic_skeleton +logger.file.level = info +logger.file.appenderRefs = file +logger.file.appenderRef.file.ref = LOGFILE + +rootLogger.level = info +rootLogger.appenderRefs = stdout +rootLogger.appenderRef.stdout.ref = CONSOLE diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java new file mode 100644 index 00000000..d7dedf40 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -0,0 +1,59 @@ +package tv.codely.checkout; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +public class TieredPricingShould { + + @Test + void unit_test_example() { + assertTrue(true); + } + + @Test + void return_total_price_for_1_subscription() { + final var tieredPricing = new TieredPricing(); + final var expectedPrice = 299; + + final var totalPrice = tieredPricing.getTotalPrice(1); + assertEquals(expectedPrice, totalPrice); + } + + @Test + void return_total_price_for_3_subscriptions() { + final var tieredPricing = new TieredPricing(); + final var expectedPrice = 239 * 3; + + final var totalPrice = tieredPricing.getTotalPrice(3); + assertEquals(expectedPrice, totalPrice); + } + + @Test + void return_total_price_for_11_subscriptions() { + final var tieredPricing = new TieredPricing(); + final var expectedPrice = 219 * 11; + + final var totalPrice = tieredPricing.getTotalPrice(11); + assertEquals(expectedPrice, totalPrice); + } + + @Test + void return_total_price_for_26_subscriptions() { + final var tieredPricing = new TieredPricing(); + final var expectedPrice = 199 * 26; + + final var totalPrice = tieredPricing.getTotalPrice(26); + assertEquals(expectedPrice, totalPrice); + } + + @Test + void return_total_price_for_51_subscriptions() { + final var tieredPricing = new TieredPricing(); + final var expectedPrice = 149 * 51; + + final var totalPrice = tieredPricing.getTotalPrice(51); + assertEquals(expectedPrice, totalPrice); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/ApiTestCase.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/ApiTestCase.java new file mode 100644 index 00000000..e0346b69 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/ApiTestCase.java @@ -0,0 +1,67 @@ +package tv.codely.checkout.api; + +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.ResultMatcher; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@WebMvcTest +public abstract class ApiTestCase { + + @Autowired + private MockMvc mockMvc; + private ResultActions currentRequest; + + + protected void assertJsonResponse( + String endpoint, + Integer expectedStatusCode, + String expectedResponse + ) throws Exception { + ResultMatcher response = expectedResponse.isEmpty() + ? content().string("") + : content().json(expectedResponse); + + mockMvc + .perform(get(endpoint)) + .andExpect(status().is(expectedStatusCode)) + .andExpect(response) + .andExpect(header().string("content-type", "application/json")); + + } + + protected void whenGetRequestSentTo(String endpoint) throws Exception { + currentRequest = mockMvc.perform(get(endpoint)); + } + + protected void assertStatusCodeIs(Integer expectedStatusCode) throws Exception { + currentRequest.andExpect(status().is(expectedStatusCode)); + } + + protected void assertContentTypeIsA(String expectedContentType) throws Exception { + currentRequest.andExpect(header().string("content-type", expectedContentType)); + } + + protected void assertResponseIs(String expectedResponse) throws Exception { + ResultMatcher response = expectedResponse.isEmpty() + ? content().string("") + : content().json(expectedResponse); + + currentRequest.andExpect(response); + } + + protected void assertSuccessJsonResponse(JSONObject json) throws Exception { + assertJsonResponse(200, json); + } + + protected void assertJsonResponse(int statusCode, JSONObject json) throws Exception { + assertStatusCodeIs(statusCode); + assertContentTypeIsA("application/json"); + assertResponseIs(json.toString()); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/Controller/ExampleGetControllerShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/Controller/ExampleGetControllerShould.java new file mode 100644 index 00000000..55c7a3b0 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/api/Controller/ExampleGetControllerShould.java @@ -0,0 +1,16 @@ +package tv.codely.checkout.api.Controller; + +import org.json.JSONObject; +import org.junit.jupiter.api.Test; +import tv.codely.checkout.api.ApiTestCase; + +public class ExampleGetControllerShould extends ApiTestCase { + + @Test + public void spring_boot_e2e_test_example() throws Exception { + whenGetRequestSentTo("/?name=world"); + + JSONObject jsonResponse = new JSONObject().put("hello", "world"); + assertSuccessJsonResponse(jsonResponse); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/resources/log4j2.properties b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/resources/log4j2.properties new file mode 100644 index 00000000..1aae4672 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/resources/log4j2.properties @@ -0,0 +1,33 @@ +name = CodelyTvJavaBasicSkeleton +property.filename = logs +appenders = console, file + +status = warn + +appender.console.name = CONSOLE +appender.console.type = CONSOLE +appender.console.target = SYSTEM_OUT + +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = [%level] [%date{HH:mm:ss.SSS}] [%class{0}#%method:%line] %message \(%mdc\) %n%throwable +appender.console.filter.threshold.type = ThresholdFilter +appender.console.filter.threshold.level = info + +appender.file.type = File +appender.file.name = LOGFILE +appender.file.fileName=var/log/java-basic-skeleton-test.log +appender.file.logstash.type=LogstashLayout +appender.file.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ +appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json +appender.file.logstash.prettyPrintEnabled = false +appender.file.logstash.stackTraceEnabled = true + +loggers = file +logger.file.name = tv.codely.java_basic_skeleton +logger.file.level = info +logger.file.appenderRefs = file +logger.file.appenderRef.file.ref = LOGFILE + +rootLogger.level = info +rootLogger.appenderRefs = stdout +rootLogger.appenderRef.stdout.ref = CONSOLE diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/var/log/.gitkeep b/exercises/tiered_pricing/solutions/adrianliz/java/var/log/.gitkeep new file mode 100644 index 00000000..e69de29b From 8b0c21b4d5265ae9ca78443235ad2100cf21cc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 17:04:55 +0200 Subject: [PATCH 02/14] feat: add PriceRange concept TieredPricing constructor parallel change --- .../java/tv/codely/checkout/PriceRange.java | 28 +++++++++++++++ .../tv/codely/checkout/TieredPricing.java | 35 ++++++++++++------- .../codely/checkout/TieredPricingShould.java | 17 +++++++++ 3 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java new file mode 100644 index 00000000..487baf77 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java @@ -0,0 +1,28 @@ +package tv.codely.checkout; + +public final class PriceRange { + + private final int numberOfSubscriptionsFrom; + private final int numberOfSubscriptionsTo; + private final double unitPrice; + + public PriceRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo, + double unitPrice) { + this.numberOfSubscriptionsFrom = numberOfSubscriptionsFrom; + this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; + this.unitPrice = unitPrice; + } + + public boolean isInRange(int numberOfSubscriptions) { + return numberOfSubscriptions >= numberOfSubscriptionsFrom + && numberOfSubscriptions <= numberOfSubscriptionsTo; + } + + public double unitPrice() { + return unitPrice; + } + + public double getTotalPrice(int numberOfSubscriptions) { + return unitPrice * numberOfSubscriptions; + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java index c38bc228..8e9f3628 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -1,19 +1,28 @@ package tv.codely.checkout; +import java.util.List; + public class TieredPricing { - public int getTotalPrice(int subscriptions) { - switch (subscriptions) { - case 1, 2: - return 299 * subscriptions; - case 3, 4, 5, 6, 7, 8, 9, 10: - return 239 * subscriptions; - case 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25: - return 219 * subscriptions; - case 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50: - return 199 * subscriptions; - default: - return 149 * subscriptions; - } + private final List priceRanges; + + public TieredPricing(final List priceRanges) { + this.priceRanges = priceRanges; + } + + public TieredPricing() { + this(List.of( + new PriceRange(1, 2, 299), + new PriceRange(3, 10, 239), + new PriceRange(11, 25, 219), + new PriceRange(26, 50, 199), + new PriceRange(51, 100, 149))); + } + + public double getTotalPrice(int subscriptions) { + return priceRanges.stream().filter(priceRange -> priceRange.isInRange(subscriptions)) + .findFirst() + .map(priceRange -> priceRange.getTotalPrice(subscriptions)) + .orElse(0D); } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index d7dedf40..10154e1a 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.List; import org.junit.jupiter.api.Test; public class TieredPricingShould { @@ -12,6 +13,22 @@ void unit_test_example() { assertTrue(true); } + @Test + void return_total_price_based_on_number_of_subscriptions() { + final var priceRanges = + List.of( + new PriceRange(1, 2, 299), + new PriceRange(3, 10, 239), + new PriceRange(11, 25, 219), + new PriceRange(26, 50, 199), + new PriceRange(51, 100, 149)); + final var tieredPricing = new TieredPricing(priceRanges); + final var expectedPrice = priceRanges.get(1).unitPrice() * 3; + + final var totalPrice = tieredPricing.getTotalPrice(3); + assertEquals(expectedPrice, totalPrice); + } + @Test void return_total_price_for_1_subscription() { final var tieredPricing = new TieredPricing(); From 20a9f595a6a30d1c45a816698733025330caba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 17:23:44 +0200 Subject: [PATCH 03/14] feat: add SubscriptionPrice and SubscriptionRange concepts PriceRange constructor parallel change --- .../java/tv/codely/checkout/PriceRange.java | 6 +++++ .../tv/codely/checkout/SubscriptionPrice.java | 14 +++++++++++ .../tv/codely/checkout/SubscriptionRange.java | 25 +++++++++++++++++++ .../codely/checkout/TieredPricingShould.java | 10 ++++---- 4 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionRange.java diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java index 487baf77..bdf60b66 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java @@ -13,6 +13,12 @@ public PriceRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo, this.unitPrice = unitPrice; } + public PriceRange(final SubscriptionRange range, + final SubscriptionPrice price) { + this(range.numberOfSubscriptionsFrom(), range.numberOfSubscriptionsTo(), + price.price()); + } + public boolean isInRange(int numberOfSubscriptions) { return numberOfSubscriptions >= numberOfSubscriptionsFrom && numberOfSubscriptions <= numberOfSubscriptionsTo; diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java new file mode 100644 index 00000000..dcd7fd66 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java @@ -0,0 +1,14 @@ +package tv.codely.checkout; + +public final class SubscriptionPrice { + + private final double price; + + public SubscriptionPrice(double price) { + this.price = price; + } + + public double price() { + return price; + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionRange.java new file mode 100644 index 00000000..37709e6e --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionRange.java @@ -0,0 +1,25 @@ +package tv.codely.checkout; + +public final class SubscriptionRange { + + private final int numberOfSubscriptionsFrom; + private final int numberOfSubscriptionsTo; + + public SubscriptionRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo) { + this.numberOfSubscriptionsFrom = numberOfSubscriptionsFrom; + this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; + } + + public boolean isSuitableFor(int numberOfSubscriptions) { + return numberOfSubscriptions >= numberOfSubscriptionsFrom + && numberOfSubscriptions <= numberOfSubscriptionsTo; + } + + public int numberOfSubscriptionsFrom() { + return numberOfSubscriptionsFrom; + } + + public int numberOfSubscriptionsTo() { + return numberOfSubscriptionsTo; + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index 10154e1a..d7598337 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -17,11 +17,11 @@ void unit_test_example() { void return_total_price_based_on_number_of_subscriptions() { final var priceRanges = List.of( - new PriceRange(1, 2, 299), - new PriceRange(3, 10, 239), - new PriceRange(11, 25, 219), - new PriceRange(26, 50, 199), - new PriceRange(51, 100, 149)); + new PriceRange(new SubscriptionRange(1, 2), new SubscriptionPrice(299)), + new PriceRange(new SubscriptionRange(3, 10), new SubscriptionPrice(239)), + new PriceRange(new SubscriptionRange(11, 25), new SubscriptionPrice(219)), + new PriceRange(new SubscriptionRange(26, 50), new SubscriptionPrice(199)), + new PriceRange(new SubscriptionRange(51, 100), new SubscriptionPrice(149))); final var tieredPricing = new TieredPricing(priceRanges); final var expectedPrice = priceRanges.get(1).unitPrice() * 3; From 8bb2feb6b38e5c095579db0df1293fd2c5e1c06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 17:30:58 +0200 Subject: [PATCH 04/14] feat: naming improvement --- .../java/tv/codely/checkout/PriceRange.java | 34 ------------------- .../tv/codely/checkout/SubscriptionPrice.java | 14 -------- .../tv/codely/checkout/SubscriptionTier.java | 27 +++++++++++++++ .../checkout/SubscriptionTierPrice.java | 14 ++++++++ ...nRange.java => SubscriptionTierRange.java} | 12 ++----- .../tv/codely/checkout/TieredPricing.java | 31 +++++++++++------ .../codely/checkout/TieredPricingShould.java | 20 ++++++++--- 7 files changed, 79 insertions(+), 73 deletions(-) delete mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java delete mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java rename exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/{SubscriptionRange.java => SubscriptionTierRange.java} (59%) diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java deleted file mode 100644 index bdf60b66..00000000 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceRange.java +++ /dev/null @@ -1,34 +0,0 @@ -package tv.codely.checkout; - -public final class PriceRange { - - private final int numberOfSubscriptionsFrom; - private final int numberOfSubscriptionsTo; - private final double unitPrice; - - public PriceRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo, - double unitPrice) { - this.numberOfSubscriptionsFrom = numberOfSubscriptionsFrom; - this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; - this.unitPrice = unitPrice; - } - - public PriceRange(final SubscriptionRange range, - final SubscriptionPrice price) { - this(range.numberOfSubscriptionsFrom(), range.numberOfSubscriptionsTo(), - price.price()); - } - - public boolean isInRange(int numberOfSubscriptions) { - return numberOfSubscriptions >= numberOfSubscriptionsFrom - && numberOfSubscriptions <= numberOfSubscriptionsTo; - } - - public double unitPrice() { - return unitPrice; - } - - public double getTotalPrice(int numberOfSubscriptions) { - return unitPrice * numberOfSubscriptions; - } -} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java deleted file mode 100644 index dcd7fd66..00000000 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionPrice.java +++ /dev/null @@ -1,14 +0,0 @@ -package tv.codely.checkout; - -public final class SubscriptionPrice { - - private final double price; - - public SubscriptionPrice(double price) { - this.price = price; - } - - public double price() { - return price; - } -} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java new file mode 100644 index 00000000..368a5857 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java @@ -0,0 +1,27 @@ +package tv.codely.checkout; + +public final class SubscriptionTier { + + private final SubscriptionTierRange range; + private final SubscriptionTierPrice price; + + public SubscriptionTier( + final SubscriptionTierRange range, + final SubscriptionTierPrice price) { + + this.range = range; + this.price = price; + } + + public boolean isInRange(int numberOfSubscriptions) { + return this.range.isSuitableFor(numberOfSubscriptions); + } + + public double unitPrice() { + return price.unitPrice(); + } + + public double getTotalPrice(int numberOfSubscriptions) { + return unitPrice() * numberOfSubscriptions; + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java new file mode 100644 index 00000000..5866cb0f --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java @@ -0,0 +1,14 @@ +package tv.codely.checkout; + +public final class SubscriptionTierPrice { + + private final double value; + + public SubscriptionTierPrice(double value) { + this.value = value; + } + + public double unitPrice() { + return value; + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java similarity index 59% rename from exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionRange.java rename to exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java index 37709e6e..a8600993 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java @@ -1,11 +1,11 @@ package tv.codely.checkout; -public final class SubscriptionRange { +public final class SubscriptionTierRange { private final int numberOfSubscriptionsFrom; private final int numberOfSubscriptionsTo; - public SubscriptionRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo) { + public SubscriptionTierRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo) { this.numberOfSubscriptionsFrom = numberOfSubscriptionsFrom; this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; } @@ -14,12 +14,4 @@ public boolean isSuitableFor(int numberOfSubscriptions) { return numberOfSubscriptions >= numberOfSubscriptionsFrom && numberOfSubscriptions <= numberOfSubscriptionsTo; } - - public int numberOfSubscriptionsFrom() { - return numberOfSubscriptionsFrom; - } - - public int numberOfSubscriptionsTo() { - return numberOfSubscriptionsTo; - } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java index 8e9f3628..b6eee7a7 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -4,25 +4,36 @@ public class TieredPricing { - private final List priceRanges; + private final List subscriptionTiers; - public TieredPricing(final List priceRanges) { - this.priceRanges = priceRanges; + public TieredPricing(final List subscriptionTiers) { + this.subscriptionTiers = subscriptionTiers; } public TieredPricing() { this(List.of( - new PriceRange(1, 2, 299), - new PriceRange(3, 10, 239), - new PriceRange(11, 25, 219), - new PriceRange(26, 50, 199), - new PriceRange(51, 100, 149))); + new SubscriptionTier( + new SubscriptionTierRange(1, 2), + new SubscriptionTierPrice(299)), + new SubscriptionTier( + new SubscriptionTierRange(3, 10), + new SubscriptionTierPrice(239)), + new SubscriptionTier( + new SubscriptionTierRange(11, 25), + new SubscriptionTierPrice(219)), + new SubscriptionTier( + new SubscriptionTierRange(26, 50), + new SubscriptionTierPrice(199)), + new SubscriptionTier( + new SubscriptionTierRange(51, 100), + new SubscriptionTierPrice(149)))); } public double getTotalPrice(int subscriptions) { - return priceRanges.stream().filter(priceRange -> priceRange.isInRange(subscriptions)) + return subscriptionTiers.stream() + .filter(subscriptionTier -> subscriptionTier.isInRange(subscriptions)) .findFirst() - .map(priceRange -> priceRange.getTotalPrice(subscriptions)) + .map(subscriptionTier -> subscriptionTier.getTotalPrice(subscriptions)) .orElse(0D); } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index d7598337..e7ca2e19 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -17,11 +17,21 @@ void unit_test_example() { void return_total_price_based_on_number_of_subscriptions() { final var priceRanges = List.of( - new PriceRange(new SubscriptionRange(1, 2), new SubscriptionPrice(299)), - new PriceRange(new SubscriptionRange(3, 10), new SubscriptionPrice(239)), - new PriceRange(new SubscriptionRange(11, 25), new SubscriptionPrice(219)), - new PriceRange(new SubscriptionRange(26, 50), new SubscriptionPrice(199)), - new PriceRange(new SubscriptionRange(51, 100), new SubscriptionPrice(149))); + new SubscriptionTier( + new SubscriptionTierRange(1, 2), + new SubscriptionTierPrice(299)), + new SubscriptionTier( + new SubscriptionTierRange(3, 10), + new SubscriptionTierPrice(239)), + new SubscriptionTier( + new SubscriptionTierRange(11, 25), + new SubscriptionTierPrice(219)), + new SubscriptionTier( + new SubscriptionTierRange(26, 50), + new SubscriptionTierPrice(199)), + new SubscriptionTier( + new SubscriptionTierRange(51, 100), + new SubscriptionTierPrice(149))); final var tieredPricing = new TieredPricing(priceRanges); final var expectedPrice = priceRanges.get(1).unitPrice() * 3; From 81dbc371468322f6cbe544476afdc853c4c337ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 18:33:15 +0200 Subject: [PATCH 05/14] feat: add object mothers in TieredPricingShould --- .../solutions/adrianliz/java/build.gradle | 1 + .../tv/codely/checkout/TieredPricing.java | 8 ++++ .../codely/checkout/TieredPricingShould.java | 30 +++++--------- .../codely/checkout/mother/DoubleMother.java | 8 ++++ .../codely/checkout/mother/IntegerMother.java | 12 ++++++ .../codely/checkout/mother/MotherCreator.java | 12 ++++++ .../mother/SubscriptionTierMother.java | 33 ++++++++++++++++ .../mother/SubscriptionTierPriceMother.java | 14 +++++++ .../mother/SubscriptionTierRangeMother.java | 39 +++++++++++++++++++ 9 files changed, 136 insertions(+), 21 deletions(-) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/DoubleMother.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/IntegerMother.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/MotherCreator.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/build.gradle b/exercises/tiered_pricing/solutions/adrianliz/java/build.gradle index 66c49dd6..a60b0294 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/build.gradle +++ b/exercises/tiered_pricing/solutions/adrianliz/java/build.gradle @@ -24,6 +24,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.4' + testImplementation 'com.github.javafaker:javafaker:1.0.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java index b6eee7a7..5c71bec1 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -36,4 +36,12 @@ public double getTotalPrice(int subscriptions) { .map(subscriptionTier -> subscriptionTier.getTotalPrice(subscriptions)) .orElse(0D); } + + public double getBasePrice(int subscriptions) { + return subscriptionTiers.stream() + .filter(subscriptionTier -> subscriptionTier.isInRange(subscriptions)) + .findFirst() + .map(SubscriptionTier::unitPrice) + .orElse(0D); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index e7ca2e19..caba0526 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -3,8 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.List; import org.junit.jupiter.api.Test; +import tv.codely.checkout.mother.IntegerMother; +import tv.codely.checkout.mother.SubscriptionTierMother; public class TieredPricingShould { @@ -15,27 +16,14 @@ void unit_test_example() { @Test void return_total_price_based_on_number_of_subscriptions() { - final var priceRanges = - List.of( - new SubscriptionTier( - new SubscriptionTierRange(1, 2), - new SubscriptionTierPrice(299)), - new SubscriptionTier( - new SubscriptionTierRange(3, 10), - new SubscriptionTierPrice(239)), - new SubscriptionTier( - new SubscriptionTierRange(11, 25), - new SubscriptionTierPrice(219)), - new SubscriptionTier( - new SubscriptionTierRange(26, 50), - new SubscriptionTierPrice(199)), - new SubscriptionTier( - new SubscriptionTierRange(51, 100), - new SubscriptionTierPrice(149))); - final var tieredPricing = new TieredPricing(priceRanges); - final var expectedPrice = priceRanges.get(1).unitPrice() * 3; + final var subscriptionTiers = SubscriptionTierMother.randoms(); + final var tieredPricing = new TieredPricing(subscriptionTiers); + final var numberOfSubscriptions = IntegerMother.random(); + final var expectedPrice = + tieredPricing.getBasePrice(numberOfSubscriptions) * numberOfSubscriptions; + + final var totalPrice = tieredPricing.getTotalPrice(numberOfSubscriptions); - final var totalPrice = tieredPricing.getTotalPrice(3); assertEquals(expectedPrice, totalPrice); } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/DoubleMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/DoubleMother.java new file mode 100644 index 00000000..f9441291 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/DoubleMother.java @@ -0,0 +1,8 @@ +package tv.codely.checkout.mother; + +public final class DoubleMother { + + public static double randomBetween(final int min, final int max) { + return MotherCreator.random().number().randomDouble(2, min, max); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/IntegerMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/IntegerMother.java new file mode 100644 index 00000000..38ce43ea --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/IntegerMother.java @@ -0,0 +1,12 @@ +package tv.codely.checkout.mother; + +public final class IntegerMother { + + public static int random() { + return MotherCreator.random().number().randomDigitNotZero(); + } + + public static int randomBetween(final int min, final int max) { + return MotherCreator.random().number().numberBetween(min, max); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/MotherCreator.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/MotherCreator.java new file mode 100644 index 00000000..d3c5bd76 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/MotherCreator.java @@ -0,0 +1,12 @@ +package tv.codely.checkout.mother; + +import com.github.javafaker.Faker; + +public final class MotherCreator { + + private static final Faker faker = new Faker(); + + public static Faker random() { + return faker; + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java new file mode 100644 index 00000000..470a4cfa --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java @@ -0,0 +1,33 @@ +package tv.codely.checkout.mother; + +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import tv.codely.checkout.SubscriptionTier; +import tv.codely.checkout.SubscriptionTierPrice; +import tv.codely.checkout.SubscriptionTierRange; + +public final class SubscriptionTierMother { + + public static SubscriptionTier create( + final SubscriptionTierRange range, + final SubscriptionTierPrice price) { + + return new SubscriptionTier(range, price); + } + + public static List randoms() { + final var subscriptionTierRanges = SubscriptionTierRangeMother.randoms(); + final var previousSubscriptionTierPrice = new AtomicReference<>(299D); + + return subscriptionTierRanges.stream() + .map(range -> { + final var subscriptionTierPrice = + DoubleMother.randomBetween( + previousSubscriptionTierPrice.get().intValue() - 60, + previousSubscriptionTierPrice.get().intValue() - 20); + previousSubscriptionTierPrice.set(subscriptionTierPrice); + return create(range, new SubscriptionTierPrice(subscriptionTierPrice)); + }) + .toList(); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java new file mode 100644 index 00000000..f8439f3a --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java @@ -0,0 +1,14 @@ +package tv.codely.checkout.mother; + +import tv.codely.checkout.SubscriptionTierPrice; + +public final class SubscriptionTierPriceMother { + + public static SubscriptionTierPrice create(final double value) { + return new SubscriptionTierPrice(value); + } + + public static SubscriptionTierPrice randomBetween(final int min, final int max) { + return create(DoubleMother.randomBetween(min, max)); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java new file mode 100644 index 00000000..d3374faf --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java @@ -0,0 +1,39 @@ +package tv.codely.checkout.mother; + +import java.util.ArrayList; +import java.util.List; +import tv.codely.checkout.SubscriptionTierRange; + +public final class SubscriptionTierRangeMother { + + public static SubscriptionTierRange create( + final int numberOfSubscriptionsFrom, + final int numberOfSubscriptionsTo) { + + return new SubscriptionTierRange(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); + } + + public static List randoms() { + final var subscriptionTiers = new ArrayList(); + final var numberOfTiers = IntegerMother.randomBetween(1, 6); + final var minSubscriptionsInTier = 3; + final var maxSubscriptionsInTier = + IntegerMother.randomBetween(minSubscriptionsInTier + 1, 20); + + var lastNumberOfSubscriptionsTo = 0; + + for (int i = 0; i < numberOfTiers; i++) { + final var numberOfSubscriptionsFrom = lastNumberOfSubscriptionsTo + 1; + final var numberOfSubscriptionsTo = + IntegerMother.randomBetween( + numberOfSubscriptionsFrom + 1, + maxSubscriptionsInTier * (i + 1)); + + lastNumberOfSubscriptionsTo = numberOfSubscriptionsTo; + + subscriptionTiers.add(create(numberOfSubscriptionsFrom, numberOfSubscriptionsTo)); + } + + return subscriptionTiers; + } +} From 0d9d999fa33e6a8057ec7071f8738945585f3b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 18:37:28 +0200 Subject: [PATCH 06/14] fix: explicit default subscription tiers in tests --- .../tv/codely/checkout/TieredPricing.java | 19 ------------ .../codely/checkout/TieredPricingShould.java | 30 +++++++++++++++---- .../mother/SubscriptionTierMother.java | 4 +-- .../mother/SubscriptionTierPriceMother.java | 4 --- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java index 5c71bec1..470cb154 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -10,25 +10,6 @@ public TieredPricing(final List subscriptionTiers) { this.subscriptionTiers = subscriptionTiers; } - public TieredPricing() { - this(List.of( - new SubscriptionTier( - new SubscriptionTierRange(1, 2), - new SubscriptionTierPrice(299)), - new SubscriptionTier( - new SubscriptionTierRange(3, 10), - new SubscriptionTierPrice(239)), - new SubscriptionTier( - new SubscriptionTierRange(11, 25), - new SubscriptionTierPrice(219)), - new SubscriptionTier( - new SubscriptionTierRange(26, 50), - new SubscriptionTierPrice(199)), - new SubscriptionTier( - new SubscriptionTierRange(51, 100), - new SubscriptionTierPrice(149)))); - } - public double getTotalPrice(int subscriptions) { return subscriptionTiers.stream() .filter(subscriptionTier -> subscriptionTier.isInRange(subscriptions)) diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index caba0526..fc9626c6 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -3,12 +3,32 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.List; import org.junit.jupiter.api.Test; import tv.codely.checkout.mother.IntegerMother; import tv.codely.checkout.mother.SubscriptionTierMother; public class TieredPricingShould { + private static List defaultSubscriptionTiers() { + return List.of( + new SubscriptionTier( + new SubscriptionTierRange(1, 2), + new SubscriptionTierPrice(299)), + new SubscriptionTier( + new SubscriptionTierRange(3, 10), + new SubscriptionTierPrice(239)), + new SubscriptionTier( + new SubscriptionTierRange(11, 25), + new SubscriptionTierPrice(219)), + new SubscriptionTier( + new SubscriptionTierRange(26, 50), + new SubscriptionTierPrice(199)), + new SubscriptionTier( + new SubscriptionTierRange(51, 100), + new SubscriptionTierPrice(149))); + } + @Test void unit_test_example() { assertTrue(true); @@ -29,7 +49,7 @@ void return_total_price_based_on_number_of_subscriptions() { @Test void return_total_price_for_1_subscription() { - final var tieredPricing = new TieredPricing(); + final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); final var expectedPrice = 299; final var totalPrice = tieredPricing.getTotalPrice(1); @@ -38,7 +58,7 @@ void return_total_price_for_1_subscription() { @Test void return_total_price_for_3_subscriptions() { - final var tieredPricing = new TieredPricing(); + final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); final var expectedPrice = 239 * 3; final var totalPrice = tieredPricing.getTotalPrice(3); @@ -47,7 +67,7 @@ void return_total_price_for_3_subscriptions() { @Test void return_total_price_for_11_subscriptions() { - final var tieredPricing = new TieredPricing(); + final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); final var expectedPrice = 219 * 11; final var totalPrice = tieredPricing.getTotalPrice(11); @@ -56,7 +76,7 @@ void return_total_price_for_11_subscriptions() { @Test void return_total_price_for_26_subscriptions() { - final var tieredPricing = new TieredPricing(); + final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); final var expectedPrice = 199 * 26; final var totalPrice = tieredPricing.getTotalPrice(26); @@ -65,7 +85,7 @@ void return_total_price_for_26_subscriptions() { @Test void return_total_price_for_51_subscriptions() { - final var tieredPricing = new TieredPricing(); + final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); final var expectedPrice = 149 * 51; final var totalPrice = tieredPricing.getTotalPrice(51); diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java index 470a4cfa..7f25a888 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java @@ -18,7 +18,7 @@ public static SubscriptionTier create( public static List randoms() { final var subscriptionTierRanges = SubscriptionTierRangeMother.randoms(); final var previousSubscriptionTierPrice = new AtomicReference<>(299D); - + return subscriptionTierRanges.stream() .map(range -> { final var subscriptionTierPrice = @@ -26,7 +26,7 @@ public static List randoms() { previousSubscriptionTierPrice.get().intValue() - 60, previousSubscriptionTierPrice.get().intValue() - 20); previousSubscriptionTierPrice.set(subscriptionTierPrice); - return create(range, new SubscriptionTierPrice(subscriptionTierPrice)); + return create(range, SubscriptionTierPriceMother.create(subscriptionTierPrice)); }) .toList(); } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java index f8439f3a..8cf7f6e6 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java @@ -7,8 +7,4 @@ public final class SubscriptionTierPriceMother { public static SubscriptionTierPrice create(final double value) { return new SubscriptionTierPrice(value); } - - public static SubscriptionTierPrice randomBetween(final int min, final int max) { - return create(DoubleMother.randomBetween(min, max)); - } } From 5e8898d5174c14950d8f8d7a819fed9926d27fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 18:46:00 +0200 Subject: [PATCH 07/14] feat: add should_have_a_subscription_tier_range_with_no_upper_limit test --- .../java/tv/codely/checkout/SubscriptionTier.java | 4 ++++ .../tv/codely/checkout/SubscriptionTierRange.java | 8 ++++++++ .../tv/codely/checkout/TieredPricingShould.java | 15 ++++++++++++++- .../mother/SubscriptionTierRangeMother.java | 9 +++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java index 368a5857..a465c152 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java @@ -24,4 +24,8 @@ public double unitPrice() { public double getTotalPrice(int numberOfSubscriptions) { return unitPrice() * numberOfSubscriptions; } + + public boolean isLast() { + return range.isLast(); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java index a8600993..dd92e6d6 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java @@ -10,8 +10,16 @@ public SubscriptionTierRange(int numberOfSubscriptionsFrom, int numberOfSubscrip this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; } + public static SubscriptionTierRange last(int numberOfSubscriptionsFrom) { + return new SubscriptionTierRange(numberOfSubscriptionsFrom, Integer.MAX_VALUE); + } + public boolean isSuitableFor(int numberOfSubscriptions) { return numberOfSubscriptions >= numberOfSubscriptionsFrom && numberOfSubscriptions <= numberOfSubscriptionsTo; } + + public boolean isLast() { + return numberOfSubscriptionsTo == Integer.MAX_VALUE; + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index fc9626c6..901f2c97 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -1,6 +1,7 @@ package tv.codely.checkout; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; @@ -25,7 +26,7 @@ private static List defaultSubscriptionTiers() { new SubscriptionTierRange(26, 50), new SubscriptionTierPrice(199)), new SubscriptionTier( - new SubscriptionTierRange(51, 100), + SubscriptionTierRange.last(51), new SubscriptionTierPrice(149))); } @@ -47,6 +48,18 @@ void return_total_price_based_on_number_of_subscriptions() { assertEquals(expectedPrice, totalPrice); } + @Test + void should_have_a_subscription_tier_range_with_no_upper_limit() { + final var subscriptionTiers = SubscriptionTierMother.randoms(); + final var lastSubscriptionTier = + subscriptionTiers.stream() + .filter(SubscriptionTier::isLast) + .findFirst() + .orElse(null); + + assertNotNull(lastSubscriptionTier); + } + @Test void return_total_price_for_1_subscription() { final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java index d3374faf..1d89dde7 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java @@ -13,6 +13,10 @@ public static SubscriptionTierRange create( return new SubscriptionTierRange(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); } + public static SubscriptionTierRange last(final int numberOfSubscriptionsFrom) { + return SubscriptionTierRange.last(numberOfSubscriptionsFrom); + } + public static List randoms() { final var subscriptionTiers = new ArrayList(); final var numberOfTiers = IntegerMother.randomBetween(1, 6); @@ -23,6 +27,11 @@ public static List randoms() { var lastNumberOfSubscriptionsTo = 0; for (int i = 0; i < numberOfTiers; i++) { + if (i == numberOfTiers - 1) { + subscriptionTiers.add(last(lastNumberOfSubscriptionsTo + 1)); + break; + } + final var numberOfSubscriptionsFrom = lastNumberOfSubscriptionsTo + 1; final var numberOfSubscriptionsTo = IntegerMother.randomBetween( From 68a170331abeece177824e7ffc31db9e72ad982a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 18:57:06 +0200 Subject: [PATCH 08/14] feat: add SubscriptionTiers to ensure encapsulation --- .../checkout/InvalidSubscriptionTiers.java | 8 ++++++ .../tv/codely/checkout/SubscriptionTiers.java | 27 +++++++++++++++++++ .../tv/codely/checkout/TieredPricing.java | 6 ++++- .../codely/checkout/TieredPricingShould.java | 18 +++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTiers.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTiers.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTiers.java new file mode 100644 index 00000000..da34be48 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTiers.java @@ -0,0 +1,8 @@ +package tv.codely.checkout; + +public final class InvalidSubscriptionTiers extends RuntimeException { + + public InvalidSubscriptionTiers(String message) { + super(message); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java new file mode 100644 index 00000000..40f96cbd --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java @@ -0,0 +1,27 @@ +package tv.codely.checkout; + +import java.util.List; + +public final class SubscriptionTiers { + + private final List tiers; + + public SubscriptionTiers(List tiers) { + validate(tiers); + this.tiers = tiers; + } + + private static void validate(final List tiers) { + if (tiers == null || tiers.isEmpty()) { + throw new InvalidSubscriptionTiers("There must be at least one subscription tier"); + } + + if (tiers.stream().noneMatch(SubscriptionTier::isLast)) { + throw new IllegalArgumentException("There must be a last subscription tier"); + } + } + + public List tiers() { + return tiers; + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java index 470cb154..322c7f0e 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -6,8 +6,12 @@ public class TieredPricing { private final List subscriptionTiers; + public TieredPricing(final SubscriptionTiers subscriptionTiers) { + this.subscriptionTiers = subscriptionTiers.tiers(); + } + public TieredPricing(final List subscriptionTiers) { - this.subscriptionTiers = subscriptionTiers; + this(new SubscriptionTiers(subscriptionTiers)); } public double getTotalPrice(int subscriptions) { diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index 901f2c97..e4c9cef2 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; @@ -48,6 +49,23 @@ void return_total_price_based_on_number_of_subscriptions() { assertEquals(expectedPrice, totalPrice); } + @Test + void should_throw_invalid_tiers_if_there_is_no_last_tier() { + final var subscriptionTiers = SubscriptionTierMother.randoms(); + final var lastSubscriptionTier = + subscriptionTiers.stream() + .filter(SubscriptionTier::isLast) + .findFirst() + .orElse(null); + + assertNotNull(lastSubscriptionTier); + } + + @Test + void should_throw_invalid_tiers_if_there_is_no_tiers() { + assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(List.of())); + } + @Test void should_have_a_subscription_tier_range_with_no_upper_limit() { final var subscriptionTiers = SubscriptionTierMother.randoms(); From 2dfd5a1b3c817d3749439d98b5e5f1b428c530f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 19:09:56 +0200 Subject: [PATCH 09/14] feat: ensure first and last tier range are valid --- .../tv/codely/checkout/SubscriptionTier.java | 12 ++++-- .../checkout/SubscriptionTierRange.java | 10 +++-- .../tv/codely/checkout/SubscriptionTiers.java | 22 ++++++++-- .../tv/codely/checkout/TieredPricing.java | 18 +++----- .../codely/checkout/TieredPricingShould.java | 42 +++++++++++-------- .../mother/SubscriptionTierPriceMother.java | 4 ++ 6 files changed, 68 insertions(+), 40 deletions(-) diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java index a465c152..ead9a55d 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java @@ -13,6 +13,14 @@ public SubscriptionTier( this.price = price; } + public boolean isFirst() { + return range.isFirst(); + } + + public boolean isLast() { + return range.isLast(); + } + public boolean isInRange(int numberOfSubscriptions) { return this.range.isSuitableFor(numberOfSubscriptions); } @@ -24,8 +32,4 @@ public double unitPrice() { public double getTotalPrice(int numberOfSubscriptions) { return unitPrice() * numberOfSubscriptions; } - - public boolean isLast() { - return range.isLast(); - } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java index dd92e6d6..e2f7d86b 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java @@ -14,12 +14,16 @@ public static SubscriptionTierRange last(int numberOfSubscriptionsFrom) { return new SubscriptionTierRange(numberOfSubscriptionsFrom, Integer.MAX_VALUE); } - public boolean isSuitableFor(int numberOfSubscriptions) { - return numberOfSubscriptions >= numberOfSubscriptionsFrom - && numberOfSubscriptions <= numberOfSubscriptionsTo; + public boolean isFirst() { + return numberOfSubscriptionsFrom == 1; } public boolean isLast() { return numberOfSubscriptionsTo == Integer.MAX_VALUE; } + + public boolean isSuitableFor(int numberOfSubscriptions) { + return numberOfSubscriptions >= numberOfSubscriptionsFrom + && numberOfSubscriptions <= numberOfSubscriptionsTo; + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java index 40f96cbd..c9622d17 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java @@ -16,12 +16,28 @@ private static void validate(final List tiers) { throw new InvalidSubscriptionTiers("There must be at least one subscription tier"); } + if (tiers.stream().noneMatch(SubscriptionTier::isFirst)) { + throw new InvalidSubscriptionTiers("There must be a first subscription tier"); + } + if (tiers.stream().noneMatch(SubscriptionTier::isLast)) { - throw new IllegalArgumentException("There must be a last subscription tier"); + throw new InvalidSubscriptionTiers("There must be a last subscription tier"); } } - public List tiers() { - return tiers; + private SubscriptionTier findSuitableTier(int subscriptions) { + return tiers.stream() + .filter(tier -> tier.isInRange(subscriptions)) + .findFirst() + .orElseThrow(() -> new InvalidSubscriptionTiers( + "There is no subscription tier for " + subscriptions + " subscriptions")); + } + + public double getTotalPrice(int subscriptions) { + return findSuitableTier(subscriptions).getTotalPrice(subscriptions); + } + + public double getBasePrice(int subscriptions) { + return findSuitableTier(subscriptions).unitPrice(); } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java index 322c7f0e..492e2a5a 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -3,11 +3,11 @@ import java.util.List; public class TieredPricing { - - private final List subscriptionTiers; + + private final SubscriptionTiers tiers; public TieredPricing(final SubscriptionTiers subscriptionTiers) { - this.subscriptionTiers = subscriptionTiers.tiers(); + this.tiers = subscriptionTiers; } public TieredPricing(final List subscriptionTiers) { @@ -15,18 +15,10 @@ public TieredPricing(final List subscriptionTiers) { } public double getTotalPrice(int subscriptions) { - return subscriptionTiers.stream() - .filter(subscriptionTier -> subscriptionTier.isInRange(subscriptions)) - .findFirst() - .map(subscriptionTier -> subscriptionTier.getTotalPrice(subscriptions)) - .orElse(0D); + return tiers.getTotalPrice(subscriptions); } public double getBasePrice(int subscriptions) { - return subscriptionTiers.stream() - .filter(subscriptionTier -> subscriptionTier.isInRange(subscriptions)) - .findFirst() - .map(SubscriptionTier::unitPrice) - .orElse(0D); + return tiers.getBasePrice(subscriptions); } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index e4c9cef2..47831629 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -9,6 +9,8 @@ import org.junit.jupiter.api.Test; import tv.codely.checkout.mother.IntegerMother; import tv.codely.checkout.mother.SubscriptionTierMother; +import tv.codely.checkout.mother.SubscriptionTierPriceMother; +import tv.codely.checkout.mother.SubscriptionTierRangeMother; public class TieredPricingShould { @@ -49,23 +51,6 @@ void return_total_price_based_on_number_of_subscriptions() { assertEquals(expectedPrice, totalPrice); } - @Test - void should_throw_invalid_tiers_if_there_is_no_last_tier() { - final var subscriptionTiers = SubscriptionTierMother.randoms(); - final var lastSubscriptionTier = - subscriptionTiers.stream() - .filter(SubscriptionTier::isLast) - .findFirst() - .orElse(null); - - assertNotNull(lastSubscriptionTier); - } - - @Test - void should_throw_invalid_tiers_if_there_is_no_tiers() { - assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(List.of())); - } - @Test void should_have_a_subscription_tier_range_with_no_upper_limit() { final var subscriptionTiers = SubscriptionTierMother.randoms(); @@ -122,4 +107,27 @@ void return_total_price_for_51_subscriptions() { final var totalPrice = tieredPricing.getTotalPrice(51); assertEquals(expectedPrice, totalPrice); } + + @Test + void throw_invalid_subscription_tiers_if_there_is_no_tiers() { + assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(List.of())); + } + + @Test + void throw_invalid_subscription_tiers_if_first_tier_range_does_not_start_at_1() { + final var subscriptionTiers = + List.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.create(2, 10), + SubscriptionTierPriceMother.random())); + + assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); + } + + @Test + void throw_invalid_subscription_tiers_if_there_is_no_last_tier() { + final var subscriptionTiers = + List.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.create(1, 10), + SubscriptionTierPriceMother.random())); + + assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java index 8cf7f6e6..a2e3920b 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierPriceMother.java @@ -7,4 +7,8 @@ public final class SubscriptionTierPriceMother { public static SubscriptionTierPrice create(final double value) { return new SubscriptionTierPrice(value); } + + public static SubscriptionTierPrice random() { + return create(DoubleMother.randomBetween(100, 300)); + } } From 696dd2675413dc6343f1e2318761218e9a7e0bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 19:41:11 +0200 Subject: [PATCH 10/14] feat: ensure tier ranges does not overlap --- .../tv/codely/checkout/SubscriptionTier.java | 23 +++++++++++++++ .../checkout/SubscriptionTierPrice.java | 19 +++++++++++++ .../checkout/SubscriptionTierRange.java | 28 +++++++++++++++++++ .../tv/codely/checkout/SubscriptionTiers.java | 15 ++++++++++ .../codely/checkout/TieredPricingShould.java | 15 +++++++++- .../mother/SubscriptionTierRangeMother.java | 4 +++ 6 files changed, 103 insertions(+), 1 deletion(-) diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java index ead9a55d..fd52e6bf 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java @@ -1,5 +1,7 @@ package tv.codely.checkout; +import java.util.Objects; + public final class SubscriptionTier { private final SubscriptionTierRange range; @@ -21,6 +23,10 @@ public boolean isLast() { return range.isLast(); } + public boolean isAfter(final SubscriptionTier other) { + return range.isAfter(other.range); + } + public boolean isInRange(int numberOfSubscriptions) { return this.range.isSuitableFor(numberOfSubscriptions); } @@ -32,4 +38,21 @@ public double unitPrice() { public double getTotalPrice(int numberOfSubscriptions) { return unitPrice() * numberOfSubscriptions; } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SubscriptionTier that = (SubscriptionTier) o; + return Objects.equals(range, that.range) && Objects.equals(price, that.price); + } + + @Override + public int hashCode() { + return Objects.hash(range, price); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java index 5866cb0f..e9b1fca6 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java @@ -1,5 +1,7 @@ package tv.codely.checkout; +import java.util.Objects; + public final class SubscriptionTierPrice { private final double value; @@ -11,4 +13,21 @@ public SubscriptionTierPrice(double value) { public double unitPrice() { return value; } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SubscriptionTierPrice that = (SubscriptionTierPrice) o; + return Double.compare(that.value, value) == 0; + } + + @Override + public int hashCode() { + return Objects.hash(value); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java index e2f7d86b..2c177c57 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java @@ -1,5 +1,7 @@ package tv.codely.checkout; +import java.util.Objects; + public final class SubscriptionTierRange { private final int numberOfSubscriptionsFrom; @@ -10,6 +12,10 @@ public SubscriptionTierRange(int numberOfSubscriptionsFrom, int numberOfSubscrip this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; } + public static SubscriptionTierRange first(int numberOfSubscriptionsTo) { + return new SubscriptionTierRange(1, numberOfSubscriptionsTo); + } + public static SubscriptionTierRange last(int numberOfSubscriptionsFrom) { return new SubscriptionTierRange(numberOfSubscriptionsFrom, Integer.MAX_VALUE); } @@ -22,8 +28,30 @@ public boolean isLast() { return numberOfSubscriptionsTo == Integer.MAX_VALUE; } + public boolean isAfter(final SubscriptionTierRange other) { + return numberOfSubscriptionsFrom > other.numberOfSubscriptionsTo; + } + public boolean isSuitableFor(int numberOfSubscriptions) { return numberOfSubscriptions >= numberOfSubscriptionsFrom && numberOfSubscriptions <= numberOfSubscriptionsTo; } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SubscriptionTierRange that = (SubscriptionTierRange) o; + return numberOfSubscriptionsFrom == that.numberOfSubscriptionsFrom + && numberOfSubscriptionsTo == that.numberOfSubscriptionsTo; + } + + @Override + public int hashCode() { + return Objects.hash(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java index c9622d17..2894cfd1 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java @@ -1,5 +1,6 @@ package tv.codely.checkout; +import java.util.HashSet; import java.util.List; public final class SubscriptionTiers { @@ -23,6 +24,20 @@ private static void validate(final List tiers) { if (tiers.stream().noneMatch(SubscriptionTier::isLast)) { throw new InvalidSubscriptionTiers("There must be a last subscription tier"); } + + if (tiers.size() == 1) { + return; + } + + final var validTiers = new HashSet(); + for (final SubscriptionTier tier : tiers) { + if (tiers.stream() + .anyMatch( + t -> !validTiers.contains(t) && !t.equals(tier) && !t.isAfter(tier))) { + throw new InvalidSubscriptionTiers("All tiers must be after the previous one"); + } + validTiers.add(tier); + } } private SubscriptionTier findSuitableTier(int subscriptions) { diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index 47831629..b1f7f707 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -17,7 +17,7 @@ public class TieredPricingShould { private static List defaultSubscriptionTiers() { return List.of( new SubscriptionTier( - new SubscriptionTierRange(1, 2), + SubscriptionTierRange.first(2), new SubscriptionTierPrice(299)), new SubscriptionTier( new SubscriptionTierRange(3, 10), @@ -130,4 +130,17 @@ void throw_invalid_subscription_tiers_if_there_is_no_last_tier() { assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); } + + @Test + void throw_invalid_subscription_tiers_if_tiers_are_not_in_order() { + final var subscriptionTiers = + List.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.first(10), + SubscriptionTierPriceMother.random()), + SubscriptionTierMother.create(SubscriptionTierRangeMother.create(9, 20), + SubscriptionTierPriceMother.random()), + SubscriptionTierMother.create(SubscriptionTierRangeMother.last(2), + SubscriptionTierPriceMother.random())); + + assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java index 1d89dde7..2e235155 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java @@ -13,6 +13,10 @@ public static SubscriptionTierRange create( return new SubscriptionTierRange(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); } + public static SubscriptionTierRange first(final int numberOfSubscriptionsTo) { + return SubscriptionTierRange.first(numberOfSubscriptionsTo); + } + public static SubscriptionTierRange last(final int numberOfSubscriptionsFrom) { return SubscriptionTierRange.last(numberOfSubscriptionsFrom); } From 28f60479f236588d9de9e7906b1ab2d88425fa3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 20:01:48 +0200 Subject: [PATCH 11/14] feat: create subscription tier range with named constructors --- .../InvalidSubscriptionTierRange.java | 8 +++++++ .../checkout/SubscriptionTierRange.java | 22 +++++++++++++++++-- .../codely/checkout/TieredPricingShould.java | 15 ++++++++----- .../mother/SubscriptionTierRangeMother.java | 4 ++-- 4 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierRange.java diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierRange.java new file mode 100644 index 00000000..bc831903 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierRange.java @@ -0,0 +1,8 @@ +package tv.codely.checkout; + +public final class InvalidSubscriptionTierRange extends RuntimeException { + + public InvalidSubscriptionTierRange(final String message) { + super(message); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java index 2c177c57..e1c6afe2 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java @@ -2,6 +2,7 @@ import java.util.Objects; +// [from, to] public final class SubscriptionTierRange { private final int numberOfSubscriptionsFrom; @@ -12,14 +13,31 @@ public SubscriptionTierRange(int numberOfSubscriptionsFrom, int numberOfSubscrip this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; } - public static SubscriptionTierRange first(int numberOfSubscriptionsTo) { - return new SubscriptionTierRange(1, numberOfSubscriptionsTo); + public static SubscriptionTierRange first(int numberOfSubscriptions) { + if (numberOfSubscriptions < 1) { + throw new InvalidSubscriptionTierRange( + "Number of subscriptions must be greater than 0"); + } + return new SubscriptionTierRange(1, numberOfSubscriptions); + } + + public static SubscriptionTierRange from( + final SubscriptionTierRange range, + final int numberOfSubscriptions) { + + final int numberOfSubscriptionsFrom = range.numberOfSubscriptionsTo + 1; + final int numberOfSubscriptionsTo = numberOfSubscriptionsFrom + numberOfSubscriptions; + return new SubscriptionTierRange(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); } public static SubscriptionTierRange last(int numberOfSubscriptionsFrom) { return new SubscriptionTierRange(numberOfSubscriptionsFrom, Integer.MAX_VALUE); } + public static SubscriptionTierRange last(final SubscriptionTierRange range) { + return new SubscriptionTierRange(range.numberOfSubscriptionsTo + 1, Integer.MAX_VALUE); + } + public boolean isFirst() { return numberOfSubscriptionsFrom == 1; } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index b1f7f707..56c5d100 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -15,21 +15,26 @@ public class TieredPricingShould { private static List defaultSubscriptionTiers() { + final var firstTierRange = SubscriptionTierRange.first(2); + final var secondTierRange = SubscriptionTierRange.from(firstTierRange, 7); + final var thirdTierRange = SubscriptionTierRange.from(secondTierRange, 14); + final var fourthTierRange = SubscriptionTierRange.from(thirdTierRange, 24); + final var lastTierRange = SubscriptionTierRange.last(fourthTierRange); return List.of( new SubscriptionTier( - SubscriptionTierRange.first(2), + firstTierRange, new SubscriptionTierPrice(299)), new SubscriptionTier( - new SubscriptionTierRange(3, 10), + secondTierRange, new SubscriptionTierPrice(239)), new SubscriptionTier( - new SubscriptionTierRange(11, 25), + thirdTierRange, new SubscriptionTierPrice(219)), new SubscriptionTier( - new SubscriptionTierRange(26, 50), + fourthTierRange, new SubscriptionTierPrice(199)), new SubscriptionTier( - SubscriptionTierRange.last(51), + lastTierRange, new SubscriptionTierPrice(149))); } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java index 2e235155..8f4d7b09 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java @@ -13,8 +13,8 @@ public static SubscriptionTierRange create( return new SubscriptionTierRange(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); } - public static SubscriptionTierRange first(final int numberOfSubscriptionsTo) { - return SubscriptionTierRange.first(numberOfSubscriptionsTo); + public static SubscriptionTierRange first(final int numberOfSubscriptions) { + return SubscriptionTierRange.first(numberOfSubscriptions); } public static SubscriptionTierRange last(final int numberOfSubscriptionsFrom) { From f27c7842ec18cf46fa54f6f9a19bab42d814aee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 20:21:54 +0200 Subject: [PATCH 12/14] feat: ensure tier range is created only with named constructor --- .../checkout/SubscriptionTierRange.java | 35 +++++++++++++----- .../tv/codely/checkout/SubscriptionTiers.java | 15 -------- .../codely/checkout/TieredPricingShould.java | 24 +------------ .../mother/SubscriptionTierRangeMother.java | 36 ++++++++----------- 4 files changed, 41 insertions(+), 69 deletions(-) diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java index e1c6afe2..27a88dd3 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java @@ -8,34 +8,51 @@ public final class SubscriptionTierRange { private final int numberOfSubscriptionsFrom; private final int numberOfSubscriptionsTo; - public SubscriptionTierRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo) { + private SubscriptionTierRange(int numberOfSubscriptionsFrom, int numberOfSubscriptionsTo) { this.numberOfSubscriptionsFrom = numberOfSubscriptionsFrom; this.numberOfSubscriptionsTo = numberOfSubscriptionsTo; } public static SubscriptionTierRange first(int numberOfSubscriptions) { - if (numberOfSubscriptions < 1) { - throw new InvalidSubscriptionTierRange( - "Number of subscriptions must be greater than 0"); - } + validate(numberOfSubscriptions); return new SubscriptionTierRange(1, numberOfSubscriptions); } + public static SubscriptionTierRange last(final SubscriptionTierRange range) { + validate(range); + return new SubscriptionTierRange(range.numberOfSubscriptionsTo + 1, Integer.MAX_VALUE); + } + public static SubscriptionTierRange from( final SubscriptionTierRange range, final int numberOfSubscriptions) { + validate(range); + validate(numberOfSubscriptions); + final int numberOfSubscriptionsFrom = range.numberOfSubscriptionsTo + 1; final int numberOfSubscriptionsTo = numberOfSubscriptionsFrom + numberOfSubscriptions; return new SubscriptionTierRange(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); } - public static SubscriptionTierRange last(int numberOfSubscriptionsFrom) { - return new SubscriptionTierRange(numberOfSubscriptionsFrom, Integer.MAX_VALUE); + + private static void validate(final int numberOfSubscriptions) { + if (numberOfSubscriptions < 1) { + throw new InvalidSubscriptionTierRange( + "Number of subscriptions must be greater than 0"); + } } - public static SubscriptionTierRange last(final SubscriptionTierRange range) { - return new SubscriptionTierRange(range.numberOfSubscriptionsTo + 1, Integer.MAX_VALUE); + private static void validate(final SubscriptionTierRange range) { + if (range == null) { + throw new InvalidSubscriptionTierRange( + "Cannot create a new subscription tier range from a null one"); + } + + if (range.isLast()) { + throw new InvalidSubscriptionTierRange( + "Cannot create a new subscription tier range after the last one"); + } } public boolean isFirst() { diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java index 2894cfd1..c9622d17 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java @@ -1,6 +1,5 @@ package tv.codely.checkout; -import java.util.HashSet; import java.util.List; public final class SubscriptionTiers { @@ -24,20 +23,6 @@ private static void validate(final List tiers) { if (tiers.stream().noneMatch(SubscriptionTier::isLast)) { throw new InvalidSubscriptionTiers("There must be a last subscription tier"); } - - if (tiers.size() == 1) { - return; - } - - final var validTiers = new HashSet(); - for (final SubscriptionTier tier : tiers) { - if (tiers.stream() - .anyMatch( - t -> !validTiers.contains(t) && !t.equals(tier) && !t.isAfter(tier))) { - throw new InvalidSubscriptionTiers("All tiers must be after the previous one"); - } - validTiers.add(tier); - } } private SubscriptionTier findSuitableTier(int subscriptions) { diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index 56c5d100..8a1a55d5 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -118,33 +118,11 @@ void throw_invalid_subscription_tiers_if_there_is_no_tiers() { assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(List.of())); } - @Test - void throw_invalid_subscription_tiers_if_first_tier_range_does_not_start_at_1() { - final var subscriptionTiers = - List.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.create(2, 10), - SubscriptionTierPriceMother.random())); - - assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); - } - @Test void throw_invalid_subscription_tiers_if_there_is_no_last_tier() { - final var subscriptionTiers = - List.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.create(1, 10), - SubscriptionTierPriceMother.random())); - - assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); - } - - @Test - void throw_invalid_subscription_tiers_if_tiers_are_not_in_order() { final var subscriptionTiers = List.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.first(10), - SubscriptionTierPriceMother.random()), - SubscriptionTierMother.create(SubscriptionTierRangeMother.create(9, 20), - SubscriptionTierPriceMother.random()), - SubscriptionTierMother.create(SubscriptionTierRangeMother.last(2), - SubscriptionTierPriceMother.random())); + SubscriptionTierPriceMother.random())); assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java index 8f4d7b09..bf8e5fae 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierRangeMother.java @@ -6,47 +6,39 @@ public final class SubscriptionTierRangeMother { - public static SubscriptionTierRange create( - final int numberOfSubscriptionsFrom, - final int numberOfSubscriptionsTo) { - - return new SubscriptionTierRange(numberOfSubscriptionsFrom, numberOfSubscriptionsTo); - } - public static SubscriptionTierRange first(final int numberOfSubscriptions) { return SubscriptionTierRange.first(numberOfSubscriptions); } - public static SubscriptionTierRange last(final int numberOfSubscriptionsFrom) { - return SubscriptionTierRange.last(numberOfSubscriptionsFrom); + public static SubscriptionTierRange last(final SubscriptionTierRange range) { + return SubscriptionTierRange.last(range); } public static List randoms() { - final var subscriptionTiers = new ArrayList(); + final var tierRanges = new ArrayList(); final var numberOfTiers = IntegerMother.randomBetween(1, 6); final var minSubscriptionsInTier = 3; final var maxSubscriptionsInTier = IntegerMother.randomBetween(minSubscriptionsInTier + 1, 20); - - var lastNumberOfSubscriptionsTo = 0; + var currentTierRange = first( + IntegerMother.randomBetween(minSubscriptionsInTier, maxSubscriptionsInTier)); + tierRanges.add(currentTierRange); for (int i = 0; i < numberOfTiers; i++) { if (i == numberOfTiers - 1) { - subscriptionTiers.add(last(lastNumberOfSubscriptionsTo + 1)); + tierRanges.add(last(currentTierRange)); break; } - final var numberOfSubscriptionsFrom = lastNumberOfSubscriptionsTo + 1; - final var numberOfSubscriptionsTo = - IntegerMother.randomBetween( - numberOfSubscriptionsFrom + 1, - maxSubscriptionsInTier * (i + 1)); - - lastNumberOfSubscriptionsTo = numberOfSubscriptionsTo; + final var numberOfSubscriptions = + IntegerMother.randomBetween(minSubscriptionsInTier, maxSubscriptionsInTier); + final var tierRange = SubscriptionTierRange.from(currentTierRange, + numberOfSubscriptions); - subscriptionTiers.add(create(numberOfSubscriptionsFrom, numberOfSubscriptionsTo)); + currentTierRange = tierRange; + tierRanges.add(tierRange); } - return subscriptionTiers; + return tierRanges; } } From 5ae57085f192b4e256598875ff44eb0a61435af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 21:14:31 +0200 Subject: [PATCH 13/14] feat: throw PriceNotFound when number of subscriptions is invalid --- .../tv/codely/checkout/PriceNotFound.java | 8 ++++ .../tv/codely/checkout/SubscriptionTier.java | 4 -- .../checkout/SubscriptionTierRange.java | 4 -- .../tv/codely/checkout/SubscriptionTiers.java | 23 ++++++----- .../tv/codely/checkout/TieredPricing.java | 14 +++---- .../codely/checkout/TieredPricingShould.java | 39 ++++++++++--------- .../mother/SubscriptionTierMother.java | 7 ++-- 7 files changed, 51 insertions(+), 48 deletions(-) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java new file mode 100644 index 00000000..71239a27 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java @@ -0,0 +1,8 @@ +package tv.codely.checkout; + +public final class PriceNotFound extends RuntimeException { + + public PriceNotFound(int subscriptions) { + super(String.format("Price not found for %d subscriptions", subscriptions)); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java index fd52e6bf..2aac8e00 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTier.java @@ -23,10 +23,6 @@ public boolean isLast() { return range.isLast(); } - public boolean isAfter(final SubscriptionTier other) { - return range.isAfter(other.range); - } - public boolean isInRange(int numberOfSubscriptions) { return this.range.isSuitableFor(numberOfSubscriptions); } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java index 27a88dd3..d67c1342 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierRange.java @@ -63,10 +63,6 @@ public boolean isLast() { return numberOfSubscriptionsTo == Integer.MAX_VALUE; } - public boolean isAfter(final SubscriptionTierRange other) { - return numberOfSubscriptionsFrom > other.numberOfSubscriptionsTo; - } - public boolean isSuitableFor(int numberOfSubscriptions) { return numberOfSubscriptions >= numberOfSubscriptionsFrom && numberOfSubscriptions <= numberOfSubscriptionsTo; diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java index c9622d17..bf81f314 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java @@ -1,17 +1,17 @@ package tv.codely.checkout; -import java.util.List; +import java.util.Set; public final class SubscriptionTiers { - private final List tiers; + private final Set tiers; - public SubscriptionTiers(List tiers) { + public SubscriptionTiers(final Set tiers) { validate(tiers); this.tiers = tiers; } - private static void validate(final List tiers) { + private static void validate(final Set tiers) { if (tiers == null || tiers.isEmpty()) { throw new InvalidSubscriptionTiers("There must be at least one subscription tier"); } @@ -25,19 +25,18 @@ private static void validate(final List tiers) { } } - private SubscriptionTier findSuitableTier(int subscriptions) { + private SubscriptionTier findSuitableTier(int numberOfSubscriptions) { return tiers.stream() - .filter(tier -> tier.isInRange(subscriptions)) + .filter(tier -> tier.isInRange(numberOfSubscriptions)) .findFirst() - .orElseThrow(() -> new InvalidSubscriptionTiers( - "There is no subscription tier for " + subscriptions + " subscriptions")); + .orElseThrow(() -> new PriceNotFound(numberOfSubscriptions)); } - public double getTotalPrice(int subscriptions) { - return findSuitableTier(subscriptions).getTotalPrice(subscriptions); + public double getTotalPrice(int numberOfSubscriptions) { + return findSuitableTier(numberOfSubscriptions).getTotalPrice(numberOfSubscriptions); } - public double getBasePrice(int subscriptions) { - return findSuitableTier(subscriptions).unitPrice(); + public double getBasePrice(int numberOfSubscriptions) { + return findSuitableTier(numberOfSubscriptions).unitPrice(); } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java index 492e2a5a..d80e5a72 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/TieredPricing.java @@ -1,24 +1,24 @@ package tv.codely.checkout; -import java.util.List; +import java.util.Set; public class TieredPricing { - + private final SubscriptionTiers tiers; public TieredPricing(final SubscriptionTiers subscriptionTiers) { this.tiers = subscriptionTiers; } - public TieredPricing(final List subscriptionTiers) { + public TieredPricing(final Set subscriptionTiers) { this(new SubscriptionTiers(subscriptionTiers)); } - public double getTotalPrice(int subscriptions) { - return tiers.getTotalPrice(subscriptions); + public double getTotalPrice(int numberOfSubscriptions) { + return tiers.getTotalPrice(numberOfSubscriptions); } - public double getBasePrice(int subscriptions) { - return tiers.getBasePrice(subscriptions); + public double getBasePrice(int numberOfSubscriptions) { + return tiers.getBasePrice(numberOfSubscriptions); } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index 8a1a55d5..5fba2489 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -1,11 +1,10 @@ package tv.codely.checkout; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.List; +import java.util.Set; import org.junit.jupiter.api.Test; import tv.codely.checkout.mother.IntegerMother; import tv.codely.checkout.mother.SubscriptionTierMother; @@ -14,13 +13,13 @@ public class TieredPricingShould { - private static List defaultSubscriptionTiers() { + private static Set defaultSubscriptionTiers() { final var firstTierRange = SubscriptionTierRange.first(2); final var secondTierRange = SubscriptionTierRange.from(firstTierRange, 7); final var thirdTierRange = SubscriptionTierRange.from(secondTierRange, 14); final var fourthTierRange = SubscriptionTierRange.from(thirdTierRange, 24); final var lastTierRange = SubscriptionTierRange.last(fourthTierRange); - return List.of( + return Set.of( new SubscriptionTier( firstTierRange, new SubscriptionTierPrice(299)), @@ -56,18 +55,6 @@ void return_total_price_based_on_number_of_subscriptions() { assertEquals(expectedPrice, totalPrice); } - @Test - void should_have_a_subscription_tier_range_with_no_upper_limit() { - final var subscriptionTiers = SubscriptionTierMother.randoms(); - final var lastSubscriptionTier = - subscriptionTiers.stream() - .filter(SubscriptionTier::isLast) - .findFirst() - .orElse(null); - - assertNotNull(lastSubscriptionTier); - } - @Test void return_total_price_for_1_subscription() { final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); @@ -115,15 +102,31 @@ void return_total_price_for_51_subscriptions() { @Test void throw_invalid_subscription_tiers_if_there_is_no_tiers() { - assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(List.of())); + assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(Set.of())); } @Test void throw_invalid_subscription_tiers_if_there_is_no_last_tier() { final var subscriptionTiers = - List.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.first(10), + Set.of(SubscriptionTierMother.create(SubscriptionTierRangeMother.first(10), SubscriptionTierPriceMother.random())); assertThrows(InvalidSubscriptionTiers.class, () -> new TieredPricing(subscriptionTiers)); } + + @Test + void throw_invalid_subscription_tier_range_if_number_of_susbcriptions_is_less_than_1() { + assertThrows(InvalidSubscriptionTierRange.class, () -> SubscriptionTierRange.first(0)); + } + + @Test + void throw_invalid_subscription_tier_range_if_previous_range_does_not_exist() { + assertThrows(InvalidSubscriptionTierRange.class, () -> SubscriptionTierRange.last(null)); + } + + @Test + void throw_price_not_found_if_number_of_subscriptions_is_not_valid() { + final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); + assertThrows(PriceNotFound.class, () -> tieredPricing.getTotalPrice(0)); + } } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java index 7f25a888..593d77d9 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/mother/SubscriptionTierMother.java @@ -1,7 +1,8 @@ package tv.codely.checkout.mother; -import java.util.List; +import java.util.Set; import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; import tv.codely.checkout.SubscriptionTier; import tv.codely.checkout.SubscriptionTierPrice; import tv.codely.checkout.SubscriptionTierRange; @@ -15,7 +16,7 @@ public static SubscriptionTier create( return new SubscriptionTier(range, price); } - public static List randoms() { + public static Set randoms() { final var subscriptionTierRanges = SubscriptionTierRangeMother.randoms(); final var previousSubscriptionTierPrice = new AtomicReference<>(299D); @@ -28,6 +29,6 @@ public static List randoms() { previousSubscriptionTierPrice.set(subscriptionTierPrice); return create(range, SubscriptionTierPriceMother.create(subscriptionTierPrice)); }) - .toList(); + .collect(Collectors.toSet()); } } From 24be6aacbf5cd8f98880fe691c0794835df48454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Lizaga?= Date: Sun, 26 Mar 2023 22:35:08 +0200 Subject: [PATCH 14/14] feat: move tests to related unit test cases --- .../InvalidSubscriptionTierPrice.java | 8 +++++++ .../tv/codely/checkout/PriceNotFound.java | 8 ------- .../checkout/SubscriptionTierNotFound.java | 9 ++++++++ .../checkout/SubscriptionTierPrice.java | 7 ++++++ .../tv/codely/checkout/SubscriptionTiers.java | 2 +- .../checkout/SubscriptionTierPriceShould.java | 13 +++++++++++ .../checkout/SubscriptionTierRangeShould.java | 19 ++++++++++++++++ .../codely/checkout/TieredPricingShould.java | 22 ++++--------------- 8 files changed, 61 insertions(+), 27 deletions(-) create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierPrice.java delete mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierNotFound.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierPriceShould.java create mode 100644 exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierRangeShould.java diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierPrice.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierPrice.java new file mode 100644 index 00000000..091da845 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/InvalidSubscriptionTierPrice.java @@ -0,0 +1,8 @@ +package tv.codely.checkout; + +public final class InvalidSubscriptionTierPrice extends RuntimeException { + + public InvalidSubscriptionTierPrice(final String message) { + super(message); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java deleted file mode 100644 index 71239a27..00000000 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/PriceNotFound.java +++ /dev/null @@ -1,8 +0,0 @@ -package tv.codely.checkout; - -public final class PriceNotFound extends RuntimeException { - - public PriceNotFound(int subscriptions) { - super(String.format("Price not found for %d subscriptions", subscriptions)); - } -} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierNotFound.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierNotFound.java new file mode 100644 index 00000000..d6ac0d9e --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierNotFound.java @@ -0,0 +1,9 @@ +package tv.codely.checkout; + +public final class SubscriptionTierNotFound extends RuntimeException { + + public SubscriptionTierNotFound(int numberOfSubscriptions) { + super(String.format("Subscription tier not found for %d numberOfSubscriptions", + numberOfSubscriptions)); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java index e9b1fca6..7e9024fd 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTierPrice.java @@ -7,9 +7,16 @@ public final class SubscriptionTierPrice { private final double value; public SubscriptionTierPrice(double value) { + validate(value); this.value = value; } + private static void validate(double value) { + if (value < 1) { + throw new InvalidSubscriptionTierPrice("The price cannot be negative"); + } + } + public double unitPrice() { return value; } diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java index bf81f314..0cc8c755 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/main/java/tv/codely/checkout/SubscriptionTiers.java @@ -29,7 +29,7 @@ private SubscriptionTier findSuitableTier(int numberOfSubscriptions) { return tiers.stream() .filter(tier -> tier.isInRange(numberOfSubscriptions)) .findFirst() - .orElseThrow(() -> new PriceNotFound(numberOfSubscriptions)); + .orElseThrow(() -> new SubscriptionTierNotFound(numberOfSubscriptions)); } public double getTotalPrice(int numberOfSubscriptions) { diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierPriceShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierPriceShould.java new file mode 100644 index 00000000..6b9725f8 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierPriceShould.java @@ -0,0 +1,13 @@ +package tv.codely.checkout; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; + +public final class SubscriptionTierPriceShould { + + @Test + void throw_invalid_subscription_tier_price_if_price_is_less_than_1() { + assertThrows(InvalidSubscriptionTierPrice.class, () -> new SubscriptionTierPrice(0)); + } +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierRangeShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierRangeShould.java new file mode 100644 index 00000000..1ba0df70 --- /dev/null +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/SubscriptionTierRangeShould.java @@ -0,0 +1,19 @@ +package tv.codely.checkout; + +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; + +public final class SubscriptionTierRangeShould { + + @Test + void throw_invalid_subscription_tier_range_if_number_of_subscriptions_is_less_than_1() { + assertThrows(InvalidSubscriptionTierRange.class, () -> SubscriptionTierRange.first(0)); + } + + @Test + void throw_invalid_subscription_tier_range_if_previous_range_does_not_exist() { + assertThrows(InvalidSubscriptionTierRange.class, () -> SubscriptionTierRange.last(null)); + } + +} diff --git a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java index 5fba2489..b14529fb 100644 --- a/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java +++ b/exercises/tiered_pricing/solutions/adrianliz/java/src/test/java/tv/codely/checkout/TieredPricingShould.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; import org.junit.jupiter.api.Test; @@ -37,11 +36,6 @@ private static Set defaultSubscriptionTiers() { new SubscriptionTierPrice(149))); } - @Test - void unit_test_example() { - assertTrue(true); - } - @Test void return_total_price_based_on_number_of_subscriptions() { final var subscriptionTiers = SubscriptionTierMother.randoms(); @@ -115,18 +109,10 @@ void throw_invalid_subscription_tiers_if_there_is_no_last_tier() { } @Test - void throw_invalid_subscription_tier_range_if_number_of_susbcriptions_is_less_than_1() { - assertThrows(InvalidSubscriptionTierRange.class, () -> SubscriptionTierRange.first(0)); - } - - @Test - void throw_invalid_subscription_tier_range_if_previous_range_does_not_exist() { - assertThrows(InvalidSubscriptionTierRange.class, () -> SubscriptionTierRange.last(null)); - } - - @Test - void throw_price_not_found_if_number_of_subscriptions_is_not_valid() { + void throw_subscription_tier_not_found_if_number_of_subscriptions_does_not_match_any_tier() { final var tieredPricing = new TieredPricing(defaultSubscriptionTiers()); - assertThrows(PriceNotFound.class, () -> tieredPricing.getTotalPrice(0)); + final var numberOfSubscriptions = 0; + assertThrows(SubscriptionTierNotFound.class, + () -> tieredPricing.getTotalPrice(numberOfSubscriptions)); } }