Resolve Conflicts

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

@@ -12,10 +12,7 @@ import net.gepafin.tendermanagement.entities.HubEntity;
 import net.gepafin.tendermanagement.entities.LoginAttemptEntity;
 import net.gepafin.tendermanagement.entities.SamlResponseEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
-import net.gepafin.tendermanagement.enums.LoginAttemptResultEnum;
-import net.gepafin.tendermanagement.enums.LoginAttemptTypeEnum;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
-import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
+import net.gepafin.tendermanagement.enums.*;
 import net.gepafin.tendermanagement.model.request.LoginReq;
 import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
 import net.gepafin.tendermanagement.model.response.CompanyResponse;
@@ -40,6 +37,7 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.stereotype.Service;
 
@@ -95,15 +93,22 @@ public class AuthenticationService {
 			LoginAttemptEntity loginAttemptEntity = prepareLoginAttemptEntity(loginReq, request);
 		try {
 			log.info("Attempting login for email: {}", loginReq.getEmail());
+			user = userRepository.findUserExcludingRoleType(
+					loginReq.getEmail(),
+					loginReq.getHubUuid(),
+					RoleStatusEnum.ROLE_BENEFICIARY.getValue()
+			).orElseThrow(() -> new ResourceNotFoundException(
+					Status.NOT_FOUND,
+					Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)
+			));
+
 			String emailWithHubId = loginReq.getEmail()+":"+loginReq.getHubUuid();
 			UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
 					emailWithHubId, loginReq.getPassword());
 			Authentication authentication = this.authenticationManager.authenticate(authenticationToken);
 			SecurityContextHolder.getContext().setAuthentication(authentication);
 			log.info("Authentication successful for email: {}", loginReq.getEmail());
-			 user = userRepository.findByEmailIgnoreCaseAndHubUniqueUuid(loginReq.getEmail(), loginReq.getHubUuid())
-					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-							Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
+
 			 loginAttemptEntity.setUserId(user.getId());
 			if (Boolean.FALSE.equals(UserStatusEnum.ACTIVE.getValue().equals(user.getStatus()))) {
 				throw new ResourceNotFoundException(Status.NOT_FOUND,

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

@@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Map;
 
+import net.gepafin.tendermanagement.model.response.VatCheckResponseBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -78,7 +79,7 @@ public class CompanyServiceImpl implements CompanyService {
 	
 	@Override
 	@Transactional(readOnly = true)
-	public Map<String, Object> checkVatNumber(HttpServletRequest request, String vatNumber) {
+	public VatCheckResponseBean checkVatNumber(HttpServletRequest request, String vatNumber) {
 		return vatCheckDao.checkVatNumber(vatNumber);
 	}
 	@Override

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

@@ -4,6 +4,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.dao.DashboardDao;
 import net.gepafin.tendermanagement.entities.CompanyEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
 import net.gepafin.tendermanagement.service.DashboardService;
@@ -32,4 +33,10 @@ public class DashboardServiceImpl implements DashboardService {
         CompanyEntity company = validator.validateUserWithCompany(request, companyId);
         return   dashboardDao.getDashboardWidgetForBeneficiary(userEntity, company);
     }
+
+    @Override
+    public ApplicationWidgetResponseBean getApplicationDetails(HttpServletRequest request) {
+        UserEntity userEntity=validator.validateUser(request);
+        return   dashboardDao.getApplicationDetails(userEntity);
+    }
 }

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

@@ -56,7 +56,7 @@ public class NotificationServiceImpl implements NotificationService {
     }
 
     @Override
-    public List<NotificationResponse> getNotificationsByCompanyIdAndUserId(Long userId, Long companyId) {
-        return notificationDao.getNotificationByCompanyIdAndUserId(userId, companyId);
+    public List<NotificationResponse> getNotificationsByCompanyIdAndUserId(Long userId, Long companyId, List<NotificationEnum> statuses) {
+        return notificationDao.getNotificationByCompanyIdAndUserId(userId, companyId, statuses);
     }
 }

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

@@ -77,8 +77,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String initiatePasswordReset(InitiatePasswordResetReq resetReq) {
-        return userDao.initiatePasswordReset(resetReq);
+    public void initiatePasswordReset(InitiatePasswordResetReq resetReq) {
+        userDao.initiatePasswordReset(resetReq);
     }
 
     @Override