Skip to content
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

support for date time parameters #1069

Merged
merged 3 commits into from
Feb 14, 2025
Merged

support for date time parameters #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1fd6e6
support for date time parameters
sumukhswamy Feb 5, 2025
11fbe04
change condition to support older parameters as well
sumukhswamy Feb 10, 2025
5c76f9a
remove comments
sumukhswamy Feb 10, 2025
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
13 changes: 11 additions & 2 deletions src/main/kotlin/org/opensearch/reportsscheduler/action/ReportInstanceActions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,17 @@ internal object ReportInstanceActions {
Metrics.REPORT_PERMISSION_USER_ERROR.counter.increment()
throw OpenSearchStatusException("Permission denied for Report Definition ${request.reportDefinitionId}", RestStatus.FORBIDDEN)
}
val beginTime: Instant = currentTime.minus(reportDefinitionDetails.reportDefinition.format.duration)
val endTime: Instant = currentTime
val beginTime: Instant
val endTime: Instant

if (!reportDefinitionDetails.reportDefinition.format.timeFrom.isNullOrBlank() &&
!reportDefinitionDetails.reportDefinition.format.timeTo.isNullOrBlank()) {
beginTime = Instant.parse(reportDefinitionDetails.reportDefinition.format.timeFrom)
endTime = Instant.parse(reportDefinitionDetails.reportDefinition.format.timeTo)
} else {
beginTime = currentTime.minus(reportDefinitionDetails.reportDefinition.format.duration)
endTime = currentTime
}
val currentStatus: Status = Status.Success // TODO: Revert to Executing when background job execution supported
val reportInstance = ReportInstance(
"ignore",
Expand Down
133 changes: 72 additions & 61 deletions src/main/kotlin/org/opensearch/reportsscheduler/model/ReportDefinition.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,74 +234,85 @@ internal data class ReportDefinition(
* Report definition format data class
*/
internal data class Format(
val duration: Duration,
val fileFormat: FileFormat,
val limit: Int?,
val header: String?,
val footer: String?
) : ToXContentObject {
internal companion object {
private const val DURATION_TAG = "duration"
private const val FILE_FORMAT_TAG = "fileFormat"
private const val LIMIT_TAG = "limit"
private const val HEADER_TAG = "header"
private const val FOOTER_TAG = "footer"
val duration: Duration,
val fileFormat: FileFormat,
val limit: Int?,
val header: String?,
val footer: String?,
val timeFrom: String?,
val timeTo: String?
) : ToXContentObject {
internal companion object {
private const val DURATION_TAG = "duration"
private const val FILE_FORMAT_TAG = "fileFormat"
private const val LIMIT_TAG = "limit"
private const val HEADER_TAG = "header"
private const val FOOTER_TAG = "footer"
private const val TIME_FROM_TAG = "timeFrom"
private const val TIME_TO_TAG = "timeTo"

/**
* Parse the data from parser and create Format object
* @param parser data referenced at parser
* @return created Format object
*/
fun parse(parser: XContentParser): Format {
var durationSeconds: Duration? = null
var fileFormat: FileFormat? = null
var limit: Int? = null
var header: String? = null
var footer: String? = null
XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser)
while (XContentParser.Token.END_OBJECT != parser.nextToken()) {
val fieldName = parser.currentName()
parser.nextToken()
when (fieldName) {
DURATION_TAG -> durationSeconds = Duration.parse(parser.text())
FILE_FORMAT_TAG -> fileFormat = FileFormat.valueOf(parser.text())
LIMIT_TAG -> limit = parser.intValue()
HEADER_TAG -> header = parser.textOrNull()
FOOTER_TAG -> footer = parser.textOrNull()
else -> {
parser.skipChildren()
log.info("$LOG_PREFIX:Format Skipping Unknown field $fieldName")
}
/**
* Parse the data from parser and create Format object
* @param parser data referenced at parser
* @return created Format object
*/
fun parse(parser: XContentParser): Format {
var durationSeconds: Duration? = null
var fileFormat: FileFormat? = null
var limit: Int? = null
var header: String? = null
var footer: String? = null
var timeFrom: String? = null
var timeTo: String? = null
XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser)
while (XContentParser.Token.END_OBJECT != parser.nextToken()) {
val fieldName = parser.currentName()
parser.nextToken()
when (fieldName) {
DURATION_TAG -> durationSeconds = Duration.parse(parser.text())
FILE_FORMAT_TAG -> fileFormat = FileFormat.valueOf(parser.text())
LIMIT_TAG -> limit = parser.intValue()
HEADER_TAG -> header = parser.textOrNull()
FOOTER_TAG -> footer = parser.textOrNull()
TIME_FROM_TAG -> timeFrom = parser.textOrNull()
TIME_TO_TAG -> timeTo = parser.textOrNull()
else -> {
parser.skipChildren()
log.info("$LOG_PREFIX:Format Skipping Unknown field $fieldName")
}
}
durationSeconds
?: throw IllegalArgumentException("$DURATION_TAG field absent")
fileFormat ?: throw IllegalArgumentException("$FILE_FORMAT_TAG field absent")
return Format(
durationSeconds,
fileFormat,
limit,
header,
footer
)
}
durationSeconds ?: throw IllegalArgumentException("$DURATION_TAG field absent")
fileFormat ?: throw IllegalArgumentException("$FILE_FORMAT_TAG field absent")
return Format(
durationSeconds,
fileFormat,
limit,
header,
footer,
timeFrom,
timeTo
)
}
}

/**
* {@inheritDoc}
*/
override fun toXContent(builder: XContentBuilder?, params: ToXContent.Params?): XContentBuilder {
builder!!
builder.startObject()
.field(DURATION_TAG, duration.toString())
.field(FILE_FORMAT_TAG, fileFormat.name)
if (limit != null) builder.field(LIMIT_TAG, limit)
if (header != null) builder.field(HEADER_TAG, header)
if (footer != null) builder.field(FOOTER_TAG, footer)
builder.endObject()
return builder
}
/**
* {@inheritDoc}
*/
override fun toXContent(builder: XContentBuilder?, params: ToXContent.Params?): XContentBuilder {
builder!!
builder.startObject()
.field(DURATION_TAG, duration.toString())
.field(FILE_FORMAT_TAG, fileFormat.name)
if (limit != null) builder.field(LIMIT_TAG, limit)
if (header != null) builder.field(HEADER_TAG, header)
if (footer != null) builder.field(FOOTER_TAG, footer)
builder.field(TIME_FROM_TAG, timeFrom)
builder.field(TIME_TO_TAG, timeTo)
builder.endObject()
return builder
}
}

/**
* Report definition trigger data class
Expand Down
Loading