Revert "[ALS-6344] - Make new query that retuns patient count and con…

…cept count"

This reverts commit 5fa91ad.

client-api/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/data/query/ResultType.java

@@ -94,11 +94,5 @@ public enum ResultType {
 	 * is suitable to time series analysis and/or loading into another 
 	 * instance of HPDS.
 	 */
-	DATAFRAME_TIMESERIES,
-
-	/**
-	 * Count number of patients and number of available concept paths. Useful for federated networks
-	 * where not every concept path in a query is guaranteed to be in a specific portal
-	 */
-	PATIENT_AND_CONCEPT_COUNT
+	DATAFRAME_TIMESERIES
 }

processing/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/processing/CountProcessor.java

@@ -229,20 +229,4 @@ public Map<String, Object> runVariantCount(Query query) {
 		}
 		return response;
 	}
-
-	public PatientAndConceptCount runPatientAndConceptCount(Query incomingQuery) {
-		log.info("Starting Patient and Concept Count query {}", incomingQuery.getPicSureId());
-		log.info("Calculating available concepts");
-		long concepts = incomingQuery.getFields().stream()
-			.map(abstractProcessor::nullableGetCube)
-			.filter(Optional::isPresent)
-			.count();
-		log.info("Calculating patient counts");
-		int patients = runCounts(incomingQuery);
-		PatientAndConceptCount patientAndConceptCount = new PatientAndConceptCount();
-		patientAndConceptCount.setConceptCount(concepts);
-		patientAndConceptCount.setPatientCount(patients);
-		log.info("Completed Patient and Concept Count query {}", incomingQuery.getPicSureId());
-		return patientAndConceptCount;
-	}
 }

service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java

@@ -455,9 +455,6 @@ private Response submitQueryAndWaitForCompletion(QueryRequest resultRequest) thr
 		case COUNT:
 			return queryOkResponse(countProcessor.runCounts(incomingQuery), incomingQuery).build();
 
-		case PATIENT_AND_CONCEPT_COUNT:
-			return queryOkResponse(countProcessor.runPatientAndConceptCount(incomingQuery), incomingQuery).build();
-
 		default:
 			// no valid type
 			return Response.status(Status.BAD_REQUEST).build();