Me/dpc 4501 remove get total

docker-compose.base.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   base:
     image: dpc-base:latest

dpc-aggregation/src/main/java/gov/cms/dpc/aggregation/engine/JobBatchProcessor.java

@@ -246,11 +246,11 @@ private Optional<Patient> fetchPatient(JobQueueBatch job, String mbi) {
         }
 
         // If we get more than one unique Patient for an MBI then we've got some upstream problems.
-        if (patients.getTotal() == 1) {
+        if (patients.getEntry().size() == 1) {
             return Optional.of((Patient) patients.getEntryFirstRep().getResource());
         }
 
-        logger.error("Expected 1 Patient to match MBI but found {}", patients.getTotal());
+        logger.error("Expected 1 Patient to match MBI but found {}", patients.getEntry().size());
         return Optional.empty();
     }
 

dpc-api/src/main/java/gov/cms/dpc/api/auth/macaroonauth/MacaroonsAuthenticator.java

@@ -53,7 +53,6 @@ public Optional<OrganizationPrincipal> authenticate(DPCAuthCredentials credentia
         searchParams.put("organization", Collections.singletonList(credentials.getOrganization().getId()));
 
         // Special handling of Group resources, which use tags instead of resource properties.
-        // TODO: Remove with DPC-552
         if (credentials.getPathAuthorizer().type() == DPCResourceType.Group) {
             searchParams.put("_tag", Collections.singletonList(String.format("%s|%s", DPCIdentifierSystem.DPC.getSystem(), credentials.getOrganization().getId())));
         }
@@ -65,7 +64,7 @@ public Optional<OrganizationPrincipal> authenticate(DPCAuthCredentials credentia
                 .encodedJson()
                 .execute();
 
-        if (bundle.getTotal() == 0) {
+        if (bundle.getEntry().isEmpty()) {
             return Optional.empty();
         }
 

dpc-api/src/test/java/gov/cms/dpc/api/auth/macaroonauth/MacaroonsAuthenticatorUnitTest.java

@@ -73,8 +73,8 @@ void test_authenticate_resource_authorized() {
 		when(searchQuery.whereMap(searchParams)).thenReturn(whereMapQuery);
 
 		IQuery<Bundle> bundleQuery = mock(IQuery.class);
-		Bundle bundle = mock(Bundle.class);
-		when(bundle.getTotal()).thenReturn(1);
+		Bundle bundle = mock(Bundle.class, RETURNS_DEEP_STUBS);
+		when(bundle.getEntry().size()).thenReturn(1);
 		when(whereMapQuery.returnBundle(Bundle.class).encodedJson()).thenReturn(bundleQuery);
 		when(bundleQuery.execute()).thenReturn(bundle);
 
@@ -132,8 +132,8 @@ void test_authenticate_resource_group() {
 		when(searchQuery.whereMap(searchParams)).thenReturn(whereMapQuery);
 
 		IQuery<Bundle> bundleQuery = mock(IQuery.class);
-		Bundle bundle = mock(Bundle.class);
-		when(bundle.getTotal()).thenReturn(1);
+		Bundle bundle = mock(Bundle.class, RETURNS_DEEP_STUBS);
+		when(bundle.getEntry().size()).thenReturn(1);
 		when(whereMapQuery.returnBundle(Bundle.class).encodedJson()).thenReturn(bundleQuery);
 		when(bundleQuery.execute()).thenReturn(bundle);
 

dpc-attribution/patient_bundle.json

@@ -6,7 +6,6 @@
       "resource": {
         "resourceType": "Bundle",
         "type": "searchset",
-        "total": 100,
         "link": [
           {
             "relation": "search",
@@ -42454,4 +42453,4 @@
       }
     }
   ]
-}
+}

dpc-bluebutton/src/test/java/gov/cms/dpc/bluebutton/client/BlueButtonClientTest.java

@@ -191,15 +191,15 @@ void shouldGetEOBFromPatientID() {
         Bundle response = bbc.requestEOBFromServer(TEST_PATIENT_ID, TEST_LAST_UPDATED, null);
 
         assertNotNull(response, "The demo patient should have a non-null EOB bundle");
-        assertEquals(32, response.getTotal(), "The demo patient should have exactly 32 EOBs");
+        assertEquals(10, response.getEntry().size(), "The demo patient's first bundle should have exactly 10 EOBs");
     }
 
     @Test
     void shouldNotHaveNextBundle() {
         Bundle response = bbc.requestEOBFromServer(TEST_SINGLE_EOB_PATIENT_ID, TEST_LAST_UPDATED, null);
 
         assertNotNull(response, "The demo patient should have a non-null EOB bundle");
-        assertEquals(1, response.getTotal(), "The demo patient should have exactly 1 EOBs");
+        assertEquals(1, response.getEntry().size(), "The demo patient should have exactly 1 EOBs");
         assertNull(response.getLink(Bundle.LINK_NEXT), "Should have no next link since all the resources are in the bundle");
     }
 
@@ -230,7 +230,7 @@ void shouldGetCoverageFromPatientID() {
         final Bundle response = bbc.requestCoverageFromServer(TEST_PATIENT_ID, TEST_LAST_UPDATED, null);
 
         assertNotNull(response, "The demo patient should have a non-null Coverage bundle");
-        assertEquals(3, response.getTotal(), "The demo patient should have exactly 3 Coverage");
+        assertEquals(3, response.getEntry().size(), "The demo patient should have exactly 3 Coverage");
     }
 
     @Test
@@ -245,7 +245,7 @@ void shouldReturnCapabilitiesStatement() {
     @Test
     void shouldHandlePatientsWithOnlyOneEOB() {
         final Bundle response = bbc.requestEOBFromServer(TEST_SINGLE_EOB_PATIENT_ID, TEST_LAST_UPDATED, null);
-        assertEquals(1, response.getTotal(), "This demo patient should have exactly 1 EOB");
+        assertEquals(1, response.getEntry().size(), "This demo patient should have exactly 1 EOB");
     }
 
     @Test

dpc-bluebutton/src/test/java/gov/cms/dpc/bluebutton/client/MockBlueButtonClientUnitTest.java

@@ -25,7 +25,7 @@ class MockBlueButtonClientUnitTest {
 	@Test
 	void testRequestPatientFromServerByMbi() {
 		Bundle resultBundle = client.requestPatientFromServerByMbi(mbi, Map.of());
-		assertEquals(1, resultBundle.getTotal());
+		assertEquals(1, resultBundle.getEntry().size());
 
 		Patient pat = (Patient) resultBundle.getEntryFirstRep().getResource();
 		assertEquals(pat.getIdPart(), id);
@@ -37,7 +37,7 @@ void testRequestPatientFromServer() {
 			.setLowerBound("2000-12-31")
 			.setUpperBound("2100-01-01");
 		Bundle resultBundle = client.requestPatientFromServer(id, dateRangeParam, Map.of());
-		assertEquals(1, resultBundle.getTotal());
+		assertEquals(1, resultBundle.getEntry().size());
 
 		Patient pat = (Patient) resultBundle.getEntryFirstRep().getResource();
 		assertEquals(pat.getIdPart(), id);

dpc-testing/src/main/java/gov/cms/dpc/testing/OrganizationHelpers.java

@@ -49,7 +49,7 @@ public static Organization createOrganization(FhirContext ctx, IGenericClient cl
                     .encodedJson()
                     .execute();
 
-            if (searchBundle.getTotal() > 0) {
+            if (searchBundle.isEmpty()) {
                 return (Organization) searchBundle.getEntryFirstRep().getResource();
             }
         }

dpc-web/public/practitioner_bundle.json

@@ -195,9 +195,8 @@
           }
         ],
         "resourceType": "Bundle",
-        "total": 4,
         "type": "searchset"
       }
     }
   ]
-}
+}