PAN-50 Finished integration tests for theorems

persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/TheoremsIntegrationTest.java

@@ -32,7 +32,7 @@ public class TheoremsIntegrationTest {
 
         assertEquals("Test theorem", savedTheorem.getName());
         assertEquals("Test branch", savedTheorem.getBranch());
-        assertTrue(savedTheorem.isProvenStatus());
+        assertTrue(savedTheorem.getProvenStatus());
         assertEquals(2, savedTheorem.getReferencedTheorems().size());
         assertEquals(2, savedTheorem.getReferencedDefinitions().size());
         assertEquals("test theorem 1", savedTheorem.getReferencedTheorems().get(0));
@@ -48,7 +48,7 @@ public class TheoremsIntegrationTest {
         assertEquals(Integer.valueOf(0), updatedTheorem.getVersion());
         assertEquals("Test theorem", updatedTheorem.getName());
         assertEquals("Test Update", updatedTheorem.getBranch());
-        assertTrue(updatedTheorem.isProvenStatus());
+        assertTrue(updatedTheorem.getProvenStatus());
         assertEquals(2, updatedTheorem.getReferencedTheorems().size());
         assertEquals(2, updatedTheorem.getReferencedDefinitions().size());
         assertEquals("test theorem 1", updatedTheorem.getReferencedTheorems().get(0));
@@ -57,12 +57,6 @@ public class TheoremsIntegrationTest {
         assertEquals("test definition 2", updatedTheorem.getReferencedDefinitions().get(1));
         assertEquals(updatedTheorem.getId(), id);
 
-        final List<TheoremDto> listOfTheoremsByBranch = theoremRepository.findByBranch("Test Update");
-
-        assertNotNull(listOfTheoremsByBranch);
-        assertEquals(1, listOfTheoremsByBranch.size());
-        assertEquals(updatedTheorem, listOfTheoremsByBranch.get(0));
-
         theoremRepository.delete(theoremDto);
         final Optional<TheoremDto> deletedTheorem = theoremRepository.findById(id);
         assertFalse(deletedTheorem.isPresent());

persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountDto.java

@@ -19,8 +19,8 @@ import java.util.Date;
 public class AccountDto extends BaseDto implements Serializable {
     @NotBlank(groups = Insert.class, message = "A username must be specified") @Size(max = 50) private String username;
     @NotBlank(groups = Insert.class, message = "A password must be specified") @Size(max = 256) private String password;
-    @NotNull private boolean administratorStatus;
-    @Temporal(TemporalType.DATE) private Date lastLogin;
+    @NotNull @Column(name = "administrator_status") private boolean administratorStatus;
+    @Temporal(TemporalType.DATE) @Column(name = "last_login") private Date lastLogin;
 
     private static final long serialVersionUID = 7095627971593953734L;
 

persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java

@@ -21,11 +21,11 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class TheoremDto extends BaseDto implements Serializable {
     @NotBlank @Size(min = 1, max = 512, message = "theorem name must be between 1 and 512 characters") private String name;
-    @NotNull private TheoremType theoremType;
+    @NotNull @Column(name = "theorem_type") private TheoremType theoremType;
     @NotNull(message = "a branch of mathematics that this theorem is associated with must be specified") private String branch;
-    @Type(type = "json") @Column(columnDefinition = "jsonb") private List<String> referencedDefinitions;
-    @Type(type = "json") @Column(columnDefinition = "jsonb") private List<String> referencedTheorems;
-    @NotNull private boolean provenStatus;
+    @Type(type = "json") @Column(name = "referenced_definitions", columnDefinition = "jsonb") private List<String> referencedDefinitions;
+    @Type(type = "json") @Column(name = "referenced_theorems", columnDefinition = "jsonb") private List<String> referencedTheorems;
+    @NotNull @Column(name = "proven_status") private boolean provenStatus;
 
     @JsonProperty("theorem_type")
     public TheoremType getTheoremType() {
@@ -57,5 +57,15 @@ public class TheoremDto extends BaseDto implements Serializable {
         this.referencedTheorems = referencedTheorems;
     }
 
+    @JsonProperty("proven_status")
+    public boolean getProvenStatus() {
+        return provenStatus;
+    }
+
+    @JsonProperty("proven_status")
+    public void setProvenStatus(final boolean provenStatus) {
+        this.provenStatus = provenStatus;
+    }
+
     private static final long serialVersionUID = 1545568391140364425L;
 }