DATAGRAPH-1436 - Fix query generation for same label derived finders.

Author: meistermeier

src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java

@@ -534,7 +534,7 @@ private Expression toCypherProperty(PersistentPropertyPath<Neo4jPersistentProper
 		Neo4jPersistentEntity<?> owner = (Neo4jPersistentEntity<?>) leafProperty.getOwner();
 		Expression expression;
 
-		if (owner.equals(this.nodeDescription)) {
+		if (owner.equals(this.nodeDescription) && path.getLength() == 1) {
 			expression = Cypher.property(Constants.NAME_OF_ROOT_NODE, leafProperty.getPropertyName());
 		} else {
 			PropertyPathWrapper propertyPathWrapper = propertyPathWrappers.stream()

src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryIT.java

@@ -777,6 +777,30 @@ void findDeepSameLabelsAndTypeRelationships(@Autowired PetRepository repository)
 
 		}
 
+		@Test
+		void findBySameLabelRelationshipProperty(@Autowired PetRepository repository) {
+			try (Session session = createSession()) {
+				session.run("CREATE (p1:Pet{name: 'Pet1'})-[:Has]->(p2:Pet{name: 'Pet2'})");
+			}
+
+			Pet pet = repository.findByFriendsName("Pet2");
+			assertThat(pet).isNotNull();
+			assertThat(pet.getFriends()).isNotEmpty();
+		}
+
+		@Test
+		void findBySameLabelRelationshipPropertyMultipleLevels(@Autowired PetRepository repository) {
+			try (Session session = createSession()) {
+				session.run(
+						"CREATE (p1:Pet{name: 'Pet1'})-[:Has]->(p2:Pet{name: 'Pet2'})-[:Has]->(p3:Pet{name: 'Pet3'})");
+			}
+
+			Pet pet = repository.findByFriendsFriendsName("Pet3");
+			assertThat(pet).isNotNull();
+			assertThat(pet.getFriends()).isNotEmpty();
+			assertThat(pet.getFriends().get(0).getFriends()).isNotEmpty();
+		}
+
 		@Test
 		void findLoopingDeepRelationships(@Autowired LoopingRelationshipRepository loopingRelationshipRepository) {
 
@@ -3361,6 +3385,10 @@ interface PetRepository extends Neo4jRepository<Pet, Long> {
 				countQuery = "MATCH (p:Pet) return count(p)")
 		Page<Pet> pagedPetsWithParameter(@Param("petName") String petName, Pageable pageable);
 
+		Pet findByFriendsName(String friendName);
+
+		Pet findByFriendsFriendsName(String friendName);
+
 	}
 
 	interface RelationshipRepository extends Neo4jRepository<PersonWithRelationship, Long> {