Resolved conflicts
This commit is contained in:
@@ -4,11 +4,14 @@ import java.util.List;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import net.gepafin.tendermanagement.entities.CallEntity;
|
||||
import net.gepafin.tendermanagement.enums.CallStatusEnum;
|
||||
import net.gepafin.tendermanagement.enums.UserStatusEnum;
|
||||
import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1;
|
||||
import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2;
|
||||
import net.gepafin.tendermanagement.model.request.UpdateCallRequestStep1;
|
||||
import net.gepafin.tendermanagement.model.response.CallDetailsResponseBean;
|
||||
import net.gepafin.tendermanagement.model.response.CallResponse;
|
||||
import net.gepafin.tendermanagement.model.response.UserResponseBean;
|
||||
|
||||
public interface CallService {
|
||||
|
||||
@@ -25,4 +28,7 @@ public interface CallService {
|
||||
CallResponse validateCall(Long callId);
|
||||
|
||||
public CallEntity getCallEntityById(Long id);
|
||||
|
||||
CallResponse updateCallStatus(Long callId, CallStatusEnum statusReq);
|
||||
|
||||
}
|
||||
|
||||
@@ -16,5 +16,5 @@ public interface LookUpDataService {
|
||||
|
||||
void deleteLookUpData(Long id);
|
||||
|
||||
List<LookUpDataResponseBean> getLookUpDataByType(LookUpDataTypeEnum type);
|
||||
List<LookUpDataResponseBean> getLookUpDataByType(List<LookUpDataTypeEnum> type);
|
||||
}
|
||||
|
||||
@@ -4,11 +4,14 @@ import jakarta.servlet.http.HttpServletRequest;
|
||||
import net.gepafin.tendermanagement.config.jwt.TokenProvider;
|
||||
import net.gepafin.tendermanagement.dao.CallDao;
|
||||
import net.gepafin.tendermanagement.entities.CallEntity;
|
||||
import net.gepafin.tendermanagement.enums.CallStatusEnum;
|
||||
import net.gepafin.tendermanagement.enums.UserStatusEnum;
|
||||
import net.gepafin.tendermanagement.model.request.CreateCallRequestStep1;
|
||||
import net.gepafin.tendermanagement.model.request.CreateCallRequestStep2;
|
||||
import net.gepafin.tendermanagement.model.request.UpdateCallRequestStep1;
|
||||
import net.gepafin.tendermanagement.model.response.CallDetailsResponseBean;
|
||||
import net.gepafin.tendermanagement.model.response.CallResponse;
|
||||
import net.gepafin.tendermanagement.model.response.UserResponseBean;
|
||||
import net.gepafin.tendermanagement.service.CallService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -71,4 +74,10 @@ public class CallServiceImpl implements CallService {
|
||||
public CallEntity getCallEntityById(Long id){
|
||||
return callDao.getCallEntityById(id);
|
||||
}
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public CallResponse updateCallStatus(Long callId, CallStatusEnum statusReq) {
|
||||
return callDao.updateCallStatus(callId, statusReq);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public class LookUpDataServiceImpl implements LookUpDataService {
|
||||
lookUpDataDao.deleteLookUpData(id);
|
||||
}
|
||||
@Override
|
||||
public List<LookUpDataResponseBean> getLookUpDataByType(LookUpDataTypeEnum type) {
|
||||
return lookUpDataDao.getLookUpDataByType(type);
|
||||
public List<LookUpDataResponseBean> getLookUpDataByType( List<LookUpDataTypeEnum> type) {
|
||||
return lookUpDataDao.getLookUpDataByTypes(type);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user