Switch MetadataSnapshotKey to @embeddable for @EmbeddedId usage. Was not correctly converting Status enum to string in some cases.

Author: sowerstl

src/main/java/gov/osti/entity/MetadataSnapshot.java

@@ -3,16 +3,12 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import gov.osti.entity.DOECodeMetadata.Status;
 import java.io.Serializable;
 import java.util.Date;
 import javax.persistence.Basic;
 import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
 import javax.persistence.Lob;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
@@ -25,30 +21,24 @@
 
 /**
  * A storage cache Entity for Approved Metadata values.
- * 
+ *
  * @author [email protected]
  */
 @Entity
-@IdClass (MetadataSnapshotKey.class)
 @Table (name = "metadata_snapshot",
-        uniqueConstraints = { 
+        uniqueConstraints = {
             @UniqueConstraint (columnNames = {"code_id", "snapshot_status"})
         }
         )
 @JsonIgnoreProperties (ignoreUnknown = true)
 @NamedQueries ({
-    @NamedQuery (name = "MetadataSnapshot.findByCodeIdAndStatus", query = "SELECT s FROM MetadataSnapshot s WHERE s.codeId=:codeId AND s.snapshotStatus=:status"),
-    @NamedQuery (name = "MetadataSnapshot.findAllByStatus", query = "SELECT s FROM MetadataSnapshot s WHERE s.snapshotStatus=:status"),
-    @NamedQuery (name = "MetadataSnapshot.findByCodeIdLastNotStatus", query = "SELECT s FROM MetadataSnapshot s WHERE s.codeId=:codeId AND s.snapshotStatus<>:status ORDER BY s.dateRecordUpdated DESC")
+    @NamedQuery (name = "MetadataSnapshot.findByCodeIdAndStatus", query = "SELECT s FROM MetadataSnapshot s WHERE s.snapshotKey.codeId=:codeId AND s.snapshotKey.snapshotStatus=:status"),
+    @NamedQuery (name = "MetadataSnapshot.findAllByStatus", query = "SELECT s FROM MetadataSnapshot s WHERE s.snapshotKey.snapshotStatus=:status"),
+    @NamedQuery (name = "MetadataSnapshot.findByCodeIdLastNotStatus", query = "SELECT s FROM MetadataSnapshot s WHERE s.snapshotKey.codeId=:codeId AND s.snapshotKey.snapshotStatus<>:status ORDER BY s.dateRecordUpdated DESC")
 })
 public class MetadataSnapshot implements Serializable {
-    @Id
-    @Column (name = "code_id")
-    private Long codeId;
-    @Id
-    @Enumerated (EnumType.STRING)
-    @Column (name = "snapshot_status")
-    private Status snapshotStatus;
+    @EmbeddedId
+    private MetadataSnapshotKey snapshotKey = new MetadataSnapshotKey();
     @Lob
     @Column (name = "json")
     private String json;
@@ -65,19 +55,19 @@ public class MetadataSnapshot implements Serializable {
     private Date dateRecordUpdated;
 
     /**
-     * Get the CODE ID identifier.
-     * @return the codeId
+     * Get the SnapshotKey of the Metadata Object.
+     * @return a MetadataSnapshotKey object
      */
-    public Long getCodeId() {
-        return codeId;
+    public MetadataSnapshotKey getSnapshotKey() {
+        return snapshotKey;
     }
 
     /**
-     * Set the unique CODE ID value.
-     * @param codeId the codeId to set
+     * Set the SnapshotKey of the Metadata Object.
+     * @param key MetadataSnapshotKey object
      */
-    public void setCodeId(Long codeId) {
-        this.codeId = codeId;
+    public void setSnapshotKey(MetadataSnapshotKey key) {
+        this.snapshotKey = key;
     }
 
     /**
@@ -96,20 +86,6 @@ public void setJson(String json) {
         this.json = json;
     }
 
-    /**
-     * @return the snapshotStatus
-     */
-    public Status getSnapshotStatus() {
-        return snapshotStatus;
-    }
-
-    /**
-     * @param snapshotStatus the snapshotStatus to set
-     */
-    public void setSnapshotStatus(Status snapshotStatus) {
-        this.snapshotStatus = snapshotStatus;
-    }
-    
     /**
      * Method called when a record is first created.  Sets dates added and
      * updated.

src/main/java/gov/osti/entity/MetadataSnapshotKey.java

@@ -5,14 +5,22 @@
 import gov.osti.entity.DOECodeMetadata.Status;
 import java.io.Serializable;
 import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 
 /**
  * Implement a primary composite key for the METADATA_SNAPSHOT Entity.
- * 
+ *
  * @author ensornl
  */
+@Embeddable
 public class MetadataSnapshotKey implements Serializable {
+    @Column (name = "code_id")
     private Long codeId;
+    @Enumerated (EnumType.STRING)
+    @Column (name = "snapshot_status")
     private Status snapshotStatus;
 
     /**
@@ -42,14 +50,14 @@ public Status getSnapshotStatus() {
     public void setSnapshotStatus(Status snapshotStatus) {
         this.snapshotStatus = snapshotStatus;
     }
-    
+
     @Override
     public boolean equals(Object o) {
         if (o instanceof MetadataSnapshotKey ) {
             return ((MetadataSnapshotKey)o).getCodeId().equals(getCodeId()) &&
                    ((MetadataSnapshotKey)o).getSnapshotStatus().equals(getSnapshotStatus());
         }
-        
+
         return false;
     }
 

src/main/java/gov/osti/services/Metadata.java

@@ -509,7 +509,7 @@ public Response listProjects(
                     String lastApprovalFor = "";
                     List<MetadataSnapshot> results = querySnapshot.setMaxResults(1).getResultList();
                     for ( MetadataSnapshot ms : results ) {
-                        lastApprovalFor = ms.getSnapshotStatus().toString();
+                        lastApprovalFor = ms.getSnapshotKey().getSnapshotStatus().toString();
                     }
 
                     // add "approve as" status indicator to response record, if not blank
@@ -1111,8 +1111,8 @@ private Response doSubmit(String json, InputStream file, FormDataContentDisposit
 
             // store the snapshot copy of Metadata
             MetadataSnapshot snapshot = new MetadataSnapshot();
-            snapshot.setCodeId(md.getCodeId());
-            snapshot.setSnapshotStatus(md.getWorkflowStatus());
+            snapshot.getSnapshotKey().setCodeId(md.getCodeId());
+            snapshot.getSnapshotKey().setSnapshotStatus(md.getWorkflowStatus());
             snapshot.setJson(md.toJson().toString());
 
             em.merge(snapshot);
@@ -1255,8 +1255,8 @@ private Response doAnnounce(String json, InputStream file, FormDataContentDispos
             }
             // store the snapshot copy of Metadata in SPECIAL STATUS
             MetadataSnapshot snapshot = new MetadataSnapshot();
-            snapshot.setCodeId(md.getCodeId());
-            snapshot.setSnapshotStatus(md.getWorkflowStatus());
+            snapshot.getSnapshotKey().setCodeId(md.getCodeId());
+            snapshot.getSnapshotKey().setSnapshotStatus(md.getWorkflowStatus());
             snapshot.setJson(md.toJson().toString());
 
             em.merge(snapshot);
@@ -1535,8 +1535,8 @@ public Response approve(@PathParam("codeId") Long codeId) {
 
             // store the snapshot copy of Metadata
             MetadataSnapshot snapshot = new MetadataSnapshot();
-            snapshot.setCodeId(md.getCodeId());
-            snapshot.setSnapshotStatus(md.getWorkflowStatus());
+            snapshot.getSnapshotKey().setCodeId(md.getCodeId());
+            snapshot.getSnapshotKey().setSnapshotStatus(md.getWorkflowStatus());
             snapshot.setJson(md.toJson().toString());
 
             em.merge(snapshot);