phipd commit

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

@@ -14,6 +14,9 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
 
     CustomerList findByCustomerListCode(String customerListCode);
 
+    @Query("select c from CustomerList c where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id and c.status = 1")
+    List<CustomerList> findAllCustomerList(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
+
     @Modifying
     @Query("update CustomerList c set c.status = 0 where c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")
     int deleteCustomerList(@Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);

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

@@ -393,10 +393,9 @@ public class CustomerServiceImpl implements CustomerService {
     public ResultDTO deleteCustomer(CustomerRequestDTO customerRequestDTO) {
         ResultDTO resultDTO = new ResultDTO();
         List<Long> listId = new ArrayList<>();
-        listId.add(customerRequestDTO.getCustomerId());
         try {
             if (customerRequestDTO != null) {
-
+                listId.add(customerRequestDTO.getCustomerId());
                 if (customerListMappingRepository.findAllCustomerListMapping(listId, customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId()).size() > 0) {
                     // delete
 //                customerRepository.deleteById(customerDTO.getCustomerId());
@@ -405,8 +404,8 @@ public class CustomerServiceImpl implements CustomerService {
                     resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                     resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
                 } else {
-                    resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
-                    resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.DELETE_ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.DELETE_ERROR);
                 }
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -425,10 +424,15 @@ public class CustomerServiceImpl implements CustomerService {
         ResultDTO resultDTO = new ResultDTO();
         try {
             if (customerRequestDTO != null) {
-//                customerRepository.deleteIds(ids);
-                customerListMappingRepository.deleteMappingByCustomerIds(customerRequestDTO.getIds(), customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId());
-                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                if (customerListMappingRepository.findAllCustomerListMapping(customerRequestDTO.getIds(), customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId()).size() > 0) {
+                    //customerRepository.deleteIds(ids);
+                    customerListMappingRepository.deleteMappingByCustomerIds(customerRequestDTO.getIds(), customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId());
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.DELETE_ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.DELETE_ERROR);
+                }
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
@@ -721,17 +725,23 @@ public class CustomerServiceImpl implements CustomerService {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO deleteCustomerList(CustomerListDTO customerListDTO) {
         ResultDTO resultDTO = new ResultDTO();
-
+        List<Long> ids = new ArrayList<>();
+        ids.add(customerListDTO.getCustomerListId());
         try {
             // delete
             if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignCount(customerListDTO.getCustomerListId()))) {
 
-                customerListRepository.deleteCustomerList(customerListDTO.getCustomerListId(), customerListDTO.getCompanySiteId());
+                if (customerListRepository.findAllCustomerList(ids, customerListDTO.getCompanySiteId()).size() > 0) {
+                    customerListRepository.deleteCustomerList(customerListDTO.getCustomerListId(), customerListDTO.getCompanySiteId());
 
-                customerListMappingRepository.deleteMappingByCustomerListId(customerListDTO.getCustomerListId(), customerListDTO.getCompanySiteId());
+                    customerListMappingRepository.deleteMappingByCustomerListId(customerListDTO.getCustomerListId(), customerListDTO.getCompanySiteId());
 
-                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.DELETE_ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.DELETE_ERROR);
+                }
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
@@ -751,12 +761,17 @@ public class CustomerServiceImpl implements CustomerService {
         try {
             if (customerRequestDTO != null) {
                 if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignIdsCount(customerRequestDTO.getIds()))) {
-                    customerListRepository.deleteCustomerListIds(customerRequestDTO.getIds(), customerRequestDTO.getCompanySiteId());
+                    if (customerListRepository.findAllCustomerList(customerRequestDTO.getIds(), customerRequestDTO.getCompanySiteId()).size() > 0) {
+                        customerListRepository.deleteCustomerListIds(customerRequestDTO.getIds(), customerRequestDTO.getCompanySiteId());
 
-                    customerListMappingRepository.deleteMappingByCustomerListIds(customerRequestDTO.getIds(), customerRequestDTO.getCompanySiteId());
+                        customerListMappingRepository.deleteMappingByCustomerListIds(customerRequestDTO.getIds(), customerRequestDTO.getCompanySiteId());
 
-                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                        resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                        resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                    } else {
+                        resultDTO.setErrorCode(Constants.ApiErrorCode.DELETE_ERROR);
+                        resultDTO.setDescription(Constants.ApiErrorDesc.DELETE_ERROR);
+                    }
                 } else {
                     resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                     resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);

src/main/java/com/viettel/campaign/utils/Constants.java

@@ -7,10 +7,12 @@ public class Constants {
     public interface ApiErrorCode {
         String ERROR = "01";
         String SUCCESS = "00";
+        String DELETE_ERROR = "02";
     }
     public interface ApiErrorDesc {
         String ERROR = "ERROR";
         String SUCCESS = "SUCCESS";
+        String DELETE_ERROR = "DELETE_ERROR";
     }
     public interface FileType {
         String pdf = "pdf";