Bulk insert of individuals (#15)

OpenHDS · Nov 4, 2018 · f229986 · f229986
1 parent 04e1eec
commit f229986
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 118 deletions.
diff --git a/domain/src/main/java/org/openhds/domain/model/CensusIndividual.java b/domain/src/main/java/org/openhds/domain/model/CensusIndividual.java
@@ -3,36 +3,42 @@
 public class CensusIndividual {
 	String uuid;
 
-	String socialGroupExtId;
-
-	String socialGroupHeadExtId;
+	SocialGroup socialGroup;
 
-	String collectedBy;
+	FieldWorker collectedBy;
 
-	String locationExtId;
+	Location location;
 
 	Individual  individual;
 
 	String bIsToA;
 
 	Individual spouse;
 
-	public String getSocialGroupExtId() {
-		return socialGroupExtId;
+	public String getUuid() {
+		return uuid;
 	}
-	
-	public void setSocialGroupExtId(String socialGroupExtId) {
-		this.socialGroupExtId = socialGroupExtId;
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
 	}
-	
-	public String getLocationExtId() {
-		return locationExtId;
+
+	public SocialGroup getSocialGroup() {
+		return socialGroup;
 	}
-	
-	public void setLocationExtId(String locationExtId) {
-		this.locationExtId = locationExtId;
+
+	public void setSocialGroup(SocialGroup socialGroup) {
+		this.socialGroup = socialGroup;
 	}
-
+
+	public Location getLocation() {
+		return location;
+	}
+
+	public void setLocation(Location location) {
+		this.location = location;
+	}
+
 	public Individual getIndividual() {
 		return individual;
 	}
@@ -41,11 +47,11 @@ public void setIndividual(Individual individual) {
 		this.individual = individual ;
 	}
 
-	public String getCollectedBy() {
+	public FieldWorker getCollectedBy() {
 		return collectedBy;
 	}
 
-	public void setCollectedBy(String collectedBy) {
+	public void setCollectedBy(FieldWorker collectedBy) {
 		this.collectedBy = collectedBy;
 	}
 
@@ -57,13 +63,6 @@ public void setbIsToA(String bIsToA) {
 		this.bIsToA = bIsToA;
 	}
 
-	public String getSocialGroupHeadExtId() {
-		return socialGroupHeadExtId;
-	}
-
-	public void setSocialGroupHeadExtId(String socialGroupHeadExtId) {
-		this.socialGroupHeadExtId = socialGroupHeadExtId;
-	}
 
 	public Individual getSpouse() {
 		return spouse;
@@ -73,11 +72,5 @@ public void setSpouse(Individual spouse) {
 		this.spouse = spouse;
 	}
 
-	public String getUuid() {
-		return uuid;
-	}
 
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
 }
diff --git a/domain/src/main/java/org/openhds/domain/model/wrappers/CensusIndividuals.java b/domain/src/main/java/org/openhds/domain/model/wrappers/CensusIndividuals.java
@@ -0,0 +1,23 @@
+package org.openhds.domain.model.wrappers;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.openhds.domain.model.CensusIndividual;
+import org.openhds.domain.model.Individual;
+
+@XmlRootElement
+public class CensusIndividuals {
+    private List<CensusIndividual> individuals;
+
+    @XmlElement(name = "censusIndividual")
+    public List<CensusIndividual> getIndividuals() {
+        return individuals;
+    }
+
+    public void setIndividuals(List<CensusIndividual> individuals) {
+        this.individuals = individuals;
+    }
+}
diff --git a/domain/src/main/resources/META-INF/spring/domainApplicationContext.xml b/domain/src/main/resources/META-INF/spring/domainApplicationContext.xml
@@ -43,6 +43,8 @@
 
                 <value>org.openhds.domain.model.wrappers.FieldWorkers</value>
                 <value>org.openhds.domain.model.wrappers.Individuals</value>
+                <value>org.openhds.domain.model.wrappers.CensusIndividuals</value>
+
                 <value>org.openhds.domain.model.wrappers.LocationHierarchyLevels</value>
                 <value>org.openhds.domain.model.wrappers.LocationHierarchies</value>
                 <value>org.openhds.domain.model.wrappers.Locations</value>