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

PAN-57 Refactored the Definition DTO

Browse Source
This commit is contained in:
atusa17
2019-03-17 14:36:44 -06:00
parent 1de1f7a5fc
commit a85bf67d08
7 changed files with 11 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/DefinitionsIntegrationTest.java
+6 -14
View File
@@ -1,8 +1,6 @@
package edu.msudenver.tsp.persistence; package edu.msudenver.tsp.persistence;
import edu.msudenver.tsp.persistence.dto.Definition;
import edu.msudenver.tsp.persistence.dto.DefinitionDto; import edu.msudenver.tsp.persistence.dto.DefinitionDto;
import edu.msudenver.tsp.persistence.dto.Notation;
import edu.msudenver.tsp.persistence.repository.DefinitionRepository; import edu.msudenver.tsp.persistence.repository.DefinitionRepository;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -35,8 +33,8 @@ public class DefinitionsIntegrationTest {
assertNotNull(savedDefinition.getDefinition()); assertNotNull(savedDefinition.getDefinition());
assertNotNull(savedDefinition.getNotation()); assertNotNull(savedDefinition.getNotation());
final List<String> definitionsList = savedDefinition.getDefinition().getDefinitions(); final List<String> definitionsList = savedDefinition.getDefinition();
final List<String> notationList = savedDefinition.getNotation().getNotations(); final List<String> notationList = savedDefinition.getNotation();
assertEquals(2, definitionsList.size()); assertEquals(2, definitionsList.size());
assertEquals(1, notationList.size()); assertEquals(1, notationList.size());
@@ -52,8 +50,8 @@ public class DefinitionsIntegrationTest {
assertNotNull(updatedDefinition.getDefinition()); assertNotNull(updatedDefinition.getDefinition());
assertNotNull(updatedDefinition.getNotation()); assertNotNull(updatedDefinition.getNotation());
final List<String> updatedDefinitionsList = updatedDefinition.getDefinition().getDefinitions(); final List<String> updatedDefinitionsList = updatedDefinition.getDefinition();
final List<String> updatedNotationsList = updatedDefinition.getNotation().getNotations(); final List<String> updatedNotationsList = updatedDefinition.getNotation();
assertEquals(2, updatedDefinitionsList.size()); assertEquals(2, updatedDefinitionsList.size());
assertEquals(1, updatedNotationsList.size()); assertEquals(1, updatedNotationsList.size());
@@ -72,19 +70,13 @@ public class DefinitionsIntegrationTest {
definitionList.add("Test definition 1"); definitionList.add("Test definition 1");
definitionList.add("Test definition 2"); definitionList.add("Test definition 2");
final Definition definition = new Definition();
definition.setDefinitions(definitionList);
final List<String> notationList = new ArrayList<>(); final List<String> notationList = new ArrayList<>();
notationList.add("\\testLaTeX"); notationList.add("\\testLaTeX");
final Notation notation = new Notation();
notation.setNotations(notationList);
final DefinitionDto definitionDto = new DefinitionDto(); final DefinitionDto definitionDto = new DefinitionDto();
definitionDto.setName("Test Name"); definitionDto.setName("Test Name");
definitionDto.setDefinition(definition); definitionDto.setDefinition(definitionList);
definitionDto.setNotation(notation); definitionDto.setNotation(notationList);
return definitionDto; return definitionDto;
} }
persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/ProofsIntegrationTest.java
-1
View File
@@ -35,7 +35,6 @@ public class ProofsIntegrationTest {
assertEquals("Test branch", savedProof.getBranch()); assertEquals("Test branch", savedProof.getBranch());
assertNotNull(savedProof.getDateCreated()); assertNotNull(savedProof.getDateCreated());
assertNotNull(savedProof.getLastUpdated()); assertNotNull(savedProof.getLastUpdated());
assertEquals(savedProof.getLastUpdated().toString().trim(), savedProof.getDateCreated().toString().trim());
assertEquals(2, savedProof.getReferencedTheorems().size()); assertEquals(2, savedProof.getReferencedTheorems().size());
assertEquals(2, savedProof.getReferencedDefinitions().size()); assertEquals(2, savedProof.getReferencedDefinitions().size());
assertEquals("test theorem 1", savedProof.getReferencedTheorems().get(0)); assertEquals("test theorem 1", savedProof.getReferencedTheorems().get(0));
persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Definition.java
-17
View File
@@ -1,17 +0,0 @@
package edu.msudenver.tsp.persistence.dto;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import java.util.List;
@Getter
@Setter
@ToString
public class Definition implements Serializable {
private List<String> definitions;
private static final long serialVersionUID = -2208496232532214840L;
}
persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java
+3 -2
View File
@@ -12,6 +12,7 @@ import javax.persistence.Table;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
@Entity(name = "definitions") @Entity(name = "definitions")
@Table(name = "definitions") @Table(name = "definitions")
@@ -24,9 +25,9 @@ public class DefinitionDto extends BaseDto implements Serializable {
private String name; private String name;
@NotBlank(groups = Insert.class, message = "At least one (1) definition must be specified") @NotBlank(groups = Insert.class, message = "At least one (1) definition must be specified")
@Type(type = "json") @Column(columnDefinition = "jsonb") private Definition definition; @Type(type = "json") @Column(columnDefinition = "jsonb") private List<String> definition;
@Type(type = "json") @Column(columnDefinition = "jsonb") private Notation notation; @Type(type = "json") @Column(columnDefinition = "jsonb") private List<String> notation;
private static final long serialVersionUID = -5314619286352932857L; private static final long serialVersionUID = -5314619286352932857L;
persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Notation.java
-16
View File
@@ -1,16 +0,0 @@
package edu.msudenver.tsp.persistence.dto;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import java.util.List;
@Getter
@Setter
@ToString
public class Notation implements Serializable {
private List<String> notations;
private static final long serialVersionUID = 2301438318932336121L;
}
persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java
-4
View File
@@ -1,4 +0,0 @@
package edu.msudenver.tsp.persistence.dto;
public class NotationDto extends BaseDto {
}
persistence/src/test/java/edu/msudenver/tsp/persistence/controller/DefinitionControllerTest.java
+2 -10
View File
@@ -1,8 +1,6 @@
package edu.msudenver.tsp.persistence.controller; package edu.msudenver.tsp.persistence.controller;
import edu.msudenver.tsp.persistence.dto.Definition;
import edu.msudenver.tsp.persistence.dto.DefinitionDto; import edu.msudenver.tsp.persistence.dto.DefinitionDto;
import edu.msudenver.tsp.persistence.dto.Notation;
import edu.msudenver.tsp.persistence.repository.DefinitionRepository; import edu.msudenver.tsp.persistence.repository.DefinitionRepository;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -216,19 +214,13 @@ public class DefinitionControllerTest {
final List<String> definitionList = new ArrayList<>(); final List<String> definitionList = new ArrayList<>();
definitionList.add("Test definition 1"); definitionList.add("Test definition 1");
final Definition definition = new Definition();
definition.setDefinitions(definitionList);
final List<String> notationList = new ArrayList<>(); final List<String> notationList = new ArrayList<>();
notationList.add("\\testLaTeX"); notationList.add("\\testLaTeX");
final Notation notation = new Notation();
notation.setNotations(notationList);
final DefinitionDto definitionDto = new DefinitionDto(); final DefinitionDto definitionDto = new DefinitionDto();
definitionDto.setName("Test Name"); definitionDto.setName("Test Name");
definitionDto.setDefinition(definition); definitionDto.setDefinition(definitionList);
definitionDto.setNotation(notation); definitionDto.setNotation(notationList);
return definitionDto; return definitionDto;
} }