Skip to content

sqlTimeStamp #2678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonredfern merged 2 commits into from
Feb 2, 2026
Merged

sqlTimeStamp #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e273c3f
Introducing sqlTimestamp for better database (especially ms sql server)
simonredfern Feb 2, 2026
fa630e1
Merge remote-tracking branch 'upstream/develop' into develop
simonredfern Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,6 +2224,9 @@ trait APIMethods510 {
|Each Consent has one of the following states: ${ConsentStatus.values.toList.sorted.mkString(", ")}.
|
|Each Consent is bound to a consumer i.e. you need to identify yourself over request header value Consumer-Key.
|
|Examples:
|
|For example:
|GET /obp/v4.0.0/users/current HTTP/1.1
|Host: 127.0.0.1:8080
Expand Down
50 changes: 34 additions & 16 deletions obp-api/src/main/scala/code/metrics/MappedMetrics.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package code.metrics

import java.sql.{PreparedStatement, Timestamp}
import java.util.Date
import java.text.SimpleDateFormat
import java.util.{Date, TimeZone}
import java.util.UUID.randomUUID

import code.api.cache.Caching
Expand Down Expand Up @@ -186,6 +187,23 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
}
}

/**
* Formats a Date as an ISO 8601 timestamp string for use in SQL queries.
* Uses the format yyyy-MM-dd'T'HH:mm:ss.SSS with the 'T' separator, which is
* universally safe across databases (PostgreSQL, SQL Server, H2, etc.).
*
* The 'T' separator is critical for SQL Server compatibility - without it,
* SQL Server may misinterpret the date based on regional/language settings.
*
* @param date The date to format
* @return ISO 8601 formatted timestamp string (e.g., "2024-01-15T10:30:45.123")
*/
private def sqlTimestamp(date: Date): String = {
val sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS")
sdf.setTimeZone(TimeZone.getTimeZone("UTC"))
sdf.format(date)
}

// override def getAllGroupedByUserId(): Map[String, List[APIMetric]] = {
// //TODO: do this all at the db level using an actual group by query
// MappedMetric.findAll.groupBy(_.getUserId)
Expand Down Expand Up @@ -378,11 +396,11 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
val includeUrlPatternsQueriesSql = s"$includeUrlPatternsQueries"

val result = {
val sqlQuery = if(isNewVersion) // in the version, we use includeXxx instead of excludeXxx, the performance should be better.
s"""SELECT count(*), avg(duration), min(duration), max(duration)
val sqlQuery = if(isNewVersion) // in the version, we use includeXxx instead of excludeXxx, the performance should be better.
s"""SELECT count(*), avg(duration), min(duration), max(duration)
FROM metric
WHERE date_c >= '${new Timestamp(fromDate.get.getTime)}'
AND date_c <= '${new Timestamp(toDate.get.getTime)}'
WHERE date_c >= '${sqlTimestamp(fromDate.get)}'
AND date_c <= '${sqlTimestamp(toDate.get)}'
AND (${trueOrFalse(consumerId.isEmpty)} or consumerid = ${sqlFriendly(consumerId)})
AND (${trueOrFalse(userId.isEmpty)} or userid = ${sqlFriendly(userId)})
AND (${trueOrFalse(implementedByPartialFunction.isEmpty)} or implementedbypartialfunction = ${sqlFriendly(implementedByPartialFunction)})
Expand All @@ -399,10 +417,10 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
AND (${trueOrFalse(includeImplementedByPartialFunctions.isEmpty) } or implementedbypartialfunction in ($includeImplementedByPartialFunctionsList))
""".stripMargin
else
s"""SELECT count(*), avg(duration), min(duration), max(duration)
s"""SELECT count(*), avg(duration), min(duration), max(duration)
FROM metric
WHERE date_c >= '${new Timestamp(fromDate.get.getTime)}'
AND date_c <= '${new Timestamp(toDate.get.getTime)}'
WHERE date_c >= '${sqlTimestamp(fromDate.get)}'
AND date_c <= '${sqlTimestamp(toDate.get)}'
AND (${trueOrFalse(consumerId.isEmpty)} or consumerid = ${sqlFriendly(consumerId)})
AND (${trueOrFalse(userId.isEmpty)} or userid = ${sqlFriendly(userId)})
AND (${trueOrFalse(implementedByPartialFunction.isEmpty)} or implementedbypartialfunction = ${sqlFriendly(implementedByPartialFunction)})
Expand Down Expand Up @@ -493,10 +511,10 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
val otherDbLimit = if (dbUrl.contains("sqlserver")) s"" else s"LIMIT $limit"
val sqlQuery: String =
s"""SELECT ${msSqlLimit} count(*), metric.implementedbypartialfunction, metric.implementedinversion
FROM metric
WHERE
date_c >= '${new Timestamp(fromDate.get.getTime)}' AND
date_c <= '${new Timestamp(toDate.get.getTime)}'
FROM metric
WHERE
date_c >= '${sqlTimestamp(fromDate.get)}' AND
date_c <= '${sqlTimestamp(toDate.get)}'
AND (${trueOrFalse(consumerId.isEmpty)} or consumerid = ${consumerId.getOrElse("null")})
AND (${trueOrFalse(userId.isEmpty)} or userid = ${userId.getOrElse("null")})
AND (${trueOrFalse(implementedByPartialFunction.isEmpty)} or implementedbypartialfunction = ${implementedByPartialFunction.getOrElse("null")})
Expand Down Expand Up @@ -578,10 +596,10 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
val sqlQuery =
s"""SELECT ${msSqlLimit} count(*) as count, consumer.id as consumerprimaryid, metric.appname as appname,
consumer.developeremail as email, consumer.consumerid as consumerid
FROM metric, consumer
WHERE metric.appname = consumer.name
AND date_c >= '${new Timestamp(fromDate.get.getTime)}'
AND date_c <= '${new Timestamp(toDate.get.getTime)}'
FROM metric, consumer
WHERE metric.appname = consumer.name
AND date_c >= '${sqlTimestamp(fromDate.get)}'
AND date_c <= '${sqlTimestamp(toDate.get)}'
AND (${trueOrFalse(consumerId.isEmpty)} or consumer.consumerid = ${sqlFriendly(consumerId)})
AND (${trueOrFalse(userId.isEmpty)} or userid = ${sqlFriendly(userId)})
AND (${trueOrFalse(implementedByPartialFunction.isEmpty)} or implementedbypartialfunction = ${sqlFriendly(implementedByPartialFunction)})
Expand Down