-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
18 changed files
with
515 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
...i/src/main/scala/pl/touk/nussknacker/ui/customhttpservice/CustomHttpServiceProvider.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package pl.touk.nussknacker.ui.customhttpservice | ||
|
||
import akka.http.scaladsl.server.Route | ||
import pl.touk.nussknacker.ui.security.api.LoggedUser | ||
|
||
trait CustomHttpServiceProvider { | ||
def provideRouteWithUser(implicit user: LoggedUser): Route | ||
} |
16 changes: 16 additions & 0 deletions
16
...ain/scala/pl/touk/nussknacker/ui/customhttpservice/CustomHttpServiceProviderFactory.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package pl.touk.nussknacker.ui.customhttpservice | ||
|
||
import cats.effect.{IO, Resource} | ||
import com.typesafe.config.Config | ||
import pl.touk.nussknacker.ui.customhttpservice.services.NussknackerServicesForCustomHttpService | ||
|
||
trait CustomHttpServiceProviderFactory { | ||
|
||
def name: String | ||
|
||
def create( | ||
config: Config, | ||
services: NussknackerServicesForCustomHttpService, | ||
): Resource[IO, CustomHttpServiceProvider] | ||
|
||
} |
5 changes: 5 additions & 0 deletions
5
...k/nussknacker/ui/customhttpservice/services/NussknackerServicesForCustomHttpService.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package pl.touk.nussknacker.ui.customhttpservice.services | ||
|
||
final class NussknackerServicesForCustomHttpService( | ||
val scenarioService: ScenarioService, | ||
) |
89 changes: 89 additions & 0 deletions
89
...pi/src/main/scala/pl/touk/nussknacker/ui/customhttpservice/services/ScenarioService.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
package pl.touk.nussknacker.ui.customhttpservice.services | ||
|
||
import cats.effect.IO | ||
import pl.touk.nussknacker.engine.api.component.ProcessingMode | ||
import pl.touk.nussknacker.engine.api.deployment.{ProcessAction, ScenarioActionName, UserName} | ||
import pl.touk.nussknacker.engine.api.process._ | ||
import pl.touk.nussknacker.engine.deployment.EngineSetupName | ||
import pl.touk.nussknacker.ui.customhttpservice.services.ScenarioService._ | ||
import pl.touk.nussknacker.ui.security.api.LoggedUser | ||
|
||
import java.net.URI | ||
import java.time.Instant | ||
|
||
trait ScenarioService { | ||
|
||
def getLatestScenariosWithDetails(query: LatestScenariosWithDetailsQuery)( | ||
implicit user: LoggedUser | ||
): IO[List[ScenarioWithDetails]] | ||
|
||
def getLatestVersionsForScenarios(query: LatestVersionsForScenariosQuery)( | ||
implicit user: LoggedUser | ||
): IO[Map[ProcessId, ScenarioVersionMetadata]] | ||
|
||
} | ||
|
||
object ScenarioService { | ||
|
||
final case class ScenarioWithDetails( | ||
name: ProcessName, | ||
processId: Option[ProcessId], | ||
processVersionId: VersionId, | ||
isLatestVersion: Boolean, | ||
description: Option[String], | ||
isArchived: Boolean, | ||
isFragment: Boolean, | ||
processingType: ProcessingType, | ||
processCategory: String, | ||
processingMode: ProcessingMode, | ||
engineSetupName: EngineSetupName, | ||
modifiedAt: Instant, | ||
modifiedBy: String, | ||
createdAt: Instant, | ||
createdBy: String, | ||
labels: List[String], | ||
// Actions are deprecated | ||
lastDeployedAction: Option[ProcessAction], | ||
lastStateAction: Option[ProcessAction], | ||
lastAction: Option[ProcessAction], | ||
// | ||
modelVersion: Option[Int], | ||
state: Option[ScenarioStatus], | ||
) | ||
|
||
final case class ScenarioStatus( | ||
status: String, | ||
visibleActions: List[ScenarioActionName], | ||
allowedActions: List[ScenarioActionName], | ||
actionTooltips: Map[ScenarioActionName, String], | ||
icon: URI, | ||
tooltip: String, | ||
description: String, | ||
) | ||
|
||
final case class LatestScenariosWithDetailsQuery( | ||
isFragment: Option[Boolean] = None, | ||
isArchived: Option[Boolean] = None, | ||
isDeployed: Option[Boolean] = None, | ||
categories: Option[Seq[String]] = None, | ||
processingTypes: Option[Seq[String]] = None, | ||
names: Option[Seq[ProcessName]] = None, | ||
) | ||
|
||
final case class LatestVersionsForScenariosQuery( | ||
isFragment: Option[Boolean] = None, | ||
isArchived: Option[Boolean] = None, | ||
isDeployed: Option[Boolean] = None, | ||
categories: Option[Seq[String]] = None, | ||
processingTypes: Option[Seq[String]] = None, | ||
names: Option[Seq[ProcessName]] = None, | ||
excludeVersionCreatedByUsers: Option[Seq[String]] = None, | ||
) | ||
|
||
final case class ScenarioVersionMetadata( | ||
versionId: VersionId, | ||
createdAt: Instant, | ||
createdByUser: UserName, | ||
) | ||
|
||
} |
109 changes: 109 additions & 0 deletions
109
.../pl/touk/nussknacker/ui/customhttpservice/ProcessServiceBasedScenarioServiceAdapter.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
package pl.touk.nussknacker.ui.customhttpservice | ||
|
||
import cats.effect.IO | ||
import pl.touk.nussknacker.engine.api.process.ProcessId | ||
import pl.touk.nussknacker.restmodel.scenariodetails.{ScenarioStatusDto, ScenarioWithDetails} | ||
import pl.touk.nussknacker.ui.customhttpservice.services.ScenarioService | ||
import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery, ScenarioVersionQuery} | ||
import pl.touk.nussknacker.ui.process.ProcessService.GetScenarioWithDetailsOptions | ||
import pl.touk.nussknacker.ui.process.repository.ScenarioVersionMetadata | ||
import pl.touk.nussknacker.ui.security.api.LoggedUser | ||
|
||
import scala.concurrent.{ExecutionContext, Future} | ||
import scala.language.implicitConversions | ||
|
||
class ProcessServiceBasedScenarioServiceAdapter( | ||
processService: ProcessService | ||
)(implicit executionContext: ExecutionContext) | ||
extends ScenarioService { | ||
|
||
override def getLatestScenariosWithDetails( | ||
query: ScenarioService.LatestScenariosWithDetailsQuery | ||
)(implicit user: LoggedUser): IO[List[ScenarioService.ScenarioWithDetails]] = | ||
processService | ||
.getLatestProcessesWithDetails( | ||
toDomain(query), | ||
GetScenarioWithDetailsOptions.withoutAdditionalFields.withFetchState | ||
) | ||
.map(_.map(toApi)) | ||
|
||
override def getLatestVersionsForScenarios( | ||
query: ScenarioService.LatestVersionsForScenariosQuery, | ||
)(implicit user: LoggedUser): IO[Map[ProcessId, ScenarioService.ScenarioVersionMetadata]] = | ||
processService | ||
.getLatestVersionForProcesses(toDomainScenarioQuery(query), toDomainScenarioVersionQuery(query)) | ||
.map(_.map { case (processId, metadata) => (processId, toApi(metadata)) }) | ||
|
||
private implicit def deferToIO[T](f: => Future[T]): IO[T] = IO.fromFuture(IO.delay(f)) | ||
|
||
private def toDomain(query: ScenarioService.LatestScenariosWithDetailsQuery): ScenarioQuery = | ||
ScenarioQuery( | ||
isFragment = query.isFragment, | ||
isArchived = query.isArchived, | ||
isDeployed = query.isDeployed, | ||
categories = query.categories, | ||
processingTypes = query.processingTypes, | ||
names = query.names, | ||
) | ||
|
||
private def toDomainScenarioQuery(query: ScenarioService.LatestVersionsForScenariosQuery): ScenarioQuery = | ||
ScenarioQuery( | ||
isFragment = query.isFragment, | ||
isArchived = query.isArchived, | ||
isDeployed = query.isDeployed, | ||
categories = query.categories, | ||
processingTypes = query.processingTypes, | ||
names = query.names, | ||
) | ||
|
||
private def toDomainScenarioVersionQuery( | ||
query: ScenarioService.LatestVersionsForScenariosQuery | ||
): ScenarioVersionQuery = | ||
ScenarioVersionQuery( | ||
excludedUserNames = query.excludeVersionCreatedByUsers | ||
) | ||
|
||
private def toApi(metadata: ScenarioVersionMetadata): ScenarioService.ScenarioVersionMetadata = | ||
ScenarioService.ScenarioVersionMetadata( | ||
versionId = metadata.versionId, | ||
createdAt = metadata.createdAt, | ||
createdByUser = metadata.createdByUser, | ||
) | ||
|
||
private def toApi(scenario: ScenarioWithDetails): ScenarioService.ScenarioWithDetails = | ||
ScenarioService.ScenarioWithDetails( | ||
name = scenario.name, | ||
processId = scenario.processId, | ||
processVersionId = scenario.processVersionId, | ||
isLatestVersion = scenario.isLatestVersion, | ||
description = scenario.description, | ||
isArchived = scenario.isArchived, | ||
isFragment = scenario.isFragment, | ||
processingType = scenario.processingType, | ||
processCategory = scenario.processCategory, | ||
processingMode = scenario.processingMode, | ||
engineSetupName = scenario.engineSetupName, | ||
modifiedAt = scenario.modifiedAt, | ||
modifiedBy = scenario.modifiedBy, | ||
createdAt = scenario.createdAt, | ||
createdBy = scenario.createdBy, | ||
labels = scenario.labels, | ||
lastDeployedAction = scenario.lastDeployedAction, | ||
lastStateAction = scenario.lastStateAction, | ||
lastAction = scenario.lastAction, | ||
modelVersion = scenario.modelVersion, | ||
state = scenario.state.map(toApi), | ||
) | ||
|
||
private def toApi(scenario: ScenarioStatusDto): ScenarioService.ScenarioStatus = | ||
ScenarioService.ScenarioStatus( | ||
status = scenario.status.name, | ||
visibleActions = scenario.visibleActions, | ||
allowedActions = scenario.allowedActions, | ||
actionTooltips = scenario.actionTooltips, | ||
icon = scenario.icon, | ||
tooltip = scenario.tooltip, | ||
description = scenario.description, | ||
) | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioVersionQuery.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package pl.touk.nussknacker.ui.process | ||
|
||
final case class ScenarioVersionQuery( | ||
excludedUserNames: Option[Seq[String]] = None, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.