resolved conflicts

src/main/java/net/gepafin/tendermanagement/service/CompanyService.java

@@ -40,6 +40,7 @@ public interface CompanyService {
 
 	void deleteCompanyDelegation(HttpServletRequest request, Long companyId);
 	UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId);
+	void removeCompanyFromList(HttpServletRequest request, Long companyId);
 
 
 }

src/main/java/net/gepafin/tendermanagement/service/RoleService.java

@@ -1,5 +1,6 @@
 package net.gepafin.tendermanagement.service;
 
+import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.model.request.RoleReq;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 
@@ -15,4 +16,5 @@ public interface RoleService {
     void deleteRole(Long roleId);
 
     List<RoleResponseBean> getAllRoles();
+    RoleEntity validateRole(Long roleId);
 }

src/main/java/net/gepafin/tendermanagement/service/UserService.java

@@ -12,6 +12,8 @@ import net.gepafin.tendermanagement.model.response.UserSamlResponse;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
 
+import java.util.List;
+
 public interface UserService {
 	JWTToken createUser(HttpServletRequest request, String tempToken, UserReq userReq);
 
@@ -43,5 +45,6 @@ public interface UserService {
     UserEntity getUserByBeneficiaryId(Long beneficiaryId);
 
     public UserEntity getUserEntityById(Long userId);
+    List<UserResponseBean> getAllUsers(Long roleId);
 
 }

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

@@ -72,7 +72,7 @@ public class AuthenticationService {
 
 	public JWTToken login(LoginReq loginReq,HttpServletRequest request) {
 		UserEntity user=null;
-		try {
+
 			LoginAttemptEntity loginAttemptEntity = prepareLoginAttemptEntity(loginReq, request);
 			log.info("Attempting login for email: {}", loginReq.getEmail());
 			UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
@@ -89,10 +89,6 @@ public class AuthenticationService {
 						Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG));
 			}
 			createSuccessLoginAttempt(loginAttemptEntity);
-		} catch (Exception e) {
-
-
-		}
 		return getJWTTokenBean(user, loginReq.getRememberMe());
 	}
 

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

@@ -118,4 +118,10 @@ public class CompanyServiceImpl implements CompanyService {
 	public  UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId){
 		return companyDao.getUserWithCompany(userId,companyId);
 	}
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void removeCompanyFromList(HttpServletRequest request, Long companyId) {
+		UserEntity userEntity =validator.validateUser(request);
+		companyDao.removeCompanyFromList(userEntity, companyId);
+	}
 }

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

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.service.impl;
 import java.util.List;
 
 import net.gepafin.tendermanagement.dao.RoleDao;
+import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.model.request.RoleReq;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.service.RoleService;
@@ -46,4 +47,10 @@ public class RoleServiceImpl implements RoleService {
         return roleDao.getAllRoles();
 
     }
+    @Override
+    @Transactional(readOnly = true)
+    public RoleEntity validateRole(Long roleId) {
+        return roleDao.validateRole(roleId);
+
+    }
 }

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 
 
 @Service
@@ -124,4 +125,10 @@ public class UserServiceImpl implements UserService {
         // Calling DAO Function
         return userDao.validateUser(userId);
     }
+    @Override
+    @Transactional(readOnly = true)
+    public List<UserResponseBean> getAllUsers(Long roleId) {
+        // Calling DAO Function
+        return userDao.getAllUsers(roleId);
+    }
 }