From 413ca77711b9e1af7c54bf1943df92531ab82b08 Mon Sep 17 00:00:00 2001
From: Sherwin Price <sherwinprice@hotmail.com>
Date: Sun, 31 Aug 2025 23:54:17 -0400
Subject: [PATCH] update - write reservation

---
 .../lodge/reservationsystem/Account.class     | Bin 4793 -> 5108 bytes
 .../lodge/reservationsystem/Reservation.class | Bin 7897 -> 7981 bytes
 src/java/lodge/reservationsystem/Account.java |   5 +++++
 .../lodge/reservationsystem/Reservation.java  |   4 ++--
 src/resources/rsv-R0000000062.json            |   1 +
 src/resources/rsv-R000000062.json             |   5 -----
 6 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 src/resources/rsv-R0000000062.json
 delete mode 100644 src/resources/rsv-R000000062.json

diff --git a/bin/main/lodge/reservationsystem/Account.class b/bin/main/lodge/reservationsystem/Account.class
index 10bd66cf9195d24e3f373f3ce23391e4c98d9bed..e83e57556451a9a9114f7a357f79acd2a335d90d 100644
GIT binary patch
delta 1050
zcmZ`%TX0iV6kR8|$!(Gwk_&C=L)#LX7E)?HbSl%zl<3s4P|AS749qah4ZWtJA*o4<
zXg^x5C{!!Tkyj~Lm4`ri7K%m1`ruWbKmPjThvN+V`D2HnuG~R?9OvA-&pCUqz1KQt
zpYh<I)&9xHm#+Yb;Jyl*K)EzTvFx!q&xKd0J#G}?Z4K|BParRzHPc2ml@=(RH@{_*
zvBd~?W#fr(^AmrA2ix$ziuVL&{x_;&J9Y>tNpovfApf5V2_qQ`FOP0AH)b1Dd>}A4
zk!p*X;k21C(=s8vGNgFiZuDb7Lkm8VUL{nzCdc%#hEK3dKy5cNtyWR{y!q>7uezo{
zP^0(Ntg*3UnbEn*h$c)GL!-Z|PYLH&8jj$obh+xCXEdC}Ioa$AI!85(;FQd|Ryn`H
zcPhS>cU?8&ikxyCQZDD=2RY;}t^0|x1D)-uq`4v4wK;001N9XF5m=Cis{#dq%|<*C
zPsTPFZEX~vVNfu1T|RUdiJQ{tsZeeU1m!g8RNNIP<Faft<B8c^QP|;R6Qumjo2Uw1
zK<OBI>y=}eRjiETU4aSox7OB<;ltd1r@-L!A9DGOlAdSaVOkv&JP#ihvRm~Cp#jh0
z1@0ChfkyOUF|WQ6yYM0^iGB`_92G|uX9YX)Dai$MyRjR4U}J?U?8QFf`uOk1Qpy`7
zwh?*LXaeO66$@1y2&?F}zEsZBJq34!lgINH#59#T{sls1!{Cz-W`snO9QGC14<aKY
z{(Sk8Pj@tvWr<wtds!^AVuzl@Zu|7=6^yO4bQe+?s5EHl&aG5SH(w?`lZwAmthTa;
z@i{989c!7nPIma`h%e*-qwB5cmpE+k{_5AO4I-ldQ`=4bf+P1>3iXgUCL{VR?`yn?
z7_-{(G~&|GXY0ptf+z<{aFQz<2IUUD(w=)vXY~rl>6$T|mcQtgubdx*!#<*n@CbIy
zrLBXPHp$c!57J4x*Xc>K4H*{8q8wd3=oZxC4TQ0k&3uy$cuPiR&NeRKB1y{;z!)(k
zWhIT*?a&?}pO@|<$0hn~_!{G!E6DOaGbSwiqh)`#>@~~Yz$8&_B5vUh?xFZ^&6el&

delta 867
zcmZuvSx*yD6#j18nJJw?I)$(_nAWicQ#5@bB31}Ckwg<oB!clltwX61DJ`-*VMI|8
zcjdSs?)w5Rh$0~R<byHs!QbJFMqe~WJ)MwfOq0pE_n!HdbMCp{%4dS^_rGS}0El8v
zfla_irYNC)n>-P2RA`5Dlb*Y=$Bef(n4L{#OERHgX!4`8RLEyFoWU@C&56jDG+f3N
zs&obAYZ^vyk+!*-<a>Ca;66>eDx`-3BTHzJT0E={MD9BANTAR#<MDKFswbA}?Py7K
z84<rBjHOOI5hyS^ccxQ`|Nl(Toa*&X3gjD!4zn#8Gh17`65ZWQ6-<0VpH;t@CS41O
z*~uDh$d;qS4w;+lpbra@6wCAW8*uV@IUJ}$9#)_jD-l8jl~{#p)F6pk1Q-!w1oN;D
zWxP7jhW)H07~hNm9Dt1xWjKgKkT7WB<=?1>tUxHJR&ZEBpY^3PiM}6jMR`#j>URh#
zcZZ5rTQ(X?f+d2MjldE5;x44UZe3c#*?J0lifGIoE?S!veU#DV(t1WVWRR+2l_<Ey
zV^pUHN;YI=9mfgUqX(rX<~3UmuXUF=N$;4kIV<B7PLt#bN?Vw*l^H&JX7Y`m&^p>)
zTRP4i*s++S$GS9=Pc4j$V<B2CJwImv-+Y&Ll;RxDbLSGgxWGFb2I;LQV9&gqPaeNC
zS}}!Da_0y7uZ}{pk30TaR3Vq8+L*cv3fiIa#BzB~#YnMOnoT<SDtBWUx)4S;PqPPg
z=>4aR=zJNOCx0C`xC|c*++-G)!P*)mMbdtvfJYh4<H~Pw(uUi(!>gZ-$Cxs1#m82B
UYQ<+(e2ytbxft;hGkArPKX1RE3;+NC

diff --git a/bin/main/lodge/reservationsystem/Reservation.class b/bin/main/lodge/reservationsystem/Reservation.class
index 384593be37954ed1fd1ab4032c30da6db01060c5..077cd73ca4fbf44c7cf44b2c006419a1d25c2d9c 100644
GIT binary patch
delta 1823
zcmZvdd2ka|9LK-Eq|K(AZIT8oEhV7@p_RfE#y_Cp7{sv*j+Ltp!-#`{rfrzCrO6g_
zfa#3Gc!G-0BA$pBT13kgLTEWWQ1C*$fO=nepm?AHD)@V^r3=W+&Ug2H-tO=B`~KeB
z-9uy7kJI;^PVWG41r6Gu*Jxv$iwc8-62Z_S9fUg#+=YGw&$LJ)5?>HDqYd?yH_wmg
zXvA^@cjF#{qq-qp7d8oH#iGtVLfq)obRA2v!oYnHV!2kP`#64!ft7eb9MvYeTIAyo
z8JLNO#W?4%@hv{s!IB{*Q;I{1CdDZwONuVVCB;CC6VDQCOP0t)tzw<CHn@S%YhHLk
zxHQ^OI%)D%H_eUAm(}Xnge@9269%vF=81|dZ$VNz(rO~+l(1RrLpD;fv~7e@#bTV>
zFHU8-%VOdBn$qcJJX&8fTE}*DXlOs1pq?{SM`Mvv`Fz5_4(ue@IUZrOY(an{1RT5Z
zvWAyLKp$*>1+R*UdJ(-Q8g&1Fy?8^zzW)U)=ZGBaO}r)6>x<olRvr6sK*PI)T;X-)
zRvLH@g9w=m<581WU_U-E@FAu#sg5-zY9%>n;E*D7V+{$urxTxO`1outWva3^-mow{
zCl)dADLxZxT({E^F~lfzrF87Yj|Pt7Cvlw-b{xa68h#P&MuGh|{4Nd~#r9)3C^EA<
zH3Hc*B5@@9GHoT<39E|56nCB|b>Gr_#z_uBUNCO$nAs+8nP8|eNWq~_auWKUH(TFS
zHzyMBnb$9zPncn|iFai8^9CVs-t#;kH)mIcO_@Us_c+KcMtc0Cyo5f%x^Ohci#R)6
zRmBxqQGA5n!LH1ct0zRNteM_ona5ALqSX_iJh9hPP|}y+3nm(y!tqFXBx3ed!rRCQ
z&W}gucAIljKzO``G(ZgZ4#^nEb&9F(KHL>;(_(LXR<p_b+6I2Dwqxnct+@4?65nkZ
z9k9=|4@u&V=_xEr;@%l0a*)RTK-Xw90%@$WMk7;rFpWnnP^!SA7Pwr2$1G5!K=W#g
zlqmAJ1;!|_#scFNc)|i#D)6KQ$`yFZ0+SSY+5!~{Jkt%DeQTAYB%W*I4}uMatmVjI
zZR7WRBmDfXmS8i=umxAM`|Gh4F{H2r+xSzH#%gX{8``lO9XP<R-B;L&<Jg72nGE14
zxn12w5CeJS#0jj!^W1L2db|MJJiN#_gNJRL3N)C%IvSIv6gE~2Em3{m3RDcWcc3wa
z^tBYqpit(pjo8IxPYSPx9Qh7jowt*CC*P68`}vMND3ezot;L8?h8#N8P~`Lr&|xvW
z-;CzZxftTCjrf8~vLO#Q;7cyu&Q^=?HNN3Zv5>162FDrhhNgkk(Wv2D4V~)PFInd)
zxF+x^JNqPuA$%u2U0_LeKw66SSQ?wg_ZRn+!Vl6<5<k!A@p1foAIH0W%<)g3b=F6u
z$H&xeA4TYoKk(<dK0+7waqMC~{=x~76ByadKN?;g!bx5?c|OJK3U1RstTz0M(|n!<
z5Agz0rczC5mQvR_nys$8?#xlwy_8;}w2#t!r3Fg;Qhns7{+xn;dsIk4x)k~U0X%NT
A#{d8T

delta 1620
zcmZvddr%ui9LK+#gj~2>2!x6WBq5{%mC#|-Kafm)VU5#KL{W!frgkR6rNp5mB%xX>
zgMTo-tEOA6idI{-^;M-nLmCRD+E%ToRjaku`nJ_#Eq(atQ}-5{!?8Cv-`(G5f49Hy
z?(E&Iy?pm&;`TGCVE|W=qIKeY!Jf0&<*t*Xa%7=D77Vqzy^BS3;UNhR;}LpDs45Xb
z@Ti2xU?(t7$-HGzShlc<;u4mE(u)n(n&Tqc@T7zWEGH<LK}Uq**%oLJw?M0iPLT{n
z^oj_I7!=7=L{!A6h=jNSFA-=uIutXj>0v{&do4lk9sY&>ieRW>PVF^!HOgVdu!y&?
zPCySU7|*tr&GyIqb#gcq4aP!|MG|@y+roS~cB4PmY=H^=irw`Dm(n6Jm+r_c)em5U
zfFwPgY1O7MNUfqzKZH#JhG~;nq8-6zx<o9!;vE7jFW<`Q2ZAkfMQvDat)29+74Hhz
zcGh7!#mDlZ65hl6^r(1`QH#|gM)8q=59!^;g36CkOptMBBp8zw{)vQ7QO8K2r9IlL
zkew1f=cKVE6lFQPuv@^Fbku0oeuX`BzwrU`BMnO~W50;4*e~H1{7Sne{{>?>DBw4O
zyt6x2-5v<Y5xJ>O_BY893BThIb(v;p$FP%LXWAp+6wU}ZO=o6Zs9lPGXhYTt-AMz{
z(34pXqN6r*A<@$+rUu$zo=!yCVRjIScAM>0Sp?JEt?dhLmm{@-YPl)u_PX4}U2Y)R
zY|o~S)P+I|)KLo^H#^BRYR)e3<Plih(YAJfME1#YEIosjKyrs8!A5xk8Av|8HQS|g
z5ERpSS;bm`6!xvm-kaGOVCPK3j^mL*bTtg%zUw`f`xAJu-cy#qk`x{XCZc{gQ&^@(
zl}S92!c!`!;NWQ$T*ARKDk$ZkTLqpZI@u)8s$>>Vc}@jaa<D=LS99>Z3Va;Apn^FZ
ztW-e_2dgH5<wd@r1YYi8%kI>`#Tp-SnD(%@suyPT!GV5wupYD6>T587c}OCJ4Y(I6
z#4(6f*vPVmum!{Hq;0}JjNl+PqlnFtH?f~^V>*irIDj>Hg?$VNUd3x{>~%(UEP8`g
z!CX?p-f@AU_9Wh{DfjSw?gMJdwL@r2B5?!p>WDXEW-m4}@^%tiyn36yYyjI6_`s%5
zV24e=4OL3-vo*NLt5ZS)59xA;lYBwD?Da)oGc$yhZNpw>Ndqfx!#DVr)%Kti-{E_D
z%AVi(gMeN99tC0T2^gzcV=^6QPZ0d{fBQsPtl~a6#r@CccAvyP#d!h;>eG(L|KnJL
z@kz@G$IWTWa@z7ula@<Sh{HHS%bfW|Y0G2hvV0WBsO+rlWM5&n=>&h^7;pc?U(B=?
ze>2tKI8Ly3F3bcV>{3+AHG``#MKgKd$koJk;;9_o&*gd^*YmmB6txf=DPSeoKY`eZ
Ilel2}7YVeUZ2$lO

diff --git a/src/java/lodge/reservationsystem/Account.java b/src/java/lodge/reservationsystem/Account.java
index a9ebce3..63f1649 100644
--- a/src/java/lodge/reservationsystem/Account.java
+++ b/src/java/lodge/reservationsystem/Account.java
@@ -48,6 +48,7 @@ public class Account {
                 return reservation_list.add(rsrv);
         }
 
+
         // @TODO Write Account out in JSON
         public static void Write(Account acct) throws IOException {
                 String dataRoot = DataRepository.getPath();
@@ -58,6 +59,10 @@ public class Account {
                         writer.write(acct.toString());
                         writer.flush();
                 }
+                
+                for (Reservation r: acct.reservation_list){
+                        r.Write(r);
+                }
         }
 
         public String account_number() {
diff --git a/src/java/lodge/reservationsystem/Reservation.java b/src/java/lodge/reservationsystem/Reservation.java
index a0935aa..dad7a51 100644
--- a/src/java/lodge/reservationsystem/Reservation.java
+++ b/src/java/lodge/reservationsystem/Reservation.java
@@ -175,7 +175,7 @@ public abstract class Reservation{
     public String toString() {
         StringBuilder sb = new StringBuilder();
 
-        sb.append("{ \"Reservation\":{");
+        sb.append(String.format("{ \"%s\":{", ReservationType()));
         sb.append("\"reservation_type\": \"" + ReservationType() + "\",");
         sb.append("\"reservation_number\": \"" + reservation_number + "\",");
         sb.append("\"reservation_status\": \"" + reservation_status + "\",");
@@ -200,7 +200,7 @@ public abstract class Reservation{
         Path path = Paths.get(dataRoot);
 
         try (BufferedWriter writer = Files.newBufferedWriter(path, StandardCharsets.UTF_8)) {
-            writer.write(super.toString());
+            writer.write(toString());
             writer.flush();
         }
     }
diff --git a/src/resources/rsv-R0000000062.json b/src/resources/rsv-R0000000062.json
new file mode 100644
index 0000000..4ef8b90
--- /dev/null
+++ b/src/resources/rsv-R0000000062.json
@@ -0,0 +1 @@
+{ "HotelReservation":{"reservation_type": "HotelReservation","reservation_number": "R0000000062","reservation_status": "Canceled","reservation_start_date": "null","reservation_start_date": "null","physical_address": "{ "Address":{"street": "30 cabin ave","city": "Carnelian","state": "CA","zip": "96140"}}","mailing_address": "{ "Address":{"street": "40 cabin ave","city": "Carnelian Bay","state": "CA","zip": "96140"}}","numberOfBeds": "4","numberOfBedRooms": "3","numberOfBathRooms": "1","numberOfFloors": "2","squareFeet": "806","price": "120.0"}}
\ No newline at end of file
diff --git a/src/resources/rsv-R000000062.json b/src/resources/rsv-R000000062.json
deleted file mode 100644
index fdd80ad..0000000
--- a/src/resources/rsv-R000000062.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"CabinReservation": {
-
-    "reservation_number":"R000000062"
-
-    }}
\ No newline at end of file