From b8951031cdf6a6fd03d42121ae80d18bfaffe511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Heredero?= <remi@heredero.ch>
Date: Wed, 4 May 2022 10:15:11 +0200
Subject: [PATCH] Co-authored-by: Fastium <Fastium@users.noreply.github.com>

---
 .vscode/launch.json        |  12 ++++++++++++
 bin/bank/BankAccount.class | Bin 1266 -> 1479 bytes
 bin/bank/Checking.class    | Bin 632 -> 1116 bytes
 bin/bank/Savings.class     | Bin 738 -> 1044 bytes
 src/bank/BankAccount.java  |  15 ++++++++++++---
 src/bank/Checking.java     |  29 +++++++++++++++++++++++++++--
 src/bank/Savings.java      |  21 +++++++++++++++++----
 7 files changed, 68 insertions(+), 9 deletions(-)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..5570fe5
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,12 @@
+{
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Launch BankController",
+            "request": "launch",
+            "mainClass": "bank.BankController",
+            "projectName": "Lab15_OOP_90898795",
+            "vmArgs": "-enableassertions"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/bin/bank/BankAccount.class b/bin/bank/BankAccount.class
index 326e5066bae4cb05a82ac0bccad9cbcf988d3343..97add3433d512c55b6963ad06b5094104cebffef 100644
GIT binary patch
literal 1479
zcmZ`&ZBx@&6n-u(B-DVl0-{!pqS98Sx~uCdz5?PK2s1c1`Ylbb5N(rANJ0O}e()za
zv+8Jdc4zzn{wT-iBta?Qbmr#X-gD0La?knp{lBjOE@RO^k3zoY_%EwdTyDE=(Dow(
zS^oRNS$C=p$6u)~)Lv*eQZQ-`&#qQbGYY-IhOa|~!rZUOr6~0Ll}UxZYo6~#Hxx3Z
z^0Gp9I;iU$G8nMXkDS8ZInURR+Rd5{A3L=MOBUt=*J&&}p(p3`&up~nt;yYXiiF6m
z=xAz_5MgHep)hQr7k#8!*R5d9Bk62uro3$8phD4gd_Rcn^vagnw$l{F_VFB(4_heW
z2$ktD45)0lv{PF78O0?@3Ij`#<G!4CS}9#~!;4nyp|g>|J~J_<a3qD@yz9p8$0>{(
zINfFV((AQIH!YM<rh`G7GKLc>UQk`6#Sx9xPIJ=08HEGe{hw-kjk*p^oTE#NVL(5d
z_EkHF3aaA&`QJ!emWV$r{E3SqvenXlUE$nrF6=NS#hjE9e_8CUzZJ|VNE$+6s8rsO
z!q}_0W`J+GKbFuf&cbzJYP3Xe!>6T@eig|h-?Cu9%wY;M2By26iyP3w9n3Oy-D$M-
z!gGbwTQwx@Jh=-Y6Za_GUUk-W?A8PE;vqYSJ+y=VreYKG6fk{n)((6-ZmDF7CTRXr
z&<<Ta>q&#>w@lcC=*=FdmJA262U+P_?y@3`-#*@OPPp#jsmib7x3}^c)_ZPxFqj5`
z1@>}pB>~7|A5WYZ?B|*!_oT@mG4$`YWOLW#5gbU9pOcp`JUBl1&l~Ki6h=EZ^yGcz
zDQk_ppD-kBGBKMGhJuKF<TAkDAWM&ukFXmdV-`u-$?j+@@mQR#28m`v+z`S##Vl3?
zgs{0v;RIpdCa5b!&AyEj#e@PqleM3M^BBe<g8hOl{)8-cL*|*rSx+Gsc@l=BA8_)2
zRGt>je#XR^4lZ<Xse>ySflEBk#c=|1cngf^6yI3^H~4_^T%3Tk`aB(y=NpsK6m|0p
kZnJ*jE&)Vi2loqe3D`S^ZGGGmF-Y>bV=0Kjqd02e2c(uDN&o-=

delta 603
zcmY+AO-~b16o%h31I$OKP)gHO6gp4~rBtg{MJV70peqsyY+!dOrA6B*saJ?AmTon7
z<HDWWF4RCVny@7?@ox~<{s7~dc1$#r+;h*@``mZVL%%Hh`|q!30A}#yt^Kn|=o9tE
zOHUHa!#!EuX^KNaPiA>)%fc0m8W<r&o{0mIuL-Y`Uw`#Nmg^3Za8-*&3ns=1>8H)c
zcCB1@=iHL;yoPlDO1ZKsq}wIfxQYn_Y4t`+geQ?982imVPu4s|S|UOSuS-#SzAE-N
z1goiCZCp2SP5q$ZtOY{efdSLTO%x2=`u|mug(?ni<Bqz}3a*VDW*k_^n3!dYZdDwV
zJJq6tc`T@uRy1?C?<WsbULT`JYE6&Z{@${KET&aOFH*1ipuav^LN9dwW1;NkF=CUY
z6U07os-d4xn<KY4IvC(vJjf#$<jn6R(8rG_T*5G)A+FT|!DQCgd-opU&$t{NYa^w%
zx{L}ldRjcHqyLCQoHxKciy4E6V2HmF#Qq^Bx!NTr1L9O?orW07eggC=D-t(S-;mp6
v{Pi!maf-Xqdu`15uW4g3`jGE!EPdoL-(wmb17HKbL8rSP;0P<7vB!S^OXXy1

diff --git a/bin/bank/Checking.class b/bin/bank/Checking.class
index 24740031a21d3285a55d5cf45b6c8097c6291487..f7457786ca19443a4847348f2ad48623c677d719 100644
GIT binary patch
literal 1116
zcmZuvO-~b16g{sU+ES(kOIylUnJUnBQ0m7*BL>4qTmc&lMt85nq#d9$WSBzyCAu*F
z0un<anz(Rl;@aP%p7&ZBQPX64?|t{3bMCqC`_C_50X)S0Bw_-Yrt}XR8*SG)^!!#5
zhQOFEt+T%7I6>Es1kxSPUzbPHcU%FnDUf*L`ChatFj3n&kf*Z2vsPm_3JJ2Zxmn*6
zFgAjHH;p((OeA3n#B24v6tV*4HQ$mwXsazxT`LN#rfW&x3eJ2tOoJLs+(1rX$PL3F
z6e#?Mrv560JX?2y$a4Ll+iF{#z;|D#P!yQm_I#_^lWaNCuSSaEI5_bl@6;V8Maje@
zrbwYl1#<rmqS|Im%pxI>?1QP=oQWY-8{P7Jcc<HFy5V!#Jfb(bt-z5-douJ?-Y*(a
z+dEO+*Sub#i?Y-6H?tc_=Wtsd>l;Z_Io98{a#tsA#IXj8FlyT9OzV1?K668<GcRiI
zhw_Y@U?06|&=or2)2^#CODVH@Dy$0kyc={w$9?9hSu$6zVp&N+g@ecWas*;(dPW9+
zNu*dAX7+=bsy?+pBfazuBX%zH38ODAY9-_CJC%;>v}9!8yjN*Kr}ok%ChXcJrtOk(
ziSh*@;;{IAj4Z#2K1m9rq#45qCSanB4CYu_WaSQ@$}-0B0C_w@0jnrdEMW5{<=`f6
z@n1#UH^r)Gp13g`sZk6pFdj$z7vYQ~L=uZ}&YI2gsD^rfLdi@ykgr~!pn6Sqk?sH`
z!cJ1;6o;50^sJUt)TH@=q`Y=gX!<xrmP9s|`g9F8E44%RN0dJ>h-q6Ax;Urt%w9tu
zPvADq=xyVG$VzL4m!}m#tI8#$?c6e5Keu19T5ZvE<D5-BzjNBJc?w>ji&gqt`$KeP
RAiAR68;CBD@vc^P?>7%M$2tH2

delta 341
zcmY*TO-{l<7=6=r209tQYFny;(v@a3x^(Bx18@W&?$nig&S2&sgoMV#7!KeWJcuje
zo3SBr^L_98c|YIXpG1G{KDGevP`~L{okE~*Fu;Kuh`Km5ID!)B%x6!tm&Kz$7w$n!
z-KV&A<LG7?liNX;`;_PzF%)}Y-=XbQgPy%?kl89}kgs`&P_mYgtO^OKDan1-92!Gz
zEw>avg=2P)7>4p5osbg+Bm-Mud5Tf%eNS(nM%jyhW;##|EqlSB471uBC|(pb1jaaP
gwQl+2Ev4NcUlIJ}_HSSwpVI`K$yP_;JiJYQ0iXRGkN^Mx

diff --git a/bin/bank/Savings.class b/bin/bank/Savings.class
index 7712331817f7c9f73a1ce0ce268dd8d674257cd0..2f9c7b368aefbfbf3b0753e0e78055ba0afc85e8 100644
GIT binary patch
delta 646
zcmYjNO=}ZT6g@99=}e}RG|fjR+9pnGwaFxL{Ei9=1y=<TNku4h@iIQrnD|B}lZdM>
z#bt;K7ybt+G%79>SAtvrfj>mOGlbygzH{C^@7(k5@8nzE`1$9{R{$;Cni!+oIx-BE
zU1@XA^G7nYkN8;Fp>KDD&86+Xlp-*|kTtQ2979qBfgdmwCy(--+JTM&Lvz<|^Knmh
z7bYH;J98^;OVQ<Fk6iilXo8M4hB7InKbQ1mC;~AI7s?b3ESWfivy(TQ#SIf>EHP*u
zKH$<5QTN>B+r#a2JLF#f0e`X2I|HF%hhjeCWA2iy>$byyB27)!+Nz_ep}|l%662ve
z3VVa0d!L8mafD1<f;$y#KdC<DuZGj_?8>nU4LXfU(V~7q#S)$OoKG<7Kd|iN(jT$%
z<fNK;_da6zn3dEyEymQT&tN&#8P=VWIz#1z92D48?;t}}C)X5J11nfY7HO=}eVJGV
ztH-#292&@@i6X92s|5>pQNkuYb?7O@!4}Tb86jE}g^kcQMNPygNk}Chkc;w{Ca4;i
zhKq^<q%+j2qBj4bN75t-t$O1#oY#BK;VH#FMWtUW;IiNUK)pnq-H6TCX*(PLMX?r9
aEDC!qj$+|Dp#&+jxIz93-QJ9STK@oM)O4Ky

delta 357
zcmYk1%`O9R6vco4>9n00qh-ugeH5*rW-1d4v9q$VvSBM3)r7Q&w3S#{vX${3A~7Kr
z9>5b=dk}GFh}hhFa_&9n+<R|)=B@Xy*Ee93)}1x9OcW)XGGp<Ys(X&j1O-L$FzQ8T
z?M^!O;<nn2Kh#EJj)fxg3ir5k*$;<<lU_gEjs~6m6xq~i#G$rl<c^{%h1!X4we@Q#
zVu*_=nWy9^Nca3_EI&vX^_vOfepOF!A7!9Xky;@y)j$`KiA9MKTx=$V^@SA!s!T~w
zk(@5}DVi2@Ekk)hy09}`%>HH{WE40->xJ5u|Abq+aala?K8WNe*vjN3*)0DHbN<2{
YmRQch999HrvT4&~RsK?PTIv&g10%93EdT%j

diff --git a/src/bank/BankAccount.java b/src/bank/BankAccount.java
index 0933b8e..c914dc8 100644
--- a/src/bank/BankAccount.java
+++ b/src/bank/BankAccount.java
@@ -8,18 +8,27 @@ public abstract class BankAccount {
         return balance;
     }
     public void deposit(double amount){
+        if(amount<0){
+            error("cannot deposit this amount !");
+            return;
+        } 
         balance += amount;
     }
     public boolean withdraw(double amount){
         if(balance<amount){
-            System.out.println("Problem : cannot withdraw that amount");
-            return false;
+            return error("cannot withdraw this amount !");
         } 
-        
         balance -= amount;
         return true;
     }
 
+    protected boolean error(String text){
+        System.out.println("Problem : " + text);
+        return false;
+    }
+    
+
+
     @Override
     public String toString() {
         return owner + " have " + balance + "CHF on his account.";
diff --git a/src/bank/Checking.java b/src/bank/Checking.java
index de341f6..10be86c 100644
--- a/src/bank/Checking.java
+++ b/src/bank/Checking.java
@@ -3,15 +3,40 @@ package bank;
 public class Checking extends BankAccount{
     private double minBalance;
 
-    Checking(String owner, double amount, double minBalance){
+    protected Checking(String owner, double amount, double minBalance){
+        if(owner==null){
+            error("An account have to be an owner");
+            return;
+        }
+        if(amount<minBalance){
+            error("Not enough money");
+            return;
+        }
+        if(minBalance>0){
+            error("Min balance can't be positive");
+            return;
+        }
         this.owner = owner;
         this.balance = amount;
         this.minBalance = minBalance;
     }
-    public void setMinBalance(double minBalance) {
+    protected void setMinBalance(double minBalance) {
+        if(minBalance>0){
+            error("Min balance can't be positive");
+            return;
+        }
         this.minBalance = minBalance;
     }
     public double getMinBalance() {
         return minBalance;
     }
+
+    @Override
+    public boolean withdraw(double amount){
+        if((balance-minBalance)<amount){
+            return error("cannot withdraw this amount !");
+        } 
+        balance -= amount;
+        return true;
+    }
 }
diff --git a/src/bank/Savings.java b/src/bank/Savings.java
index 6aea0db..9a4db41 100644
--- a/src/bank/Savings.java
+++ b/src/bank/Savings.java
@@ -5,13 +5,26 @@ import java.util.Date;
 
 public class Savings extends BankAccount{
     private double interestRate;
-    Savings(String owner, double amount, double interestRate){
+    protected Savings(String owner, double amount, double interestRate){
+        if(owner==null){
+            error("An account have to be an owner");
+            return;
+        }
+        if(amount<0) {
+            error("A Saving account can't have a negative amount");
+            return;
+        }
+        if(interestRate<0){
+            error("cannot have interest negative");
+            return;
+        }
         this.owner = owner;
         this.balance = amount;
         this.interestRate = interestRate;
     }
-    public double calcInterest(Date a, Date b){
-        int day = DateUtils.nDays(a, b);
-        return interestRate * (day/360.0);
+    
+    protected double calcInterest(Date a, Date b){
+        double days = DateUtils.nDays(a, b);
+        return balance * interestRate * (days/360.0);
     }
 }