Merge remote-tracking branch 'origin/master'

src/main/java/com/viettel/campaign/model/ccms_full/ContactQuestResult.java

@@ -3,10 +3,7 @@ package com.viettel.campaign.model.ccms_full;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -16,6 +13,9 @@ import java.io.Serializable;
 @Setter
 public class ContactQuestResult implements Serializable {
     @Id
+    @GeneratedValue(generator = "CONTACT_CUST_RESULT_SEQ")
+    @SequenceGenerator(name = "CONTACT_CUST_RESULT_SEQ", sequenceName = "CONTACT_CUST_RESULT_SEQ", allocationSize = 1)
+    @Basic(optional = false)
     @Column(name = "CONTACT_QUEST_RESULT_ID")
     @NotNull
     private Long contactQuestResultId;

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

 package com.viettel.campaign.repository.ccms_full;
 
+import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.ContactQuestResult;
 import com.viettel.campaign.web.dto.ContactQuestResultDTO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Repository
+@Transactional(DataSourceQualify.CCMS_FULL)
 public interface ContactQuestResultRepository extends JpaRepository<ContactQuestResult, Long> {
     List<ContactQuestResultDTO> findByCompanySiteIdAndCampaignId(Long companySiteId, Long campaignId);
 }

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

@@ -682,9 +682,11 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
+    @Transactional
     public ResultDTO createListContacQuestResult(List<ContactQuestResultDTO> dtoList) {
         ResultDTO resultDTO = new ResultDTO();
         List<ContactQuestResult> lstContactQuestResult = new ArrayList<>();
+
         for (ContactQuestResultDTO item : dtoList) {
             lstContactQuestResult.add(modelMapper.map(item, ContactQuestResult.class));
         }

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

@@ -170,7 +170,7 @@ public class CampaignExecuteController {
     @ResponseBody
     public ResponseEntity<ResultDTO> createListContactQuestResult(@RequestBody List<ContactQuestResultDTO> dtoList) {
         ResultDTO result = null;
-        //ResultDTO result = campaignExecuteService.createListContacQuestResult(dtoList);
+        result = campaignExecuteService.createListContacQuestResult(dtoList);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }