[RELEASE] release-1.51.2 into otus-dev

source/otus-activity/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.ccem.otus</groupId>
 		<artifactId>otus-root</artifactId>
- 		<version>1.52.0-SNAPSHOT</version>
+ 		<version>1.52.0</version>
 		<relativePath>../otus-root/pom.xml</relativePath>
 	</parent>
 

source/otus-activity/src/main/java/org/ccem/otus/model/survey/activity/SurveyActivity.java

@@ -139,8 +139,7 @@ public Optional<Interview> getLastInterview() {
   }
 
   public Boolean isFinalized() {
-    ActivityStatus activityStatus = getCurrentStatus().get();
-    return activityStatus.getName().equals(ActivityStatusOptions.FINALIZED.getName());
+    return currentStatusIs(ActivityStatusOptions.FINALIZED);
   }
 
   public static String serialize(SurveyActivity surveyActivity) {
@@ -181,4 +180,17 @@ public void setParticipantData(Participant participantData) {
   public void setCategory(ActivityCategory category) {
     this.category = category;
   }
+
+  public ActivityStatus getCreationStatus(){
+    return this.getStatusHistory().get(0);
+  }
+
+  public boolean couldBeExtracted(){
+    return isFinalized() || currentStatusIs(ActivityStatusOptions.SAVED);
+  }
+
+  private boolean currentStatusIs(ActivityStatusOptions activityStatusOptions){
+    ActivityStatus activityStatus = getCurrentStatus().get();
+    return activityStatus.getName().equals(activityStatusOptions.getName());
+  }
 }

source/otus-activity/src/main/java/org/ccem/otus/model/survey/activity/filling/answer/TextAnswer.java

@@ -14,6 +14,10 @@ public String getValue() {
     return value;
   }
 
+  public void setValue(String value) {
+    this.value = value;
+  }
+
   @Override
   public Map<String, Object> getAnswerExtract(String questionID) {
     Map<String, Object> extraction = new LinkedHashMap<>();

source/otus-activity/src/main/java/org/ccem/otus/persistence/ActivityDao.java

@@ -45,4 +45,6 @@ public interface ActivityDao {
   void removeStageFromActivities(ObjectId stageOID);
 
   void discardByID(ObjectId activityOID) throws DataNotFoundException;
+
+  List<ObjectId> getActivityIds(String acronym, Integer version, Boolean isDiscardedValue, List<String> activityIdsToExcludeOfQuery) throws MemoryExcededException;
 }

source/otus-activity/src/main/java/org/ccem/otus/service/ActivityService.java

@@ -52,4 +52,6 @@ public interface ActivityService {
 
   void discardByID(ObjectId activityOID) throws DataNotFoundException;
 
+  List<ObjectId> getActivityIds(String acronym, Integer version, List<String> activityIdsToExcludeOfQuery) throws MemoryExcededException;
+
 }

source/otus-activity/src/main/java/org/ccem/otus/service/ActivityServiceBean.java

@@ -190,4 +190,9 @@ public void discardByID(ObjectId activityID) throws DataNotFoundException {
     activityDao.discardByID(activityID);
   }
 
+  @Override
+  public List<ObjectId> getActivityIds(String acronym, Integer version, List<String> activityIdsToExcludeOfQuery) throws MemoryExcededException {
+    return activityDao.getActivityIds(acronym, version, null, activityIdsToExcludeOfQuery);
+  }
+
 }

source/otus-activity/src/main/java/org/ccem/otus/service/extraction/model/ActivityExtraction.java

@@ -0,0 +1,33 @@
+package org.ccem.otus.service.extraction.model;
+
+import com.google.gson.annotations.SerializedName;
+import org.ccem.otus.model.SerializableModel;
+import org.ccem.otus.model.survey.activity.SurveyActivity;
+import org.ccem.otus.participant.model.Participant;
+import org.ccem.otus.survey.form.SurveyForm;
+
+public class ActivityExtraction extends SerializableModel {
+
+  @SerializedName("survey")
+  private ActivityExtractionSurveyData surveyData;
+  @SerializedName("activity")
+  private ActivityExtractionActivityData activityData;
+
+  public ActivityExtraction(SurveyForm surveyForm, SurveyActivity surveyActivity) {
+    this.surveyData = new ActivityExtractionSurveyData(surveyForm);
+    this.activityData = new ActivityExtractionActivityData(surveyActivity);
+  }
+
+  public ActivityExtractionSurveyData getSurveyData() {
+    return surveyData;
+  }
+
+  public ActivityExtractionActivityData getActivityData() {
+    return activityData;
+  }
+
+  public void setParticipantData(Participant participant){
+    this.activityData.setParticipantData(participant);
+  }
+
+}

source/otus-activity/src/main/java/org/ccem/otus/service/extraction/model/ActivityExtractionActivityData.java

@@ -0,0 +1,106 @@
+package org.ccem.otus.service.extraction.model;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import org.ccem.otus.model.survey.activity.SurveyActivity;
+import org.ccem.otus.model.survey.activity.filling.QuestionFill;
+import org.ccem.otus.model.survey.activity.mode.ActivityMode;
+import org.ccem.otus.model.survey.activity.navigation.NavigationTrackingItem;
+import org.ccem.otus.model.survey.activity.navigation.enums.NavigationTrackingItemStatuses;
+import org.ccem.otus.model.survey.activity.status.ActivityStatusOptions;
+import org.ccem.otus.participant.model.Participant;
+import org.ccem.otus.survey.template.utils.adapters.LocalDateTimeAdapter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ActivityExtractionActivityData {
+
+  private String activityId;
+  private String acronym;
+  private Integer version;
+  private Long recruitmentNumber;
+  @SerializedName("recruitment_number")
+  private String recruitmentNumberStr;
+  @SerializedName("participant_field_center")
+  private String participantFieldCenter;
+  private String mode;
+  private String type;
+  private String category;
+  @SerializedName("participant_field_center_by_activity")
+  private String activityFieldCenter;
+  private String interviewer;
+  @SerializedName("current_status")
+  private String currentStatus;
+  @SerializedName("current_status_date")
+  private String currentStatusDate;
+  @SerializedName("creation_date")
+  private String creationDate;
+  @SerializedName("paper_realization_date")
+  private String paperRealizationDate;
+  @SerializedName("paper_interviewer")
+  private String paperInterviewer;
+  @SerializedName("last_finalization_date")
+  private String lastFinalizationDate;
+  @SerializedName("external_id")
+  private String externalId;
+  private String fillingList;
+  private List<NavigationTrackingItem> navigationTrackingItems;
+
+  public ActivityExtractionActivityData(SurveyActivity surveyActivity) {
+    this.activityId = surveyActivity.getActivityID().toHexString();
+    this.acronym = surveyActivity.getSurveyForm().getAcronym();
+    this.version = surveyActivity.getSurveyForm().getVersion();
+    this.mode = surveyActivity.getMode().toString();
+    this.type = "";
+    this.category = surveyActivity.getCategory().getName();
+    this.activityFieldCenter = surveyActivity.getParticipantData().getFieldCenter().getAcronym();
+
+    surveyActivity.getLastInterview().ifPresent(interview -> {
+      this.interviewer = interview.getInterviewer().getEmail();
+    });
+
+    surveyActivity.getCurrentStatus().ifPresent(status -> {
+      this.currentStatus = status.getName();
+      this.currentStatusDate = status.getDate().toString();
+    });
+
+    this.creationDate = surveyActivity.getCreationStatus().getDate().toString();
+
+    if(surveyActivity.getMode() == ActivityMode.PAPER){
+      surveyActivity.getLastStatusByName(ActivityStatusOptions.INITIALIZED_OFFLINE.getName()).ifPresent(status -> {
+        this.paperInterviewer = status.getUser().getEmail();
+        this.paperRealizationDate = status.getDate().toString();
+      });
+    }
+
+    this.externalId = surveyActivity.getExternalID();
+    this.fillingList = serializeAnswers(surveyActivity.getFillContainer().getFillingList());
+
+    this.navigationTrackingItems = surveyActivity.getNavigationTracker().items
+      .stream().filter(item -> item.state.equals(String.valueOf(NavigationTrackingItemStatuses.SKIPPED)))
+      .collect(Collectors.toList());
+
+    this.recruitmentNumber = surveyActivity.getParticipantData().getRecruitmentNumber();
+    this.recruitmentNumberStr = this.recruitmentNumber.toString();
+  }
+
+  public String getId() {
+    return activityId;
+  }
+
+  public Long getRecruitmentNumber() {
+    return recruitmentNumber;
+  }
+
+  public void setParticipantData(Participant participant){
+    this.participantFieldCenter = participant.getFieldCenter().getAcronym();
+  }
+
+  private String serializeAnswers(List<QuestionFill> fillingList) {
+    GsonBuilder builder = new GsonBuilder();
+    builder.registerTypeAdapter(LocalDateTime.class, new LocalDateTimeAdapter());
+    return builder.create().toJson(fillingList);
+  }
+}

source/otus-activity/src/main/java/org/ccem/otus/service/extraction/model/ActivityExtractionSurveyData.java

@@ -0,0 +1,23 @@
+package org.ccem.otus.service.extraction.model;
+
+import com.google.gson.annotations.SerializedName;
+import org.ccem.otus.survey.form.SurveyForm;
+import org.ccem.otus.survey.template.item.SurveyItem;
+
+import java.util.List;
+
+public class ActivityExtractionSurveyData {
+
+  @SerializedName("id")
+  private String surveyId;
+  private List<SurveyItem> itemContainer;
+
+  public ActivityExtractionSurveyData(SurveyForm surveyForm) {
+    this.surveyId = surveyForm.getSurveyID().toHexString();
+    this.itemContainer = surveyForm.getSurveyTemplate().itemContainer;
+  }
+
+  public String getId() {
+    return surveyId;
+  }
+}

source/otus-activity/src/main/java/org/ccem/otus/service/extraction/model/Rscript.java

@@ -0,0 +1,21 @@
+package org.ccem.otus.service.extraction.model;
+
+import org.ccem.otus.model.SerializableModel;
+
+public class Rscript extends SerializableModel {
+
+  private String name;
+  private String script;
+
+  public String getName() {
+    return name;
+  }
+
+  public String getScript() {
+    return script;
+  }
+
+  public static Rscript deserialize(String json){
+    return (Rscript)deserialize(json, Rscript.class);
+  }
+}

source/otus-activity/src/main/java/org/ccem/otus/service/extraction/model/SurveyExtraction.java

@@ -0,0 +1,44 @@
+package org.ccem.otus.service.extraction.model;
+
+import org.ccem.otus.model.SerializableModelWithID;
+
+public class SurveyExtraction extends SerializableModelWithID {
+
+  private String surveyId;
+  private String surveyAcronym;
+  private Integer surveyVersion;
+  private String RscriptName;
+
+  public SurveyExtraction(String surveyAcronym, Integer surveyVesion, String rscriptName) {
+    this.surveyAcronym = surveyAcronym;
+    this.surveyVersion = surveyVesion;
+    RscriptName = rscriptName;
+  }
+
+  public String getSurveyId() {
+    return surveyId;
+  }
+
+  public String getSurveyAcronym() {
+    return surveyAcronym;
+  }
+
+  public Integer getSurveyVersion() {
+    return surveyVersion;
+  }
+
+  public String getRscriptName() {
+    return RscriptName;
+  }
+
+  public void setSurveyId(String surveyId) {
+    this.surveyId = surveyId;
+    this.surveyAcronym = null;
+    this.surveyVersion = null;
+  }
+
+  public static SurveyExtraction fromJson(String json){
+    return (SurveyExtraction)deserialize(json, SurveyExtraction.class);
+  }
+
+}

source/otus-activity/src/test/java/org/ccem/otus/service/ActivityServiceBeanTest.java

@@ -233,9 +233,15 @@ public void removeStageFromActivities_method_should_call_removeStageFromActiviti
   }
 
   @Test
-  public void discardByID_method_should_invoke_ActivityDao_discardByID() throws DataNotFoundException {
+  public void discardByID_method_should_call_activityDao_discardByID_method() throws DataNotFoundException {
     service.discardByID(ACTIVITY_OID);
     verify(activityDao, times(1)).discardByID(ACTIVITY_OID);
   }
 
+  @Test
+  public void getActivityIds_method_should_call_activityDao_getActivityIds_method() throws MemoryExcededException {
+    final List<String> activityIdsToExcludeOfQuery = new ArrayList<>();
+    service.getActivityIds(ACRONYM, VERSION, activityIdsToExcludeOfQuery);
+    verify(activityDao, times(1)).getActivityIds(ACRONYM, VERSION, null, activityIdsToExcludeOfQuery);
+  }
 }