Merge branch 'master' of http://git.myitsol.com/hanv/service-campaign

 Conflicts:
	src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepository.java

@@ -88,4 +88,9 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
             "    and customer_list_id = :p_cus_list_id\n" +
             "    and (status = 0 or status in (select * from status_customer))", nativeQuery = true)
     List<CampaignCustomer> findListCustomerToDel(@Param("p_company_site_id") Long companySiteId, @Param("p_campaign_id") Long campaignId, @Param("p_cus_list_id") Long customerListId);
+
+    CampaignCustomer findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId(Long campaignId, Long companySiteId, Long customerId);
+
+    @Query(value = "select complete_value from campaign_complete_code where status = 1 and is_finish = 0 and is_recall = 0", nativeQuery = true)
+    List<Short> getStatus();
 }

src/main/java/com/viettel/campaign/service/CustomerService.java

@@ -59,6 +59,8 @@ public interface CustomerService {
 
     List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO);
 
+    ResultDTO deleteCustomerFromCampaign(CampaignCustomerDTO campaignCustomerDTO);
+
 
     // ------------ customer  ------------ //
 

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

@@ -2,7 +2,6 @@ package com.viettel.campaign.service.impl;
 
 import com.github.tennaito.rsql.jpa.JpaCriteriaCountQueryVisitor;
 import com.github.tennaito.rsql.jpa.JpaCriteriaQueryVisitor;
-import com.sun.org.apache.xpath.internal.objects.XObject;
 import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.mapper.CustomerListMapper;
 import com.viettel.campaign.mapper.CustomerMapper;
@@ -11,7 +10,10 @@ import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
-import com.viettel.campaign.web.dto.request_dto.*;
+import com.viettel.campaign.web.dto.request_dto.CustomerDetailRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 import cz.jirutka.rsql.parser.RSQLParser;
 import cz.jirutka.rsql.parser.ast.Node;
@@ -1600,7 +1602,9 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append(" c.customer_type cusType,");
             sb.append(" c.company_name compName,");
             sb.append(" c.current_address currentAddress,");
-            sb.append(" c.description");
+            sb.append(" c.description,");
+            sb.append(" c.ipcc_status ipccStatus,");
+            sb.append(" c.call_allowed customerDnc");
             sb.append(" from customer c");
             sb.append(" inner join cusInCampaign cc on c.customer_id = cc.customer_id");
             sb.append(" left join cusPhone cP on c.customer_id = cP.cusId");
@@ -1631,6 +1635,35 @@ public class CustomerServiceImpl implements CustomerService {
         return customerList;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO deleteCustomerFromCampaign(CampaignCustomerDTO campaignCustomerDTO) {
+        ResultDTO resultDTO = new ResultDTO();
+        Long companySiteId = campaignCustomerDTO.getCompanySiteId();
+        Long campaignId = campaignCustomerDTO.getCampaignId();
+        String[] lstCusId = campaignCustomerDTO.getLstCustomerId().split(",");
+        List<Short> lstStatus = campaignCustomerRepository.getStatus();
+        try {
+            for (String cusId: lstCusId) {
+                CampaignCustomer entity = campaignCustomerRepository.findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId(campaignId, companySiteId, Long.parseLong(cusId));
+                if (entity.getStatus() == 0) {
+                    campaignCustomerRepository.delete(entity);
+                } else if (lstStatus.contains(entity.getStatus())){
+                    entity.setInCampaignStatus((short)0);
+                    campaignCustomerRepository.save(entity);
+                }
+            }
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
+
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public List<Customer> findAllByCondition(Long siteId, Date endTime) {
@@ -1746,20 +1779,20 @@ public class CustomerServiceImpl implements CustomerService {
                     "       C.CURRENT_ADDRESS currentAddress," +
                     "       C.USERNAME username," +
                     "       C.GENDER gender," +
-                    "       C.COMPANY_NAME companyName ," +
+                    "       C.COMPANY_NAME companyName" +
                     "       C.DATE_OF_BIRTH dateOfBirth," +
                     "       C.COMPANY_NAME companyName," +
                     "       C.CUSTOMER_TYPE customerType," +
                     "       C.PLACE_OF_BIRTH placeOfBirth," +
                     "       C.CUSTOMER_TYPE customerType," +
                     "       C.EMAIL email," +
-                    "       C.USERNAME username," +
+                    "       C.USERNAME username" +
                     "       C.NAME name," +
                     "       C.MOBILE_NUMBER mobileNumber," +
                     "       C.SITE_ID siteId," +
                     "       C.STATUS status," +
                     "       CF.FUNCTION_CODE functionCode," +
-                    "       CF.ACTIVE active," +
+                    "       CFO.ACTIVE active" +
                     "       CFO.*");
             stringBuilder.append("FROM CUSTOMER C");
             stringBuilder.append("  INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID");

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

@@ -243,7 +243,7 @@ public class ScenarioServiceImpl implements ScenarioService {
         SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         Map<String, Object> result = new HashMap<>();
         StringBuilder sb = new StringBuilder();
-        boolean isValid = false;
+        boolean isValid = true;
         try {
             List<String> fileHeaderList = new ArrayList<>();
             fileHeaderList.add(BundleUtils.getLangString("scenario.template.questionCode", locale));
@@ -322,9 +322,19 @@ public class ScenarioServiceImpl implements ScenarioService {
 
             //<editor-fold desc="Validate dữ liệu" defaultstate="collapsed">
             String selectedType = "";
+            List<String> lstImportQuestionCodes = new ArrayList<>();
+            String tmpCurrentQuestionCode = null;
+
+            rawDataList.forEach(item -> {
+                if (item[0] != null && !item[0].toString().trim().equals(""))
+                    lstImportQuestionCodes.add(item[0].toString().trim());
+            });
+
             for (int i = 0; i < rawDataList.size(); i++) {
-                if (rawDataList.get(i)[0] != null && !rawDataList.get(i)[0].toString().trim().equals(""))
+                if (rawDataList.get(i)[0] != null && !rawDataList.get(i)[0].toString().trim().equals("")) {
                     selectedType = rawDataList.get(i)[1].toString().trim();
+                    tmpCurrentQuestionCode = rawDataList.get(i)[0].toString().trim();
+                }
                 //validate question
                 if ((rawDataList.get(i)[0] != null && !rawDataList.get(i)[0].toString().trim().equals("")) ||
                         (rawDataList.get(i)[1] != null && !rawDataList.get(i)[1].toString().trim().equals("")) ||
@@ -358,6 +368,12 @@ 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)) ||
+                                validateMappingQuestion(rawDataList.get(i)[7].toString().trim(), tmpCurrentQuestionCode, lstImportQuestionCodes))
+                        sb.append(BundleUtils.getLangString("scenario.mappingQuestion.invalid"));
+                    }
+
                 }
                 Row dataRow = sheet.getRow(3 + i);
                 Cell resultCell = dataRow.createCell(row.getPhysicalNumberOfCells() - 1);
@@ -365,12 +381,11 @@ public class ScenarioServiceImpl implements ScenarioService {
                     resultCell.setCellValue(sb.toString());
                     isValid = false;
                 } else {
-                    isValid = true;
+//                    isValid = true;
                     resultCell.setCellValue("Ok");
                 }
                 sb = new StringBuilder();
             }
-            selectedType = "";
             //</editor-fold>
 
             //insert data
@@ -378,13 +393,14 @@ public class ScenarioServiceImpl implements ScenarioService {
                 logger.info("----- Data valid, start import scenario question -----");
                 List<ScenarioQuestionDTO> lstQuestion = buildQuestionsLst(rawDataList, scenarioId, campaignId, companySiteId);
                 lstQuestion.forEach(question -> {
-                    questionService.add(question);
+//                    questionService.add(question);
                 });
                 FileOutputStream fos = new FileOutputStream(file);
                 workbook.write(fos);
                 result.put("file", file);
                 result.put("message", BundleUtils.getLangString("customer.importSuccess", locale));
             } else {
+                logger.info("----- Data invalid, can't import scenario question -----");
                 FileOutputStream fos = new FileOutputStream(file);
                 workbook.write(fos);
                 result.put("file", file);
@@ -398,9 +414,17 @@ public class ScenarioServiceImpl implements ScenarioService {
         return result;
     }
 
-    private boolean validateQuestionIndex(Object index) {
-        if (index != null && DataUtil.isLong(index.toString())) return true;
-        return false;
+    private boolean validateMappingQuestion(String mappingQuestion, String currentQuestionCode, List<String> lstQuestionCode) {
+        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;
+
+//        String notMappedCode = lstQuestionCode.stream().filter(p -> (!p.equals(mappingQuestion))).findAny().orElse(null);
+//        if(notMappedCode != null) return false;
+        return true;
     }
 
 
@@ -411,15 +435,15 @@ public class ScenarioServiceImpl implements ScenarioService {
         List<ScenarioQuestionDTO> lstQuestions = new ArrayList<>();
         List<ScenarioAnswerDTO> lstAnswerOfQuestion = new ArrayList<>();
         ScenarioQuestionDTO questionDTO = null;
-        Integer questionIndex = null;
+        String questionCode = null;
         for (int i = 0; i < rawDatas.size(); i++) {
             if (rawDatas.get(i)[0] != null && !rawDatas.get(i)[0].toString().trim().equals("")) {
-                questionIndex = Double.valueOf(rawDatas.get(i)[0].toString().trim()).intValue();
+                questionCode = rawDatas.get(i)[0].toString().trim();
                 questionDTO = new ScenarioQuestionDTO();
                 questionDTO.setScenarioId(scenarioId);
                 questionDTO.setCampaignId(campaignId);
                 questionDTO.setCompanySiteId(companySiteId);
-                questionDTO.setImportIndex(questionIndex);
+                questionDTO.setImportCode(questionCode);
 
                 if (rawDatas.get(i)[1].toString().trim().equals(BundleUtils.getLangString("scenario.template.text")))
                     questionDTO.setType((short) 0);
@@ -445,9 +469,9 @@ public class ScenarioServiceImpl implements ScenarioService {
                     answerDto.setHasInput((short) 1);
                 else answerDto.setHasInput((short) 0);
                 if (rawDatas.get(i)[7] != null && !rawDatas.get(i)[7].toString().trim().equals("")) {
-                    answerDto.setMappingQuestionId(Double.valueOf(rawDatas.get(i)[7].toString().trim()).longValue());
+                    answerDto.setMappingQuestionCode(rawDatas.get(i)[7].toString().trim());
                 }
-                answerDto.setImportQuestionIndex(questionIndex);
+                answerDto.setImportQuestionCode(questionCode);
                 answerDto.setCompanySiteId(companySiteId);
 
                 lstAnswerOfQuestion.add(answerDto);
@@ -456,7 +480,7 @@ public class ScenarioServiceImpl implements ScenarioService {
 
         questionOrderIndex = questionRepository.getMaxOrderId(scenarioId, campaignId, companySiteId);
 
-        if(questionOrderIndex == null) questionOrderIndex = 0L;
+        if (questionOrderIndex == null) questionOrderIndex = 0L;
         lstQuestions.forEach(q -> {
             questionOrderIndex += 1;
             q.setOrderIndex(questionOrderIndex);
@@ -466,7 +490,7 @@ public class ScenarioServiceImpl implements ScenarioService {
             lstAnswerOfQuestion.forEach(a -> {
                 answerIndex += 1;
                 a.setOrderIndex(answerIndex);
-                if(a.getImportQuestionIndex() == q.getImportIndex()) answers.add(a);
+                if (a.getImportQuestionCode().equals(q.getImportCode())) answers.add(a);
             });
             q.setLstAnswers(answers);
         });

src/main/java/com/viettel/campaign/web/dto/CampaignCustomerDTO.java

@@ -26,4 +26,5 @@ public class CampaignCustomerDTO extends BaseDTO{
     private Long callStatus;
     private Long companySiteId;
     private Long complainId;
+    private String lstCustomerId;
 }

src/main/java/com/viettel/campaign/web/dto/CustomerDTO.java

@@ -34,4 +34,5 @@ public class CustomerDTO extends BaseDTO {
     private Long emailAllowed;
     private Long smsAllowed;
     private String ipccStatus;
+    private String customerDnc;
 }

src/main/java/com/viettel/campaign/web/dto/ScenarioAnswerDTO.java

@@ -25,5 +25,6 @@ public class ScenarioAnswerDTO implements Serializable {
     public Date deleteTime;
     public Long mappingQuestionId;
     public Long campaignId;
-    public Integer importQuestionIndex;
+    public String importQuestionCode;
+    public String mappingQuestionCode;
 }

src/main/java/com/viettel/campaign/web/dto/ScenarioQuestionDTO.java

@@ -29,5 +29,5 @@ public class ScenarioQuestionDTO implements Serializable {
     private Short isDefault;
     private Short answerIndex;
     private List<ScenarioAnswerDTO> lstAnswers;
-    private Integer importIndex;
+    private String importCode;
 }

src/main/java/com/viettel/campaign/web/rest/CustomerController.java

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.model.ccms_full.CampaignCustomer;
 import com.viettel.campaign.model.ccms_full.Customer;
 import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
@@ -252,6 +253,13 @@ public class CustomerController {
         return new ResponseEntity<>(data, HttpStatus.OK);
     }
 
+    @PostMapping("/deleteCustomerFromCampaign")
+    @ResponseBody
+    public ResponseEntity<?> deleteCustomerFromCampaign(@RequestBody CampaignCustomerDTO dto) {
+        ResultDTO resultDTO = customerService.deleteCustomerFromCampaign(dto);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
 
 
     private String saveUploadFile(MultipartFile file) {

src/main/java/com/viettel/campaign/web/rest/ScenarioController.java

@@ -132,6 +132,9 @@ public class ScenarioController {
 //                    .body(Files.readAllBytes(fileExport.toPath()));
         } catch (Exception e) {
             logger.error(e.getMessage());
+            ResultDTO resultDTO = new ResultDTO();
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }

src/main/resources/i18n/language_en.properties

@@ -134,4 +134,5 @@ scenario.answer.required="Answer is required for SingleChoice or MultiChoice que
 scenario.hashInput.required="Has input is required"
 scenario.required.required="Require is required"
 scenario.default.required="Default is required"
+scenario.mappingQuestion.invalid="Mapping question invalid"
 

src/main/resources/i18n/language_vi.properties

@@ -136,6 +136,7 @@ scenario.answer.required="Câu trả lời cho câu hỏi SingleChoice, MultiCho
 scenario.hashInput.required="Trường Nhập text bắt buộc nhập"
 scenario.required.required="Trường Bắt buộc bắt buộc nhập"
 scenario.default.required="Trường Mặc định bắt buộc nhập"
+scenario.mappingQuestion.invalid="Câu hỏi liên kết không hợp lệ"