anhvd commit change

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

@@ -2,6 +2,8 @@ package com.viettel.campaign.repository.ccms_full;
 
 import com.viettel.campaign.model.ccms_full.ScenarioQuestion;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,4 +15,7 @@ import java.util.List;
 @Repository
 public interface ScenarioQuestionRepository extends JpaRepository<ScenarioQuestion, Long> {
     List<ScenarioQuestion> findScenarioQuestionsByScenarioIdAndCampaignIdAndCompanySiteIdAndStatus(Long scenarioId, Long campaignId, Long companySiteId, Short status);
+
+    @Query(value="SELECT MAX(orderIndex) FROM ScenarioQuestion WHERE scenarioId = :scenarioId AND campaignId = :campaignId AND companySiteId = :companySiteId AND status = 1")
+    Long getMaxOrderId(@Param("scenarioId") Long scenarioId, @Param("campaignId") Long campaignId, @Param("companySiteId") Long companySiteId);
 }

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

@@ -11,4 +11,6 @@ public interface ScenarioQuestionService {
     ResultDTO findByScenarioIdAndCampaignIdAndCompanySiteId(Long scenarioId, Long campaignId, Long companySiteId);
 
     ResultDTO add(ScenarioQuestionDTO scenarioQuestionDTO);
+
+    Long getMaxOrderId(Long scenarioId, Long campaignId, Long companySiteId);
 }

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.Scenario;
 import com.viettel.campaign.model.ccms_full.ScenarioQuestion;
 import com.viettel.campaign.repository.ccms_full.ScenarioQuestionRepository;
@@ -12,6 +13,7 @@ import org.apache.logging.log4j.Logger;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -30,6 +32,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     ModelMapper modelMapper;
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO findByScenarioIdAndCampaignIdAndCompanySiteId(Long scenarioId, Long campaignId, Long companySiteId) {
         ResultDTO resultDTO = new ResultDTO();
         try {
@@ -46,6 +49,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO add(ScenarioQuestionDTO scenarioQuestionDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
@@ -61,4 +65,15 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
         }
         return null;
     }
+
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public Long getMaxOrderId(Long scenarioId, Long campaignId, Long companySiteId) {
+        try {
+            return scenarioQuestionRepository.getMaxOrderId(scenarioId, campaignId, companySiteId);
+        }catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+        }
+        return null;
+    }
 }

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

@@ -6,10 +6,7 @@ import com.viettel.campaign.web.dto.ScenarioQuestionDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
@@ -35,4 +32,10 @@ public class ScenarioQuestionController {
         ResultDTO resultDTO = scenarioQuestionService.add(scenarioQuestionDTO);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
+
+    @RequestMapping(value = "/get-max-orderId", method = RequestMethod.GET)
+    public Long getMaxOrderId(@RequestParam Long scenarioId, @RequestParam Long campaignId, @RequestParam Long companySiteId)
+    {
+        return scenarioQuestionService.getMaxOrderId(scenarioId, campaignId, companySiteId);
+    }
 }