Fix test

imx-org · Sep 27, 2023 · cf61a0b · cf61a0b
1 parent 0852b05
commit cf61a0b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 14 deletions.
diff --git a/data/bld/BuildingPart.json b/data/bld/BuildingPart.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "B0001",
+    "id": "BP0001",
     "isPartOf": [
       {
         "id": "B0001"
@@ -11,7 +11,7 @@
     }
   },
   {
-    "id": "B0002",
+    "id": "BP0002",
     "isPartOf": [
       {
         "id": "B0002"
@@ -22,7 +22,7 @@
     }
   },
   {
-    "id": "B0003",
+    "id": "BP0003",
     "isPartOf": [
       {
         "id": "B0002"

diff --git a/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchPlanner.java b/engine/src/main/java/nl/geostandaarden/imx/orchestrate/engine/fetch/FetchPlanner.java
@@ -198,8 +198,29 @@ private FetchOperation fetchSourceObject(ObjectTypeRef sourceTypeRef, Set<Path>
                     var keyProperty = sourceType.getProperty(keyPath.getFirstSegment());
                     selectedProperties.add(SelectedProperty.forProperty(keyProperty));
                   });
-//            } else {
-//              selectedProperties.add(new SelectedProperty(property, selectIdentity(targetTypeRef)));
+            } else {
+              var targetModel = modelMapping.getSourceModel(targetTypeRef.getModelAlias());
+
+              // TODO: Refactoe
+              if (property.getCardinality().isSingular()) {
+                selectedProperties.add(SelectedProperty.builder()
+                    .property(property)
+                    .nestedRequest(ObjectRequest.builder(targetModel)
+                        .objectType(targetTypeRef)
+                        .objectKey(Map.of())
+                        .selectedProperties(selectIdentity(targetTypeRef))
+                        .build())
+                    .build());
+              } else {
+                // TODO: Filter
+                selectedProperties.add(SelectedProperty.builder()
+                    .property(property)
+                    .nestedRequest(CollectionRequest.builder(targetModel)
+                        .objectType(targetTypeRef)
+                        .selectedProperties(selectIdentity(targetTypeRef))
+                        .build())
+                    .build());
+              }
             }
 
             var identityPaths = targetType.getIdentityProperties()
@@ -304,13 +325,7 @@ private Set<SelectedProperty> selectIdentity(ObjectTypeRef typeRef) {
     return modelMapping.getSourceType(typeRef)
         .getIdentityProperties()
         .stream()
-        .map(property -> {
-//          if (property instanceof Relation relation) {
-//            return new SelectedProperty(property, selectIdentity(relation.getTarget(typeRef)));
-//          }
-
-          return SelectedProperty.forProperty(property);
-        })
+        .map(SelectedProperty::forProperty)
         .collect(toSet());
   }
 }
diff --git a/engine/src/test/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateEngineTest.java b/engine/src/test/java/nl/geostandaarden/imx/orchestrate/engine/OrchestrateEngineTest.java
@@ -6,6 +6,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Map;
+import nl.geostandaarden.imx.orchestrate.engine.exchange.CollectionRequest;
 import nl.geostandaarden.imx.orchestrate.engine.exchange.ObjectRequest;
 import nl.geostandaarden.imx.orchestrate.engine.source.DataRepository;
 import nl.geostandaarden.imx.orchestrate.model.ComponentRegistry;
@@ -20,6 +21,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -67,13 +69,31 @@ void fetch() {
         .build();
 
     when(dataRepositoryMock.findOne(any(ObjectRequest.class)))
-        .thenReturn(Mono.just(Map.of("id", "B0001", "area", 123)));
+        .thenAnswer(invocation -> {
+          var objectType = ((ObjectRequest) invocation.getArgument(0)).getObjectType();
+
+          return switch (objectType.getName()) {
+            case "Building" -> Mono.just(Map.of("id", "B0001", "area", 123));
+            case "Address" -> Mono.just(Map.of("id", "A0001", "houseNumber", 23, "postalCode", "1234AB"));
+            default -> throw new IllegalStateException();
+          };
+        });
+
+    when(dataRepositoryMock.find(any(CollectionRequest.class)))
+        .thenAnswer(invocation -> {
+          var objectType = ((CollectionRequest) invocation.getArgument(0)).getObjectType();
+
+          return switch (objectType.getName()) {
+            case "BuildingPart" -> Flux.just(Map.of("id", "BP0001", "hasMainAddress", Map.of("id", "A0001")));
+            default -> throw new IllegalStateException();
+          };
+        });
 
     var resultMono = engine.fetch(request);
 
     StepVerifier.create(resultMono)
         .assertNext(result -> {
-          System.out.println(result);
+          System.out.println(result.getProperties());
         })
         .expectComplete()
         .verify();