#175: restore organization/people composite - remove 'position-stub'

vivo-community · Jan 30, 2020 · 0c26894 · 0c26894
1 parent 98aff98
commit 0c26894
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 132 deletions.
diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/inert/model/person/PositionStub.java b/src/main/java/edu/tamu/scholars/middleware/graphql/inert/model/person/PositionStub.java
diff --git a/...main/java/edu/tamu/scholars/middleware/graphql/inert/model/position/OrganizationStub.java b/...main/java/edu/tamu/scholars/middleware/graphql/inert/model/position/OrganizationStub.java
@@ -2,23 +2,10 @@
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY;
 
-import java.util.List;
-
-import edu.tamu.scholars.middleware.discovery.model.Common;
 import edu.tamu.scholars.middleware.graphql.model.AbstractNestedDocument;
-import io.leangen.graphql.annotations.types.GraphQLType;
-import org.springframework.data.solr.core.mapping.Indexed;
-import org.springframework.data.solr.core.mapping.SolrDocument;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import edu.tamu.scholars.middleware.discovery.annotation.CollectionSource;
-import edu.tamu.scholars.middleware.discovery.annotation.NestedMultiValuedProperty;
-import edu.tamu.scholars.middleware.discovery.annotation.NestedObject;
-import edu.tamu.scholars.middleware.discovery.annotation.NestedObject.Reference;
-import edu.tamu.scholars.middleware.discovery.annotation.PropertySource;
-
-import edu.tamu.scholars.middleware.graphql.inert.model.position.Organization;
 import io.leangen.graphql.annotations.GraphQLIgnore;
 
 @GraphQLIgnore

diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/model/Organization.java b/src/main/java/edu/tamu/scholars/middleware/graphql/model/Organization.java
@@ -5,7 +5,7 @@
 import edu.tamu.scholars.middleware.graphql.model.organization.AwardOrHonorGiven;
 import edu.tamu.scholars.middleware.graphql.model.organization.AwardOrHonorReceived;
 import edu.tamu.scholars.middleware.graphql.model.organization.OrganizationForTraining;
-import edu.tamu.scholars.middleware.graphql.model.organization.People;
+import edu.tamu.scholars.middleware.graphql.model.Person;
 import edu.tamu.scholars.middleware.graphql.model.organization.HasSubOrganization;
 import edu.tamu.scholars.middleware.graphql.model.organization.OrganizationWithin;
 import edu.tamu.scholars.middleware.graphql.model.organization.LeadOrganizationOf;
@@ -67,7 +67,7 @@ public class Organization extends AbstractNestedDocument {
 
   private List<OrganizationForTraining> organizationForTraining;
 
-  private List<People> people;
+  private List<Person> people;
 
   private List<HasSubOrganization> hasSubOrganizations;
 
@@ -214,11 +214,11 @@ public void setOrganizationForTraining(List<OrganizationForTraining> organizatio
     this.organizationForTraining = organizationForTraining;
   }
 
-  public List<People> getPeople() {
+  public List<Person> getPeople() {
     return people;
   }
 
-  public void setPeople(List<People> people) {
+  public void setPeople(List<Person> people) {
     this.people = people;
   }
 

diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/model/organization/People.java b/src/main/java/edu/tamu/scholars/middleware/graphql/model/organization/People.java
diff --git a/src/main/resources/graphql/composites.yml b/src/main/resources/graphql/composites.yml
@@ -7,7 +7,7 @@
     - name: publications
       type: Document
 
-#- type: Organization
-#  references:
-#  - name: people
-#    type: Person
+- type: Organization
+  references:
+  - name: people
+    type: Person