Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAN-50 Finished integration tests for theorems

Browse Source
This commit is contained in:
atusa17
2019-03-11 13:07:21 -06:00
parent fd760293ef
commit 64dd8397cc
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountDto.java
+2 -2
View File
@@ -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
+14 -4
View File
@@ -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;
}