[NU-1893] Fix "Failed to get node validation" when opening fragment n…

…ode details for referencing non-existing fragment (#7190) * [NU-1893] Fix "Failed to get node validation" when opening fragment node details for referencing non-existing fragment * tests fix
TouK · Nov 21, 2024 · 17b806a · 17b806a
1 parent b89a0f3
commit 17b806a
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 12 deletions.
diff --git a/...er/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepository.scala b/...er/server/src/main/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepository.scala
@@ -1,10 +1,10 @@
 package pl.touk.nussknacker.ui.process.fragment
 
+import cats.implicits.toTraverseOps
 import pl.touk.nussknacker.engine.api.process.{ProcessName, ProcessingType}
 import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess
 import pl.touk.nussknacker.ui.process.ScenarioQuery
 import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository
-import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessNotFoundError
 import pl.touk.nussknacker.ui.security.api.LoggedUser
 
 import scala.concurrent.duration._
@@ -46,10 +46,7 @@ class DefaultFragmentRepository(processRepository: FetchingProcessRepository[Fut
   )(implicit user: LoggedUser): Future[Option[CanonicalProcess]] = {
     processRepository
       .fetchProcessId(fragmentName)
-      .flatMap { processIdOpt =>
-        val processId = processIdOpt.getOrElse(throw ProcessNotFoundError(fragmentName))
-        processRepository.fetchLatestProcessDetailsForProcessId[CanonicalProcess](processId)
-      }
+      .flatMap(_.map(processRepository.fetchLatestProcessDetailsForProcessId[CanonicalProcess]).sequence.map(_.flatten))
       .map(_.map(_.json))
   }
 

diff --git a/...er/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceBusinessSpec.scala b/...er/server/src/test/scala/pl/touk/nussknacker/ui/api/NodesApiHttpServiceBusinessSpec.scala
@@ -499,22 +499,34 @@ class NodesApiHttpServiceBusinessSpec
              |}""".stripMargin)
     }
 
-    "return 404 for not existent fragment validation" in {
-      val fragmentName = "fragment"
+    "return 200 for fragment input node referencing fragment that doesn't exist" in {
+      val nonExistingFragmentName = "non-existing-fragment"
 
       given()
         .applicationState {
           createSavedScenario(exampleScenario)
         }
         .basicAuthAllPermUser()
-        .jsonBody(exampleNodeValidationRequestForFragment(fragmentName))
+        .jsonBody(exampleNodeValidationRequestForFragment(nonExistingFragmentName))
         .when()
         .post(s"$nuDesignerHttpAddress/api/nodes/${exampleScenario.name}/validation")
         .Then()
-        .statusCode(404)
-        .body(
-          equalTo(s"No scenario $fragmentName found")
-        )
+        .statusCode(200)
+        .equalsJsonBody(s"""{
+             |  "parameters": null,
+             |  "expressionType": null,
+             |  "validationErrors": [
+             |    {
+             |      "typ": "UnknownFragment",
+             |      "message": "Unknown fragment",
+             |      "description": "Node fragment uses fragment non-existing-fragment which is missing",
+             |      "fieldName": null,
+             |      "errorType": "SaveAllowed",
+             |      "details": null
+             |    }
+             |  ],
+             |  "validationPerformed": true
+             |}""".stripMargin)
     }
   }
 

diff --git a/...erver/src/test/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepositorySpec.scala b/...erver/src/test/scala/pl/touk/nussknacker/ui/process/fragment/FragmentRepositorySpec.scala
@@ -5,6 +5,7 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
+import pl.touk.nussknacker.engine.api.process.ProcessName
 import pl.touk.nussknacker.test.VeryPatientScalaFutures
 import pl.touk.nussknacker.test.utils.domain.ProcessTestData.sampleFragmentName
 import pl.touk.nussknacker.test.base.it.NuResourcesTest
@@ -36,4 +37,8 @@ class FragmentRepositorySpec
     )
   }
 
+  it should "return None for missing fragment" in {
+    fragmentRepository.fetchLatestFragment(ProcessName("non-existing-fragment"))(adminUser).futureValue shouldBe None
+  }
+
 }
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -107,6 +107,7 @@
 * [#7187](https://github.com/TouK/nussknacker/pull/7187) Fix "Failed to get node validation" when using literal lists that mixes different types of elements
 * [#7183](https://github.com/TouK/nussknacker/pull/7183) Hide categories from a scenarios list and more scenario details when only one category is available
 * [#7192](https://github.com/TouK/nussknacker/pull/7192) Fix "Failed to get node validation" when opening node details referencing non-existing component
+* [#7190](https://github.com/TouK/nussknacker/pull/7190) Fix "Failed to get node validation" when opening fragment node details for referencing non-existing fragment 
 
 ## 1.17
 

diff --git a/...io-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala b/...io-compiler/src/test/scala/pl/touk/nussknacker/engine/compile/NodeDataValidatorSpec.scala
@@ -497,6 +497,27 @@ class NodeDataValidatorSpec extends AnyFunSuite with Matchers with Inside with T
     }
   }
 
+  test("should return business error when fragment input node referencing fragment that doesn't exist") {
+    validate(
+      FragmentInput(
+        "frInput",
+        FragmentRef(
+          "non-existing-fragment",
+          List(NodeParameter(ParameterName("param1"), "145".spel)),
+          Map("out1" -> "test1")
+        )
+      ),
+      ValidationContext.empty,
+      outgoingEdges = List(OutgoingEdge("any", Some(FragmentOutput("out1"))))
+    ) should matchPattern {
+      case ValidationPerformed(
+            List(UnknownFragment("non-existing-fragment", "frInput")),
+            None,
+            None
+          ) =>
+    }
+  }
+
   test("should validate fragment parameters") {
     inside(
       validate(