From b9db8b8f6aa75d2088101b52d8166f9d0940eda9 Mon Sep 17 00:00:00 2001 From: Lucien Clin Date: Tue, 19 May 2026 16:22:17 +0200 Subject: [PATCH 1/3] refactor: Improved connector provision for orchestrator --- .../dnpm/dip/rest/api/UseCaseController.scala | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala b/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala index f272a13..f4aa31b 100644 --- a/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala +++ b/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala @@ -42,9 +42,10 @@ import de.dnpm.dip.service.{ UsageScope } import de.dnpm.dip.connector.{ - FakeConnector, HttpConnector } +import HttpConnector.QueryParameters +import HttpConnector.QueryParameters._ import de.dnpm.dip.connector.HttpMethod._ import Orchestrator.{ Process, @@ -172,26 +173,17 @@ with AuthorizationOps[UserPermissions] mvhService, queryService )( - sys.props.getOrElse(HttpConnector.Type.property,"broker") match { - - case HttpConnector.Type(typ) => - HttpConnector( - typ, - { - case LocalControllingInfo.Request(origin,criteria) => - ( - GET, s"/api/$useCasePrefix/peer2peer/local-controlling-info", - criteria match { - case Some(Controlling.Criteria(period)) => - Map("episode.start" -> Seq(ISO_LOCAL_DATE.format(period.start))) ++ - period.endOption.map(ISO_LOCAL_DATE.format).map(Seq(_)).map("episode.end" -> _) - case _ => Map.empty - } - ) + HttpConnector { + case LocalControllingInfo.Request(origin,criteria) => + ( + GET, s"/api/$useCasePrefix/peer2peer/local-controlling-info", + criteria match { + case Some(Controlling.Criteria(period)) => + QueryParameters("episode.start" -> ISO_LOCAL_DATE.format(period.start)) + + ("episode.end" -> period.endOption.map(ISO_LOCAL_DATE.format)) + case _ => Map.empty } ) - - case _ => FakeConnector[Future] } ) From beca197e2ba3d8e6427f6722797e33cc4a6348a9 Mon Sep 17 00:00:00 2001 From: Lucien Clin Date: Tue, 19 May 2026 16:28:26 +0200 Subject: [PATCH 2/3] build: Added modified build.sbt with bumped connector-base --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c8cdcf2..b52cb76 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ libraryDependencies ++= Seq( "de.dnpm.dip" %% "rd-validation-service-impl" % "1.1.8", "de.dnpm.dip" %% "rd-query-service-api" % "1.1.4", "de.dnpm.dip" %% "rd-query-service-impl" % "1.1.4", - "de.dnpm.dip" %% "connector-base" % "1.1.3", + "de.dnpm.dip" %% "connector-base" % "1.2.0-SNAPSHOT", "de.dnpm.dip" %% "hp-ontology" % "1.2.0", "de.dnpm.dip" %% "alpha-id-se" % "1.2.0", "de.dnpm.dip" %% "orphanet-ordo" % "1.2.0", From f84291273e7e73489d7ccae1ef90cb50c9fe1f35 Mon Sep 17 00:00:00 2001 From: Lucien Clin Date: Mon, 1 Jun 2026 15:24:24 +0200 Subject: [PATCH 3/3] fix: Bump to service-base 1.4.0 and all other dependent service components --- .../dnpm/dip/rest/api/UseCaseController.scala | 5 +++-- build.sbt | 20 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala b/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala index f4aa31b..39af7a4 100644 --- a/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala +++ b/app/controllers/de/dnpm/dip/rest/api/UseCaseController.scala @@ -66,6 +66,7 @@ import ValidationService.{ DataAcceptableWithIssues, FatalIssuesDetected, UnacceptableIssuesDetected, + Validate } import de.dnpm.dip.service.query.{ PatientFilter, @@ -274,7 +275,7 @@ with AuthorizationOps[UserPermissions] def validate = Action.async(patientRecordParser){ req => - validationService.validate(req.body).map { + (validationService ! Validate(req.body,persist = false)).map { case Right(DataAcceptableWithIssues(_,report)) => Ok(Json.toJson(report)) case Right(_) => Ok case Left(UnacceptableIssuesDetected(report)) => UnprocessableEntity(Json.toJson(report)) @@ -413,7 +414,7 @@ with AuthorizationOps[UserPermissions] def validationReport(id: Id[Patient]) = AuthorizedAction(ReadValidationReport).async { req => - (validationService.dataQualityReport(id)) + (validationService.validationReport(id)) .map(_.map(Hyper(_))) .map(JsonResult(_,s"Invalid Patient ID ${id.value}")) } diff --git a/build.sbt b/build.sbt index b52cb76..20d6249 100644 --- a/build.sbt +++ b/build.sbt @@ -31,16 +31,16 @@ libraryDependencies ++= Seq( "de.dnpm.dip" %% "admin-service-impl" % "1.1.2", "de.dnpm.dip" %% "catalog-service-api" % "1.1.1", "de.dnpm.dip" %% "catalog-service-impl" % "1.1.1", - "de.dnpm.dip" %% "service-base" % "1.3.1", - "de.dnpm.dip" %% "mtb-validation-service-api" % "1.1.8", - "de.dnpm.dip" %% "mtb-validation-service-impl" % "1.1.8", - "de.dnpm.dip" %% "mtb-query-service-api" % "1.1.3", - "de.dnpm.dip" %% "mtb-query-service-impl" % "1.1.3", - "de.dnpm.dip" %% "rd-validation-service-api" % "1.1.8", - "de.dnpm.dip" %% "rd-validation-service-impl" % "1.1.8", - "de.dnpm.dip" %% "rd-query-service-api" % "1.1.4", - "de.dnpm.dip" %% "rd-query-service-impl" % "1.1.4", - "de.dnpm.dip" %% "connector-base" % "1.2.0-SNAPSHOT", + "de.dnpm.dip" %% "service-base" % "1.4.0", + "de.dnpm.dip" %% "mtb-validation-service-api" % "1.1.9", + "de.dnpm.dip" %% "mtb-validation-service-impl" % "1.1.9", + "de.dnpm.dip" %% "mtb-query-service-api" % "1.1.4", + "de.dnpm.dip" %% "mtb-query-service-impl" % "1.1.4", + "de.dnpm.dip" %% "rd-validation-service-api" % "1.1.9", + "de.dnpm.dip" %% "rd-validation-service-impl" % "1.1.9", + "de.dnpm.dip" %% "rd-query-service-api" % "1.1.5", + "de.dnpm.dip" %% "rd-query-service-impl" % "1.1.5", + "de.dnpm.dip" %% "connector-base" % "1.2.0", "de.dnpm.dip" %% "hp-ontology" % "1.2.0", "de.dnpm.dip" %% "alpha-id-se" % "1.2.0", "de.dnpm.dip" %% "orphanet-ordo" % "1.2.0",