updated code

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

@@ -1,7 +1,6 @@
 package net.gepafin.tendermanagement.service.impl;
 
 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.entities.UserEntity;
@@ -12,12 +11,13 @@ 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.service.CallService;
+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 java.util.List;
-import java.util.Map;
 
 
 @Service
@@ -27,59 +27,61 @@ public class CallServiceImpl implements CallService {
     private CallDao callDao;
 
     @Autowired
-    private TokenProvider tokenProvider;
+    private Validator validator;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CallResponse createCallStep1(HttpServletRequest request, CreateCallRequestStep1 createCallRequest) {
-        Map<String, Object> userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request);
-        return callDao.createCallStep1(createCallRequest, Long.parseLong(userInfo.get("userId").toString()));
+        UserEntity user = validator.validateUser(request);
+        return callDao.createCallStep1(createCallRequest, user);
     }
     
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CallResponse createCallStep2(HttpServletRequest request, Long callId, CreateCallRequestStep2 createCallRequest) {
-        Map<String, Object> userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request);
-        return callDao.createCallStep2(callId, createCallRequest, Long.parseLong(userInfo.get("userId").toString()));
+    	UserEntity user = validator.validateUser(request);
+    	CallEntity call = validator.validateUserWithCall(user, callId);
+        return callDao.createCallStep2(call, createCallRequest, user);
     }
     
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CallResponse updateCallStep1(HttpServletRequest request, Long callId,
     		UpdateCallRequestStep1 updateCallRequest) {
-    	Map<String, Object> userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request);
-    	return callDao.updateCallStep1(callId, updateCallRequest, Long.parseLong(userInfo.get("userId").toString()));
+    	UserEntity user = validator.validateUser(request);
+    	CallEntity call = validator.validateUserWithCall(user, callId);
+    	return callDao.updateCallStep1(call, updateCallRequest, user);
     }
     @Override
     @Transactional(readOnly = true)
-    public CallResponse getCallById(Long callId) {
-        return callDao.getCallById(callId);
+    public CallResponse getCallById(HttpServletRequest request, Long callId) {
+    	UserEntity user = validator.validateUser(request);
+    	CallEntity call = validator.validateUserWithCall(user, callId);
+        return callDao.getCallById(call);
     }
     
     @Override
     @Transactional(readOnly = true)
     public List<CallDetailsResponseBean> getAllCalls(HttpServletRequest request) {
-        Map<String, Object> userInfo= tokenProvider.getUserInfoAndUserIdFromToken(request);
-        UserEntity user=tokenProvider.validateUser(userInfo);
+    	UserEntity user = validator.validateUser(request);
         return callDao.getAllCalls(user);
 
     }
     
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CallResponse validateCallData(Long callId) {
-    	return callDao.validateCallData(callDao.validateCall(callId));
-    }
-
-    @Override
-    public CallEntity getCallEntityById(Long id){
-        return callDao.getCallEntityById(id);
+    public CallResponse validateCallData(HttpServletRequest request, Long callId) {
+    	UserEntity user = validator.validateUser(request);
+    	CallEntity call = validator.validateUserWithCall(user, callId);
+    	return callDao.validateCallData(call);
     }
     
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CallResponse updateCallStatus(HttpServletRequest request, Long callId, CallStatusEnum statusReq) {
-        return callDao.updateCallStatus(callId, statusReq);
+    	UserEntity user = validator.validateUser(request);
+    	CallEntity call = validator.validateUserWithCall(user, callId);
+        return callDao.updateCallStatus(call, statusReq);
 
     }
     
@@ -88,8 +90,15 @@ public class CallServiceImpl implements CallService {
     	return callDao.validateCall(callId);
     }
 
-    @Override
-    public CallEntity validatePublishedCall(Long callId) {
-    return   callDao.validatePublishedCall(callId);
-    }
-    }
+	@Override
+	public CallEntity validatePublishedCall(Long callId) {
+		return callDao.validatePublishedCall(callId);
+	}
+
+	@Override
+	@Transactional(readOnly = true)
+	public byte[] downloadCallDocumentsAsZip(Long callId) {
+		return callDao.downloadCallDocumentsAsZip(callId);
+	}
+	
+}