only show results for latest corrected/deleted TestEvent

backend/src/main/java/gov/cdc/usds/simplereport/service/ResultService.java

@@ -12,6 +12,7 @@
 import gov.cdc.usds.simplereport.db.model.TestEvent;
 import gov.cdc.usds.simplereport.db.model.TestEvent_;
 import gov.cdc.usds.simplereport.db.model.TestOrder;
+import gov.cdc.usds.simplereport.db.model.TestOrder_;
 import gov.cdc.usds.simplereport.db.model.auxiliary.PersonRole;
 import gov.cdc.usds.simplereport.db.model.auxiliary.TestResult;
 import gov.cdc.usds.simplereport.db.repository.ResultRepository;
@@ -21,6 +22,7 @@
 import java.util.Set;
 import java.util.UUID;
 import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -35,7 +37,6 @@
 @Transactional
 public class ResultService {
   private final ResultRepository resultRepository;
-  private final DiseaseService diseaseService;
   private final OrganizationService organizationService;
 
   private Specification<Result> buildResultSearchFilter(
@@ -48,8 +49,13 @@ private Specification<Result> buildResultSearchFilter(
       Date endDate) {
     return (root, query, cb) -> {
       Join<Result, TestEvent> testEventJoin = root.join(Result_.testEvent);
+      Join<TestEvent, TestOrder> testOrderJoin = testEventJoin.join(TestEvent_.order);
       Join<TestEvent, Person> personJoin = testEventJoin.join(TestEvent_.patient);
       Predicate p = cb.conjunction();
+      Path<UUID> latestTestEventUUID =
+          testOrderJoin.get(TestOrder_.testEvent).get(IdentifiedEntity_.internalId);
+
+      p = cb.and(p, cb.equal(testEventJoin.get(IdentifiedEntity_.internalId), latestTestEventUUID));
 
       query.orderBy(cb.desc(root.get(AuditedEntity_.createdAt)));
       query.distinct(true);