Dates function change (#38)

* Changed the datetime function

* Changed the dates methods to return date with time as well

Author: balu836

src/main/java/uk/co/evoco/testdata/Dates.java

@@ -17,66 +17,66 @@ public class Dates extends MockUnitBase {
      * ahead of the start date
      * @param startDate start date
      * @param daysToAdd days to add to start date
-     * @param dateFormat date format (e.g. "dd/MM/yyyy")
+     * @param dateFormat date format (e.g. "dd/MM/yyyy","dd/MM/yyyy HH:mm")
      * @return String representing resulting date
      */
     public static String futureDate(String startDate, int daysToAdd, String dateFormat) {
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
-        LocalDate date = DateTime.parse(startDate, dateTimeFormatter).plusDays(daysToAdd).toLocalDate();
-        return date.toString(dateTimeFormatter);
+        DateTime dateTime = DateTime.parse(startDate, dateTimeFormatter).plusDays(daysToAdd).toDateTime();
+        return dateTime.toString(dateTimeFormatter);
     }
 
     /**
      * Returns a string that represents the date that is the given days
      * behind of the start date
      * @param startDate start date
      * @param daysToRemove days to remove from start date
-     * @param dateFormat date format (e.g. "dd/MM/yyyy")
+     * @param dateFormat date format (e.g. "dd/MM/yyyy","dd/MM/yyyy HH:mm")
      * @return String representing resulting date
      */
     public static String pastDate(String startDate, int daysToRemove, String dateFormat) {
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
-        LocalDate date = DateTime.parse(startDate, dateTimeFormatter).minusDays(daysToRemove).toLocalDate();
-        return date.toString(dateTimeFormatter);
+        DateTime dateTime = DateTime.parse(startDate, dateTimeFormatter).minusDays(daysToRemove).toDateTime();
+        return dateTime.toString(dateTimeFormatter);
     }
 
     /**
      * Returns the current date for today
-     * @param dateFormat date format (e.g. "dd/MM/yyyy")
+     * @param dateFormat date format (e.g. "dd/MM/yyyy","dd/MM/yyyy HH:mm")
      * @return String representing resulting date
      */
     public static String now(String dateFormat) {
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
-        LocalDate date = DateTime.now().toLocalDate();
-        return date.toString(dateTimeFormatter);
+        DateTime dateTime = DateTime.now().toDateTime();
+        return dateTime.toString(dateTimeFormatter);
     }
 
     /**
      *
      * @param startDate the date to start with
      * @param numberOfBusinessDaysToAdd Days to add, avoiding weekends
-     * @param dateFormat date format (e.g. "dd/MM/yyyy")
+     * @param dateFormat date format (e.g. "dd/MM/yyyy","dd/MM/yyyy HH:mm"")
      * @return String representing resulting date
      */
     public static String futureDateAvoidingWeekends(String startDate, int numberOfBusinessDaysToAdd, String dateFormat) {
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
-        LocalDate futureDate = DateTime.parse(startDate, dateTimeFormatter).toLocalDate();
+        DateTime futureDateTime = DateTime.parse(startDate, dateTimeFormatter).toDateTime();
         int addedDays = 0;
         while (addedDays < numberOfBusinessDaysToAdd) {
-            futureDate = futureDate.plusDays(1);
-            if (!((futureDate.getDayOfWeek() == 6) || (futureDate.getDayOfWeek() == 7))) {
+            futureDateTime = futureDateTime.plusDays(1);
+            if (!((futureDateTime.getDayOfWeek() == 6) || (futureDateTime.getDayOfWeek() == 7))) {
                 ++addedDays;
             }
         }
-        return futureDate.toString(dateTimeFormatter);
+        return futureDateTime.toString(dateTimeFormatter);
     }
 
     /**
      *
      * @param locale the location for UK bank holidays (see @link Dates)
      * @param startDate the date to start with
      * @param numberOfBusinessDaysToAdd Days to add, avoiding weekends and UK bank holidays
-     * @param dateFormat date format (e.g. "dd/MM/yyyy")
+     * @param dateFormat date format (e.g. "dd/MM/yyyy","dd/MM/yyyy HH:mm")
      * @return String representing resulting date
      * @throws JsonProcessingException if the JSON source for bank holidays cannot be read
      */
@@ -86,19 +86,20 @@ public static String futureDataAvoidingWeekendsAndBankHolidays(
         BankHolidays bankHolidays = JsonUtils.fromString(
                 get("https://www.gov.uk/bank-holidays.json").body().asString(), BankHolidays.class);
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
-        LocalDate now = DateTime.parse(startDate, dateTimeFormatter).toLocalDate();
-        LocalDate futureDate = DateTime.parse(
+        DateTime now = DateTime.parse(startDate, dateTimeFormatter).toDateTime();
+        DateTime futureDateTime = DateTime.parse(
                 futureDateAvoidingWeekends(
                         startDate,
                         numberOfBusinessDaysToAdd,
-                        dateFormat), dateTimeFormatter).toLocalDate();
+                        dateFormat), dateTimeFormatter).toDateTime();
         int bankHolidayCount = 0;
         for(BankHoliday bankHoliday : bankHolidays.get(locale)) {
-            if (!bankHoliday.getLocalDate().isBefore(now) && !bankHoliday.getLocalDate().isAfter(futureDate)) {
+            if (!bankHoliday.getLocalDate().isBefore(new LocalDate(now)) && !bankHoliday.getLocalDate().isAfter(new LocalDate(futureDateTime))) {
                 bankHolidayCount++;
             }
         }
-        futureDate = futureDate.plusDays(bankHolidayCount);
-        return futureDate.toString(dateTimeFormatter);
+        futureDateTime = futureDateTime.plusDays(bankHolidayCount);
+        return futureDateTime.toString(dateTimeFormatter);
     }
+
 }

src/test/java/uk/co/evoco/testdata/DatesTests.java

@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.jupiter.api.Test;
 
+import java.util.Date;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static uk.co.evoco.testdata.Dates.*;
@@ -41,4 +43,23 @@ public void testCanGetDateInFutureAvoidingWeekendsAndBankHolidaysWhenStartDateIs
                 Locale.ENGLAND_AND_WALES, "25/08/2017", 2, "dd/MM/yyyy"),
                 is("30/08/2017"));
     }
+
+    @Test
+    public void testCanGetDateTimeInFuture() {
+        assertThat(futureDate("01/06/2019 12:34", 5, "dd/MM/yyyy HH:mm"), is("06/06/2019 12:34"));
+    }
+
+    @Test
+    public void testCanGetDateTimeInPast() {
+        assertThat(
+                pastDate("06/06/2019 11:45", 5, "dd/MM/yyyy HH:mm"), is("01/06/2019 11:45"));
+    }
+
+    @Test
+    public void testCanDataTimeInFutureAvoidingWeekend() {
+        assertThat(
+                futureDateAvoidingWeekends("06/06/2019 13:54", 5, "dd/MM/yyyy HH:mm"),
+                is("13/06/2019 13:54"));
+    }
+
 }