study without program error

Author: BrapiCoordinatorSelby

src/main/java/org/brapi/test/BrAPITestServer/model/entity/core/StudyEntity.java

@@ -308,5 +308,7 @@ public void setTrial(TrialEntity trial) {
 		this.trial = trial;
 		if (trial.getProgram() != null)
 			setProgram(trial.getProgram());
+		if (trial.getCrop() != null)
+			setCrop(trial.getCrop());
 	}
 }

src/main/java/org/brapi/test/BrAPITestServer/model/entity/pheno/ObservationUnitEntity.java

@@ -75,6 +75,8 @@ public void setTrial(TrialEntity trial) {
 		this.trial = trial;
 		if (trial.getProgram() != null)
 			setProgram(trial.getProgram());
+		if (trial.getCrop() != null)
+			setCrop(trial.getCrop());
 	}
 	public StudyEntity getStudy() {
 		return study;
@@ -83,6 +85,8 @@ public void setStudy(StudyEntity study) {
 		this.study = study;
 		if (study.getTrial() != null)
 			setTrial(study.getTrial());
+		if (study.getCrop() != null)
+			setCrop(study.getCrop());
 	}
 	public GermplasmEntity getGermplasm() {
 		return germplasm;

src/main/java/org/brapi/test/BrAPITestServer/service/core/StudyService.java

@@ -295,8 +295,6 @@ private void updateEntity(StudyEntity entity, StudyNewRequest body) throws BrAPI
 		if (body.getTrialDbId() != null) {
 			TrialEntity trial = trialService.getTrialEntity(body.getTrialDbId());
 			entity.setTrial(trial);
-			entity.setProgram(trial.getProgram());
-			entity.setCrop(trial.getCrop());
 		} else if (body.getCommonCropName() != null) {
 			CropEntity crop = cropService.getCropEntity(body.getCommonCropName());
 			entity.setCrop(crop);
@@ -374,11 +372,13 @@ private Study convertFromEntity(StudyEntity entity) {
 					study.setCommonCropName(entity.getTrial().getProgram().getCrop().getCropName());
 				}
 			}
-		} else if (entity.getProgram() != null) {
+		} 
+		if (entity.getProgram() != null) {
 			if (entity.getProgram().getCrop() != null) {
 				study.setCommonCropName(entity.getProgram().getCrop().getCropName());
 			}
-		} else if (entity.getCrop() != null) {
+		} 
+		if (entity.getCrop() != null) {
 			study.setCommonCropName(entity.getCrop().getCropName());
 		}
 

src/main/java/org/brapi/test/BrAPITestServer/service/core/TrialService.java

@@ -195,7 +195,8 @@ private Trial convertFromEntity(TrialEntity entity) {
 			if (entity.getProgram().getCrop() != null) {
 				trial.setCommonCropName(entity.getProgram().getCrop().getCropName());
 			}
-		} else if (entity.getCrop() != null) {
+		}
+		if (entity.getCrop() != null) {
 			trial.setCommonCropName(entity.getCrop().getCropName());
 		}
 

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

@@ -416,14 +416,16 @@ private ObservationUnit convertFromEntity(ObservationUnitEntity entity) {
 					unit.setProgramName(entity.getStudy().getTrial().getProgram().getName());
 				}
 			}
-		} else if (entity.getTrial() != null) {
+		} 
+		if (entity.getTrial() != null) {
 			unit.setTrialDbId(entity.getTrial().getId());
 			unit.setTrialName(entity.getTrial().getTrialName());
 			if (entity.getTrial().getProgram() != null) {
 				unit.setProgramDbId(entity.getTrial().getProgram().getId());
 				unit.setProgramName(entity.getTrial().getProgram().getName());
 			}
-		} else if (entity.getProgram() != null) {
+		} 
+		if (entity.getProgram() != null) {
 			unit.setProgramDbId(entity.getProgram().getId());
 			unit.setProgramName(entity.getProgram().getName());
 		}