From b1091cd3bc1df2c366b559e48f04c97d9fd06f23 Mon Sep 17 00:00:00 2001
From: Filip Izydorczyk <filip.izydorczyk@protonmail.com>
Date: Tue, 8 Dec 2020 18:16:17 +0100
Subject: [PATCH] Added tour data model

---
 README.md                                     |  5 +-
 .../com/plannaplan/models/ConfigData.java     | 67 +++++++++----------
 .../java/com/plannaplan/models/TourData.java  | 38 +++++++++++
 3 files changed, 72 insertions(+), 38 deletions(-)
 create mode 100755 buisnesslogic/src/main/java/com/plannaplan/models/TourData.java

diff --git a/README.md b/README.md
index 281203b..bc96534 100755
--- a/README.md
+++ b/README.md
@@ -46,10 +46,7 @@ W paczce dla proda w protpertiesach poufne dane odczytywane są ze zmiennych śr
 Zeby spakowac apke do `jara` wystarcza dwie komendy zaczynajac z glownego katalogu projektu
 
 ```
-mvn clean
-mvn install
-cd restservice
-mvn clean package spring-boot:repackage
+mvn clean; mvn install; cd restservice; mvn clean package spring-boot:repackage
 ```
 
 Utworzony zostanie jar w `restservice/target/restservice-1.0-SNAPSHOT.jar`. Oczywiscie zeby jar zadzialal kontenery dockerowe musza byc odpalone (lub baza danych na serwerze jesli zmienialismy propertisy z localhost)
diff --git a/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java b/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java
index 6cd1fc3..f5c966d 100755
--- a/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java
+++ b/buisnesslogic/src/main/java/com/plannaplan/models/ConfigData.java
@@ -1,51 +1,50 @@
 package com.plannaplan.models;
 
-import java.util.Date;
 import java.io.InputStream;
 
 public class ConfigData {
-    private Date start;
-    private Date end;
+    private TourData firstTour;
+    private TourData secondTour;
     private InputStream filestream;
 
-    /*
-     * ConfigData
-     *
-     * @param start when the configdata begins
-     * @param end when the configdata ends
-     * @param filestream where the filestream is
+    /**
+     * constructor
+     * 
+     * @param firstTour  date of first tours
+     * @param secondTour date of second tours
+     * @param filestream filestram with data to import
      */
-    public ConfigData(Date start, Date end, InputStream filestream) {
-        this.start = start;
-        this.end = end;
+    public ConfigData(TourData firstTour, TourData secondTour, InputStream filestream) {
+        this.firstTour = firstTour;
+        this.secondTour = secondTour;
         this.filestream = filestream;
     }
 
-    /*
-     * getFilestream
-     *
-     * @return filestream
+    /**
+     * second tour getter
+     * 
+     * @return TourData second tour
+     */
+    public TourData getSecondTour() {
+        return secondTour;
+    }
+
+    /**
+     * first tour getter
+     * 
+     * @return TourData first tour
+     */
+    public TourData getFirstTour() {
+        return firstTour;
+    }
+
+    /**
+     * filestream getter
+     * 
+     * @return InputStream with data to import
      */
     public InputStream getFilestream() {
         return filestream;
     }
 
-    /*
-     * getEnd
-     *
-     * @return end
-     */
-    public Date getEnd() {
-        return end;
-    }
-
-    /*
-     * getStart
-     *
-     * @return start
-     */
-    public Date getStart() {
-        return start;
-    }
-
 }
diff --git a/buisnesslogic/src/main/java/com/plannaplan/models/TourData.java b/buisnesslogic/src/main/java/com/plannaplan/models/TourData.java
new file mode 100755
index 0000000..2c661c7
--- /dev/null
+++ b/buisnesslogic/src/main/java/com/plannaplan/models/TourData.java
@@ -0,0 +1,38 @@
+package com.plannaplan.models;
+
+import java.util.Date;
+
+public class TourData {
+
+    private Date start;
+    private Date end;
+
+    /**
+     * construcotr
+     * 
+     * @param start Date when tour start
+     * @param end   Date when tour end
+     */
+    public TourData(Date start, Date end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    /**
+     * tour end getter
+     * 
+     * @return Date end of tour
+     */
+    public Date getEnd() {
+        return end;
+    }
+
+    /**
+     * tour start getter
+     * 
+     * @return Date beginning of tour
+     */
+    public Date getStart() {
+        return start;
+    }
+}