diff --git a/src/main/java/com/viettel/campaign/repository/CustomerListRepository.java b/src/main/java/com/viettel/campaign/repository/CustomerListRepository.java index cdb4d474989fb08b3819914d1b5935eb0da439c4..c26936bb3c065707896a74d6b98d8a50fad7ab47 100644 --- a/src/main/java/com/viettel/campaign/repository/CustomerListRepository.java +++ b/src/main/java/com/viettel/campaign/repository/CustomerListRepository.java @@ -1,8 +1,8 @@ package com.viettel.campaign.repository; import com.viettel.campaign.model.CustomerList; -import com.viettel.campaign.web.dto.ResultDTO; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -11,6 +11,7 @@ import java.util.List; public interface CustomerListRepository extends JpaRepository<CustomerList, Long> { CustomerList findCustomerListByCustomerListId(long customerListId); - @Query("delete from CustomerList c where c.customerListId in :ids") - ResultDTO deleteIds(@Param("ids") List<Long> ids); + @Modifying + @Query("delete from CustomerList c where c.customerListId in (:ids)") + int deleteIds(@Param("ids") List<Long> ids); } diff --git a/src/main/java/com/viettel/campaign/service/CustomerListServiceImpl.java b/src/main/java/com/viettel/campaign/service/CustomerListServiceImpl.java index eac8956cebc2858e4b33ddcbc73b88e7a43b6dd1..e778506feb63330721704c08e009da0ea220dcac 100644 --- a/src/main/java/com/viettel/campaign/service/CustomerListServiceImpl.java +++ b/src/main/java/com/viettel/campaign/service/CustomerListServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityManager; import java.util.*; @@ -116,6 +117,7 @@ public class CustomerListServiceImpl implements CustomerListService { return resultDTO; } + @Transactional @Override public ResultDTO deleteIds(List<Long> ids) { ResultDTO resultDTO = new ResultDTO(); @@ -131,6 +133,6 @@ public class CustomerListServiceImpl implements CustomerListService { } catch (Exception e) { e.printStackTrace(); } - return null; + return resultDTO; } } diff --git a/src/main/java/com/viettel/campaign/web/rest/CustomerListController.java b/src/main/java/com/viettel/campaign/web/rest/CustomerListController.java index d398c3ab0705939360367840fa212711e3c2a7c8..1be823fe419c8c55bd0b505fe3d7f9aa5c2e3227 100644 --- a/src/main/java/com/viettel/campaign/web/rest/CustomerListController.java +++ b/src/main/java/com/viettel/campaign/web/rest/CustomerListController.java @@ -1,6 +1,5 @@ package com.viettel.campaign.web.rest; -import com.viettel.campaign.model.CustomerList; import com.viettel.campaign.service.CustomerListService; import com.viettel.campaign.web.dto.CustomerListDTO; import com.viettel.campaign.web.dto.ResultDTO; @@ -11,7 +10,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -79,12 +77,8 @@ public class CustomerListController { @PostMapping("/ids") @ResponseBody - public ResultDTO deleteIds(@RequestBody @Valid List<CustomerListDTO> customerListDTOList) { - List<Long> ids = new ArrayList<>(); + public ResultDTO deleteIds(@RequestBody @Valid List<Long> ids) { ResultDTO result = new ResultDTO(); - for (CustomerListDTO customerList: customerListDTOList) { - ids.add(customerList.getCustomerListId()); - } result = customerListService.deleteIds(ids); return result; }