Resolved conflicts

src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java

@@ -13,12 +13,14 @@ import net.gepafin.tendermanagement.model.request.ApplicationRequestBean;
 import net.gepafin.tendermanagement.model.response.ApplicationGetResponseBean;
 import net.gepafin.tendermanagement.model.response.ApplicationResponse;
 import net.gepafin.tendermanagement.model.response.ApplicationResponseBean;
+import net.gepafin.tendermanagement.model.response.ApplicationSignedDocumentResponse;
 import net.gepafin.tendermanagement.model.response.NextOrPreviousFormResponse;
 import net.gepafin.tendermanagement.service.ApplicationService;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -64,7 +66,7 @@ public class ApplicationServiceImpl implements ApplicationService {
     @Transactional(rollbackFor = Exception.class)
     public ApplicationResponse createApplication(HttpServletRequest request, Long companyId, ApplicationRequest applicationRequest, Long callId) {
         UserEntity userEntity = validator.validateUser(request);
-        CompanyEntity companyEntity = validator.validateUSerWithCompany(request, companyId);
+        CompanyEntity companyEntity = validator.validateUserWithCompany(request, companyId);
         return applicationDao.createApplicationByCallId(companyEntity, applicationRequest, callId, userEntity);
     }
     
@@ -88,8 +90,26 @@ public class ApplicationServiceImpl implements ApplicationService {
 	public List<ApplicationResponse> getAllApplications(HttpServletRequest request, Long callId, Long companyId) {
 		UserEntity userEntity = validator.validateUser(request);
 		if (companyId != null) {
-			validator.validateUSerWithCompany(request, companyId);
+			validator.validateUserWithCompany(request, companyId);
 		}
 		return applicationDao.getAllApplications(userEntity, callId, companyId);
 	}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ApplicationSignedDocumentResponse uploadSignedDocument(HttpServletRequest request, Long applicationId, MultipartFile file) {
+    	return applicationDao.uploadSignedDocument(request, applicationId, file);
+    }
+    
+    @Override
+    @Transactional(readOnly = true)
+    public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId) {
+    	return applicationDao.getSignedDocument(request, applicationId);
+    }
+    
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteSignedDocument(HttpServletRequest request, Long applicationId) {
+    	applicationDao.deleteSignedDocument(request, applicationId);
+    }
+    
 }