Extract Fields From FHIR Bundle

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messages/Message.java

@@ -8,8 +8,6 @@
  * receiving applications and facilities, as well as order numbers.
  */
 public interface Message<T> extends FhirResource<T> {
-    String getFhirResourceId();
-
     String getPlacerOrderNumber();
 
     MessageHdDataType getSendingApplicationDetails();

etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/FhirResource.java

@@ -8,4 +8,6 @@
  */
 public interface FhirResource<T> {
     T getUnderlyingResource();
+
+    String getFhirResourceId();
 }

etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiFhirResource.java

@@ -16,4 +16,9 @@ public HapiFhirResource(IBaseResource innerResource) {
     public IBaseResource getUnderlyingResource() {
         return innerResource;
     }
+
+    @Override
+    public String getFhirResourceId() {
+        return innerResource.getIdElement().getIdPart();
+    }
 }

etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/FhirResourceMock.groovy

@@ -14,4 +14,9 @@ class FhirResourceMock<T> implements FhirResource<T> {
     public T getUnderlyingResource() {
         return innerResource
     }
+
+    @Override
+    String getFhirResourceId() {
+        return null
+    }
 }