Merge conflicts solutioned
[RRRRHHHH_Code] / ruralHouses / src / dataAccess / DB4oManager.java
index c594b1c..b0513ae 100644 (file)
@@ -5,7 +5,6 @@ import java.io.File;
 //import java.util.Vector;
 import java.rmi.RemoteException;
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Vector;
@@ -22,6 +21,7 @@ import configuration.ConfigXML;
 import domain.Account;
 import domain.Administrator;
 import domain.Booking;
+import domain.Client;
 import domain.HouseFeatures;
 import domain.Offer;
 //import dataModel.Offer;
@@ -69,7 +69,8 @@ public class DB4oManager {
                } else // c.getDataBaseOpenMode().equals("open")
 
                {
-                       ObjectSet<DB4oManagerAux> res = db.queryByExample(DB4oManagerAux.class);
+                       ObjectSet<DB4oManagerAux> res = db
+                                       .queryByExample(DB4oManagerAux.class);
                        ListIterator<DB4oManagerAux> listIter = res.listIterator();
                        if (listIter.hasNext())
                                theDB4oManagerAux = (DB4oManagerAux) res.next();
@@ -82,7 +83,8 @@ public class DB4oManager {
                configuration.common().updateDepth(c.getUpdateDepth());
                configuration.common().objectClass(Owner.class).cascadeOnUpdate(true);
                configuration.common().objectClass(Owner.class).cascadeOnDelete(true);
-               configuration.common().objectClass(RuralHouse.class).cascadeOnUpdate(true);
+               configuration.common().objectClass(RuralHouse.class)
+                               .cascadeOnUpdate(true);
                configuration.common().objectClass(Account.class).cascadeOnUpdate(true);
                db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename());
        }
@@ -117,30 +119,32 @@ public class DB4oManager {
        public void initializeDB() {
 
                try {
-                       Owner jon = new Owner("Jon");
-                       Owner alfredo = new Owner("Alfredo");
+                       Owner jon = new Owner("Jon", "1349 5677 21 2133567777",
+                                       "Jon@gmail.com");
+                       Owner alfredo = new Owner("Alfredo", "4144 0087 23 9700002133",
+                                       "alfredo@gmail.com");
                        jon.addRuralHouse("Ezkioko", "Ezkioko etxea", "Beatriz", 3, 3, 3,
                                        3, 3);
                        jon.addRuralHouse("Eskiatze", "Eskiatzeko etxea", "Guazate", 4, 4,
                                        4, 4, 4);
-                       jon.setBankAccount("1349 5677 21 2133567777");
                        alfredo.addRuralHouse("Aitonako", "Casa del abuelo", "Vegas", 5, 5,
                                        5, 5, 5);
-                       
+
                        alfredo.addRuralHouse("Murgoitz", "", "Cedro", 6, 6, 6, 6, 6);
-                       alfredo.setBankAccount("4144 0087 23 9700002133");
                        Account jonAcc = new Account("1", "1", jon);
                        Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
                                        alfredo);
 
-                       Account admin = new Account("admin","admin", true);
-                       db.store(Administrator.giveAdmin());
+
+                       Account admin = new Account("admin", "admin", true);
+                       db.store(Administrator.getInstance());
+
                        db.store(jonAcc);
                        db.store(alfredoAcc);
                        db.store(admin);
                        db.commit();
                } finally {
-                       db.close();     
+                       db.close();
                }
        }
 
@@ -152,7 +156,7 @@ public class DB4oManager {
                        openDB();
 
                try {
-                       Owner proto = new Owner(null, null);
+                       Owner proto = new Owner(null, null, null);
                        ObjectSet<Owner> result = db.queryByExample(proto);
                        while (result.hasNext()) {
                                Owner o = (Owner) result.next();
@@ -196,9 +200,7 @@ public class DB4oManager {
                return o;
        }
 
-       
-       public void deleteOffer(Offer offer) throws RemoteException,
-                       Exception {
+       public void deleteOffer(Offer offer) throws RemoteException, Exception {
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
@@ -206,7 +208,7 @@ public class DB4oManager {
 
                try {
                        ObjectSet<Offer> of = db.queryByExample(offer);
-                       RuralHouse rh =of.get(0).getRuralHouse();
+                       RuralHouse rh = of.get(0).getRuralHouse();
                        System.out.println(rh.offers.remove(of.get(0)));
                        db.store(rh);
                        db.commit();
@@ -219,75 +221,72 @@ public class DB4oManager {
                }
        }
 
+
        
-       @SuppressWarnings("static-access")
-       public LinkedList<RuralHouse>[] getAdminData(){
+       public Administrator getAdminData(){
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
-               @SuppressWarnings("unchecked")
-               LinkedList<RuralHouse>[] ret =  new LinkedList[2];
-               
+
                try {
+
                        
                        List<Administrator> admL = db.query(new Predicate<Administrator>(){
-                               /**
-                                * 
-                                */
                                private static final long serialVersionUID = 1L;
 
-                               public boolean match(Administrator admin){
+                               public boolean match(Administrator admin) {
                                        return true;
                                }
                        });
+
+                       
                        
-                       ret[0] = admL.get(0).getAddRequest();
-                       ret[1] = admL.get(0).getRemoveRequest();
-                       return ret;
+                       return admL.get(0);
                }
                finally {
                        db.close();
-                       
+
                }
-               
+
        }
-       
-       @SuppressWarnings("static-access")
+
        public void storeAdmin() {
+
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
-                       openDB();               
+                       openDB();
                try {
-                       
-                       List<Administrator> admL = db.query(new Predicate<Administrator>(){
+
+                       List<Administrator> admL = db.query(new Predicate<Administrator>() {
                                /**
                                 * 
                                 */
                                private static final long serialVersionUID = 1L;
 
-                               public boolean match(Administrator admin){
+                               public boolean match(Administrator admin) {
                                        return true;
                                }
                        });
-                       
-                       admL.get(0).setAddRequest(Administrator.getAddRequest());
-                       admL.get(0).setRemoveRequest(Administrator.getRemoveRequest());
+
+                       admL.get(0).setAddRequest(
+                                       Administrator.getInstance().getAddRequest());
+                       admL.get(0).setRemoveRequest(
+                                       Administrator.getInstance().getRemoveRequest());
+                       admL.get(0).setNewOwnerRequest(
+                                       Administrator.getInstance().getNewOwnerRequest());
+
                        db.commit();
-                       
-               }
-               catch(Exception e){
-                       
-               }
-               finally {
+
+               } catch (Exception e) {
+
+               } finally {
                        db.close();
                }
-               
-               
+
        }
-       
-       
+
        /**
         * This method creates a book with a corresponding parameters
         * 
@@ -295,17 +294,15 @@ public class DB4oManager {
         *            day, last day, house number and telephone
         * @return a book
         */
-       public Booking createBooking(RuralHouse ruralHouse, Date firstDate,
-                       Date lastDate, String bookTelephoneNumber)
-                       throws OfferCanNotBeBooked {
+       public Vector<Booking> createBooking(RuralHouse ruralHouse, Date firstDate,
+                       Date lastDate, Client cl) throws OfferCanNotBeBooked {
 
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
 
-               Booking bok = null;
-               
+               Vector<Booking> book = new Vector<Booking>() ;
 
                try {
 
@@ -321,13 +318,14 @@ public class DB4oManager {
                        offer = rh.findOffer(firstDate, lastDate);
 
                        if (offer != null) {
-                               offer.createBooking(theDB4oManagerAux.bookingNumber++,
-                                               bookTelephoneNumber);
+                               offer.createBooking(theDB4oManagerAux.bookingNumber++, cl);
                                db.store(theDB4oManagerAux); // To store the new value for
                                                                                                // bookingNumber
+                               
                                db.store(offer);
                                db.commit();
-                               bok = offer.getBooking();
+                               book = offer.getBookings();
+                               
                        }
 
                } catch (com.db4o.ext.ObjectNotStorableException e) {
@@ -338,7 +336,7 @@ public class DB4oManager {
                } finally {
                        db.close();
                }
-               return bok;
+               return book;
        }
 
        /**
@@ -353,7 +351,7 @@ public class DB4oManager {
                        openDB();
 
                try {
-                       Owner proto = new Owner(null, null);
+                       Owner proto = new Owner(null, null, null);
                        ObjectSet<Owner> result = db.queryByExample(proto);
                        Vector<Owner> owners = new Vector<Owner>();
                        while (result.hasNext())
@@ -421,13 +419,13 @@ public class DB4oManager {
 
        /**
         * @param usr
-        * @param pwd
+        * @param ps
         * @return
         * @throws RemoteException
         * @throws Exception
         */
-       public Vector<Account> getAccount(String usr, String pwd)
-                       throws RemoteException, Exception {
+       public Vector<Account> getAccount(Account proto) throws RemoteException,
+                       Exception {
 
                if (c.isDatabaseLocal() == false)
                        openSDB();
@@ -435,7 +433,6 @@ public class DB4oManager {
                        openDB();
 
                try {
-                       Account proto = new Account(usr, pwd, null);
                        ObjectSet<Account> result = db.queryByExample(proto);
                        Vector<Account> accounts = new Vector<Account>();
                        while (result.hasNext())
@@ -490,7 +487,7 @@ public class DB4oManager {
                        ObjectSet<Owner> result = db.queryByExample(owner);
                        ObjectSet<RuralHouse> rhs = db.queryByExample(rh);
                        if (!rhs.isEmpty()) {
-                               Owner found =  result.get(0);
+                               Owner found = result.get(0);
                                found.getRuralHouses().remove(rhs.get(0));
                                db.delete(rhs.get(0));
                                db.store(found);
@@ -504,7 +501,6 @@ public class DB4oManager {
 
        }
 
-
        public Vector<RuralHouse> getRuralHouses(String name, String town,
                        int nBed, int nKit, int nBath, int nPark, int nLiv) {
                HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark);
@@ -527,5 +523,67 @@ public class DB4oManager {
 
        }
 
+       public boolean addAccount(Account acc) {
+               if (c.isDatabaseLocal() == false)
+                       openSDB();
+               else
+                       openDB();
+
+               try {
+                       // TODO realize if there is another account with same username.
+                       // Quite difficult with the f***ing salt
+                       db.store(acc);
+                       db.commit();
+               } catch (Exception exc) {
+                       exc.printStackTrace();
+               } finally {
+                       db.close();
+               }
+               return true;
+       }
+
+       // TODO remove account
+
+       public boolean removeAccount(Account acc) {
+               return false;
+       }
+       
+       //TODO this method should be improved.
+       public void acceptBooking(Offer of){
+               Offer off = new Offer(of.getOfferNumber(),of.getRuralHouse(),of.getFirstDay(),of.getLastDay(),of.getPrice());
+               if (c.isDatabaseLocal() == false)
+                       openSDB();
+               else
+                       openDB();
+
+               try {
+                       ObjectSet<Offer> result = db.queryByExample(off);
+                       this.deleteOffer(result.get(0));
+                       db.store(of);
+                       db.close();
+                       
+               } catch (Exception e) {
+                       e.printStackTrace();;
+               }               
+       }
        
+       public void removeBooking(Booking b){
+               if (c.isDatabaseLocal() == false)
+                       openSDB();
+               else
+                       openDB();
+               try {
+                       ObjectSet<Booking> result = db.queryByExample(b);
+                       ObjectSet<Client> result2= db.queryByExample(b.getClient());
+                       db.delete(result.get(0));
+                       db.delete(result2.get(0));
+                       db.commit();
+               } catch (Exception e) {
+                       e.printStackTrace();;
+               }finally{
+                       db.close();
+               }
+
+               
+       }
 }