Updated Identity Mapper class

Author: charles-augustin

…a/com/sdmproject/mapper/IdentityMap.java …/com/sdmproject/mapper/ClientMapper.javaVehicle Rental System/src/main/java/com/sdmproject/mapper/IdentityMap.java renamed to Vehicle Rental System/src/main/java/com/sdmproject/mapper/ClientMapper.java Vehicle Rental System/src/main/java/com/sdmproject/mapper/IdentityMap.java renamed to Vehicle Rental System/src/main/java/com/sdmproject/mapper/ClientMapper.java

@@ -6,12 +6,12 @@
 import com.sdmproject.model.ClientRecord;
 import com.sdmproject.orm.Table;
 
-public class IdentityMap {
+public class ClientMapper {
 
 	private Table<ClientRecord, Integer> DAO;
 	private List<ClientRecord> cRec;
 
-	public IdentityMap() {
+	public ClientMapper() {
 		this.DAO = new Table<ClientRecord, Integer>(ClientRecord.class);
 		this.cRec = new ArrayList<ClientRecord>();
 	}
@@ -28,4 +28,28 @@ public ClientRecord findById(int id) {
 		cRec.add(clientRecord);
 		return clientRecord;
 	}
+
+	public ClientRecord findByLicienceNo(String driverLicienceNo) {
+		ClientRecord clientRecord;
+		if (!cRec.isEmpty()) {
+			for (ClientRecord cr : this.cRec) {
+				if (cr.getDriverLicienceNo() == driverLicienceNo)
+					return cr;
+			}
+		}
+
+		clientRecord = DAO.queryForParamsEquality(new String[] { "driverLicienceNo" }, new Object[] { driverLicienceNo }).get(0);
+		return clientRecord;
+	}
+
+	public List<ClientRecord> findAll() {
+		if (!cRec.isEmpty()) {
+			return cRec;
+		}
+		cRec = DAO.queryForAll();
+		return cRec;
+	}
+	
+	
+
 }

Vehicle Rental System/src/main/java/com/sdmproject/mapper/ReservationMapper.java

@@ -0,0 +1,58 @@
+package com.sdmproject.mapper;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.sdmproject.model.Reservation;
+import com.sdmproject.orm.Table;
+
+public class ReservationMapper {
+	private Table<Reservation, Integer> DAO;
+	private List<Reservation> reservationList;
+
+	public ReservationMapper() {
+		this.DAO = new Table<Reservation, Integer>(Reservation.class);
+		this.reservationList = new ArrayList<Reservation>();
+	}
+
+	public Reservation findById(int id) {
+		Reservation resRecord;
+		if (!reservationList.isEmpty()) {
+			for (Reservation cr : this.reservationList) {
+				if (cr.getId() == id)
+					return cr;
+			}
+		}
+		resRecord = DAO.queryById(id);
+		reservationList.add(resRecord);
+		return resRecord;
+	}
+	
+	public List<Reservation> findAllReservations(String sortProp, String order) {
+		if(!reservationList.isEmpty())
+			return reservationList;
+		reservationList = DAO.queryForParamsForDifferentOperations(new String[] { "typeOfReservation" },
+				new String[] { "="},
+				new String[] { "RESERVATION" });
+		return reservationList;
+	}
+	
+	public List<Reservation> findAllRentalWithVehicle(String sortProperty, String sortOrder, int id) {
+		if(!reservationList.isEmpty())
+			return reservationList;
+		reservationList = DAO.queryForParamsForDifferentOperationsWithSort(new String[] { "typeOfReservation", "vehicleID" },
+				new String[] { "=", "="}, new Object[] { "RENTAL", id}, sortProperty, sortOrder.equals("desc"));
+		return reservationList;
+	}
+	
+	public List<Reservation> findAllReservationOnDueDate(Date dueDate) {
+		if(!reservationList.isEmpty())
+			return reservationList;
+		reservationList = DAO.queryForParamsForDifferentOperations(new String[] { "DATE(toDateTime)", "typeOfReservation" },
+				new String[] { "=", "=" },
+				new String[] { new SimpleDateFormat("yyyy-MM-dd").format(dueDate), "RESERVATION" });
+		return reservationList;
+	}
+}

Vehicle Rental System/src/main/java/com/sdmproject/mapper/VehicleMapper.java

@@ -0,0 +1,53 @@
+package com.sdmproject.mapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sdmproject.model.Vehicle;
+import com.sdmproject.orm.Table;
+
+public class VehicleMapper {
+	private Table<Vehicle, Integer> DAO;
+	private List<Vehicle> vRec;
+
+	public VehicleMapper() {
+		this.DAO = new Table<Vehicle, Integer>(Vehicle.class);
+		this.vRec = new ArrayList<Vehicle>();
+	}
+	
+	
+	public Vehicle findByPlateNo(String plateNO) {
+		Vehicle vehicleRecord;
+		if (!vRec.isEmpty()) {
+			for (Vehicle cr : this.vRec) {
+				if (cr.getPlateNo() == plateNO)
+					return cr;
+			}
+		}
+		vehicleRecord = DAO.queryForParamsEquality(new String[] {"plateNO"}, new Object[] {plateNO}).get(0);
+		vRec.add(vehicleRecord);
+		return vehicleRecord;
+	}
+	
+	public Vehicle findById(int id) {
+		Vehicle vehicleRecord;
+		if (!vRec.isEmpty()) {
+			for (Vehicle cr : this.vRec) {
+				if (cr.getId() == id)
+					return cr;
+			}
+		}
+		vehicleRecord = DAO.queryById(id);
+		vRec.add(vehicleRecord);
+		return vehicleRecord;
+	}
+	
+	public List<Vehicle> findAll() {
+		if (!vRec.isEmpty()) {
+			return vRec;
+		}
+		vRec = DAO.queryForAll();
+		return vRec;
+	}
+
+}