Fixed user issue in contract
This commit is contained in:
@@ -14,6 +14,7 @@ import net.gepafin.tendermanagement.model.response.ApplicationContractResponse;
|
|||||||
import net.gepafin.tendermanagement.model.response.DocumentResponseBean;
|
import net.gepafin.tendermanagement.model.response.DocumentResponseBean;
|
||||||
import net.gepafin.tendermanagement.repositories.ApplicationContractRepository;
|
import net.gepafin.tendermanagement.repositories.ApplicationContractRepository;
|
||||||
import net.gepafin.tendermanagement.repositories.ApplicationRepository;
|
import net.gepafin.tendermanagement.repositories.ApplicationRepository;
|
||||||
|
import net.gepafin.tendermanagement.service.UserService;
|
||||||
import net.gepafin.tendermanagement.util.DateTimeUtil;
|
import net.gepafin.tendermanagement.util.DateTimeUtil;
|
||||||
import net.gepafin.tendermanagement.util.LoggingUtil;
|
import net.gepafin.tendermanagement.util.LoggingUtil;
|
||||||
import net.gepafin.tendermanagement.util.Utils;
|
import net.gepafin.tendermanagement.util.Utils;
|
||||||
@@ -63,6 +64,9 @@ public class ApplicationContractDao {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private NotificationDao notificationDao;
|
private NotificationDao notificationDao;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private UserService userService;
|
||||||
|
|
||||||
public ApplicationContractResponse createApplicationContract(Long applicationId, List<MultipartFile> contractDocuments, ApplicationContractRequest applicationContractRequest, UserEntity user) {
|
public ApplicationContractResponse createApplicationContract(Long applicationId, List<MultipartFile> contractDocuments, ApplicationContractRequest applicationContractRequest, UserEntity user) {
|
||||||
ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationId);
|
ApplicationEntity applicationEntity = applicationDao.validateApplication(applicationId);
|
||||||
|
|
||||||
@@ -84,7 +88,8 @@ public class ApplicationContractDao {
|
|||||||
applicationRepository.save(applicationEntity);
|
applicationRepository.save(applicationEntity);
|
||||||
loggingUtil.addVersionHistory(
|
loggingUtil.addVersionHistory(
|
||||||
VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationData).newData(applicationEntity).build());
|
VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationData).newData(applicationEntity).build());
|
||||||
emailNotificationDao.sendEmailForApplicationContracted(applicationEntity, applicationContractEntity, user);
|
UserEntity userEntity = userService.validateUser(applicationEntity.getUserId());
|
||||||
|
emailNotificationDao.sendEmailForApplicationContracted(applicationEntity, applicationContractEntity, userEntity);
|
||||||
return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, null);
|
return createApplicationContractResponse(applicationContractEntity, documentResponseBeans, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user