From b52128a0b1a1925a62a4b531e587588667e517ed Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:15:27 -0500
Subject: [PATCH] These are fixes for issues found via unit test that are in PR
#652. But that PR is currently still WIP and these changes have nothing to
do with why that PR is WIP. Therefore PR just covers these changes to the
creation time not being saved/reset.
---
.../hirs/attestationca/persist/entity/AbstractEntity.java | 8 ++------
.../entity/manager/EndorsementCredentialRepository.java | 1 +
.../page/controllers/CertificatePageController.java | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/AbstractEntity.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/AbstractEntity.java
index e89249c6..5844db5e 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/AbstractEntity.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/AbstractEntity.java
@@ -7,9 +7,6 @@ import jakarta.persistence.MappedSuperclass;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
-import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.Generated;
-import org.hibernate.annotations.GenerationTime;
import org.hibernate.annotations.UuidGenerator;
import java.io.Serializable;
@@ -38,9 +35,7 @@ public abstract class AbstractEntity implements Serializable {
private UUID id;
@Column (name = "create_time")
- @ColumnDefault(value = "CURRENT_TIMESTAMP")
- @Generated(GenerationTime.INSERT)
- private Date createTime = new Date();
+ private Date createTime;
/**
* Default empty constructor is required for Hibernate. It is protected to
@@ -48,6 +43,7 @@ public abstract class AbstractEntity implements Serializable {
*/
protected AbstractEntity() {
super();
+ createTime = new Date();
}
/**
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/EndorsementCredentialRepository.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/EndorsementCredentialRepository.java
index dbc459ec..6ba43285 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/EndorsementCredentialRepository.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/manager/EndorsementCredentialRepository.java
@@ -16,5 +16,6 @@ public interface EndorsementCredentialRepository extends JpaRepository<Endorseme
List<EndorsementCredential> findByArchiveFlag(boolean archiveFlag);
Page<EndorsementCredential> findByArchiveFlag(boolean archiveFlag, Pageable pageable);
EndorsementCredential findByHolderSerialNumber(BigInteger holderSerialNumber);
+ EndorsementCredential findBySerialNumber(BigInteger serialNumber);
List<EndorsementCredential> findByDeviceId(UUID deviceId);
}
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 e90f1d3e..84a6095f 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
@@ -253,7 +253,7 @@ public class CertificatePageController extends PageController<NoPageParams> {
PlatformCredential pc = (PlatformCredential) records.get(i);
// find the EC using the PC's "holder serial number"
associatedEC = this.endorsementCredentialRepository
- .findByHolderSerialNumber(pc.getHolderSerialNumber());
+ .findBySerialNumber(pc.getHolderSerialNumber());
if (associatedEC != null) {
log.debug("EC ID for holder s/n " + pc