[RELEASE]'release-1.7' into 'master'

otus-solutions · Jun 7, 2019 · f1ec749 · f1ec749
2 parents 9670d7c + 7ab5051
commit f1ec749
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/survey-model/pom.xml b/survey-model/pom.xml
@@ -3,7 +3,7 @@
 	<groupId>org.ccem.otus</groupId>
 	<artifactId>survey-model</artifactId>
 	<packaging>jar</packaging>
-	<version>1.6</version>
+	<version>1.7</version>
 	<name>survey-model</name>
 
 	<properties>

diff --git a/survey-model/src/main/java/org/ccem/otus/survey/form/SurveyForm.java b/survey-model/src/main/java/org/ccem/otus/survey/form/SurveyForm.java
@@ -23,6 +23,8 @@ public class SurveyForm {
 	private String objectType;
 	private SurveyFormType surveyFormType;
 	private SurveyTemplate surveyTemplate;
+	private String name;
+	private String acronym;
 	private Integer version;
 	private Boolean isDiscarded;
 
@@ -47,6 +49,10 @@ public SurveyTemplate getSurveyTemplate() {
 		return surveyTemplate;
 	}
 
+	public void setSurveyTemplate(SurveyTemplate surveyTemplate) {
+		this.surveyTemplate = surveyTemplate;
+	}
+
 	public LocalDateTime getSendingDate() {
 		return sendingDate;
 	}
@@ -67,6 +73,22 @@ public String getSender() {
 		return sender;
 	}
 
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setAcronym(String acronym) {
+		this.acronym = acronym;
+	}
+
+	public String getAcronym() {
+		return acronym;
+	}
+
+	public String getName() {
+		return name;
+	}
+
 	public Integer getVersion() {
 		return version;
 	}
@@ -107,5 +129,4 @@ public static GsonBuilder getGsonBuilder() {
 		builder.serializeNulls();
 		return builder;
 	}
-
 }
diff --git a/survey-model/src/test/java/org/ccem/otus/survey/form/SurveyFormTest.java b/survey-model/src/test/java/org/ccem/otus/survey/form/SurveyFormTest.java
@@ -67,6 +67,8 @@ public void should_serialize_survey_form(){
 				"\"surveyTemplate\":{\"extents\":\"StudioObject\",\"objectType\":\"Survey\",\"oid\":\"dXNlclVVSUQ6W3VuZGVmaW5lZF1zdXJ2ZXlVVUlEOls3MDZlMTE2MC02M2I5LTExZTYtOWJjNy0xNWVhN2RkZDA4NTZdcmVwb3NpdG9yeVVVSUQ6WyBOb3QgZG9uZSB5ZXQgXQ==\",\"identity\":{\"extents\":null,\"objectType\":null,\"name\":\"TERMO DE CONSENTIMENTO LIVRE E ESCLARECIDO\",\"acronym\":null,\"recommendedTo\":null,\"description\":null,\"keywords\":null},\"dataSources\":null,\"metainfo\":{\"extents\":null,\"objectType\":\"SurveyMetaInfo\",\"creationDatetime\":null,\"otusStudioVersion\":null}," +
 				"\"itemContainer\":[]," +
 				"\"navigationList\":[]}," +
+				"\"name\":null," +
+				"\"acronym\":null," +
 				"\"version\":null," +
 				"\"isDiscarded\":false" +
 				"}";