artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 19:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added function dateRangesOverlap

Browse Source
This commit is contained in:
Marko Milić 2019-10-01 11:37:41 +02:00
parent cb683064f6
commit bfb5cf1787
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
obp-api/src/main/scala/code/api/util/APIUtil.scala
View File

@ -2691,5 +2691,22 @@ Returns a string showed to the developer
case _ => Full(StrongCustomerAuthentication.UNDEFINED)
}
}
/**
* Given two ranges(like date ranges), do they overlap and if so, how much?
*
* A +-----------------+ B
* C +-------------------+ D
*
* if NOT ( B <= C or A >= D) then they overlap
* Next, do 4 calculations:
* B-A, B-C, D-A, D-C
* The actual overlap will be the least of these.
*
*/
case class DateInterval(start: Date, end: Date)
def dateRangesOverlap(range1: DateInterval, range2: DateInterval): Boolean = {
if(range1.end.before(range2.start) || range1.start.after(range2.end)) false else true
}
}

24
obp-api/src/test/scala/code/util/APIUtilTest.scala
View File

@ -27,6 +27,8 @@ TESOBE (http://www.tesobe.com/)
package code.util
import java.time.{ZoneId, ZonedDateTime}
import java.time.format.DateTimeFormatter
import java.util.Date
import code.api.JSONFactoryGateway.PayloadOfJwtJSON
@ -49,6 +51,28 @@ class APIUtilTest extends FeatureSpec with Matchers with GivenWhenThen with MdcL
val inputStringDateFormat = DateWithMsFormat
val startDateObject: Date = DefaultFromDate
val endDateObject: Date = DefaultToDate
feature("test APIUtil.dateRangesOverlap method") {
val oneDayAgo = ZonedDateTime.now(ZoneId.of("UTC")).minusDays(1)
val twoDayAgo = ZonedDateTime.now(ZoneId.of("UTC")).minusDays(2)
val tomorrow = ZonedDateTime.now(ZoneId.of("UTC")).plusDays(2)
val dayAfterTomorrow = ZonedDateTime.now(ZoneId.of("UTC")).plusDays(1)
val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm'Z'")
scenario("Date intervals do not overlap"){
val interval1 = DateInterval(Date.from(twoDayAgo.toInstant()), Date.from(oneDayAgo.toInstant()))
val interval2 = DateInterval(Date.from(tomorrow.toInstant()), Date.from(dayAfterTomorrow.toInstant()))
dateRangesOverlap(interval1, interval2) should be (false)
}
scenario("Date intervals overlap"){
val interval1 = DateInterval(Date.from(twoDayAgo.toInstant()), Date.from(tomorrow.toInstant()))
val interval2 = DateInterval(Date.from(oneDayAgo.toInstant()), Date.from(dayAfterTomorrow.toInstant()))
dateRangesOverlap(interval1, interval2) should be (true)
}
}
feature("test APIUtil.getHttpRequestUrlParam method")
{