anhvd commit secenario import

src/main/java/com/viettel/campaign/service/impl/ScenarioQuestionServiceImpl.java

@@ -239,6 +239,8 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
             return resultDTO;
         }
         try {
+            scenarioQuestionDTO.setCode(scenarioQuestionDTO.getCode().trim());
+            scenarioQuestionDTO.setQuestion(scenarioQuestionDTO.getQuestion().trim());
             ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
 
             if (scenarioQuestion.getScenarioQuestionId() != null) {
@@ -271,6 +273,8 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                         campaignLogAnswer.setCampaignId(scenarioQuestion.getCampaignId());
 
                         if (item.getScenarioAnswerId() != null) {
+                            item.setCode(item.getCode().trim());
+                            item.setAnswer(item.getAnswer().trim());
                             ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                             scenarioAnswerRepository.save(answer);
                             campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());
@@ -281,6 +285,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                             item.setScenarioQuestionId(scenarioQuestion.getScenarioQuestionId());
                             item.setCreateTime(new Date());
                             item.setStatus((short) 1);
+                            item.setAnswer(item.getAnswer().trim());
                             ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                             scenarioAnswerRepository.save(answer);
                             campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());

src/main/java/com/viettel/campaign/service/impl/ScenarioServiceImpl.java

@@ -72,6 +72,9 @@ public class ScenarioServiceImpl implements ScenarioService {
     public ResultDTO update(ScenarioDTO scenarioDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
+            scenarioDTO.setCode(scenarioDTO.getCode().trim());
+            if (scenarioDTO.getDescription() != null) scenarioDTO.setDescription(scenarioDTO.getDescription().trim());
+            else scenarioDTO.setDescription("");
             scenarioDTO.setUpdateBy(null);
             scenarioDTO.setUpdateTime(new Date());
 
@@ -368,10 +371,10 @@ public class ScenarioServiceImpl implements ScenarioService {
                     if (rawDataList.get(i)[4] == null && rawDataList.get(i)[4].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.hashInput.required"));
                     }
-                    if((rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals(""))) {
-                        if((rawDataList.get(i)[7].toString().trim().equals(tmpCurrentQuestionCode)) ||
+                    if ((rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals(""))) {
+                        if ((rawDataList.get(i)[7].toString().trim().equals(tmpCurrentQuestionCode)) ||
                                 validateMappingQuestion(rawDataList.get(i)[7].toString().trim(), tmpCurrentQuestionCode, lstImportQuestionCodes))
-                        sb.append(BundleUtils.getLangString("scenario.mappingQuestion.invalid"));
+                            sb.append(BundleUtils.getLangString("scenario.mappingQuestion.invalid"));
                     }
 
                 }
@@ -415,12 +418,12 @@ public class ScenarioServiceImpl implements ScenarioService {
     }
 
     private boolean validateMappingQuestion(String mappingQuestion, String currentQuestionCode, List<String> lstQuestionCode) {
-        if(mappingQuestion == currentQuestionCode) return false;
+        if (mappingQuestion == currentQuestionCode) return false;
 
         String duplicateCode = lstQuestionCode.stream().
                 filter(p -> (p.equals(mappingQuestion) && p.equals(currentQuestionCode))).
                 findAny().orElse(null);
-        if(duplicateCode == null) return false;
+        if (duplicateCode == null) return false;
 
 //        String notMappedCode = lstQuestionCode.stream().filter(p -> (!p.equals(mappingQuestion))).findAny().orElse(null);
 //        if(notMappedCode != null) return false;