GH-2123 - Select correct conversion for assigned ids of related nodes.

We must select the source entity and it's associcated id property for
correctly picking up the right conversion as the source is only matched
by the assigned id.

It does not matter for new related target noode as that one is created
or merged in the same step and we can work with its internal id.

This fixes #2123.

Author: michael-simons

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

@@ -528,7 +528,7 @@ private void processNestedRelations(Neo4jPersistentEntity<?> sourceEntity, Objec
 						sourceEntity, relationshipContext, relatedValueToStore);
 
 				Optional<Long> relationshipInternalId = neo4jClient.query(renderer.render(statementHolder.getStatement())).in(inDatabase)
-						.bind(convertIdValues(targetEntity.getRequiredIdProperty(), fromId)) //
+						.bind(convertIdValues(sourceEntity.getRequiredIdProperty(), fromId)) //
 							.to(Constants.FROM_ID_PARAMETER_NAME)
 						.bind(relatedInternalId) //
 							.to(Constants.TO_ID_PARAMETER_NAME) //

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

@@ -537,7 +537,7 @@ private Mono<Void> processNestedRelations(Neo4jPersistentEntity<?> sourceEntity,
 											// in case of no properties the bind will just return an empty map
 											Mono<Long> relationshipCreationMonoNested = neo4jClient
 													.query(renderer.render(statementHolder.getStatement())).in(inDatabase)
-													.bind(convertIdValues(targetEntity.getRequiredIdProperty(), fromId)) //
+													.bind(convertIdValues(sourceEntity.getRequiredIdProperty(), fromId)) //
 														.to(Constants.FROM_ID_PARAMETER_NAME) //
 													.bind(relatedInternalId) //
 														.to(Constants.TO_ID_PARAMETER_NAME) //

src/test/java/org/springframework/data/neo4j/integration/properties/DomainClasses.java

@@ -15,9 +15,11 @@
  */
 package org.springframework.data.neo4j.integration.properties;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,9 +28,11 @@
 import org.springframework.data.neo4j.core.schema.GeneratedValue;
 import org.springframework.data.neo4j.core.schema.Id;
 import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.schema.Property;
 import org.springframework.data.neo4j.core.schema.Relationship;
 import org.springframework.data.neo4j.core.schema.RelationshipProperties;
 import org.springframework.data.neo4j.core.schema.TargetNode;
+import org.springframework.data.neo4j.core.support.DateLong;
 
 /**
  * @author Michael J. Simons
@@ -127,4 +131,18 @@ static class SimplePropertyContainerWithVersion extends SimplePropertyContainer
 		@Version
 		private Long version;
 	}
+
+	@Node
+	@AllArgsConstructor
+	@Getter @Setter
+	static class WeirdSource {
+
+		@Id
+		@Property("id")
+		@DateLong
+		private Date myFineId;
+
+		@Relationship(type = "ITS_COMPLICATED")
+		IrrelevantTargetContainer irrelevantTargetContainer;
+	}
 }

src/test/java/org/springframework/data/neo4j/integration/properties/PropertyIT.java

@@ -19,6 +19,7 @@
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Optional;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -220,6 +221,20 @@ void relationshipIdsShouldBeFilledDynamicRelationships() {
 		assertThat(source2.getRels().get("DYN_REL").getId()).isNotNull();
 	}
 
+	@Test // GH-2123
+	void customConvertersForRelsMustBeTakenIntoAccount() {
+
+		Date now = new Date();
+		DomainClasses.WeirdSource source = new DomainClasses.WeirdSource(now, new DomainClasses.IrrelevantTargetContainer());
+		template.save(source).getMyFineId();
+		try (Session session = driver.session()) {
+			long cnt = session
+					.run("MATCH (m) - [r:ITS_COMPLICATED] -> (n) WHERE m.id = $id RETURN count(m)",
+							Collections.singletonMap("id", now.getTime())).single().get(0).asLong();
+			assertThat(cnt).isEqualTo(1L);
+		}
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	static class Config extends AbstractNeo4jConfig {

src/test/java/org/springframework/data/neo4j/integration/properties/ReactivePropertyIT.java

@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -235,6 +236,23 @@ void relationshipIdsShouldBeFilledDynamicRelationships() {
 				.verifyComplete();
 	}
 
+	@Test // GH-2123
+	void customConvertersForRelsMustBeTakenIntoAccount() {
+
+		Date now = new Date();
+		template.save(new DomainClasses.WeirdSource(now, new DomainClasses.IrrelevantTargetContainer()))
+				.as(StepVerifier::create)
+				.expectNextCount(1)
+				.verifyComplete();
+
+		try (Session session = driver.session()) {
+			long cnt = session
+					.run("MATCH (m) - [r:ITS_COMPLICATED] -> (n) WHERE m.id = $id RETURN count(m)",
+							Collections.singletonMap("id", now.getTime())).single().get(0).asLong();
+			assertThat(cnt).isEqualTo(1L);
+		}
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	static class Config extends AbstractReactiveNeo4jConfig {