GH-2223 - Reactive part.

Author: meistermeier

src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java

@@ -544,8 +544,8 @@ private <T> T processNestedRelations(Neo4jPersistentEntity<?> sourceEntity, Pers
 				Long relatedInternalId;
 				// No need to save values if processed
 				if (stateMachine.hasProcessedValue(relatedValueToStore)) {
-					Object thing = stateMachine.getProcessedAs(newRelatedObject);
-					relatedInternalId = queryRelatedNode(thing, targetEntity, inDatabase);
+					Object newRelatedObjectForQuery = stateMachine.getProcessedAs(newRelatedObject);
+					relatedInternalId = queryRelatedNode(newRelatedObjectForQuery, targetEntity, inDatabase);
 				} else {
 					relatedInternalId = saveRelatedNode(newRelatedObject, targetEntity, inDatabase);
 				}

src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java

@@ -661,7 +661,8 @@ private <T> Mono<T> processNestedRelations(Neo4jPersistentEntity<?> sourceEntity
 
 							Mono<Long> queryOrSave;
 							if (stateMachine.hasProcessedValue(relatedValueToStore)) {
-								queryOrSave = queryRelatedNode(newRelatedObject, targetEntity, inDatabase);
+								Object newRelatedObjectForQuery = stateMachine.getProcessedAs(newRelatedObject);
+								queryOrSave = queryRelatedNode(newRelatedObjectForQuery, targetEntity, inDatabase);
 							} else {
 								queryOrSave = saveRelatedNode(newRelatedObject, targetEntity, inDatabase);
 							}
@@ -671,6 +672,7 @@ private <T> Mono<T> processNestedRelations(Neo4jPersistentEntity<?> sourceEntity
 									PersistentPropertyAccessor<?> targetPropertyAccessor = targetEntity.getPropertyAccessor(newRelatedObject);
 									if (targetEntity.isUsingInternalIds()) {
 										targetPropertyAccessor.setProperty(targetEntity.getRequiredIdProperty(), relatedInternalId);
+										stateMachine.markValueAsProcessedAs(newRelatedObject, targetPropertyAccessor.getBean());
 									}
 
 									Object idValue = idProperty != null

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveImmutableGeneratedIdsIT.java

@@ -17,8 +17,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.neo4j.driver.Record;
+import org.neo4j.driver.Session;
+import org.springframework.data.neo4j.repository.Neo4jRepository;
 import reactor.test.StepVerifier;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -302,6 +306,41 @@ void childrenShouldNotBeRecreatedForNoReasons(@Autowired ReactiveNeo4jTemplate t
 				.verifyComplete();
 	}
 
+	@Test // GH-2223
+	void saveWithGeneratedIdsWithMultipleRelationshipsToOneNode(@Autowired Driver driver,
+			@Autowired ImmutablePersonWithGeneratedIdRepository repository) {
+
+		ImmutablePersonWithGeneratedId person1 = new ImmutablePersonWithGeneratedId();
+		ImmutablePersonWithGeneratedId person2 = ImmutablePersonWithGeneratedId.fallback(person1);
+		List<ImmutablePersonWithGeneratedId> onboardedBy = new ArrayList<>();
+		onboardedBy.add(person1);
+		onboardedBy.add(person2);
+		ImmutablePersonWithGeneratedId person3 = ImmutablePersonWithGeneratedId.wasOnboardedBy(onboardedBy);
+
+		StepVerifier.create(repository.save(person3))
+				.assertNext(savedPerson -> {
+					assertThat(savedPerson.id).isNotNull();
+					assertThat(savedPerson.wasOnboardedBy).allMatch(ob -> ob.id != null);
+
+					ImmutablePersonWithGeneratedId savedPerson2 = savedPerson.wasOnboardedBy.stream().filter(p -> p.fallback != null).findFirst().get();
+					assertThat(savedPerson2.fallback.id).isNotNull();
+				})
+				.verifyComplete();
+
+		try (Session session = driver.session()) {
+			List<Record> result = session.run(
+					"MATCH (person3:ImmutablePersonWithGeneratedId) " +
+							"-[:ONBOARDED_BY]->(person2:ImmutablePersonWithGeneratedId) " +
+							"-[:FALLBACK]->(person1:ImmutablePersonWithGeneratedId), " +
+							"(person3)-[:ONBOARDED_BY]->(person1) " +
+							"return person3")
+					.list();
+			assertThat(result).hasSize(1);
+		}
+	}
+
+	interface ImmutablePersonWithGeneratedIdRepository extends ReactiveNeo4jRepository<ImmutablePersonWithGeneratedId, Long> {}
+
 	@Configuration
 	@EnableReactiveNeo4jRepositories(considerNestedRepositories = true)
 	@EnableTransactionManagement