ShUp: adds find acquisition equipment by serial number to shup client

fli-iam · Nov 3, 2023 · c790f9a · c790f9a
1 parent 0936dfa
commit c790f9a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/...n/java/org/shanoir/ng/acquisitionequipment/repository/AcquisitionEquipmentRepository.java b/...n/java/org/shanoir/ng/acquisitionequipment/repository/AcquisitionEquipmentRepository.java
@@ -30,7 +30,7 @@ public interface AcquisitionEquipmentRepository extends CrudRepository<Acquisiti
 
 	List<AcquisitionEquipment> findByCenterStudyCenterListStudyId(Long studyId);
 
-	List<AcquisitionEquipment> findBySerialNumber(String serialNumber);
+	List<AcquisitionEquipment> findBySerialNumberContaining(String serialNumber);
 
 	List<AcquisitionEquipment> findByManufacturerModelId(Long manufacturerModelId);
 

diff --git a/...ain/java/org/shanoir/ng/acquisitionequipment/service/AcquisitionEquipmentServiceImpl.java b/...ain/java/org/shanoir/ng/acquisitionequipment/service/AcquisitionEquipmentServiceImpl.java
@@ -79,7 +79,7 @@ public List<AcquisitionEquipment> findAllByStudyId(Long studyId) {
 	}
 
 	public List<AcquisitionEquipment> findAllBySerialNumber(String serialNumber) {
-		return this.repository.findBySerialNumber(serialNumber);
+		return this.repository.findBySerialNumberContaining(serialNumber);
 	}
 
 	public AcquisitionEquipment create(AcquisitionEquipment entity) {

diff --git a/...dies/src/main/java/org/shanoir/ng/acquisitionequipment/service/RabbitMqCenterService.java b/...dies/src/main/java/org/shanoir/ng/acquisitionequipment/service/RabbitMqCenterService.java
@@ -84,7 +84,7 @@ public String findAcquisitionEquipments(String message) {
 	@Transactional
 	public Long getEquipmentFromCode(String message) {
 		try {
-			List<AcquisitionEquipment> equipList = acquisitionEquipmentService.findBySerialNumber(message);
+			List<AcquisitionEquipment> equipList = acquisitionEquipmentService.findBySerialNumberContaining(message);
 			if (equipList == null || equipList.isEmpty()) {
 				return null;
 			}

diff --git a/...ploader/src/main/java/org/shanoir/uploader/service/rest/ShanoirUploaderServiceClient.java b/...ploader/src/main/java/org/shanoir/uploader/service/rest/ShanoirUploaderServiceClient.java
@@ -458,6 +458,25 @@ public List<AcquisitionEquipment> findAcquisitionEquipments() throws Exception {
 		return null;
 	}
 
+	public List<AcquisitionEquipment> findAcquisitionEquipmentsBySerialNumber(String serialNumber) throws Exception {
+		long startTime = System.currentTimeMillis();
+		try (CloseableHttpResponse response = httpService.get(this.serviceURLAcquisitionEquipmentsBySerialNumber)) {
+			long stopTime = System.currentTimeMillis();
+			long elapsedTime = stopTime - startTime;
+			logger.info("findAcquisitionEquipmentsBySerialNumber: " + elapsedTime + "ms");
+			int code = response.getCode();
+			if (code == HttpStatus.SC_OK) {
+				List<AcquisitionEquipment> acquisitionEquipments = Util.getMappedList(response,
+						AcquisitionEquipment.class);
+				return acquisitionEquipments;
+			} else {
+				logger.error("Could not find acquisition equipments by serial number (status code: " + code + ", message: "
+						+ apiResponseMessages.getOrDefault(code, "unknown status code") + ")");
+			}
+		}
+		return null;
+	}
+
 	public void uploadFile(String tempDirId, File file) throws Exception {
 		try (CloseableHttpResponse response = httpService.postFile(this.serviceURLImporterCreateTempDir, tempDirId,
 				file)) {
@@ -467,7 +486,7 @@ public void uploadFile(String tempDirId, File file) throws Exception {
 				logger.error("Error in uploadFile: with tempDirId " + tempDirId + " with file (path: "
 						+ file.getAbsolutePath() + ", size in bytes: " + Files.size(file.toPath()) + "), status code: "
 						+ code + ", message: " + apiResponseMessages.getOrDefault(code, "unknown status code"));
-				throw new Exception("Error in uploadFile");
+				throw new Exception("Error in uploadFile.");
 			}
 		}
 	}

diff --git a/...oir-uploader/src/test/java/org/shanoir/uploader/test/importer/CenterAndEquipmentTest.java b/...oir-uploader/src/test/java/org/shanoir/uploader/test/importer/CenterAndEquipmentTest.java
@@ -1,5 +1,6 @@
 package org.shanoir.uploader.test.importer;
 
+import java.util.List;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
@@ -25,7 +26,7 @@ public void createCenter() throws Exception {
 	}
 
 	@Test
-	public void createEquipment() throws Exception {
+	public void createEquipmentAndFindIt() throws Exception {
 		Center center = new Center();
 		center.setName("Center-Name-" + UUID.randomUUID().toString());
 		Center createdCenter = shUpClient.createCenter(center);
@@ -42,11 +43,14 @@ public void createEquipment() throws Exception {
 		ManufacturerModel createdManufacturerModel = shUpClient.createManufacturerModel(manufacturerModel);
 		Assertions.assertNotNull(createdManufacturerModel);
 		AcquisitionEquipment equipment = new AcquisitionEquipment();
-		equipment.setSerialNumber("Serial-Number-" + UUID.randomUUID().toString());
+		String serialNumberRandom = UUID.randomUUID().toString();
+		equipment.setSerialNumber("Serial-Number-" + serialNumberRandom);
 		equipment.setCenter(new IdName(createdCenter.getId(), createdCenter.getName()));
 		equipment.setManufacturerModel(createdManufacturerModel);
 		AcquisitionEquipment createdEquipment = shUpClient.createEquipment(equipment);
 		Assertions.assertNotNull(createdEquipment);
+		List<AcquisitionEquipment> equipments = shUpClient.findAcquisitionEquipmentsBySerialNumber(serialNumberRandom);
+		Assertions.assertNotNull(equipments);
 	}
-
+	
 }