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

# Conflicts:
#	src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java

campaign.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-</module>
\ No newline at end of file

src/main/java/com/viettel/campaign/model/Campaign.java

@@ -16,6 +16,8 @@ public class Campaign implements Serializable {
 
     @Id
     @NotNull
+    @GeneratedValue(generator = "campaign_seq")
+    @SequenceGenerator(name = "campaign_seq", sequenceName = "campaign_seq", allocationSize = 1)
     @Basic(optional = false)
     @Column(name = "CAMPAIGN_ID")
     private Long campaignId;

src/main/java/com/viettel/campaign/model/TimeRangeDialMode.java

@@ -18,6 +18,8 @@ import java.util.Date;
 public class TimeRangeDialMode implements Serializable {
     @Id
     @NotNull
+    @GeneratedValue(generator = "TIME_RANGE_DIAL_MODE_SEQ")
+    @SequenceGenerator(name = "TIME_RANGE_DIAL_MODE_SEQ", sequenceName = "TIME_RANGE_DIAL_MODE_SEQ", allocationSize = 1)
     @Basic(optional = false)
     @Column(name = "TIME_RANGE_DIAL_MODE_ID")
     private Long timeRangeDialModeId;

src/main/java/com/viettel/campaign/model/TimeZoneDialMode.java

@@ -19,9 +19,11 @@ import java.io.Serializable;
 public class TimeZoneDialMode implements Serializable{
     @Id
     @NotNull
+    @GeneratedValue(generator = "TIME_ZONE_DIAL_MODE_SEQ")
+    @SequenceGenerator(name = "TIME_ZONE_DIAL_MODE_SEQ", sequenceName = "TIME_ZONE_DIAL_MODE_SEQ", allocationSize = 1)
     @Basic(optional = false)
     @Column(name = "TIME_ZONE_DIAL_MODE_ID")
-    private Long timeRangeDialModeId;
+    private Long timeZoneDialModeId;
 
     @Column(name = "COMPANY_SITE_ID")
     private Long companySiteId;

src/main/java/com/viettel/campaign/repository/CampaignRepositoryCustom.java

@@ -11,4 +11,6 @@ public interface CampaignRepositoryCustom {
     ResultDTO search(CampaignRequestDTO requestDto);
 
     ResultDTO findByCampaignCode(CampaignRequestDTO requestDTO);
+
+    String getMaxCampaignIndex();
 }

src/main/java/com/viettel/campaign/repository/impl/CampaignRepositoryImpl.java

@@ -375,9 +375,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setData(dataPage);
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            session.close();
 
-            return result;
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -388,4 +386,25 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         return result;
     }
 
+    @Override
+    public String getMaxCampaignIndex() {
+        logger.info("Start search max campaign code index::");
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+        try {
+            StringBuilder sqlStr = new StringBuilder();
+            sqlStr.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-max-campaign-code-index"));
+            SQLQuery query = session.createSQLQuery(sqlStr.toString());
+            List<String> list = query.list();
+            if(list.size() > 0) {
+                return list.get(0);
+            }
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+        }
+        return null;
+    }
+
 }

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

@@ -34,13 +34,9 @@ public interface CustomerService {
 
     ResultDTO deleteCustomerListIds(CustomerRequestDTO customerRequestDTO);
 
-<<<<<<< HEAD
     ResultDTO searchCustomerList(SearchCustomerRequestDTO searchCustomerRequestDTO);
-=======
-    ResultDTO searchCustomerList(CampaignCustomerRequestDTO campaignCustomerRequestDTO);
 
     // ------------ customer contact ------------ //
 
     ResultDTO getCustomerContact(Long customerId, Short contactType, String contact);
->>>>>>> 34ea2d6ca2abb80539da3dd29437f08fed559e93
 }

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.model.Campaign;
+import com.viettel.campaign.model.TimeRangeDialMode;
 import com.viettel.campaign.model.TimeZoneDialMode;
 import com.viettel.campaign.repository.CampaignRepository;
+import com.viettel.campaign.repository.TimeRangeDialModeRepository;
 import com.viettel.campaign.repository.TimeZoneDialModeRepository;
 import com.viettel.campaign.repository.impl.CampaignRepositoryImpl;
 import com.viettel.campaign.service.CampaignService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.web.dto.CampaignDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.TimeRangeDialModeDTO;
+import com.viettel.campaign.web.dto.TimeZoneDialModeDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -18,8 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -32,6 +35,9 @@ public class CampaignServiceImpl implements CampaignService {
     @Autowired
     TimeZoneDialModeRepository timeZoneDialModeRepository;
 
+    @Autowired
+    TimeRangeDialModeRepository timeRangeDialModeRepository;
+
     @Autowired
     ModelMapper modelMapper;
 
@@ -54,23 +60,38 @@ public class CampaignServiceImpl implements CampaignService {
     public ResultDTO addNewCampaign(CampaignDTO campaignDTO) {
         ResultDTO resultDTO = new ResultDTO();
         Campaign campaign = modelMapper.map(campaignDTO, Campaign.class);
-        TimeZoneDialMode timeZoneDialMode = new TimeZoneDialMode();
+        Long campaignId;
+        List<TimeZoneDialModeDTO> timeZoneDialModes = new ArrayList<>();
+        List<TimeRangeDialModeDTO> timeRangeDialModes = new ArrayList<>();
+        List<TimeRangeDialMode> lstTimeRangeModeToInsert = new ArrayList<>();
+        List<TimeZoneDialMode> lstTimeZoneModeToInser = new ArrayList<>();
         try {
-            campaign = campaignRepository.save(campaign);
+            String campaignCode = generateCampaignCode(campaignDTO.getCampaignType(), campaignDTO.getChanel());
+            campaign.setCampaignCode(campaignCode);
+            Campaign campaignResult = campaignRepository.save(campaign);
+            campaignId = campaign.getCampaignId();
             //insert sub tables
-            if(campaignDTO.getCurrentTimeMode().equals(1)){
-                timeZoneDialMode.setCompanySiteId(campaignDTO.getCompanySiteId());
-                timeZoneDialMode.setCampaignId(campaign.getCampaignId());
-//                timeZoneDialMode.setHour(campaignDTO.getT);
-
-                timeZoneDialModeRepository.save(timeZoneDialMode);
+            if(campaignDTO.getLstTimeRange().size() > 0) {
+                timeRangeDialModes = campaignDTO.getLstTimeRange();
+                timeRangeDialModes.forEach(item -> {
+                    item.setCampaignId(campaignId);
+                    TimeRangeDialMode timeRangeDialMode = modelMapper.map(item, TimeRangeDialMode.class);
+                    lstTimeRangeModeToInsert.add(timeRangeDialMode);
+                });
+                timeRangeDialModeRepository.saveAll(lstTimeRangeModeToInsert);
             }
-            if(campaignDTO.getCurrentTimeMode().equals(2)) {
-
+            if(campaignDTO.getLstTimeZone().size() > 0) {
+                timeZoneDialModes = campaignDTO.getLstTimeZone();
+                timeZoneDialModes.forEach(item -> {
+                    item.setCampaignId(campaignId);
+                    TimeZoneDialMode timeZoneDialMode = modelMapper.map(item, TimeZoneDialMode.class);
+                    lstTimeZoneModeToInser.add(timeZoneDialMode);
+                });
+                timeZoneDialModeRepository.saveAll(lstTimeZoneModeToInser);
             }
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setErrorCode(Constants.ApiErrorDesc.SUCCESS);
-            resultDTO.setData(campaign);
+            resultDTO.setData(campaignResult);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -97,4 +118,15 @@ public class CampaignServiceImpl implements CampaignService {
 
         return result;
     }
+
+    private String generateCampaignCode(String campaignType, Short chanel) {
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+        String maxIndexStr = campaignRepository.getMaxCampaignIndex();
+        if(maxIndexStr != null) {
+            Long maxIndex = Long.valueOf(maxIndexStr) + 1;
+            String result = campaignType + "_" + String.valueOf(chanel) + "_" + String.valueOf(year) + "_" + maxIndex.toString();
+            return result;
+        }
+        return null;
+    }
 }

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

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -57,5 +58,10 @@ public class CampaignDTO extends BaseDTO {
     private Long numOfNotJoinedCus;
     private Long numOfLockCus;
     private String campaignTypeName;
+    private Date timeRangeStartTime;
+    private String timeZoneHour;
+    private String timeZoneMinute;
+    private List<TimeRangeDialModeDTO> lstTimeRange;
+    private List<TimeZoneDialModeDTO> lstTimeZone;
     private Short agentStatus;
 }

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

@@ -10,7 +10,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class TimeZoneDialModeDTO {
-    private Long timeRangeDialModeId;
+    private Long timeZoneDialModeId;
     private Long companySiteId;
     private String hour;
     private String minute;

src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java

@@ -2,7 +2,11 @@ package com.viettel.campaign.web.rest.controller;
 
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
+<<<<<<< HEAD
 import com.viettel.campaign.web.dto.ContactCustResultDTO;
+=======
+import com.viettel.campaign.web.dto.CampaignDTO;
+>>>>>>> 1877e2709aa93ae5ac71159f8d3c290d0f90981a
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.slf4j.Logger;
@@ -42,14 +46,14 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @RequestMapping(value = "/findByCampaignCode", method = RequestMethod.POST)
+    @RequestMapping(value = "/find-by-campaign-code", method = RequestMethod.POST)
     public ResultDTO findByCampaignCode(@RequestBody CampaignRequestDTO dto) {
         return campaignService.findByCampaignCode(dto);
     }
 
     @RequestMapping(method = RequestMethod.POST)
-    public ResultDTO addNewCampaign(@RequestBody CampaignRequestDTO dto) {
-        return campaignService.findByCampaignCode(dto);
+    public ResultDTO addNewCampaign(@RequestBody CampaignDTO dto) {
+        return campaignService.addNewCampaign(dto);
     }
 
     @GetMapping("/countRecallCustomer")

src/main/resources/sql/campaign-mng/get-max-campaign-code-index.sql

+SELECT CASE WHEN
+            (SELECT COUNT(1) FROM CAMPAIGN) > 0
+       THEN (SELECT SUBSTR((SELECT CAMPAIGN_CODE FROM CAMPAIGN WHERE CAMPAIGN_ID = (SELECT MAX(CAMPAIGN_ID) FROM CAMPAIGN)),
+                    INSTR((SELECT CAMPAIGN_CODE FROM CAMPAIGN WHERE CAMPAIGN_ID = (SELECT MAX(CAMPAIGN_ID) FROM CAMPAIGN)), '_', -1, 1 )+1) FROM DUAL)
+       ELSE '0'
+       END FROM DUAL