From db6ae76bcf17983938597fc68c26937cd6ca0a7e Mon Sep 17 00:00:00 2001
From: Luis Pabon <turkeyfried@gmail.com>
Date: Mon, 8 Apr 2024 11:42:17 -0400
Subject: [PATCH] Made some light refactoring on FhirResource

Improving code coverage
---
 .../etor/demographics/Demographics.java                    | 2 ++
 .../hhs/cdc/trustedintermediary/etor/messages/Message.java | 2 ++
 .../trustedintermediary/etor/ruleengine/FhirResource.java  | 2 --
 .../external/hapi/HapiFhirResource.java                    | 5 -----
 .../hhs/cdc/trustedintermediary/FhirResourceMock.groovy    | 7 +------
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/demographics/Demographics.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/demographics/Demographics.java
index 662ff477a..ed0e7ea5a 100644
--- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/demographics/Demographics.java
+++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/demographics/Demographics.java
@@ -8,5 +8,7 @@
  * @param <T> The underlying FHIR demographics type.
  */
 public interface Demographics<T> extends FhirResource<T> {
+    String getFhirResourceId();
+
     String getPatientId();
 }
diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messages/Message.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messages/Message.java
index 67b24684e..bbe1da597 100644
--- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messages/Message.java
+++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/messages/Message.java
@@ -8,6 +8,8 @@
  * receiving applications and facilities, as well as order numbers.
  */
 public interface Message<T> extends FhirResource<T> {
+    String getFhirResourceId();
+
     String getPlacerOrderNumber();
 
     MessageHdDataType getSendingApplicationDetails();
diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/FhirResource.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/FhirResource.java
index 0b15aa3a9..e3fa5bda9 100644
--- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/FhirResource.java
+++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/FhirResource.java
@@ -8,6 +8,4 @@
  */
 public interface FhirResource<T> {
     T getUnderlyingResource();
-
-    String getFhirResourceId();
 }
diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiFhirResource.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiFhirResource.java
index 697a07ecf..a0f41783e 100644
--- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiFhirResource.java
+++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiFhirResource.java
@@ -16,9 +16,4 @@ public HapiFhirResource(IBaseResource innerResource) {
     public IBaseResource getUnderlyingResource() {
         return innerResource;
     }
-
-    @Override
-    public String getFhirResourceId() {
-        return innerResource.getIdElement().getIdPart();
-    }
 }
diff --git a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/FhirResourceMock.groovy b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/FhirResourceMock.groovy
index d6433a486..9f25e65de 100644
--- a/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/FhirResourceMock.groovy
+++ b/etor/src/test/groovy/gov/hhs/cdc/trustedintermediary/FhirResourceMock.groovy
@@ -11,12 +11,7 @@ class FhirResourceMock<T> implements FhirResource<T> {
     }
 
     @Override
-    public T getUnderlyingResource() {
+    T getUnderlyingResource() {
         return innerResource
     }
-
-    @Override
-    String getFhirResourceId() {
-        return null
-    }
 }