Fix proper implementation of #326:

- Remove relation from SampleType to Facility
- Change uniqueness constraint for SampleType to be pid alone

Author: RKrahl

src/main/java/org/icatproject/core/entity/Facility.java

@@ -63,9 +63,6 @@ public class Facility extends EntityBaseBean implements Serializable {
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "facility")
 	private List<ParameterType> parameterTypes = new ArrayList<ParameterType>();
 
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "facility")
-	private List<SampleType> sampleTypes = new ArrayList<SampleType>();
-
 	@Comment("A URL associated with this facility")
 	private String url;
 
@@ -129,10 +126,6 @@ public List<ParameterType> getParameterTypes() {
 		return parameterTypes;
 	}
 
-	public List<SampleType> getSampleTypes() {
-		return sampleTypes;
-	}
-
 	public String getUrl() {
 		return url;
 	}
@@ -193,10 +186,6 @@ public void setParameterTypes(List<ParameterType> parameterTypes) {
 		this.parameterTypes = parameterTypes;
 	}
 
-	public void setSampleTypes(List<SampleType> sampleTypes) {
-		this.sampleTypes = sampleTypes;
-	}
-
 	public void setUrl(String url) {
 		this.url = url;
 	}

src/main/java/org/icatproject/core/entity/SampleType.java

@@ -25,15 +25,9 @@
 @Comment("A sample to be used in an investigation")
 @SuppressWarnings("serial")
 @Entity
-@Table(uniqueConstraints = { @UniqueConstraint(columnNames = { "FACILITY_ID", "NAME",
-		"PID" }) })
+@Table(uniqueConstraints = { @UniqueConstraint(columnNames = { "PID" }) })
 public class SampleType extends EntityBaseBean implements Serializable {
 
-	@Comment("The facility which has defined this sample type")
-	@JoinColumn(name = "FACILITY_ID", nullable = false)
-	@ManyToOne(fetch = FetchType.LAZY)
-	private Facility facility;
-
 	@Comment("A persistent identifier attributed to this sample type, ideally referring to a vocabulary term")
 	@Column(name = "PID", nullable = false)
 	private String pid;
@@ -58,10 +52,6 @@ public class SampleType extends EntityBaseBean implements Serializable {
 	public SampleType() {
 	}
 
-	public Facility getFacility() {
-		return facility;
-	}
-
 	public String getPid() {
 		return pid;
 	}
@@ -82,10 +72,6 @@ public List<Sample> getSamples() {
 		return samples;
 	}
 
-	public void setFacility(Facility facility) {
-		this.facility = facility;
-	}
-
 	public void setPid(String pid) {
 		this.pid = pid;
 	}

src/test/java/org/icatproject/core/manager/TestEntityInfo.java

@@ -170,7 +170,7 @@ public void testExportNull() throws Exception {
 	public void testFields() throws Exception {
 		testField(
 				"applications,dataPublicationTypes,dataPublications,datafileFormats,datasetTypes,daysUntilRelease,description,facilityCycles,"
-						+ "fullName,instruments,investigationTypes,investigations,name,parameterTypes,sampleTypes,url",
+						+ "fullName,instruments,investigationTypes,investigations,name,parameterTypes,url",
 				Facility.class);
 		testField("description,facility,investigations,name", InvestigationType.class);
 		testField(

src/test/java/org/icatproject/integration/TestRS.java

@@ -187,7 +187,7 @@ public void TestJsoniseBean() throws Exception {
 		 * "2019-03-11T15:58:33.000Z","applications":[],"datafileFormats":[],
 		 * "datasetTypes":[],"daysUntilRelease":90,"facilityCycles":[],"instruments":[],
 		 * "investigationTypes":[],"investigations":[],"name":"Test port facility"
-		 * ,"parameterTypes":[],"sampleTypes":[]}}]>
+		 * ,"parameterTypes":[]}}]>
 		 */
 		JsonArray fac_response = search(session, "SELECT f from Facility f WHERE f.name = 'Test port facility'", 1);
 		collector.checkThat(fac_response.getJsonObject(0).containsKey("Facility"), is(true));
@@ -293,12 +293,11 @@ public void TestJsoniseBean() throws Exception {
 		collector.checkThat(st_response.getJsonObject(0).containsKey("SampleType"), is(true));
 
 		/*
-		 * Expected: <[{"SampleType":{"id":????,"createId":"db/notroot","createTime":
-		 * "2019-03-11T15:58:33.000Z","modId":"db/notroot","modTime":
-		 * "2019-03-11T15:58:33.000Z","molecularFormula":null,"name":"N/A",
-		 * "pid":"st:004","safetyInformation":"N/A","samples":[]}}]>
+		 * Expected: <[{"SampleType":{"id":420,"createId":"db/notroot","createTime":
+		 * "2025-12-17T13:23:13.000Z","modId":"db/notroot","modTime":
+		 * "2025-12-17T13:23:13.000Z","name":"fossil","pid":"st:004","samples":[]}}]>
 		 */
-		JsonArray st_null_response = search(session, "SELECT st from SampleType st WHERE st.name = 'N/A'", 1);
+		JsonArray st_null_response = search(session, "SELECT st from SampleType st WHERE st.name = 'fossil'", 1);
 		collector.checkThat(st_null_response.getJsonObject(0).containsKey("SampleType"), is(true));
 		collector.checkThat(st_null_response.getJsonObject(0).getJsonObject("SampleType").getString("pid"), is("st:004"));
 		collector.checkThat(st_null_response.getJsonObject(0).getJsonObject("SampleType").get("molecularFormula"), is(equalTo(null)));

src/test/java/org/icatproject/integration/TestWS.java

@@ -104,7 +104,6 @@ private static void create() throws Exception {
 
 		SampleType sampleType = new SampleType();
 		/* FIXME: sampleType.setPid("somepid"); */
-		sampleType.setFacility(facility);
 		sampleType.setName("somename");
 		sampleType.setMolecularFormula("Someformula");
 		session.create(sampleType);
@@ -1008,7 +1007,6 @@ public void getInvestigationWithVeryManyDatasets() throws Exception {
 
 		SampleType sampleType = new SampleType();
 		/* FIXME: sampleType.setPid("somepid"); */
-		sampleType.setFacility(facility);
 		sampleType.setName("somename");
 		sampleType.setMolecularFormula("Someformula");
 		session.create(sampleType);

src/test/java/org/icatproject/integration/WSession.java

@@ -195,7 +195,7 @@ public void addUserGroupMember(String groupName, String userName) throws Excepti
 	}
 
 	public void clear() throws Exception {
-		deleteAll(Arrays.asList("Facility", "DataCollection", "Study", "FundingReference", "Technique"));
+		deleteAll(Arrays.asList("Facility", "DataCollection", "Study", "FundingReference", "Technique", "SampleType"));
 	}
 
 	private void deleteAll(List<String> names) throws IcatException_Exception {

src/test/resources/icat-import-check.port

@@ -40,14 +40,15 @@ Shift(investigation(facility(name:0), name:1, visitId:2), startDate:3, endDate:4
 "Test port facility", "expt1", "zero", 2014-01-01T00:00:00+01:00, 2014-01-01T18:00:00+01:00, "beamtime", "EDDI"
 "Test port facility", "expt1", "two", 2014-04-29T14:00:00+02:00, 2014-04-30T18:15:00+02:00, "preparing", null
 
-SampleType(facility(name:0), name:1, molecularFormula:2, safetyInformation:3, pid:4)
-"Test port facility", "diamond", "C", "fairly harmless", "st:001"
-"Test port facility", "graphite", "C", "bit messy", "st:002"
-"Test port facility", "rust", "Fe3O4", "messy", "st:003"
-
-Sample(investigation(facility(name:0), name:1, visitId:2), type(facility(name:0), name:3, molecularFormula:4), name:5, pid:6)
-"Test port facility", "expt1", "one", "diamond", "C", "Koh-I-Noor", "sdb:374717"
-"Test port facility", "expt1", "one", "rust",  "Fe3O4", "Ford\t\"Anglia\"", null
+SampleType(name:0, molecularFormula:1, safetyInformation:2, pid:3)
+"diamond", "C", "fairly harmless", "st:001"
+"graphite", "C", "bit messy", "st:002"
+"rust", "Fe3O4", "messy", "st:003"
+"fossil", null, null, "st:004"
+
+Sample(investigation(facility(name:0), name:1, visitId:2), type(pid:3), name:4, pid:5)
+"Test port facility", "expt1", "one", "st:001", "Koh-I-Noor", "sdb:374717"
+"Test port facility", "expt1", "one", "st:003", "Ford\t\"Anglia\"", null
 
 InvestigationParameter(investigation(facility(name:0), name:1, visitId:2), type(facility(name:0), name:3 , units:4),stringValue:5)
 "Test port facility", "expt1", "one", "colour" , "name", "green"

src/test/resources/icat.port

@@ -40,15 +40,15 @@ Shift(investigation(facility(name:0), name:1, visitId:2), startDate:3, endDate:4
 "Test port facility", "expt1", "zero", 2014-01-01T00:00:00+01:00, 2014-01-01T18:00:00+01:00, "beamtime", "EDDI"
 "Test port facility", "expt1", "two", 2014-04-29T14:00:00+02:00, 2014-04-30T18:15:00+02:00, "preparing", null
 
-SampleType(facility(name:0), name:1, molecularFormula:2, safetyInformation:3, pid:4)
-"Test port facility", "diamond", "C", "fairly harmless", "st:001"
-"Test port facility", "graphite", "C", "bit messy", "st:002" 
-"Test port facility", "rust", "Fe3O4", "messy", "st:003"
-"Test port facility", "N/A", null, "N/A", "st:004"
-
-Sample(investigation(facility(name:0), name:1, visitId:2), type(facility(name:0), name:3, molecularFormula:4), name:5, pid:6)
-"Test port facility", "expt1", "one", "diamond", "C", "Koh-I-Noor", "sdb:374717"
-"Test port facility", "expt1", "one", "rust",  "Fe3O4", "Ford\t\"Anglia\"", null
+SampleType(name:0, molecularFormula:1, safetyInformation:2, pid:3)
+"diamond", "C", "fairly harmless", "st:001"
+"graphite", "C", "bit messy", "st:002"
+"rust", "Fe3O4", "messy", "st:003"
+"fossil", null, null, "st:004"
+
+Sample(investigation(facility(name:0), name:1, visitId:2), type(pid:3), name:4, pid:5)
+"Test port facility", "expt1", "one", "st:001", "Koh-I-Noor", "sdb:374717"
+"Test port facility", "expt1", "one", "st:003", "Ford\t\"Anglia\"", null
 
 InvestigationParameter(investigation(facility(name:0), name:1, visitId:2), type(facility(name:0), name:3 , units:4),stringValue:5)
 "Test port facility", "expt1", "one", "colour" , "name", "green"