RRRRHHHH_Code
Diff Revisions
25898b ...
vs
fca164 ...
for ruralHouses/src/dataAccess/DB4oManager.java
|
@@ -82,9 +82,11 @@ |
82 |
82 |
|
configuration.common().activationDepth(c.getActivationDepth()); |
83 |
83 |
|
configuration.common().updateDepth(c.getUpdateDepth()); |
84 |
84 |
|
configuration.common().objectClass(Owner.class).cascadeOnUpdate(true); |
85 |
|
- |
configuration.common().objectClass(Owner.class).cascadeOnDelete(true); |
|
85 |
+ |
configuration.common().objectClass(Booking.class).cascadeOnDelete(true); |
86 |
86 |
|
configuration.common().objectClass(RuralHouse.class) |
87 |
87 |
|
.cascadeOnUpdate(true); |
|
88 |
+ |
configuration.common().objectClass(Offer.class) |
|
89 |
+ |
.cascadeOnUpdate(true); |
88 |
90 |
|
configuration.common().objectClass(Account.class).cascadeOnUpdate(true); |
89 |
91 |
|
db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename()); |
90 |
92 |
|
} |
|
@@ -207,7 +209,7 @@ |
207 |
209 |
|
try { |
208 |
210 |
|
ObjectSet<Offer> of = db.queryByExample(offer); |
209 |
211 |
|
RuralHouse rh = of.get(0).getRuralHouse(); |
210 |
|
- |
System.out.println(rh.offers.remove(of.get(0))); |
|
212 |
+ |
System.out.println(rh.getAllOffers().remove(of.get(0))); |
211 |
213 |
|
db.store(rh); |
212 |
214 |
|
db.commit(); |
213 |
215 |
|
|
|
@@ -562,10 +564,10 @@ |
562 |
564 |
|
return false; |
563 |
565 |
|
} |
564 |
566 |
|
|
565 |
|
- |
// TODO this method should be improved. |
566 |
567 |
|
public void acceptBooking(Offer of) { |
567 |
|
- |
Offer off = new Offer(of.getOfferNumber(), of.getRuralHouse(), |
568 |
|
- |
of.getFirstDay(), of.getLastDay(), of.getPrice()); |
|
568 |
+ |
Offer off = new Offer(of.getOfferNumber(), new RuralHouse(of |
|
569 |
+ |
.getRuralHouse().getHouseName(), null, null, null, null), null, |
|
570 |
+ |
null, 0); |
569 |
571 |
|
if (c.isDatabaseLocal() == false) |
570 |
572 |
|
openSDB(); |
571 |
573 |
|
else |
|
@@ -573,8 +575,12 @@ |
573 |
575 |
|
|
574 |
576 |
|
try { |
575 |
577 |
|
ObjectSet<Offer> result = db.queryByExample(off); |
576 |
|
- |
this.deleteOffer(result.get(0)); |
577 |
|
- |
db.store(of); |
|
578 |
+ |
db.delete(result.get(0)); |
|
579 |
+ |
RuralHouse rh = result.get(0).getRuralHouse(); |
|
580 |
+ |
of.setRuralHouse(rh); |
|
581 |
+ |
rh.getAllOffers().remove(result.get(0)); |
|
582 |
+ |
rh.getAllOffers().add(of); |
|
583 |
+ |
db.store(rh); |
578 |
584 |
|
db.close(); |
579 |
585 |
|
|
580 |
586 |
|
} catch (Exception e) { |
|
@@ -590,9 +596,8 @@ |
590 |
596 |
|
openDB(); |
591 |
597 |
|
try { |
592 |
598 |
|
ObjectSet<Booking> result = db.queryByExample(b); |
593 |
|
- |
ObjectSet<Client> result2 = db.queryByExample(b.getClient()); |
594 |
|
- |
db.delete(result.get(0)); |
595 |
|
- |
db.delete(result2.get(0)); |
|
599 |
+ |
result.get(0).getOffer().getBookings().remove(b); |
|
600 |
+ |
db.store(result.get(0).getOffer()); |
596 |
601 |
|
db.commit(); |
597 |
602 |
|
} catch (Exception e) { |
598 |
603 |
|
e.printStackTrace(); |