From 46ecbe6b269a0ac79591370ce262a71f45afbb41 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Mon, 7 Aug 2023 06:23:41 -0400 Subject: [PATCH] Resolved the issue with the Certificate page not paging. I had the setters flipped. --- .../CertificatePageController.java | 65 +++++++++++++------ .../ReferenceManifestPageController.java | 2 + .../RimDatabasePageController.java | 4 +- .../ValidationReportsPageController.java | 3 + 4 files changed, 54 insertions(+), 20 deletions(-) diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java index f50d7c64..674d6c7f 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/CertificatePageController.java @@ -61,9 +61,6 @@ import java.util.UUID; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -//import java.security.cert.CertificateEncodingException; -//import java.security.cert.X509Certificate; - // note uploading base64 certs, old or new having decode issues check ACA channel /** @@ -223,12 +220,6 @@ public class CertificatePageController extends PageController { } }; - - /** - * Ok I think what I will do is make repositories for each certificate type to I can - * tell it what the type T is. - */ - FilteredRecordsList records = new FilteredRecordsList<>(); int currentPage = input.getStart() / input.getLength(); Pageable paging = PageRequest.of(currentPage, input.getLength(), Sort.by(orderColumnName)); @@ -239,13 +230,14 @@ public class CertificatePageController extends PageController { // records = OrderedListQueryDataTableAdapter.getOrderedList( // getCertificateClass(certificateType), platformCertificateRepository, // input, orderColumnName, criteriaModifier); + FilteredRecordsList records = new FilteredRecordsList<>(); org.springframework.data.domain.Page pagedResult = this.platformCertificateRepository.findAll(paging); if (pagedResult.hasContent()) { records.addAll(pagedResult.getContent()); } - records.setRecordsFiltered(input.getLength()); - records.setRecordsTotal(platformCertificateRepository.count()); + records.setRecordsTotal(input.getLength()); + records.setRecordsFiltered(platformCertificateRepository.count()); EndorsementCredential associatedEC; if (!records.isEmpty()) { @@ -264,18 +256,53 @@ public class CertificatePageController extends PageController { pc.setEndorsementCredential(associatedEC); } } + + log.debug("Returning list of size: " + records.size()); + return new DataTableResponse<>(records, input); } else if (certificateType.equals(ENDORSEMENTCREDENTIAL)) { - records = OrderedListQueryDataTableAdapter.getOrderedList( - getCertificateClass(certificateType), endorsementCredentialRepository, - input, orderColumnName, criteriaModifier); +// records = OrderedListQueryDataTableAdapter.getOrderedList( +// getCertificateClass(certificateType), endorsementCredentialRepository, +// input, orderColumnName, criteriaModifier); + FilteredRecordsList records = new FilteredRecordsList<>(); + org.springframework.data.domain.Page pagedResult = this.endorsementCredentialRepository.findAll(paging); + if (pagedResult.hasContent()) { + records.addAll(pagedResult.getContent()); + } + + records.setRecordsTotal(input.getLength()); + records.setRecordsFiltered(endorsementCredentialRepository.count()); + + log.debug("Returning list of size: " + records.size()); + return new DataTableResponse<>(records, input); } else if (certificateType.equals(TRUSTCHAIN)) { - records = OrderedListQueryDataTableAdapter.getOrderedList( - getCertificateClass(certificateType), caCredentialRepository, - input, orderColumnName, criteriaModifier); +// records = OrderedListQueryDataTableAdapter.getOrderedList( +// getCertificateClass(certificateType), caCredentialRepository, +// input, orderColumnName, criteriaModifier); + FilteredRecordsList records = new FilteredRecordsList<>(); + org.springframework.data.domain.Page pagedResult = this.caCredentialRepository.findAll(paging); + + if (pagedResult.hasContent()) { + records.addAll(pagedResult.getContent()); + } + records.setRecordsTotal(input.getLength()); + records.setRecordsFiltered(caCredentialRepository.count()); + + log.debug("Returning list of size: " + records.size()); + return new DataTableResponse<>(records, input); + } else if (certificateType.equals(ISSUEDCERTIFICATES)) { + FilteredRecordsList records = new FilteredRecordsList<>(); + org.springframework.data.domain.Page pagedResult = this.issuedCertificateRepository.findAll(paging); + if (pagedResult.hasContent()) { + records.addAll(pagedResult.getContent()); + } + records.setRecordsTotal(input.getLength()); + records.setRecordsFiltered(issuedCertificateRepository.count()); + + log.debug("Returning list of size: " + records.size()); + return new DataTableResponse<>(records, input); } - log.debug("Returning list of size: " + records.size()); - return new DataTableResponse<>(records, input); + return new DataTableResponse(new FilteredRecordsList<>(), input); } /** diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java index 69cb3c49..4bfdde19 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java @@ -136,6 +136,8 @@ public class ReferenceManifestPageController extends PageController records = new FilteredRecordsList<>(); int currentPage = input.getStart() / input.getLength(); Pageable paging = PageRequest.of(currentPage, input.getLength(), Sort.by(orderColumnName)); diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java index 253576c6..b7aef697 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java @@ -106,7 +106,8 @@ public class RimDatabasePageController extends PageController { } }; - log.info("Querying with the following datatableinput: " + input.toString()); + log.info("Querying with the following dataTableInput: " + input.toString()); + FilteredRecordsList referenceDigestValues = new FilteredRecordsList<>(); int currentPage = input.getStart() / input.getLength(); @@ -141,6 +142,7 @@ public class RimDatabasePageController extends PageController { } } + log.debug("Returning list of size: " + referenceDigestValues.size()); return new DataTableResponse<>(referenceDigestValues, input); } } diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java index f010941e..9106180f 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ValidationReportsPageController.java @@ -29,6 +29,9 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.extern.log4j.Log4j2; import org.hibernate.Session; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.ui.Model;