#175: make graphql Position extension work with existing Person mode

vivo-community · Jan 30, 2020 · 9c00914 · 9c00914
1 parent 52b4dbe
commit 9c00914
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 129 deletions.
diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/inert/model/person/Person.java b/src/main/java/edu/tamu/scholars/middleware/graphql/inert/model/person/Person.java
diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/inert/service/OrganizationResolver.java b/src/main/java/edu/tamu/scholars/middleware/graphql/inert/service/OrganizationResolver.java
@@ -42,8 +42,6 @@ public Organization getById(
     System.out.println("**** NODE: " + node);
     return mapper.convertValue(node, Organization.class);
   }
-
-
 
   @GraphQLQuery
   public Organization[] organizations(@GraphQLContext Position position) {

diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/inert/service/PersonResolver.java b/src/main/java/edu/tamu/scholars/middleware/graphql/inert/service/PersonResolver.java
diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/inert/service/PositionResolver.java b/src/main/java/edu/tamu/scholars/middleware/graphql/inert/service/PositionResolver.java
@@ -16,11 +16,14 @@
 import edu.tamu.scholars.middleware.graphql.inert.model.person.Position;
 import edu.tamu.scholars.middleware.graphql.inert.model.person.PositionStub;
 
-import edu.tamu.scholars.middleware.graphql.inert.model.person.Person;
+//import edu.tamu.scholars.middleware.graphql.inert.model.person.Person;
+import edu.tamu.scholars.middleware.graphql.model.Person;
+import edu.tamu.scholars.middleware.graphql.model.Relationship;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.ArrayList;
+import java.util.Iterator;
 
 @GraphQLApi
 @Service
@@ -39,7 +42,6 @@ public Position getById(
   ) {
     // @formatter:on
 
-
     Optional<Individual> position = repo.findById(id);
     ObjectNode node = mapper.valueToTree(position);
     System.out.println("**** NODE: " + node);
@@ -48,23 +50,22 @@ public Position getById(
 
 
   @GraphQLQuery
-  public Position[] positions(@GraphQLContext Person person) {
-     PositionStub[] positions = person.getPositions();
-     Position[] list = new Position[positions.length];
+  public List<Position> positions(@GraphQLContext Person person) {
+     List<Relationship> positions = person.getPositions();
+     //List<edu.tamu.scholars.middleware.graphql.model.person.Position> positions = person.getPositions();
 
-     System.out.println("**** found " + positions.length + " positions");
-     for (int i = 0; i < positions.length; i++) {  
-       PositionStub pos = positions[i];
-       Optional<Individual> position = repo.findById(pos.getId());
-       System.out.println("found " + position);
-       ObjectNode node = mapper.valueToTree(position);
-       System.out.println("**** NODE: " + node);
-       Position real = mapper.convertValue(node, Position.class);
+     List<Position> list = new ArrayList<Position>();
+
+     for (Relationship rel: positions) {
+     //for (edu.tamu.scholars.middleware.graphql.model.person.Position rel: positions) {
+      Optional<Individual> position = repo.findById(rel.getId());
 
-       list[i] = real;
-    }
+      ObjectNode node = mapper.valueToTree(position);
+      System.out.println("**** NODE: " + node);
+      Position real = mapper.convertValue(node, Position.class);
+      list.add(real);
+     }
     return list;
   }
-
 
 }