Merge pull request #22 from Breeding-Insight/bug/BI-2051

BI-2051 - Out Of Memory Error

Author: mlm483

src/main/java/org/brapi/test/BrAPITestServer/service/pheno/ObservationService.java

@@ -272,16 +272,16 @@ public ObservationEntity getObservationEntity(String observationDbId, HttpStatus
 	}
 
 	public List<Observation> saveObservations(@Valid List<ObservationNewRequest> requests) throws BrAPIServerException {
-		List<Observation> savedObservations = new ArrayList<>();
-
+		List<ObservationEntity> toSave = new ArrayList<>();
 		for (ObservationNewRequest request : requests) {
 			ObservationEntity entity = new ObservationEntity();
-			updateEntity(entity, request);
-			ObservationEntity savedEntity = observationRepository.save(entity);
-			savedObservations.add(convertFromEntity(savedEntity));
+			updateEntity(entity, request);  // TODO: does updateEntity need to hit the database?
+			toSave.add(entity);
 		}
-
-		return savedObservations;
+		return observationRepository.saveAllAndFlush(toSave)
+				.stream()
+				.map(this::convertFromEntity)
+				.collect(Collectors.toList());
 	}
 
 	public List<Observation> updateObservations(@Valid Map<String, ObservationNewRequest> requests)

src/main/java/org/brapi/test/BrAPITestServer/service/pheno/ObservationUnitService.java

@@ -332,16 +332,17 @@ public ObservationUnitEntity getObservationUnitEntity(String observationUnitDbId
 
 	public List<ObservationUnit> saveObservationUnits(@Valid List<ObservationUnitNewRequest> requests)
 			throws BrAPIServerException {
-		List<ObservationUnit> savedObservationUnits = new ArrayList<>();
-
+		List<ObservationUnitEntity> toSave = new ArrayList<>();
 		for (ObservationUnitNewRequest request : requests) {
 			ObservationUnitEntity entity = new ObservationUnitEntity();
-			updateEntity(entity, request);
-			ObservationUnitEntity savedEntity = observationUnitRepository.save(entity);
-			savedObservationUnits.add(convertFromEntity(savedEntity));
+			updateEntity(entity, request);  // TODO: does updateEntity need to hit the database?
+			toSave.add(entity);
 		}
 
-		return savedObservationUnits;
+		return observationUnitRepository.saveAllAndFlush(toSave)
+				.stream()
+				.map(this::convertFromEntity)
+				.collect(Collectors.toList());
 	}
 
 	public List<ObservationUnit> updateObservationUnits(@Valid Map<String, ObservationUnitNewRequest> requests)