Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

Commit 7bcd32c

Browse files
BrapiCoordinatorSelbyBrapiCoordinatorSelby
committed
fix for #49 
1 parent 73c4694 commit 7bcd32c

File tree

10 files changed

+407
-115
lines changed

10 files changed

+407
-115
lines changed

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import javax.persistence.Table;
99

1010
import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
11+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
12+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
1113

1214
@Entity
1315
@Table(name="crop")
@@ -17,6 +19,54 @@ public class CropEntity extends BrAPIBaseEntity {
1719

1820
@OneToMany(mappedBy="crop")
1921
private List<ProgramEntity> program;
22+
@OneToMany(mappedBy="crop")
23+
private List<TrialEntity> trials;
24+
@OneToMany(mappedBy="crop")
25+
private List<StudyEntity> studies;
26+
@OneToMany(mappedBy="crop")
27+
private List<ObservationUnitEntity> observationUnits;
28+
@OneToMany(mappedBy="crop")
29+
private List<ObservationEntity> observations;
30+
31+
public List<ProgramEntity> getProgram() {
32+
return program;
33+
}
34+
35+
public void setProgram(List<ProgramEntity> program) {
36+
this.program = program;
37+
}
38+
39+
public List<TrialEntity> getTrials() {
40+
return trials;
41+
}
42+
43+
public void setTrials(List<TrialEntity> trials) {
44+
this.trials = trials;
45+
}
46+
47+
public List<StudyEntity> getStudies() {
48+
return studies;
49+
}
50+
51+
public void setStudies(List<StudyEntity> studies) {
52+
this.studies = studies;
53+
}
54+
55+
public List<ObservationUnitEntity> getObservationUnits() {
56+
return observationUnits;
57+
}
58+
59+
public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
60+
this.observationUnits = observationUnits;
61+
}
62+
63+
public List<ObservationEntity> getObservations() {
64+
return observations;
65+
}
66+
67+
public void setObservations(List<ObservationEntity> observations) {
68+
this.observations = observations;
69+
}
2070

2171
public String getCropName() {
2272
return cropName;

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import javax.persistence.Table;
1111

1212
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
13+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
14+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
1315

1416
@Entity
1517
@Table(name="program")
@@ -24,11 +26,37 @@ public class ProgramEntity extends BrAPIPrimaryEntity{
2426
private String documentationURL;
2527
@OneToOne
2628
private PersonEntity leadPerson;
29+
2730
@ManyToOne
2831
private CropEntity crop;
32+
2933
@OneToMany(mappedBy="program")
3034
private List<TrialEntity> trials;
35+
@OneToMany(mappedBy="program")
36+
private List<StudyEntity> studies;
37+
@OneToMany(mappedBy="program")
38+
private List<ObservationUnitEntity> observationUnits;
39+
@OneToMany(mappedBy="program")
40+
private List<ObservationEntity> observations;
3141

42+
public List<StudyEntity> getStudies() {
43+
return studies;
44+
}
45+
public void setStudies(List<StudyEntity> studies) {
46+
this.studies = studies;
47+
}
48+
public List<ObservationUnitEntity> getObservationUnits() {
49+
return observationUnits;
50+
}
51+
public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
52+
this.observationUnits = observationUnits;
53+
}
54+
public List<ObservationEntity> getObservations() {
55+
return observations;
56+
}
57+
public void setObservations(List<ObservationEntity> observations) {
58+
this.observations = observations;
59+
}
3260
public String getDocumentationURL() {
3361
return documentationURL;
3462
}

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import javax.persistence.Table;
1616

1717
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
18+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
19+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
1820

1921
@Entity
2022
@Table(name = "study")
@@ -68,9 +70,52 @@ public class StudyEntity extends BrAPIPrimaryEntity {
6870
private String studyPUI;
6971
@Column
7072
private String studyType;
73+
74+
@ManyToOne
75+
private CropEntity crop;
76+
@ManyToOne
77+
private ProgramEntity program;
7178
@ManyToOne
7279
private TrialEntity trial;
7380

81+
@OneToMany(mappedBy="study")
82+
private List<ObservationUnitEntity> observationUnits;
83+
@OneToMany(mappedBy="study")
84+
private List<ObservationEntity> observations;
85+
86+
public CropEntity getCrop() {
87+
return crop;
88+
}
89+
90+
public void setCrop(CropEntity crop) {
91+
this.crop = crop;
92+
}
93+
94+
public ProgramEntity getProgram() {
95+
return program;
96+
}
97+
98+
public void setProgram(ProgramEntity program) {
99+
this.program = program;
100+
setCrop(program.getCrop());
101+
}
102+
103+
public List<ObservationUnitEntity> getObservationUnits() {
104+
return observationUnits;
105+
}
106+
107+
public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
108+
this.observationUnits = observationUnits;
109+
}
110+
111+
public List<ObservationEntity> getObservations() {
112+
return observations;
113+
}
114+
115+
public void setObservations(List<ObservationEntity> observations) {
116+
this.observations = observations;
117+
}
118+
74119
public boolean isActive() {
75120
return active;
76121
}
@@ -245,5 +290,6 @@ public TrialEntity getTrial() {
245290

246291
public void setTrial(TrialEntity trial) {
247292
this.trial = trial;
293+
setProgram(trial.getProgram());
248294
}
249295
}

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

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import javax.persistence.Table;
1515

1616
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
17+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
18+
import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
1719

1820
@Entity
1921
@Table(name = "trial")
@@ -31,8 +33,6 @@ public class TrialEntity extends BrAPIPrimaryEntity {
3133
private String documentationURL;
3234
@Column
3335
private Date endDate;
34-
@ManyToOne
35-
private ProgramEntity program;
3636
@OneToMany(mappedBy = "trial")
3737
private List<PublicationEntity> publications;
3838
@Column
@@ -43,9 +43,37 @@ public class TrialEntity extends BrAPIPrimaryEntity {
4343
private String trialName;
4444
@Column
4545
private String trialPUI;
46+
47+
@ManyToOne
48+
private CropEntity crop;
49+
@ManyToOne
50+
private ProgramEntity program;
51+
4652
@OneToMany(mappedBy = "trial")
4753
private List<StudyEntity> studies;
54+
@OneToMany(mappedBy="trial")
55+
private List<ObservationUnitEntity> observationUnits;
56+
@OneToMany(mappedBy="trial")
57+
private List<ObservationEntity> observations;
4858

59+
public CropEntity getCrop() {
60+
return crop;
61+
}
62+
public void setCrop(CropEntity crop) {
63+
this.crop = crop;
64+
}
65+
public List<ObservationUnitEntity> getObservationUnits() {
66+
return observationUnits;
67+
}
68+
public void setObservationUnits(List<ObservationUnitEntity> observationUnits) {
69+
this.observationUnits = observationUnits;
70+
}
71+
public List<ObservationEntity> getObservations() {
72+
return observations;
73+
}
74+
public void setObservations(List<ObservationEntity> observations) {
75+
this.observations = observations;
76+
}
4977
public Boolean isActive() {
5078
return active;
5179
}
@@ -81,6 +109,7 @@ public ProgramEntity getProgram() {
81109
}
82110
public void setProgram(ProgramEntity program) {
83111
this.program = program;
112+
setCrop(program.getCrop());
84113
}
85114
public List<PublicationEntity> getPublications() {
86115
return publications;

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

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
import javax.persistence.Table;
99

1010
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
11+
import org.brapi.test.BrAPITestServer.model.entity.core.CropEntity;
12+
import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
1113
import org.brapi.test.BrAPITestServer.model.entity.core.SeasonEntity;
14+
import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
15+
import org.brapi.test.BrAPITestServer.model.entity.core.TrialEntity;
1216

1317
@Entity
1418
@Table(name="observation")
@@ -18,8 +22,6 @@ public class ObservationEntity extends BrAPIPrimaryEntity{
1822
@Column
1923
private Date observationTimeStamp;
2024
@ManyToOne
21-
private ObservationUnitEntity observationUnit;
22-
@ManyToOne
2325
private ObservationVariableEntity observationVariable;
2426
@ManyToOne
2527
private SeasonEntity season;
@@ -28,6 +30,44 @@ public class ObservationEntity extends BrAPIPrimaryEntity{
2830
@Column
2931
private String value;
3032

33+
@ManyToOne
34+
private CropEntity crop;
35+
@ManyToOne
36+
private ProgramEntity program;
37+
@ManyToOne
38+
private TrialEntity trial;
39+
@ManyToOne
40+
private StudyEntity study;
41+
@ManyToOne
42+
private ObservationUnitEntity observationUnit;
43+
44+
public CropEntity getCrop() {
45+
return crop;
46+
}
47+
public void setCrop(CropEntity crop) {
48+
this.crop = crop;
49+
}
50+
public ProgramEntity getProgram() {
51+
return program;
52+
}
53+
public void setProgram(ProgramEntity program) {
54+
this.program = program;
55+
setCrop(program.getCrop());
56+
}
57+
public TrialEntity getTrial() {
58+
return trial;
59+
}
60+
public void setTrial(TrialEntity trial) {
61+
this.trial = trial;
62+
setProgram(trial.getProgram());
63+
}
64+
public StudyEntity getStudy() {
65+
return study;
66+
}
67+
public void setStudy(StudyEntity study) {
68+
this.study = study;
69+
setTrial(study.getTrial());
70+
}
3171
public String getUploadedBy() {
3272
return uploadedBy;
3373
}
@@ -39,6 +79,7 @@ public ObservationUnitEntity getObservationUnit() {
3979
}
4080
public void setObservationUnit(ObservationUnitEntity observationUnit) {
4181
this.observationUnit = observationUnit;
82+
setStudy(observationUnit.getStudy());
4283
}
4384
public Date getObservationTimeStamp() {
4485
return observationTimeStamp;

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

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
import javax.persistence.Table;
1212

1313
import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
14+
import org.brapi.test.BrAPITestServer.model.entity.core.CropEntity;
15+
import org.brapi.test.BrAPITestServer.model.entity.core.ProgramEntity;
1416
import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
17+
import org.brapi.test.BrAPITestServer.model.entity.core.TrialEntity;
1518
import org.brapi.test.BrAPITestServer.model.entity.germ.GermplasmEntity;
1619
import org.brapi.test.BrAPITestServer.model.entity.germ.SeedLotEntity;
1720

1821
@Entity
1922
@Table(name = "observation_unit")
2023
public class ObservationUnitEntity extends BrAPIPrimaryEntity {
21-
@ManyToOne
22-
private StudyEntity study;
2324
@ManyToOne
2425
private GermplasmEntity germplasm;
2526
@Column
@@ -32,14 +33,45 @@ public class ObservationUnitEntity extends BrAPIPrimaryEntity {
3233
private List<TreatmentEntity> treatments;
3334
@OneToOne(mappedBy="observationUnit", cascade=CascadeType.ALL)
3435
private ObservationUnitPositionEntity position;
36+
37+
@ManyToOne
38+
private CropEntity crop;
39+
@ManyToOne
40+
private ProgramEntity program;
41+
@ManyToOne
42+
private TrialEntity trial;
43+
@ManyToOne
44+
private StudyEntity study;
45+
3546
@OneToMany(mappedBy="observationUnit", cascade=CascadeType.ALL)
3647
private List<ObservationEntity> observations;
3748

49+
public CropEntity getCrop() {
50+
return crop;
51+
}
52+
public void setCrop(CropEntity crop) {
53+
this.crop = crop;
54+
}
55+
public ProgramEntity getProgram() {
56+
return program;
57+
}
58+
public void setProgram(ProgramEntity program) {
59+
this.program = program;
60+
setCrop(program.getCrop());
61+
}
62+
public TrialEntity getTrial() {
63+
return trial;
64+
}
65+
public void setTrial(TrialEntity trial) {
66+
this.trial = trial;
67+
setProgram(trial.getProgram());
68+
}
3869
public StudyEntity getStudy() {
3970
return study;
4071
}
4172
public void setStudy(StudyEntity study) {
4273
this.study = study;
74+
setTrial(study.getTrial());
4375
}
4476
public GermplasmEntity getGermplasm() {
4577
return germplasm;

0 commit comments

Comments
 (0)