Commit

src/main/Main.java

@@ -17,23 +17,17 @@ import services.AirportService;
  * @author Ieva Bekmane 3ITB
  */
 public class Main {
-	
 	public static void main(String[] args) {
 		
 		AirportService services = new AirportService();
 		
+		
 		/*====================================PASSENGERS======================================*/
-		/*Passenger p1 = new Passenger("Janis", "Liepins", "AS12345", Nationality.LATVIAN, IdenType.PASSPORT, true, "No extra needs");
-		Passenger p2 = new Passenger("Liene", "Kalnina", "GH12345", Nationality.ESTONIAN, IdenType.IDCARD, false, "No extra needs");
-		VipPassenger vip1 = new VipPassenger("Baiba", "Jauka", "ER12345", Nationality.ITALIAN, IdenType.PASSPORT, true, "No extra needs", "ZX12345");
-		VipPassenger vip2 = new VipPassenger("Zane", "Berzina", "LM12345", Nationality.LATVIAN, IdenType.PASSPORT, true, "No extra needs", "BN12345");
-		AirportService.allPassenger.add(p1);
-		AirportService.allPassenger.add(p2);
-		AirportService.allPassenger.add(vip1);
-		AirportService.allPassenger.add(vip2);*/
 		services.addNewPassenger("Janis", "Liepins", Nationality.LATVIAN, IdenType.PASSPORT, "AS12345", true);
 		services.addNewPassenger("Katrina", "Zarina", Nationality.LATVIAN, IdenType.IDCARD, "DF12345", false);
+		services.addNewPassenger("Baiba", "Jauka", Nationality.ESTONIAN, IdenType.PASSPORT, "IS43251", false);
 		services.addNewVipPassenger("Juris", "Pakalns", Nationality.ITALIAN, IdenType.IDCARD, "DE12345", true, "VZ12345");
+		services.addNewVipPassenger("Karlis", "Berzins", Nationality.ITALIAN, IdenType.PASSPORT, "NJ12345", true, "FD90324");
 		
 		System.out.println("---------------------Passengers-------------------------");
 		for(Passenger p : AirportService.allPassenger) {
@@ -43,20 +37,17 @@ public class Main {
 		
 		System.out.println("Delete passenger by name and surname: " + services.deletePassengerByNameAndSurname("Baiba", "Jauka"));
 		System.out.println("Delete passenger by number: " + services.deletePassengerByIdentNr("AS12345"));
-		System.out.println("Delete VipPassenger by vipNr: " + services.deleteVipPassengerByVipNr(2));
+		System.out.println("Delete VipPassenger by vipNr: " + services.deleteVipPassengerByVipNr(1));
 		
 		System.out.println("---------------Passengers after delete------------------");
 		for(Passenger p : AirportService.allPassenger) {
 			System.out.println(p);
 		}
-		System.out.println("--------------------------------------------------------");
-		
 		
 		/* =======================AIRPORTS======================*/
-		Airport a1 = new Airport(2000, AirportName.BARSELONA);
-		Airport a2 = new Airport(3000, AirportName.OSLO);
-		AirportService.allAirports.add(a1);
-		AirportService.allAirports.add(a2);
+		
+		services.addNewAirport(AirportName.OSLO, 3214);
+		services.addNewAirport(AirportName.BARSELONA, -2451);
 		services.addNewAirport(AirportName.RIGA, 4000);
 		services.addNewAirport(AirportName.TALLINN, 2500);
 		
@@ -77,70 +68,69 @@ public class Main {
 		
 		
 		/*=============================FLIGHTS=======================================*/
-		AirportService.allAirports.add(a1);
+		services.addNewAirport(AirportName.OSLO, 3214);
 		services.addNewAirport(AirportName.RIGA, 4000);
 		
-		Date d1 = new Date(2020, 10, 10, 9, 00);
-		Date d2 = new Date(2020, 11, 12, 10, 00);
+		System.out.println("Add new flight: " + services.addNewFlight(AirportName.BARSELONA, AirportName.RIGA, new Date(2020, 10, 10, 9, 00), (byte) 2));
+		System.out.println("Add new flight: " + services.addNewFlight(AirportName.OSLO, AirportName.BARSELONA, new Date(2020, 11, 12, 10, 00), (byte) 3));
+		System.out.println("Add new flight: " + services.addNewFlight(AirportName.TALLINN, AirportName.RIGA, new Date(2020, 6, 3, 3, 25), (byte) 1));
+		System.out.println("Add new flight: " + services.addNewFlight(AirportName.RIGA, AirportName.OSLO, new Date(2020, 6, 5, 2, 15), (byte) 3));
+		System.out.println("Add new flight: " + services.addNewFlight(AirportName.BARSELONA, AirportName.TALLINN, new Date(2020, 6, 7, 12, 20), (byte)1));
+		System.out.println("Add new flight: " + services.addNewFlight(AirportName.TALLINN, AirportName.OSLO, new Date(2020, 6, 14, 5, 35), (byte)3));
 		
-		Flight f1 = new Flight(d1, (byte) 3, AirportService.allAirports.get(0), AirportService.allAirports.get(1));
-		Flight f2 = new Flight(d2, (byte) 3, AirportService.allAirports.get(0), AirportService.allAirports.get(2));
-		AirportService.allFlights.add(f1);
-		AirportService.allFlights.add(f2);
 		System.out.println("------------------Flights------------------------------");
 		for(Flight f : AirportService.allFlights) {
 			System.out.println(f);
 		}
 		System.out.println("--------------------------------------------------------");
-		//System.out.println("Delete Flight by flight number and airport name: " + services.deleteFlightInAirportByNr(AirportName.OSLO, 0));
+		System.out.println("Delete Flight by flight number and airport name: " + services.deleteFlightInAirportByNr(AirportName.OSLO, 1));
 		System.out.println("------------Flights after delete-----------------------");
 		for(Flight f : AirportService.allFlights) {
 			System.out.println(f);
 		}
 		System.out.println("--------------------------------------------------------");
+		
 		/*============================BOARDING PASSES===================================*/
 		services.addNewPassenger("Janis", "Liepins", Nationality.LATVIAN, IdenType.PASSPORT, "AS12345", true);
-		services.addNewVipPassenger("Juris", "Pakalns", Nationality.ITALIAN, IdenType.IDCARD, "DE12345", true, "VZ12345");
-		
-		for(Passenger p : AirportService.allPassenger) {
-			System.out.println(p);
-		}
+		services.addNewPassenger("Baiba", "Jauka", Nationality.ESTONIAN, IdenType.PASSPORT, "IS43251", false);
 		
 		BoardingPass b1 = new BoardingPass(AirportService.allPassenger.get(0));
 		BoardingPass b2 = new BoardingPass(AirportService.allPassenger.get(1));
 		BoardingPass b3 = new BoardingPass(AirportService.allPassenger.get(2));
-		//BoardingPass b4 = new BoardingPass(vip2);
-		
-		
 		AirportService.allBoardingPasses.add(b1);
 		AirportService.allBoardingPasses.add(b2);
 		AirportService.allBoardingPasses.add(b3);
-		//AirportService.allBoardingPasses.add(b4);
-		b2.generateSeatByPriority();
+
 		System.out.println("-------------------Boarding passes---------------------");
 		for(BoardingPass b : AirportService.allBoardingPasses) {
 			System.out.println(b);
 		}
 		System.out.println("--------------------------------------------------------");
 		
-		//System.out.println("Delete bording pass by number: " + services.deleteBoardingPassByBoardingPassNr(AirportService.allBoardingPasses.get(1).getBoardingPassNr()));
+		System.out.println("Delete bording pass by number: " + services.deleteBoardingPassByBoardingPassNr(AirportService.allBoardingPasses.get(2).getBoardingPassNr()));
 		System.out.println("--------------Boarding passes after delete---------------");
 		for(BoardingPass b : AirportService.allBoardingPasses) {
 			System.out.println(b);
 		}
 		System.out.println("--------------------------------------------------------");
 		
+		
 		for(Airport a : AirportService.allAirports) {
 			System.out.println(a);
 		}
+		System.out.println("-----------All flights in Airport Barselona-------------");
+		services.showAppFlightsFromAirport(AirportName.BARSELONA);
 		System.out.println("--------------------------------------------------------");
-		services.showAppFlightsFromAirport(AirportName.OSLO);
+		
+		System.out.println("-----------All flights in Airport Tallinn-------------");
+		services.showAppFlightsFromAirport(AirportName.TALLINN);
 		System.out.println("--------------------------------------------------------");
-		System.out.println(services.addNewBoardingPassByObject(f1, AirportService.allPassenger.get(2)));
+		
+		System.out.println("------------Sort all airport by capacity----------------");
+		services.sortAllAirportsByCapacity();
 		System.out.println("--------------------------------------------------------");
-		for(BoardingPass b : AirportService.allBoardingPasses) {
-			System.out.println(b);
-		}
+		
+		services.sortAllFlightsInDay();
 	}
 
 }

src/models/BoardingPass.java

@@ -10,7 +10,7 @@ import services.AirportService;
  */
 public class BoardingPass implements INumberGenerator{
 	private String boardingPassNr;
-	private short group;
+	private int group;
 	private Passenger passenger;
 	private Seat seat;
 	
@@ -105,6 +105,7 @@ public class BoardingPass implements INumberGenerator{
 			this.seat = new Seat(row, seat);
 		}
 	}
+
 	/*
 	 * @brief Boarding pass number is created as follows: the first letter from passenger name + 
 	 * 			the first letter from surname + seat + group
@@ -117,6 +118,8 @@ public class BoardingPass implements INumberGenerator{
 		StringBuilder sb = new StringBuilder();
 		sb.append(passenger.getName().charAt(0));
 		sb.append(passenger.getSurname().charAt(0));
+		//sb.append(seat);
+		//sb.append(group);
 		
 		this.boardingPassNr = sb.toString();
 	}

src/models/Flight.java

@@ -12,7 +12,7 @@ public class Flight implements INumberGenerator{
 	private int flightNr;
 	private Date dateAndTime;
 	private byte duration;
-	private PriorityQueue<BoardingPass> allPassenger = new PriorityQueue<BoardingPass>();
+	public static PriorityQueue<BoardingPass> allPassenger = new PriorityQueue<BoardingPass>();
 	private Airport airportFrom;
 	private Airport airportTo;
 	private static int flightNrCount = 0;
@@ -96,7 +96,8 @@ public class Flight implements INumberGenerator{
 	 * @return none
 	 */
 	public void setDuration(byte duration) {
-		this.duration = duration;
+		if(duration > 0)
+			this.duration = duration;
 	}
 	/*
 	 * @brief Returns passengers in flight
@@ -114,7 +115,8 @@ public class Flight implements INumberGenerator{
 	 * @return none
 	 */
 	public void setAllPassenger(PriorityQueue<BoardingPass> allPassenger) {
-		this.allPassenger = allPassenger;
+		if(allPassenger != null)
+			this.allPassenger = allPassenger;
 	}
 	/*
 	 * @brief Argument constructor
@@ -140,8 +142,8 @@ public class Flight implements INumberGenerator{
 	 */
 	@Override
 	public String toString() {
-		return "Flight [flightNr=" + flightNr + ", dateAndTime=" + dateAndTime + ", duration=" + duration
-				+ ", allPassenger=" + allPassenger + ", airportFrom=" + airportFrom + ", airportTo=" + airportTo + "]";
+		return "Flight: " + flightNr + ", Date: " + dateAndTime + ", duration: " + duration
+				+ ", allPassenger: " + allPassenger + ", From: " + airportFrom + ", To: " + airportTo;
 	}
 	/*
 	 * @brief Generates number for Flight
@@ -168,11 +170,4 @@ public class Flight implements INumberGenerator{
 			return true;
 		}
 	}
-	
-	
-	
-	
-	
-	
-	
 }

src/utils/Verifiction.java

@@ -47,6 +47,9 @@ public class Verifiction {
 		if(number > 0) {
 			result = number;
 		}
+		else {
+			result = Math.abs(number);
+		}
 		return result;
 	}
 }