issue 3058 touchstone conformance fix for response bundle entry id (#3060)

* issue 3058 touchstone conformance fix for response bundle entry id

Signed-off-by: Robin Arnold <robin.arnold@ibm.com>

* issue 3058 fix fhir-server unit test for new delete response

Signed-off-by: Robin Arnold <robin.arnold@ibm.com>

* fix another test

ReindexOperationPhase2Test.verifyFoundBySearch was using the entry id that we removed.  It should be using the resource id instead.

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>

Co-authored-by: Lee Surprenant <lmsurpre@us.ibm.com>

Author: punktilious

fhir-server-spi/src/main/java/com/ibm/fhir/server/spi/operation/FHIRResourceHelpers.java

@@ -273,6 +273,8 @@ FHIRRestOperationResponse doPatch(String type, String id, FHIRPatch patch, Strin
      *            the resource type associated with the Resource to be deleted
      * @param id
      *            the id of the Resource to be deleted
+     * @param searchQueryString
+     *            a search query associated with a conditional delete request (mutually exclusive with id)
      * @return a FHIRRestOperationResponse that contains the results of the operation
      * @throws Exception
      */

fhir-server-test/src/test/java/com/ibm/fhir/server/test/operation/ReindexOperationPhase2Test.java

@@ -216,7 +216,7 @@ private void verifyFoundBySearch(String code, String id, String value) {
         assertEquals(response.getStatus(), Status.OK.getStatusCode());
         Bundle bundle = response.readEntity(Bundle.class);
         assertFalse(bundle.getEntry().isEmpty());
-        assertEquals(bundle.getEntry().get(0).getId(), id);
+        assertEquals(bundle.getEntry().get(0).getResource().getId(), id);
     }
 
     @Test(groups = {"reindex"}, dependsOnMethods = {})

fhir-server/src/main/java/com/ibm/fhir/server/util/FHIRRestHelper.java

@@ -864,18 +864,6 @@ private void checkIdAndMeta(Resource resource) throws FHIRPersistenceException {
         }
     }
 
-    /**
-     * Performs a 'delete' operation on the specified resource.
-     *
-     * @param type
-     *            the resource type associated with the Resource to be deleted
-     * @param id
-     *            the id of the Resource to be deleted
-     * @param requestProperties
-     *            additional request properties which supplement the HTTP headers associated with this request
-     * @return a FHIRRestOperationResponse that contains the results of the operation
-     * @throws Exception
-     */
     @Override
     public FHIRRestOperationResponse doDelete(String type, String id, String searchQueryString) throws Exception {
         log.entering(this.getClass().getName(), "doDelete");
@@ -1012,7 +1000,7 @@ public FHIRRestOperationResponse doDelete(String type, String id, String searchQ
                         .details(CodeableConcept.builder()
                             .text(string("Deleted " + responseBundle.getEntry().size() + " " + type + " resource(s) " +
                                 "with the following id(s): " +
-                                responseBundle.getEntry().stream().map(Bundle.Entry::getId).collect(Collectors.joining(","))))
+                                responseBundle.getEntry().stream().map(e -> e.getResource().getId()).collect(Collectors.joining(","))))
                             .build())
                         .build());
 
@@ -2116,7 +2104,7 @@ Bundle createSearchResponseBundle(List<Resource> resources, FHIRSearchContext se
                 Entry.Builder entryBuilder = Entry.builder();
                 if (resource != null) {
                     if (resource.getId() != null) {
-                        entryBuilder.id(resource.getId());
+                        // do not set the entryBuilder.id value for response bundle
                         entryBuilder.fullUrl(Uri.of(getRequestBaseUri(type) + "/" + resource.getClass().getSimpleName() + "/" + resource.getId()));
                     } else {
                         String msg = "A resource with no id was found.";

fhir-server/src/test/java/com/ibm/fhir/server/test/InteractionValidationConfigTest.java

@@ -1414,8 +1414,8 @@ public void testDeleteValidSpecificResourceType() throws Exception {
             FHIRRestOperationResponse response = helper.doDelete("Patient", "1", null);
             List<Issue> issues = response.getOperationOutcome().getIssue();
             assertEquals(issues.size(), 1);
-            assertEquals("Deleted 1 Patient resource(s) with the following id(s): 1",
-                issues.get(0).getDetails().getText().getValue());
+            assertEquals(issues.get(0).getDetails().getText().getValue(),
+                "Deleted 1 Patient resource(s) with the following id(s): test");
             assertEquals(IssueSeverity.INFORMATION, issues.get(0).getSeverity());
             assertEquals(IssueType.INFORMATIONAL, issues.get(0).getCode());
         } catch (FHIROperationException e) {
@@ -1437,8 +1437,8 @@ public void testDeleteValidGenericResourceType() throws Exception {
             FHIRRestOperationResponse response = helper.doDelete("Encounter", "1", null);
             List<Issue> issues = response.getOperationOutcome().getIssue();
             assertEquals(issues.size(), 1);
-            assertEquals("Deleted 1 Encounter resource(s) with the following id(s): 1",
-                issues.get(0).getDetails().getText().getValue());
+            assertEquals(issues.get(0).getDetails().getText().getValue(),
+                "Deleted 1 Encounter resource(s) with the following id(s): test");
             assertEquals(IssueSeverity.INFORMATION, issues.get(0).getSeverity());
             assertEquals(IssueType.INFORMATIONAL, issues.get(0).getCode());
         } catch (FHIROperationException e) {
@@ -1460,10 +1460,9 @@ public void testDeleteValidAnyResourceType() throws Exception {
             FHIRRestOperationResponse response = helper.doDelete("Encounter", "1", null);
             List<Issue> issues = response.getOperationOutcome().getIssue();
             assertEquals(issues.size(), 1);
-            assertEquals("Deleted 1 Encounter resource(s) with the following id(s): 1",
-                issues.get(0).getDetails().getText().getValue());
-            assertEquals(IssueSeverity.INFORMATION, issues.get(0).getSeverity());
-            assertEquals(IssueType.INFORMATIONAL, issues.get(0).getCode());
+            assertEquals(issues.get(0).getDetails().getText().getValue(), "Deleted 1 Encounter resource(s) with the following id(s): test");
+            assertEquals(issues.get(0).getSeverity(), IssueSeverity.INFORMATION);
+            assertEquals(issues.get(0).getCode(), IssueType.INFORMATIONAL);
         } catch (FHIROperationException e) {
             fail();
         }