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

Jump to bottom

Fixes #13567: A change not triggering a validation is displayed as a change request in "unknow" status #120

Closed
wants to merge 1 commit into from
Closed

Fixes #13567: A change not triggering a validation is displayed as a change request in "unknow" status #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 27 additions & 10 deletions ...c/main/scala/com/normation/plugins/changevalidation/snippet/ChangeRequestManagement.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,35 @@ class ChangeRequestManagement extends DispatchSnippet with Loggable {
* }
*/
case class ChangeRequestLine (
id : Int
, name : String
, creator : String
, step : String
, lastModification: String
) extends JsTableLine {
val json = {
JsObj(
"id" -> id
, "name" -> name
, "creator" -> creator
, "step" -> step
, "lastModification" -> lastModification
)
}
}

def toChangeRequestLine(
changeRequest : ChangeRequest
, workflowStateMap: Map[ChangeRequestId,WorkflowNodeId]
, eventsMap : Map[ChangeRequestId, EventLog]
) extends JsTableLine {
): Option[ChangeRequestLine] = {
val date = eventsMap.get(changeRequest.id).map(event => DateFormaterService.getFormatedDate(event.creationDate)).getOrElse("Unknown")

val json = {
JsObj(
"id" -> changeRequest.id.value
, "name" -> changeRequest.info.name
, "creator" -> changeRequest.owner
, "step" -> (workflowStateMap.get(changeRequest.id).map(_.value).getOrElse("Unknown"): String)
, "lastModification" -> date
workflowStateMap.get(changeRequest.id).map { status => ChangeRequestLine(
changeRequest.id.value
, changeRequest.info.name
, changeRequest.owner
, status.value
, date
)
}
}
Expand All @@ -122,7 +138,8 @@ class ChangeRequestManagement extends DispatchSnippet with Loggable {
logger.error(fail.messageChain)
Map()
}
changeRequests.map(ChangeRequestLine(_,workflowStateMap,eventMap)).toList
changeRequests.flatMap(toChangeRequestLine(_,workflowStateMap,eventMap)).toList

case eb:EmptyBox =>
val fail = eb ?~! s"Could not get change requests because of : ${eb}"
logger.error(fail.msg)
Expand Down