Skip to content

Commit

Permalink
[NU-1772] Updates in the scenario activity API contract (#6929)
Browse files Browse the repository at this point in the history 
* Updates in the scenario activity API contract

* Updates in the scenario activity API contract

* Updates in the scenario activity API contract

* Updates in the scenario activity API contract

* Changelog
  • Loading branch information
@mgoworko
mgoworko authored Sep 24, 2024
1 parent aa1747b commit 40fc17d
Show file tree
Hide file tree
Showing 10 changed files with 711 additions and 855 deletions.
113 changes: 57 additions & 56 deletions ...ner/server/src/main/scala/pl/touk/nussknacker/ui/api/ScenarioActivityApiHttpService.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,13 @@ class ScenarioActivityApiHttpService(
scenarioComment match {
case ScenarioComment.Available(comment, lastModifiedByUserName, lastModifiedAt) =>
Dtos.ScenarioActivityComment(
status = Dtos.ScenarioActivityCommentStatus.Available(comment),
content = Dtos.ScenarioActivityCommentContent.Available(comment),
lastModifiedBy = lastModifiedByUserName.value,
lastModifiedAt = lastModifiedAt,
)
case ScenarioComment.Deleted(deletedByUserName, deletedAt) =>
Dtos.ScenarioActivityComment(
status = Dtos.ScenarioActivityCommentStatus.Deleted,
content = Dtos.ScenarioActivityCommentContent.Deleted,
lastModifiedBy = deletedByUserName.value,
lastModifiedAt = deletedAt,
)
Expand All @@ -241,14 +241,14 @@ class ScenarioActivityApiHttpService(
attachment match {
case ScenarioAttachment.Available(attachmentId, attachmentFilename, lastModifiedByUserName, lastModifiedAt) =>
Dtos.ScenarioActivityAttachment(
status = Dtos.ScenarioActivityAttachmentStatus.Available(attachmentId.value),
file = Dtos.ScenarioActivityAttachmentFile.Available(attachmentId.value),
filename = attachmentFilename.value,
lastModifiedBy = lastModifiedByUserName.value,
lastModifiedAt = lastModifiedAt,
)
case ScenarioAttachment.Deleted(attachmentFilename, deletedByUserName, deletedAt) =>
Dtos.ScenarioActivityAttachment(
status = Dtos.ScenarioActivityAttachmentStatus.Deleted,
file = Dtos.ScenarioActivityAttachmentFile.Deleted,
filename = attachmentFilename.value,
lastModifiedBy = deletedByUserName.value,
lastModifiedAt = deletedAt,
Expand All @@ -258,90 +258,90 @@ class ScenarioActivityApiHttpService(

private def toDto(scenarioActivity: ScenarioActivity): Dtos.ScenarioActivity = {
scenarioActivity match {
case ScenarioActivity.ScenarioCreated(_, scenarioActivityId, user, date, scenarioVersion) =>
Dtos.ScenarioActivity.ScenarioCreated(
case ScenarioActivity.ScenarioCreated(_, scenarioActivityId, user, date, scenarioVersionId) =>
Dtos.ScenarioActivity.forScenarioCreated(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value)
scenarioVersionId = scenarioVersionId.map(_.value)
)
case ScenarioActivity.ScenarioArchived(_, scenarioActivityId, user, date, scenarioVersion) =>
Dtos.ScenarioActivity.ScenarioArchived(
case ScenarioActivity.ScenarioArchived(_, scenarioActivityId, user, date, scenarioVersionId) =>
Dtos.ScenarioActivity.forScenarioArchived(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value)
scenarioVersionId = scenarioVersionId.map(_.value)
)
case ScenarioActivity.ScenarioUnarchived(_, scenarioActivityId, user, date, scenarioVersion) =>
Dtos.ScenarioActivity.ScenarioUnarchived(
case ScenarioActivity.ScenarioUnarchived(_, scenarioActivityId, user, date, scenarioVersionId) =>
Dtos.ScenarioActivity.forScenarioUnarchived(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value)
scenarioVersionId = scenarioVersionId.map(_.value)
)
case ScenarioActivity.ScenarioDeployed(_, scenarioActivityId, user, date, scenarioVersion, comment) =>
Dtos.ScenarioActivity.ScenarioDeployed(
case ScenarioActivity.ScenarioDeployed(_, scenarioActivityId, user, date, scenarioVersionId, comment) =>
Dtos.ScenarioActivity.forScenarioDeployed(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
comment = toDto(comment),
)
case ScenarioActivity.ScenarioPaused(_, scenarioActivityId, user, date, scenarioVersion, comment) =>
Dtos.ScenarioActivity.ScenarioPaused(
case ScenarioActivity.ScenarioPaused(_, scenarioActivityId, user, date, scenarioVersionId, comment) =>
Dtos.ScenarioActivity.forScenarioPaused(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
comment = toDto(comment),
)
case ScenarioActivity.ScenarioCanceled(_, scenarioActivityId, user, date, scenarioVersion, comment) =>
Dtos.ScenarioActivity.ScenarioCanceled(
case ScenarioActivity.ScenarioCanceled(_, scenarioActivityId, user, date, scenarioVersionId, comment) =>
Dtos.ScenarioActivity.forScenarioCanceled(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
comment = toDto(comment),
)
case ScenarioActivity.ScenarioModified(_, scenarioActivityId, user, date, scenarioVersion, comment) =>
Dtos.ScenarioActivity.ScenarioModified(
case ScenarioActivity.ScenarioModified(_, scenarioActivityId, user, date, scenarioVersionId, comment) =>
Dtos.ScenarioActivity.forScenarioModified(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
comment = toDto(comment),
)
case ScenarioActivity.ScenarioNameChanged(_, id, user, date, version, oldName, newName) =>
Dtos.ScenarioActivity.ScenarioNameChanged(
Dtos.ScenarioActivity.forScenarioNameChanged(
id = id.value,
user = user.name.value,
date = date,
scenarioVersion = version.map(_.value),
scenarioVersionId = version.map(_.value),
oldName = oldName,
newName = newName,
)
case ScenarioActivity.CommentAdded(_, scenarioActivityId, user, date, scenarioVersion, comment) =>
Dtos.ScenarioActivity.CommentAdded(
case ScenarioActivity.CommentAdded(_, scenarioActivityId, user, date, scenarioVersionId, comment) =>
Dtos.ScenarioActivity.forCommentAdded(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
comment = toDto(comment),
)
case ScenarioActivity.AttachmentAdded(_, scenarioActivityId, user, date, scenarioVersion, attachment) =>
Dtos.ScenarioActivity.AttachmentAdded(
case ScenarioActivity.AttachmentAdded(_, scenarioActivityId, user, date, scenarioVersionId, attachment) =>
Dtos.ScenarioActivity.forAttachmentAdded(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
attachment = toDto(attachment),
)
case ScenarioActivity.ChangedProcessingMode(_, scenarioActivityId, user, date, scenarioVersion, from, to) =>
Dtos.ScenarioActivity.ChangedProcessingMode(
case ScenarioActivity.ChangedProcessingMode(_, scenarioActivityId, user, date, scenarioVersionId, from, to) =>
Dtos.ScenarioActivity.forChangedProcessingMode(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
from = from.entryName,
to = to.entryName
)
Expand All @@ -350,32 +350,32 @@ class ScenarioActivityApiHttpService(
scenarioActivityId,
user,
date,
scenarioVersion,
scenarioVersionId,
sourceEnvironment,
sourceScenarioVersion
sourceScenarioVersionId
) =>
Dtos.ScenarioActivity.IncomingMigration(
Dtos.ScenarioActivity.forIncomingMigration(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
sourceEnvironment = sourceEnvironment.name,
sourceScenarioVersion = sourceScenarioVersion.value.toString,
sourceScenarioVersionId = sourceScenarioVersionId.value.toString,
)
case ScenarioActivity.OutgoingMigration(
_,
scenarioActivityId,
user,
date,
scenarioVersion,
scenarioVersionId,
comment,
destinationEnvironment
) =>
Dtos.ScenarioActivity.OutgoingMigration(
Dtos.ScenarioActivity.forOutgoingMigration(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
comment = toDto(comment),
destinationEnvironment = destinationEnvironment.name,
)
Expand All @@ -384,16 +384,16 @@ class ScenarioActivityApiHttpService(
scenarioActivityId,
user,
date,
scenarioVersion,
scenarioVersionId,
comment,
dateFinished,
errorMessage
) =>
Dtos.ScenarioActivity.PerformedSingleExecution(
Dtos.ScenarioActivity.forPerformedSingleExecution(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
comment = toDto(comment),
dateFinished = dateFinished,
errorMessage = errorMessage,
Expand All @@ -403,15 +403,15 @@ class ScenarioActivityApiHttpService(
scenarioActivityId,
user,
date,
scenarioVersion,
scenarioVersionId,
dateFinished,
errorMessage
) =>
Dtos.ScenarioActivity.PerformedScheduledExecution(
Dtos.ScenarioActivity.forPerformedScheduledExecution(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
dateFinished = dateFinished,
errorMessage = errorMessage,
)
Expand All @@ -420,28 +420,29 @@ class ScenarioActivityApiHttpService(
scenarioActivityId,
user,
date,
scenarioVersion,
scenarioVersionId,
dateFinished,
changes,
errorMessage
) =>
Dtos.ScenarioActivity.AutomaticUpdate(
Dtos.ScenarioActivity.forAutomaticUpdate(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
dateFinished = dateFinished,
changes = changes,
errorMessage = errorMessage,
)
case ScenarioActivity.CustomAction(_, scenarioActivityId, user, date, scenarioVersion, actionName, comment) =>
Dtos.ScenarioActivity.CustomAction(
case ScenarioActivity.CustomAction(_, scenarioActivityId, user, date, scenarioVersionId, actionName, comment) =>
Dtos.ScenarioActivity.forCustomAction(
id = scenarioActivityId.value,
user = user.name.value,
date = date,
scenarioVersion = scenarioVersion.map(_.value),
scenarioVersionId = scenarioVersionId.map(_.value),
actionName = actionName,
comment = toDto(comment),
customIcon = None,
)
}
}
Expand Down
Loading

0 comments on commit 40fc17d

Please sign in to comment.