new resourceNotAllowedWithError impl working for DELETE entries

DELETE entries do not have a resource, resulting in a
NullPointerException in the previous implementation.

Author: hhund

src/main/java/dev/dsf/bpe/service/CheckAllowList.java

@@ -11,6 +11,7 @@
 import org.hl7.fhir.r4.model.Organization;
 import org.hl7.fhir.r4.model.OrganizationAffiliation;
 import org.hl7.fhir.r4.model.Resource;
+import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.StringType;
 import org.hl7.fhir.r4.model.Task;
 import org.slf4j.Logger;
@@ -76,10 +77,17 @@ private Predicate<BundleEntryComponent> entryNotAllowedWithError(Task task, Stri
 	private boolean resourceNotAllowedWithError(BundleEntryComponent entry, Task task, String bundleUrl)
 	{
 		Resource resource = entry.getResource();
-		boolean resourceAllowed = (resource instanceof Organization || resource instanceof OrganizationAffiliation
-				|| resource instanceof Endpoint);
-
-		if (!resourceAllowed)
+		boolean resourceAllowed = (HTTPVerb.DELETE.equals(entry.getRequest().getMethod())
+				&& (entry.getRequest().getUrl().startsWith(ResourceType.Organization.name())
+						|| entry.getRequest().getUrl().startsWith(ResourceType.OrganizationAffiliation.name())
+						|| entry.getRequest().getUrl().startsWith(ResourceType.Endpoint.name())))
+				|| (resource instanceof Organization || resource instanceof OrganizationAffiliation
+						|| resource instanceof Endpoint);
+
+		if (HTTPVerb.DELETE.equals(entry.getRequest().getMethod()) && !resourceAllowed)
+			addError(task, "Resource delete of '" + entry.getRequest().getUrl() + "' not allowed in Bundle with id '"
+					+ bundleUrl + "'");
+		else if (!HTTPVerb.DELETE.equals(entry.getRequest().getMethod()) && !resourceAllowed)
 			addError(task, "Resource of type '" + resource.getResourceType().name()
 					+ "' not allowed in Bundle with id '" + bundleUrl + "'");