Merge pull request #42 from Breeding-Insight/bug/BI-2423

BI-2423 - Add @where annotation to entites to filter out soft deleted rows

Author: mlm483

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

@@ -5,9 +5,11 @@
 import javax.persistence.*;
 
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "trial_dataset_authorship")
+@Where(clause = "soft_deleted = false")
 public class DatasetAuthorshipEntity extends BrAPIBaseEntity {
 	@Column
 	private String datasetPUI;

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

@@ -3,9 +3,11 @@
 import javax.persistence.*;
 
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIBaseEntity;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "trial_publication")
+@Where(clause = "soft_deleted = false")
 public class PublicationEntity extends BrAPIBaseEntity {
 	@Column
 	private String publicationPUI;

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

@@ -9,9 +9,11 @@
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationUnitEntity;
 import org.brapi.test.BrAPITestServer.model.entity.pheno.ObservationVariableEntity;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "study")
+@Where(clause = "soft_deleted = false")
 public class StudyEntity extends BrAPIPrimaryEntity {
 
 	@Column

src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/CallSetEntity.java

@@ -7,9 +7,11 @@
 import javax.persistence.*;
 
 import org.brapi.test.BrAPITestServer.model.entity.BrAPIPrimaryEntity;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "callset")
+@Where(clause = "soft_deleted = false")
 public class CallSetEntity extends BrAPIPrimaryEntity {
 	@Column
 	private String callSetName;

src/main/java/org/brapi/test/BrAPITestServer/model/entity/geno/PlateEntity.java

@@ -14,9 +14,11 @@
 
 import io.swagger.model.geno.PlateFormat;
 import io.swagger.model.geno.SampleType;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name="plate")
+@Where(clause = "soft_deleted = false")
 public class PlateEntity extends BrAPIPrimaryEntity{
 	@Column
     private String clientPlateDbId;

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

@@ -11,9 +11,11 @@
 import org.brapi.test.BrAPITestServer.model.entity.core.SeasonEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.StudyEntity;
 import org.brapi.test.BrAPITestServer.model.entity.core.TrialEntity;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "observation")
+@Where(clause = "soft_deleted = false")
 public class ObservationEntity extends BrAPIPrimaryEntity {
 	@Column
 	private String collector;

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

@@ -12,9 +12,11 @@
 import org.brapi.test.BrAPITestServer.model.entity.germ.CrossEntity;
 import org.brapi.test.BrAPITestServer.model.entity.germ.GermplasmEntity;
 import org.brapi.test.BrAPITestServer.model.entity.germ.SeedLotEntity;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "observation_unit")
+@Where(clause = "soft_deleted = false")
 public class ObservationUnitEntity extends BrAPIPrimaryEntity {
 	@ManyToOne(fetch = FetchType.LAZY)
 	private CrossEntity cross;