fix(GH-273): detach result entities from entity manager persistent context (#275)

* fix(GH-273): add detach entity in result list stream

* fix: detach result entity for singular queries

* fix: add unit test

* fix: update testGH273

* fix: polish test

Author: igdianov

graphql-jpa-query-example-simple/src/main/resources/application.yml

@@ -5,6 +5,8 @@ spring:
     open-in-view: false
   h2:
     console.enabled: true
+  datasource:
+    url: jdbc:h2:mem:starwars
 
   graphql:
     jpa:

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java

@@ -262,7 +262,8 @@ protected <T> Stream<T> getResultStream(TypedQuery<T> query,
 
         // Let's execute query and get wrap result into stream
         return query.getResultList()
-                    .stream();
+                    .stream()
+                    .peek(entityManager::detach);
     }
 
     protected Object querySingleResult(final DataFetchingEnvironment environment) {
@@ -285,7 +286,13 @@ protected Object querySingleResult(final DataFetchingEnvironment environment) {
                 logger.info("\nGraphQL JPQL Single Result Query String:\n    {}", getJPQLQueryString(query));
             }
 
-            return query.getSingleResult();
+            Object result = query.getSingleResult();
+            
+            if (result != null) {
+                entityManager.detach(result);
+            }
+            
+            return result;
         }
 
         return null;

graphql-jpa-query-schema/src/test/java/com/introproventures/graphql/jpa/query/schema/StarwarsQueryExecutorTests.java

@@ -32,15 +32,17 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import com.introproventures.graphql.jpa.query.AbstractSpringBootTestSupport;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
 import com.introproventures.graphql.jpa.query.schema.model.starwars.Character;
 import com.introproventures.graphql.jpa.query.schema.model.starwars.Droid;
+import com.introproventures.graphql.jpa.query.schema.model.starwars.Human;
 
 @SpringBootTest
-@Transactional
 public class StarwarsQueryExecutorTests extends AbstractSpringBootTestSupport {
 
     @SpringBootApplication
@@ -66,6 +68,9 @@ public GraphQLSchemaBuilder graphQLSchemaBuilder(final EntityManager entityManag
 
     @Autowired
     private EntityManager em;
+    
+    @Autowired
+    private PlatformTransactionManager txManager;
 
     @Test
     public void contextLoads() {
@@ -2118,4 +2123,86 @@ public void queryWithInLineExplicitOptionalFalseForSingularAttributeAndWhereSear
         assertThat(result.toString()).isEqualTo(expected);
     }
 
+    // https://github.com/introproventures/graphql-jpa-query/issues/273
+    @Test
+    public void testGH273Plural() {
+
+        //given:
+        String query = "{" + 
+                "  Humans(where: {id: {EQ: \"1000\"}}) {" + 
+                "    select {" + 
+                "      id" + 
+                "      name" + 
+                "    }" + 
+                "  }" + 
+                "}";
+
+        // given
+        new TransactionTemplate(txManager).executeWithoutResult((txStatus) -> {
+            Object result = executor.execute(query).getData();
+            
+            String expected = "{Humans={select=[{id=1000, name=Luke Skywalker}]}}";
+            
+            assertThat(result.toString()).isEqualTo(expected);
+            
+            Human human = em.find(Human.class, "1000");
+            
+            human.setName("Luky Skywalker");
+        });
+
+        // when
+        new TransactionTemplate(txManager).executeWithoutResult((txStatus) -> {
+            // then
+            Object result = executor.execute(query).getData();
+
+            String updated = "{Humans={select=[{id=1000, name=Luky Skywalker}]}}";;
+            
+            assertThat(result.toString()).isEqualTo(updated);          
+            
+            Human human = em.find(Human.class, "1000");
+            
+            human.setName("Luke Skywalker");
+        });        
+    }
+    
+    // https://github.com/introproventures/graphql-jpa-query/issues/273
+    @Test
+    public void testGH273Singular() {
+
+        //given:
+        String query = "{" + 
+                "  Human(id: \"1000\" ) {" + 
+                "    id" + 
+                "    name" + 
+                "  }" + 
+                " " + 
+                "}";
+
+        // given
+        new TransactionTemplate(txManager).executeWithoutResult((txStatus) -> {
+            Object result = executor.execute(query).getData();
+            
+            String expected = "{Human={id=1000, name=Luke Skywalker}}";
+            
+            assertThat(result.toString()).isEqualTo(expected);
+            
+            Human human = em.find(Human.class, "1000");
+            
+            human.setName("Luky Skywalker");
+        });
+
+        // when
+        new TransactionTemplate(txManager).executeWithoutResult((txStatus) -> {
+            // then
+            Object result = executor.execute(query).getData();
+
+            String updated = "{Human={id=1000, name=Luky Skywalker}}";
+            
+            assertThat(result.toString()).isEqualTo(updated);          
+            
+            Human human = em.find(Human.class, "1000");
+            
+            human.setName("Luke Skywalker");
+        });        
+    }        
 }