Merge pull request #103 from ral-facilities/handle_missing_mechanisms

Use run.properties before downloadRepository for getDownloadTypeStatuses

Author: patrick-austin

src/main/java/org/icatproject/topcat/TransportMap.java

@@ -137,6 +137,14 @@ public boolean isAllowed(String facility, String transport, String userName, Ica
         }
     }
 
+    /**
+     * @param facilityName ICAT Facility.name
+     * @return Map of transport mechanism (AKA DownloadType) name to details of that mechanism
+     */
+    public HashMap<String, TransportMechanism> getFacilityMapping(String facilityName) {
+        return mapping.get(facilityName);
+    }
+
     /**
      * 
      * @param facilityName ICAT Facility.name

src/main/java/org/icatproject/topcat/web/rest/UserResource.java

@@ -8,7 +8,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import java.util.Map.Entry;
 
 import jakarta.ejb.EJB;
 import jakarta.ejb.LocalBean;
@@ -1194,22 +1194,31 @@ public Response getDownloadTypeStatuses(@QueryParam("facilityName") String facil
 		IcatClient icatClient = new IcatClient(icatUrl, sessionId);
 		String userName = icatClient.getUserName();
 		TransportMap transportMap = TransportMap.getInstance();
+		HashMap<String, TransportMechanism> facilityMapping = transportMap.getFacilityMapping(facilityName);
 
 		JsonObjectBuilder responseJson = Json.createObjectBuilder();
-		List<DownloadType> downloadTypes = downloadTypeRepository.getDownloadTypes(facilityName);
-		for (DownloadType downloadType : downloadTypes) {
-			String downloadTypeName = downloadType.getDownloadType();
-			if (transportMap.isAllowed(facilityName, downloadTypeName, userName, icatClient)) {
-				JsonObjectBuilder downloadTypeBuilder = Json.createObjectBuilder();
-				downloadTypeBuilder.add("disabled", downloadType.getDisabled());
-				downloadTypeBuilder.add("message", downloadType.getMessage());
-				TransportMechanism transportMechanism = transportMap.getTransportMechanism(facilityName, downloadTypeName);
-				if (transportMechanism != null) {
-					downloadTypeBuilder.add("idsUrl", transportMechanism.idsUrl);
-					downloadTypeBuilder.add("displayName", transportMechanism.displayName);
-					downloadTypeBuilder.add("description", transportMechanism.description);
+		if (facilityMapping != null) {
+			for (Entry<String, TransportMechanism> entry : facilityMapping.entrySet()) {
+				String downloadTypeName = entry.getKey();
+				TransportMechanism transportMechanism = entry.getValue();
+				if (transportMap.isAllowed(facilityName, downloadTypeName, userName, icatClient)) {
+					JsonObjectBuilder downloadTypeBuilder = Json.createObjectBuilder();
+					if (transportMechanism != null) {
+						downloadTypeBuilder.add("idsUrl", transportMechanism.idsUrl);
+						downloadTypeBuilder.add("displayName", transportMechanism.displayName);
+						downloadTypeBuilder.add("description", transportMechanism.description);
+					}
+
+					DownloadType downloadType = downloadTypeRepository.getDownloadType(facilityName, downloadTypeName);
+					if (downloadType != null) {
+						downloadTypeBuilder.add("disabled", downloadType.getDisabled());
+						downloadTypeBuilder.add("message", downloadType.getMessage());
+					} else {
+						downloadTypeBuilder.add("disabled", false);
+						downloadTypeBuilder.add("message", "");
+					}
+					responseJson.add(downloadTypeName, downloadTypeBuilder);
 				}
-				responseJson.add(downloadTypeName, downloadTypeBuilder);
 			}
 		}
 

src/test/java/org/icatproject/topcat/UserResourceTest.java

@@ -728,13 +728,8 @@ public void testGetDownloadTypeStatuses() throws Exception {
 			downloadTypeRepository.save(httpType);
 			httpTypeId = httpType.getId();
 
-			DownloadType globusType = new DownloadType();
-			globusType.setFacilityName("LILS");
-			globusType.setDownloadType("globus");
-			globusType.setDisabled(false);
-			globusType.setMessage("");
-			downloadTypeRepository.save(globusType);
-			globusTypeId = globusType.getId();
+			// Do not create globus in the repository, as when absent the response should assume that it is enabled with
+			// no message
 
 			DownloadType lilsType = new DownloadType();
 			lilsType.setFacilityName("LILS");
@@ -774,7 +769,6 @@ public void testGetDownloadTypeStatuses() throws Exception {
 		} finally {
 			// Remove the entries we created to avoid interference with other tests
 			downloadTypeRepository.remove(httpTypeId);
-			downloadTypeRepository.remove(globusTypeId);
 			downloadTypeRepository.remove(lilsTypeId);
 		}
 	}