Resolve Conflicts

pom.xml

@@ -245,6 +245,12 @@
 			<artifactId>reactor-netty</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>2.15.2</version>
+		</dependency>
+
 	</dependencies>
 <repositories>
     <repository>

src/main/java/net/gepafin/tendermanagement/TendermanagementApplication.java

@@ -23,7 +23,8 @@ public class TendermanagementApplication {
 
 		@Override
 		public void addCorsMappings(CorsRegistry registry) {
-			registry.addMapping("/**").allowedOrigins("http://localhost:3000").allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD").allowCredentials(true);
+			registry.addMapping("/**").allowedOrigins("http://localhost:3000", "http://127.0.0.1:5500", "https://bandi-staging.memento.credit", "https://bandi.gepafin.it")
+					.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD").allowCredentials(true);
 		}
 	}
 

src/main/java/net/gepafin/tendermanagement/config/JacksonConfig.java

@@ -0,0 +1,20 @@
+package net.gepafin.tendermanagement.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class JacksonConfig {
+
+    @Bean
+    public ObjectMapper objectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(new JavaTimeModule());
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        return mapper;
+    }
+}
+

src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java

@@ -63,7 +63,7 @@ public class SamlSuccessHandler implements AuthenticationSuccessHandler {
 			Saml2AuthenticatedPrincipal principal = (Saml2AuthenticatedPrincipal) samlAuth.getPrincipal();
 
 			Map<String, List<Object>> userAttributes = principal.getAttributes();
-			String token = Utils.generateSecureToken();
+			String token = Utils.generateSecureSamlToken();
 			logger.info("SAML User Attributes: " + userAttributes);
 			
 			  // Extracting raw SAML response

src/main/java/net/gepafin/tendermanagement/config/SecurityConfig.java

@@ -12,6 +12,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -97,7 +98,9 @@ public class SecurityConfig {
     }
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        http.csrf(AbstractHttpConfigurer::disable).authorizeHttpRequests(auth -> auth
+        http.csrf(AbstractHttpConfigurer::disable).headers(headers -> headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin)
+                        .contentSecurityPolicy(csp -> csp.policyDirectives("frame-ancestors 'self' https://bandi-staging.memento.credit https://bandi.gepafin.it")))
+                .authorizeHttpRequests(auth -> auth
                 // Allow public access to the login endpoints
                 .requestMatchers("/v1/user/login").permitAll() // JWT-based login
                 .requestMatchers("/v1/user").permitAll() // User registration

src/main/java/net/gepafin/tendermanagement/config/WebSocketConfig.java

@@ -33,7 +33,7 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
 
-        registry.addEndpoint("/wss").setAllowedOrigins("http://localhost:3000", "http://127.0.0.1:5500/", "https://bandi-staging.memento.credit/**", "https://bandi.gepafin.it/**")
+        registry.addEndpoint("/wss").setAllowedOrigins("http://localhost:3000", "http://127.0.0.1:5500", "https://bandi-staging.memento.credit", "https://bandi.gepafin.it")
                 .withSockJS();
     }
 }

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -305,6 +305,7 @@ public class GepafinConstant {
     public static final String USER_ID = "userId";
     public static final String LOGIN_ATTEMPT_ID = "loginAttemptId";
     public static final String USER_ACTION_ID = "userActionId";
+    public static final String RESET_PASSWORD_URL_FORMAT = "/reset-password?token=%s&email=%s";
     public static final String VALID_VATNUMBER_MSG = "valid.vatnumber.message";
     public static final String ATLEAST_ONE_ID_REQUIRED="atleast.one.id.required";
 
@@ -354,5 +355,10 @@ public class GepafinConstant {
     public static final String NOTIFICATION_DELETED_SUCCESSFULLY="notification.deleted.successfully";
     public static final String NOTIFICATION_UPDATED_SUCCESSFULLY="notification.updated.successfully";
     public static final String USER_WITH_COMPANY_NOT_FOUND = "user.with.company.not.found";
+
+    //action log response
+    public static final String STATUS_CODE_STRING = "statusCode";
+    public static final String GET_STATUS_CODE_STRING = "status";
+    public static final String MESSAGE_STRING = "message";
 }
 

src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java

@@ -306,7 +306,7 @@ public class ApplicationAmendmentRequestDao {
         ApplicationAmendmentRequestEntity applicationAmendment = saveApplicationAmendmentRequestEntity(applicationAmendmentRequestEntity, null, VersionActionTypeEnum.INSERT);
         String evaluationStatusType = applicationEvaluationEntity.getStatus();
         if (Boolean.FALSE.equals(evaluationStatusType.equals((ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue())))){
-            applicationEvaluationEntity.setStatus(ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue());
+//            applicationEvaluationEntity.setStatus(ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue());
 
             //Set Status
         applicationEvaluationEntity.setStatus(ApplicationEvaluationStatusTypeEnum.SOCCORSO.getValue());

src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java

@@ -295,7 +295,12 @@ public class ApplicationDao {
         log.info("Deleting application with ID: {}", id);
 
         ApplicationEntity applicationEntity= validateApplication(id);
-        
+        if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.DRAFT.getValue().equals(applicationEntity.getStatus()))) {
+            throw new CustomValidationException(
+                    Status.VALIDATION_ERROR,
+                    Translator.toLocale(GepafinConstant.APPLICATION_NOT_IN_DRAFT_STATUS)
+            );
+        }
         ApplicationEntity oldApplicationDataEntity = Utils.getClonedEntityForData(applicationEntity);
         
         validator.validateUserWithCompany(request, applicationEntity.getCompanyId());

src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java

@@ -24,7 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1800,6 +1802,11 @@ public class ApplicationEvaluationDao {
                 existingEntity.setClosingDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
                 assignedApplicationsEntity.setStatus(AssignedApplicationEnum.CLOSE.getValue());
             }
+            if (existingEntity.getStartDate() != null && existingEntity.getClosingDate() != null) {
+                long activeDays = ChronoUnit.DAYS.between(existingEntity.getStartDate(), existingEntity.getClosingDate());
+                activeDays -= existingEntity.getSuspendedDays() != null ? existingEntity.getSuspendedDays() : 0;
+                existingEntity.setActiveDays(activeDays);
+            }
             entity = applicationEvaluationRepository.save(existingEntity);
             assignedApplicationsRepository.save(assignedApplicationsEntity);
 

src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java

@@ -189,15 +189,15 @@ public class CompanyDao {
 		setIfUpdated(companyEntity::getCountry, companyEntity::setCountry, companyRequest.getCountry());
 		setIfUpdated(companyEntity::getNumberOfEmployees, companyEntity::setNumberOfEmployees, companyRequest.getNumberOfEmployees());
 		setIfUpdated(companyEntity::getAnnualRevenue, companyEntity::setAnnualRevenue, companyRequest.getAnnualRevenue());
-		
+//
-		if(StringUtils.isNotBlank(companyRequest.getVatNumber())) {
+//		if(StringUtils.isNotBlank(companyRequest.getVatNumber())) {
-			CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), userEntity.getHub().getId());
+//			CompanyEntity existingCompany = companyRepository.findByVatNumberAndHubId(companyRequest.getVatNumber(), userEntity.getHub().getId());
-			if(existingCompany!=null){
+//			if(existingCompany!=null){
-				throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.VATNUMBER_ALREADY_EXISTS));
+//				throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.VATNUMBER_ALREADY_EXISTS));
-			}
+//			}
-			companyEntity.setVatNumber(companyRequest.getVatNumber());
+//			companyEntity.setVatNumber(companyRequest.getVatNumber());
-
+//
-		}
+//		}
 		companyRepository.save(companyEntity);
 
 		/** This code is responsible for adding a version history log for the "Update company" operation. **/

src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java

@@ -4,6 +4,7 @@ import net.gepafin.tendermanagement.entities.*;
 import net.gepafin.tendermanagement.enums.CallStatusEnum;
 import net.gepafin.tendermanagement.enums.RoleStatusEnum;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;
+import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.Widget1;
 import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
@@ -13,6 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -37,6 +42,9 @@ public class DashboardDao {
 	private BeneficiaryPreferredCallRepository beneficiaryPreferredCallRepository;
 
 
+	@Autowired
+	private ApplicationEvaluationRepository applicationEvaluationRepository;
+
 	public SuperAdminWidgetResponseBean getDashboardWidget(UserEntity requestedUserEntity) {
 		SuperAdminWidgetResponseBean widgetResponseBean = new SuperAdminWidgetResponseBean();
 		widgetResponseBean.setWidget1(createWidget1(requestedUserEntity));
@@ -133,4 +141,70 @@ public class DashboardDao {
 		}
 		return beneficiaryWidgetResponseBean;
 	}
+
+	public ApplicationWidgetResponseBean getApplicationDetails(UserEntity userEntity) {
+		ApplicationWidgetResponseBean applicationWidgetResponseBean = initializeResponseBean();
+
+		Long hubId = userEntity.getHub().getId();
+
+		setApplicationCounts(applicationWidgetResponseBean, hubId);
+		calculateEvaluationAverageTime(applicationWidgetResponseBean, hubId);
+
+		return applicationWidgetResponseBean;
+	}
+
+	private ApplicationWidgetResponseBean initializeResponseBean() {
+		return ApplicationWidgetResponseBean.builder()
+				.numberOfApplication(0L)
+				.numberOfAssignedApplication(0L)
+				.numberOfAcceptedApplication(0L)
+				.numberOfApplicationInAmendmentState(0L)
+				.numberOfDueApplication(0L)
+				.evaluationAverageTime(BigDecimal.ZERO)
+				.build();
+	}
+
+	private void setApplicationCounts(ApplicationWidgetResponseBean responseBean, Long hubId) {
+		Long activeApplications = applicationRepository.countApplicationsByHubId(hubId);
+		if (activeApplications != null) {
+			responseBean.setNumberOfApplication(activeApplications);
+		}
+
+		Long assignedApplications = applicationRepository.countAssignedApplicationsByHubId(hubId);
+		if (assignedApplications != null) {
+			responseBean.setNumberOfAssignedApplication(assignedApplications);
+		}
+
+		Long approvedApplications = applicationRepository.countApprovedApplicationsByHubId(hubId);
+		if (approvedApplications != null) {
+			responseBean.setNumberOfAcceptedApplication(approvedApplications);
+		}
+
+		Long soccorsoApplications = applicationRepository.countSoccorsoApplicationsByHubId(hubId);
+		if (soccorsoApplications != null) {
+			responseBean.setNumberOfApplicationInAmendmentState(soccorsoApplications);
+		}
+	}
+
+	private void calculateEvaluationAverageTime(ApplicationWidgetResponseBean responseBean, Long hubId) {
+		List<Long> applicationIds = applicationRepository.findApplicationIdsByHubId(hubId);
+
+		if (Boolean.FALSE.equals(applicationIds.isEmpty())) {
+			BigDecimal averageTime = applicationEvaluationRepository.findAverageEvaluationTimeByApplicationIds(applicationIds);
+			responseBean.setEvaluationAverageTime(averageTime != null ? averageTime : BigDecimal.ZERO);
+		}
+		LocalDate twoDaysLater = LocalDate.now().plusDays(2);
+
+		Long dueApplications = applicationEvaluationRepository.countDueApplicationsBetween(
+				applicationIds,
+				LocalDate.now(),
+				twoDaysLater
+		);
+
+		if (dueApplications != null) {
+			responseBean.setNumberOfDueApplication(dueApplications);
+		}
+	}
+
+
 }

src/main/java/net/gepafin/tendermanagement/dao/UserDao.java

@@ -6,21 +6,15 @@ import net.gepafin.tendermanagement.config.SamlSuccessHandler;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.*;
-import net.gepafin.tendermanagement.enums.RoleStatusEnum;
+import net.gepafin.tendermanagement.enums.*;
-import net.gepafin.tendermanagement.enums.UserActionContextEnum;
-import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
-import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 import net.gepafin.tendermanagement.model.request.*;
-import net.gepafin.tendermanagement.model.response.CompanyResponse;
+import net.gepafin.tendermanagement.model.response.*;
-import net.gepafin.tendermanagement.model.response.RoleResponseBean;
-import net.gepafin.tendermanagement.model.response.UserSamlResponse;
-import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;
 import net.gepafin.tendermanagement.repositories.BeneficiaryRepository;
 import net.gepafin.tendermanagement.repositories.UserRepository;
 import net.gepafin.tendermanagement.service.HubService;
 import net.gepafin.tendermanagement.service.RoleService;
+import net.gepafin.tendermanagement.service.SystemEmailTemplatesService;
 import net.gepafin.tendermanagement.service.impl.AuthenticationService;
 import net.gepafin.tendermanagement.util.LoggingUtil;
 import net.gepafin.tendermanagement.util.Utils;
@@ -39,6 +33,7 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.List;
 
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
@@ -90,6 +85,18 @@ public class UserDao {
     @Autowired
     private HttpServletRequest request;
 
+    @Autowired
+    private SystemEmailTemplatesService systemEmailTemplatesService;
+    
+    @Autowired
+    private EmailLogDao emailLogDao;
+
+    @Autowired
+    private EmailNotificationDao emailNotificationDao;
+
+    @Value("${fe.base.url}")
+    private String feBaseUrl;
+
     public JWTToken createUser(HttpServletRequest request, String tempToken, UserReq userReq) {
 
         if (StringUtils.isEmpty(userReq.getHubUuid())) {
@@ -120,9 +127,35 @@ public class UserDao {
         /** This code is responsible for adding a version history log for the "Create user" operation. **/
         loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).newData(userEntity).build());
 
+        if(beneficiary == null){
+            sendEmailToOnboardingUser(userEntity);
+        }
         return token;
     }
-    
+        public void sendEmailToOnboardingUser(UserEntity userEntity){
+            SystemEmailTemplateResponse emailTemplate = systemEmailTemplatesService.retrieveTemplateByTypeAndCall(
+                    SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.USER_ONBOARDING, userEntity.getHub(), null);
+            EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(emailTemplate.getEmailScenario(), RecipientTypeEnum.USER, userEntity.getId(), userEntity.getEmail(),
+                    userEntity.getId(), null, null, null);
+            String firstName = userEntity.getFirstName() != null ? userEntity.getFirstName() : "";
+            String lastName = userEntity.getLastName() != null ? userEntity.getLastName() : "";
+            String userName = String.join(" ", firstName, lastName).trim();
+            String subject = Utils.replacePlaceholders(emailTemplate.getSubject(), Map.of(
+                    "{{user_name}}", userName
+            ));
+            String body = Utils.replacePlaceholders(emailTemplate.getHtmlContent(), Map.of(
+                    "{{user_name}}", userName,
+                    "{{user_email}}", userEntity.getEmail()
+            ));
+
+            emailNotificationDao.sendMail(
+                    userEntity.getHub().getId(),
+                    subject,
+                    body,
+                    List.of(userEntity.getEmail()),
+                    emailLogRequest
+            );
+        }
 	private BeneficiaryEntity createBeneficiary(RoleEntity roleEntity, UserReq userReq, HubEntity hub) {
 		BeneficiaryEntity beneficiaryEntity = null;
 		if (RoleStatusEnum.ROLE_BENEFICIARY.getValue().equals(roleEntity.getRoleType())) {
@@ -157,6 +190,8 @@ public class UserDao {
 			userReq.setHubUuid(userEntity.getHub().getUniqueUuid());
 		}else {
 			samlSuccessHandler.validateToken(tempToken, userReq.getCodiceFiscale(), userReq.getHubUuid());
+			RoleEntity roleEntity = roleDao.getRoleByType(RoleStatusEnum.ROLE_BENEFICIARY);
+			userReq.setRoleId(roleEntity.getId());
 		}
 		
 		if (Boolean.FALSE.equals(Utils.isValidEmail(userReq.getEmail()))) {
@@ -164,12 +199,10 @@ public class UserDao {
 					Translator.toLocale(GepafinConstant.VALIDATE_EMAIL));
 		}
 		log.info("Creating user with email: {}", userReq.getEmail());
-		if (userRepository.existsByEmailIgnoreCaseAndHubUniqueUuid(userReq.getEmail(), userReq.getHubUuid())) {
+        RoleEntity roleEntity = roleService.validateRole(userReq.getRoleId());
-			log.error("User creation failed: Email {} already exists", userReq.getEmail());
+        validateDuplicateEmail(userReq.getEmail(), userReq.getHubUuid(), roleEntity.getRoleType());
-			throw new CustomValidationException(Status.VALIDATION_ERROR,
+
-					Translator.toLocale(GepafinConstant.EMAIL_ALREADY_EXISTS));
+        if (Boolean.FALSE.equals(StringUtils.isEmpty(userReq.getCodiceFiscale()))
-		}
-		if (Boolean.FALSE.equals(StringUtils.isEmpty(userReq.getCodiceFiscale()))
 				&& userRepository.existsByBeneficiaryCodiceFiscaleAndHubId(userReq.getCodiceFiscale(), hub.getId())) {
 			log.error("User creation failed: CodiceFiscale {} already exists", userReq.getCodiceFiscale());
 			throw new CustomValidationException(Status.VALIDATION_ERROR,
@@ -192,7 +225,30 @@ public class UserDao {
 		}
 	}
 
-	private void validatePassword(String password, String confirmPassword, String tempToken) {
+    private void validateDuplicateEmail(String email, String hubUuid, String roleType) {
+        String beneficiaryRoleType = RoleStatusEnum.ROLE_BENEFICIARY.getValue();
+
+        if (beneficiaryRoleType.equals(roleType)) {
+            Boolean beneficiaryExistsInHub = userRepository.existsByEmailIgnoreCaseForBeneficiaries(
+                    email, hubUuid, beneficiaryRoleType);
+
+            if (Boolean.TRUE.equals(beneficiaryExistsInHub)) {
+                throw new CustomValidationException(Status.VALIDATION_ERROR,
+                        Translator.toLocale(GepafinConstant.EMAIL_ALREADY_EXISTS));
+            }
+        } else {
+            Boolean existsForNonBeneficiaries = userRepository.existsByEmailIgnoreCaseForNonBeneficiaries(
+                    email, hubUuid, beneficiaryRoleType);
+
+            if (Boolean.TRUE.equals(existsForNonBeneficiaries)) {
+                throw new CustomValidationException(Status.VALIDATION_ERROR,
+                        Translator.toLocale(GepafinConstant.EMAIL_ALREADY_EXISTS));
+            }
+        }
+    }
+
+
+    private void validatePassword(String password, String confirmPassword, String tempToken) {
         if (StringUtils.isEmpty(password) || StringUtils.isEmpty(confirmPassword)) {
         	if(tempToken == null) {        		
         		throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.VALIDATE_PASSWORD));
@@ -267,7 +323,7 @@ public class UserDao {
 			userEntity.setAddress(userReq.getAddress());
 			userEntity.setPhoneNumber(userReq.getPhoneNumber());
 			userEntity.setDateOfBirth(userReq.getDateOfBirth());
-		}
+        }
         return userRepository.save(userEntity);
     }
 
@@ -366,25 +422,83 @@ public class UserDao {
         return user;
     }
 
-    public String initiatePasswordReset(InitiatePasswordResetReq resetReq) {
+    public void initiatePasswordReset(InitiatePasswordResetReq resetReq) {
-		UserEntity user = userRepository
+        UserEntity user = userRepository.findUserExcludingRoleType(
-				.findByEmailIgnoreCaseAndHubUniqueUuid(resetReq.getEmail(), resetReq.getHubUuid())
+                resetReq.getEmail(),
-				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
+                resetReq.getHubUuid(),
-						Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
+                RoleStatusEnum.ROLE_BENEFICIARY.getValue()
+        ).orElseThrow(() -> new ResourceNotFoundException(
+                Status.NOT_FOUND,
+                Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)
+        ));
 
+        UserEntity oldUserEntity = Utils.getClonedEntityForData(user);
         String token = Utils.generateSecureToken();
         user.setResetPasswordToken(token);
         userRepository.save(user);
+
+        /** This code is responsible for adding a version history log for the "Initiate password reset request" operation **/
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldUserEntity).newData(user).build());
+
         log.info("Password reset token generated for user: {}", resetReq.getEmail());
-        return token;
+
+        sendResetPasswordTokenEmail(user, token);
+    }
+    public void sendResetPasswordTokenEmail(UserEntity user, String token) {
+
+        SystemEmailTemplateResponse emailTemplate = systemEmailTemplatesService.retrieveTemplateByTypeAndCall(
+                SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.PASSWORD_RESET, user.getHub(), null);
+        String redirectUrl = feBaseUrl;
+        if (Boolean.FALSE.equals(StringUtils.isEmpty(user.getHub().getDomainName()))) {
+            redirectUrl = user.getHub().getDomainName();
+        }
+
+        EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(
+                emailTemplate.getEmailScenario(),
+                RecipientTypeEnum.USER,
+                user.getId(),
+                user.getEmail(),
+                user.getId(),
+                null,
+                null,
+                null);
+        redirectUrl = String.format(
+                user.getHub().getDomainName() + GepafinConstant.RESET_PASSWORD_URL_FORMAT,
+                token,
+                user.getEmail()
+        );
+        String firstName = user.getFirstName() != null ? user.getFirstName() : "";
+        String lastName = user.getLastName() != null ? user.getLastName() : "";
+        String userName = String.join(" ", firstName, lastName).trim();
+        String subject = Utils.replacePlaceholders(emailTemplate.getSubject(), Map.of(
+                "{{user_name}}", userName
+        ));
+        String body = Utils.replacePlaceholders(emailTemplate.getHtmlContent(), Map.of(
+                "{{user_name}}", userName,
+                "{{reset_password_link}}", redirectUrl
+        ));
+        emailNotificationDao.sendMail(
+                user.getHub().getId(),
+                subject,
+                body,
+                List.of(user.getEmail()),
+                emailLogRequest
+        );
+
+        log.info("Password reset token email sent to: {}", user.getEmail());
     }
 
     public Boolean resetPassword(ResetPasswordReq resetPasswordReq) {
-    	UserEntity user = userRepository
+        UserEntity user = userRepository.findUserExcludingRoleType(
-				.findByEmailIgnoreCaseAndHubUniqueUuid(resetPasswordReq.getEmail(), resetPasswordReq.getHubUuid())
+                resetPasswordReq.getEmail(),
-				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
+                resetPasswordReq.getHubUuid(),
-						Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
+                RoleStatusEnum.ROLE_BENEFICIARY.getValue()
-    	
+        ).orElseThrow(() -> new ResourceNotFoundException(
+                Status.NOT_FOUND,
+                Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)
+        ));
+
+        UserEntity oldUserEntity = Utils.getClonedEntityForData(user);
         if (!resetPasswordReq.getNewPassword().equals(resetPasswordReq.getConfirmPassword())) {
             log.info("User creation failed: Passwords do not match for email {}", user.getEmail());
             throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.PASSWORD_DOESNT_MATCH));
@@ -399,25 +513,36 @@ public class UserDao {
         user.setPassword(passwordEncoder.encode(resetPasswordReq.getNewPassword()));
         user.setResetPasswordToken(null);
         userRepository.save(user);
+
+        /** This code is responsible for adding a version history log for the "Reset Password " operation **/
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldUserEntity).newData(user).build());
+
         log.info("Password successfully reset for user: {}", resetPasswordReq.getEmail());
         return true;
     }
 
-    public Boolean changePassword(UserEntity userEntity, ChangePasswordRequest request) {
+    public Boolean changePassword(UserEntity userEntity, ChangePasswordRequest changePasswordRequest) {
     	UserEntity user = userRepository
-				.findByEmailIgnoreCaseAndHubUniqueUuid(request.getEmail(), userEntity.getHub().getUniqueUuid())
+				.findUserExcludingRoleType(changePasswordRequest.getEmail(), userEntity.getHub().getUniqueUuid(),RoleStatusEnum.ROLE_BENEFICIARY.getValue())
-				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
+                .orElseThrow(() -> new ResourceNotFoundException(
-						Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
+                        Status.NOT_FOUND,
-    	
+                        Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)
-        if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
+                ));
+        UserEntity oldUserEntity = Utils.getClonedEntityForData(userEntity);
+        if (!passwordEncoder.matches(changePasswordRequest.getPassword(), user.getPassword())) {
             throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.CURRENT_PASSWORD_INCORRECT));
         }
-        if (!request.getNewPassword().equals(request.getConfirmPassword())) {
+        if (!changePasswordRequest.getNewPassword().equals(changePasswordRequest.getConfirmPassword())) {
             log.info("User creation failed: Passwords do not match for email {}", user.getEmail());
             throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.PASSWORD_DOESNT_MATCH));
         }
-        user.setPassword(passwordEncoder.encode(request.getNewPassword()));
+        user.setPassword(passwordEncoder.encode(changePasswordRequest.getNewPassword()));
         userRepository.save(user);
+
+        /** This code is responsible for adding a version history log for the "Change user password" operation **/
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldUserEntity).newData(user).build());
+
+
         return true;
     }
     public void logout(HttpServletRequest request, HttpServletResponse response) {

src/main/java/net/gepafin/tendermanagement/dao/VatCheckDao.java

@@ -68,25 +68,46 @@ public class VatCheckDao {
             if (response.getStatusCode() == HttpStatus.OK && response.hasBody()) {
                 log.info("Successfully checked vat number");
                 Map<String, Object> responseMap = response.getBody();
-                if (responseMap != null && responseMap.containsKey("data")) {
+                processValidResponse(responseMap, vatCheckResponseBean);
-                    responseBody = (Map<String, Object>) responseMap.get("data");
-                    responseBody.remove("timestamp_creation");
-                    responseBody.remove("timestamp_last_update");
-                    responseBody.remove("data_iscrizione");
-                    responseBody.remove("id");
-                    Map<String, Object> data = new LinkedHashMap<>();
-                    data.put("data", responseBody);
-                    vatCheckResponseBean.setValid(true);
-                    vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.VALID_VATNUMBER_MSG));
-                    vatCheckResponseBean.setVatCheckResponse(data);
-                }
             }
         } catch (FeignException ex) {
-            log.error("Exception occurred while checking vat number: {0}", ex);
+                if (ex.status() == 406) {
-            Utils.callException(ex.status(), ex);
+                    try {
-        }
+                        Map<String, Object> errorResponse = Utils.parseErrorResponse(ex.contentUTF8());
+                        processValidResponse(errorResponse, vatCheckResponseBean);
+                    } catch (Exception parseEx) {
+                        log.error("Failed to parse 406 error response: {0}", parseEx);
+                    }
+                } else {
+                    log.error("Exception occurred while checking vat number: {0}", ex);
+                    Utils.callException(ex.status(), ex);
+                }
+            }
         return vatCheckResponseBean;
     }
+    public static void processValidResponse(Map<String, Object> responseMap, VatCheckResponseBean vatCheckResponseBean) {
+        if (responseMap != null && responseMap.containsKey("data")) {
+            Map<String, Object> responseBody = (Map<String, Object>) responseMap.get("data");
+
+            if (responseBody != null) {
+                responseBody.remove("timestamp_creation");
+                responseBody.remove("timestamp_last_update");
+                responseBody.remove("data_iscrizione");
+                responseBody.remove("id");
+
+                Map<String, Object> data = new LinkedHashMap<>();
+                data.put("data", responseBody);
+
+                vatCheckResponseBean.setValid(true);
+                vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.VALID_VATNUMBER_MSG));
+                vatCheckResponseBean.setVatCheckResponse(data);
+            } else {
+                vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+            }
+        } else {
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+        }
+    }
 
 	public VatCheckResponseBean checkVatNumber(String vatNumber) {
 		try {

src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java

@@ -65,4 +65,7 @@ public class ApplicationEvaluationEntity extends BaseEntity{
     @Column(name = "CLOSING_DATE")
     private LocalDateTime closingDate;
 
+    @Column(name = "ACTIVE_DAYS")
+    private Long activeDays;
+
 }

src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java

@@ -47,6 +47,8 @@ public class SystemEmailTemplatesEntity extends BaseEntity {
 		INADMISSIBILITY_NOTIFICATION_DUE_TO_FAILURE("INADMISSIBILITY_NOTIFICATION_DUE_TO_FAILURE"),
 		ADMISSIBILITY_NOTIFICATION("ADMISSIBILITY_NOTIFICATION"),
 		AMENDMENT_REMINDER("AMENDMENT_REMINDER"),
+		USER_ONBOARDING("USER_ONBOARDING"),
+		PASSWORD_RESET("PASSWORD_RESET"),
 		INADMISSIBILITY_TEMPLATE("INADMISSIBILITY_NOTIFICATION");
 		
 		private String value;

src/main/java/net/gepafin/tendermanagement/enums/EmailScenarioTypeEnum.java

@@ -9,6 +9,8 @@ public enum EmailScenarioTypeEnum {
     APPLICATION_AMENDMENT_EXPIRED("APPLICATION_AMENDMENT_EXPIRED"),
     APPLICATION_AMENDMENT_REMINDER("APPLICATION_AMENDMENT_REMINDER"),
     APPLICATION_APPROVED("APPLICATION_APPROVED"),
+    USER_CREATION("USER_CREATION"),
+    PASSWORD_RESET_REQUEST("PASSWORD_RESET_REQUEST"),
     APPLICATION_REJECTED("APPLICATION_REJECTED");
 
     private final String value;

src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java

@@ -24,7 +24,9 @@ public enum UserActionContextEnum {
     VALIDATE_EXISTING_USER_WITH_SPID_TOKEN("VALIDATE_EXISTING_USER_WITH_SPID_TOKEN"),
     GET_VALID_USER_DETAILS("GET_VALID_USER_DETAILS"),
     GET_ALL_USERS_BY_ROLE("GET_ALL_USERS_BY_ROLE"),
-
+    CHANGE_USER_PASSWORD("CHANGE_USER_PASSWORD"),
+    INITIATE_PASSWORD_RESET_REQUEST("INITIATE_PASSWORD_RESET_REQUEST"),
+    RESET_USER_PASSWORD("RESET_USER_PASSWORD"),
     /** application action context **/
     GET_APPLICATION("GET_APPLICATION"),
     CREATE_UPDATE_APPLICATION_FORM("CREATE_UPDATE_APPLICATION_FORM"),
@@ -134,6 +136,7 @@ public enum UserActionContextEnum {
     /** Dashboard action context **/
     GET_DASHBOARD_WIDGET_FOR_SUPER_ADMIN("GET_DASHBOARD_WIDGET_FOR_SUPER_ADMIN"),
     GET_DASHBOARD_WIDGET_FOR_BENEFICIARY("GET_DASHBOARD_WIDGET_FOR_BENEFICIARY"),
+    GET_APPLICATION_DETAILS("GET_APPLICATION_DETAILS"),
 
     /** Evaluation criteria action context **/
     GET_EVALUATION_CRITERIA("GET_EVALUATION_CRITERIA"),

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationWidgetResponseBean.java

@@ -0,0 +1,23 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+public class ApplicationWidgetResponseBean {
+
+    private Long numberOfApplication;
+
+    private Long numberOfAssignedApplication;
+
+    private Long numberOfAcceptedApplication;
+
+    private Long numberOfApplicationInAmendmentState;
+
+    private Long numberOfDueApplication;
+
+    private BigDecimal evaluationAverageTime;
+}

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java

@@ -8,6 +8,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -38,4 +40,27 @@ public interface ApplicationEvaluationRepository extends JpaRepository<Applicati
             "AND a.status NOT IN ('CLOSE', 'EXPIRED') " +
             "AND a.endDate BETWEEN :startTime AND :endTime")
     List<ApplicationEvaluationEntity> findExpiringBetween(LocalDateTime startTime, LocalDateTime endTime);
+//    @Query("SELECT AVG(DATEDIFF(DAY, e.startDate, e.endDate)) FROM ApplicationEvaluationEntity e WHERE e.applicationId IN :applicationIds AND e.startDate IS NOT NULL AND e.endDate IS NOT NULL AND e.isDeleted = false ")
+    @Query("""
+        SELECT AVG(e.activeDays)
+        FROM ApplicationEvaluationEntity e 
+        WHERE e.applicationId IN :applicationIds 
+        AND e.activeDays IS NOT NULL 
+        AND e.isDeleted = false
+        """)
+    BigDecimal findAverageEvaluationTimeByApplicationIds(@Param("applicationIds") List<Long> applicationIds);
+    @Query("""
+    SELECT COUNT(e) 
+    FROM ApplicationEvaluationEntity e
+    WHERE e.applicationId IN :applicationIds
+      AND FUNCTION('DATE', e.endDate) BETWEEN :startDate AND :endDate
+      AND e.isDeleted = false
+""")
+    Long countDueApplicationsBetween(
+            @Param("applicationIds") List<Long> applicationIds,
+            @Param("startDate") LocalDate startDate,
+            @Param("endDate") LocalDate endDate
+    );
+
+
 }

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java

@@ -44,4 +44,20 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 
 	@Query("SELECT a.call.id FROM ApplicationEntity a WHERE a.id = :id AND a.isDeleted = false")
 	Long findCallIdById(@Param("id") Long id);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.status = 'SUBMIT' AND a.isDeleted = false")
+	public Long countApplicationsByHubId(@Param("hubId") Long hubId);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.status = 'EVALUATION' AND a.isDeleted = false")
+	Long countAssignedApplicationsByHubId(@Param("hubId") Long hubId);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.status = 'APPROVED' AND a.isDeleted = false")
+	Long countApprovedApplicationsByHubId(@Param("hubId") Long hubId);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.status = 'SOCCORSO' AND a.isDeleted = false")
+	Long countSoccorsoApplicationsByHubId(@Param("hubId") Long hubId);
+	@Query("SELECT a.id FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.isDeleted = false")
+	List<Long> findApplicationIdsByHubId(@Param("hubId") Long hubId);
+
+
 }

src/main/java/net/gepafin/tendermanagement/repositories/UserActionsRepository.java

@@ -6,5 +6,5 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public interface UserActionsRepository extends JpaRepository<UserActionEntity, Long> {
-    UserActionEntity findUserActionById(Long id);
+    UserActionEntity findUserActionByIdAndIsDeletedFalse(Long id);
 }

src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java

@@ -2,6 +2,8 @@ package net.gepafin.tendermanagement.repositories;
 
 import net.gepafin.tendermanagement.entities.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,9 +14,16 @@ public interface UserRepository extends JpaRepository<UserEntity, Long> {
 	
     UserEntity findByBeneficiaryId(Long beneficiaryId);
 
-    Optional<UserEntity> findByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid);
+//    Optional<UserEntity> findByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid);
 
-	boolean existsByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid);
+	@Query("SELECT u FROM UserEntity u WHERE LOWER(u.email) = LOWER(:email) AND u.hub.uniqueUuid = :hubUuid AND u.roleEntity.roleType <> :roleType")
+	Optional<UserEntity> findUserExcludingRoleType(
+			@Param("email") String email,
+			@Param("hubUuid") String hubUuid,
+			@Param("roleType") String roleType
+	);
+
+//	boolean existsByEmailIgnoreCaseAndHubUniqueUuid(String email, String hubUuid);
 
 	List<UserEntity> findByRoleEntityIdInAndHubId(List<Long> roleIds, Long hubId);
 
@@ -24,7 +33,28 @@ public interface UserRepository extends JpaRepository<UserEntity, Long> {
 
 	Optional<UserEntity> findByBeneficiaryCodiceFiscaleAndHubId(String codiceFiscale, Long hubId);
 
-	boolean existsByBeneficiaryCodiceFiscaleAndHubId(String codiceFiscale, Long hubId);
+//	Boolean existsByBeneficiaryCodiceFiscaleAndHubId(String codiceFiscale, Long hubId);
+
+    @Query("SELECT COUNT(u) > 0 " +
+            "FROM UserEntity u " +
+            "WHERE LOWER(u.email) = LOWER(:email) " +
+            "AND u.hub.uniqueUuid = :hubUuid " +
+            "AND u.roleEntity.roleType <> :beneficiaryRoleType")
+    Boolean existsByEmailIgnoreCaseForNonBeneficiaries(@Param("email") String email,
+                                                       @Param("hubUuid") String hubUuid,
+                                                       @Param("beneficiaryRoleType") String beneficiaryRoleType);
+
+    @Query("SELECT COUNT(u) > 0 " +
+            "FROM UserEntity u " +
+            "WHERE LOWER(u.email) = LOWER(:email) " +
+            "AND u.hub.uniqueUuid = :hubUuid " +
+            "AND u.roleEntity.roleType = :beneficiaryRoleType")
+    Boolean existsByEmailIgnoreCaseForBeneficiaries(@Param("email") String email,
+                                                    @Param("hubUuid") String hubUuid,
+                                                    @Param("beneficiaryRoleType") String beneficiaryRoleType);
+
+
+    boolean existsByBeneficiaryCodiceFiscaleAndHubId(String codiceFiscale, Long hubId);
 
 	List<UserEntity> findByRoleEntity_RoleTypeAndHubId(String roleType, Long hubId);
 

src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java

@@ -3,10 +3,26 @@ package net.gepafin.tendermanagement.scheduler;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.dao.ApplicationAmendmentRequestDao;
 import net.gepafin.tendermanagement.dao.NotificationDao;
-import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import net.gepafin.tendermanagement.entities.ApplicationEntity;
-import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
+import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
+import net.gepafin.tendermanagement.repositories.ApplicationRepository;
+import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
+import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
@@ -18,25 +34,9 @@ import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
 import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
 import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository;
-import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
-import net.gepafin.tendermanagement.repositories.ApplicationRepository;
-import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
-import net.gepafin.tendermanagement.service.ApplicationService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
 import net.gepafin.tendermanagement.util.LoggingUtil;
 import net.gepafin.tendermanagement.util.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Component
 public class ApplicationAmendmentScheduler {
@@ -60,9 +60,6 @@ public class ApplicationAmendmentScheduler {
 	@Autowired
 	private AssignedApplicationsRepository assignedApplicationsRepository;
 
-	@Autowired
-	private ApplicationService applicationService;
-
 	@Autowired
 	private ApplicationRepository applicationRepository;
 

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

@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.service;
 
 import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
 import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
 
@@ -9,5 +10,5 @@ public interface DashboardService {
     public SuperAdminWidgetResponseBean getDashboardWidgetForSuperAdmin(HttpServletRequest request);
 
     public BeneficiaryWidgetResponseBean getDashboardWidgetForBeneficiary(HttpServletRequest request, Long companyId);
-
+    public ApplicationWidgetResponseBean getApplicationDetails(HttpServletRequest request);
 }

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

@@ -27,7 +27,7 @@ public interface UserService {
 
 	UserEntity validateUser(Long userId);
     
-    String initiatePasswordReset(InitiatePasswordResetReq resetReq);
+    void initiatePasswordReset(InitiatePasswordResetReq resetReq);
 
     Boolean resetPassword(ResetPasswordReq resetPasswordReq);
 

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.*;
-import net.gepafin.tendermanagement.enums.LoginAttemptTypeEnum;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
-import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
 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/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/UserServiceImpl.java

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

src/main/java/net/gepafin/tendermanagement/util/LoggingUtil.java

@@ -41,6 +41,8 @@ public class LoggingUtil {
     @Autowired
     private TokenProvider tokenProvider;
 
+    private static final ThreadLocal<Long> userActionIdHolder = new ThreadLocal<>();
+
     public UserActionEntity logUserAction(UserActionRequest userActionRequest) {
         UserActionEntity userAction = new UserActionEntity();
         try {
@@ -83,12 +85,22 @@ public class LoggingUtil {
             userAction.setResponse(response);
             userActionsRepository.save(userAction);
             userActionRequest.getRequest().setAttribute(GepafinConstant.USER_ACTION_ID, userAction.getId());
+            userActionIdHolder.set(userAction.getId());
         } catch (Exception e) {
             log.error("Error logging user action: {}", e.getMessage(), e);
         }
         return userAction;
     }
 
+    public Long getUserActionId() {
+        return userActionIdHolder.get();
+    }
+
+    public void clearUserActionId() {
+        userActionIdHolder.remove();
+        log.info("UserActionId cleared from ThreadLocal");
+    }
+
     private String normalizeUrl(String url) {
 
         url = url.replaceAll("(?<!:)//+", "/");
@@ -263,6 +275,7 @@ public class LoggingUtil {
             userAction.setResponse(response);
             userActionsRepository.save(userAction);
             userActionRequest.getRequest().setAttribute(GepafinConstant.USER_ACTION_ID, userAction.getId());
+
         } catch (Exception e) {
             log.error("Error logging user action: {}", e.getMessage(), e);
         }
@@ -323,10 +336,35 @@ public class LoggingUtil {
 
     public UserActionEntity getUserActionLogById(Long id) {
 
-        return userActionsRepository.findUserActionById(id);
+        return userActionsRepository.findUserActionByIdAndIsDeletedFalse(id);
     }
     public List<VersionHistoryEntity> getVersionHistoryLogById(Long id) {
 
         return versionHistoryRepository.findVersionHistoryByUserActionId(id);
     }
+
+    public void updateUserActionWithError(Long userActionId, String errorDetails) {
+        if (userActionId == null) {
+            return;
+        }
+
+        UserActionEntity userAction = userActionsRepository.findUserActionByIdAndIsDeletedFalse(userActionId);
+        if (userAction != null) {
+            userAction.setResponse(errorDetails);
+            userActionsRepository.save(userAction);
+        }
+    }
+
+    public void updateUserActionWithResponse(Long userActionId, String response) {
+        if (userActionId == null) {
+            return;
+        }
+
+        UserActionEntity userAction = userActionsRepository.findUserActionByIdAndIsDeletedFalse(userActionId);
+        if (userAction != null) {
+            userAction.setResponse(response);
+            userActionsRepository.save(userAction);
+        }
+    }
+
 }

src/main/java/net/gepafin/tendermanagement/util/UserActionAspect.java

@@ -0,0 +1,148 @@
+package net.gepafin.tendermanagement.util;
+
+import com.amazonaws.services.alexaforbusiness.model.UnauthorizedException;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import net.gepafin.tendermanagement.constants.GepafinConstant;
+import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
+import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
+import net.gepafin.tendermanagement.web.rest.api.errors.Status;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.AccessDeniedException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Aspect
+@Component
+@Slf4j
+public class UserActionAspect {
+
+    @Autowired
+    private LoggingUtil loggingUtil;
+
+    @Around("execution(public * net.gepafin.tendermanagement.web.rest.api.impl..*(..))")
+    public Object logApiResponse(ProceedingJoinPoint joinPoint) throws Throwable {
+
+        Object result;
+
+        HttpServletRequest request = getRequestFromContext();
+        try {
+            Long userActionId = getUserActionIdFromRequest(request);
+
+            if (userActionId != null) {
+                request.setAttribute(GepafinConstant.USER_ACTION_ID, userActionId);
+                log.info("Stored userActionId in RequestContext: {}", userActionId);
+            } else {
+                userActionId = loggingUtil.getUserActionId();
+                if (userActionId != null) {
+                    request.setAttribute(GepafinConstant.USER_ACTION_ID, userActionId);
+                }
+            }
+
+            result = joinPoint.proceed();
+
+            if (result instanceof ResponseEntity<?>) {
+                Long storedUserActionId = (Long) request.getAttribute(GepafinConstant.USER_ACTION_ID);
+                handleSuccessResponse((ResponseEntity<?>) result, storedUserActionId == null ? userActionId : storedUserActionId);
+            }
+        } catch (Exception ex) {
+            log.error("Exception occurred: ", ex);
+            handleError(ex, getUserActionIdFromRequest(request));
+            throw ex;
+        } finally {
+            loggingUtil.clearUserActionId();
+        }
+
+        return result;
+    }
+
+    private void handleSuccessResponse(ResponseEntity<?> responseEntity, Long userActionId) {
+
+        if (userActionId != null) {
+            Map<String, Object> responseWithUserAction = new LinkedHashMap<>();
+            responseWithUserAction.put(GepafinConstant.STATUS_CODE_STRING, responseEntity.getStatusCode().value());
+
+            // Log and update user action
+            loggingUtil.updateUserActionWithResponse(userActionId, Utils.convertMapIntoJsonString(responseWithUserAction));
+            log.info("Updated userActionId with response: {}", userActionId);
+        }
+    }
+
+    private void handleError(Throwable ex, Long userActionId) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+
+        HttpStatus status = getStatusCodeFromException(ex);
+        log.info("Status Code received from exception : {}", status);
+        String errorMessage = ex.getMessage();
+
+        Map<String, Object> errorResponse = new LinkedHashMap<>();
+        errorResponse.put(GepafinConstant.STATUS_CODE_STRING, status.value());
+        errorResponse.put(GepafinConstant.GET_STATUS_CODE_STRING, status);
+        errorResponse.put(GepafinConstant.MESSAGE_STRING, errorMessage);
+
+        if (userActionId != null) {
+            String errorDetails = Utils.convertMapIntoJsonString(errorResponse);
+            loggingUtil.updateUserActionWithError(userActionId, errorDetails);
+            log.info("Updated userActionId with error details: {}", userActionId);
+        }
+    }
+
+    private HttpServletRequest getRequestFromContext() {
+
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        return attributes != null ? attributes.getRequest() : null;
+    }
+
+    private Long getUserActionIdFromRequest(HttpServletRequest request) {
+
+        if (request != null) {
+            Object userActionIdAttr = request.getAttribute(GepafinConstant.USER_ACTION_ID);
+            return userActionIdAttr != null ? Long.valueOf(userActionIdAttr.toString()) : null;
+        }
+        return null;
+    }
+
+    private HttpStatus getStatusCodeFromException(Throwable ex) {
+
+        if (ex instanceof ResourceNotFoundException) {
+            return HttpStatus.NOT_FOUND;
+        }
+
+        if (ex instanceof ResponseStatusException responseStatusException) {
+            return (HttpStatus) responseStatusException.getStatusCode();
+        }
+
+        if (ex instanceof CustomValidationException) {
+            return HttpStatus.BAD_REQUEST;
+        }
+
+        if (ex instanceof EntityNotFoundException) {
+            return HttpStatus.NOT_FOUND;
+        }
+        if (ex instanceof IllegalArgumentException || ex instanceof MissingServletRequestParameterException || ex instanceof MethodArgumentNotValidException) {
+            return HttpStatus.BAD_REQUEST;
+        }
+        if (ex instanceof AccessDeniedException) {
+            return HttpStatus.FORBIDDEN;
+        }
+        if (ex instanceof UnauthorizedException) {
+            return HttpStatus.UNAUTHORIZED;
+        }
+
+        return HttpStatus.INTERNAL_SERVER_ERROR;
+    }
+}

src/main/java/net/gepafin/tendermanagement/util/Utils.java

@@ -24,6 +24,7 @@ import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
@@ -153,6 +154,9 @@ public class Utils {
 	public static String convertMapIntoJsonString(Map<String, Object> map) {
 		try {
 			ObjectMapper mapper = new ObjectMapper();
+			mapper.registerModule(new JavaTimeModule());
+			mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+			mapper.enable(SerializationFeature.INDENT_OUTPUT);
 			if (MapUtils.isNotEmpty(map)) {
 				return mapper.writeValueAsString(map);
 			}
@@ -206,7 +210,7 @@ public class Utils {
         return new String(decodedBytes, StandardCharsets.UTF_8);
     }
 
-	public static String generateSecureToken() {
+	public static String generateSecureSamlToken() {
         SecureRandom secureRandom = new SecureRandom();
         byte[] tokenBytes = new byte[24];
         secureRandom.nextBytes(tokenBytes);
@@ -214,7 +218,14 @@ public class Utils {
         log.debug("Generated secure token: {}", token);
         return token;
     }
-
+	public static String generateSecureToken() {
+		SecureRandom secureRandom = new SecureRandom();
+		byte[] tokenBytes = new byte[5];
+		secureRandom.nextBytes(tokenBytes);
+		String token = Base64.getUrlEncoder().withoutPadding().encodeToString(tokenBytes);
+		log.debug("Generated secure token: {}", token);
+		return token;
+	}
 	public static Map<String, List<Object>> convertStringIntoMap(String jsonString) {
 		try {
 			return mapper.readValue(jsonString, new TypeReference<Map<String, List<Object>>>() {
@@ -690,4 +701,22 @@ public class Utils {
 	public static String createChannelForUserAndCompany(Long userId, Long companyId) {
 		return GepafinConstant.COMMON_SINGLE_CHANNEL_PREFIX + userId + GepafinConstant.COMPANY_PREFIX + companyId;
 	}
+
+	public static Map<String, Object> parseErrorResponse(String responseBody) {
+		if (StringUtils.isBlank(responseBody)) {
+			return defaultErrorResponse();
+		}
+		try {
+			return mapper.readValue(responseBody, Map.class);
+		} catch (Exception e) {
+			log.error("Failed to parse error response: {}", e.getMessage(), e);
+			return defaultErrorResponse();
+		}
+	}
+
+	private static Map<String, Object> defaultErrorResponse() {
+		return Collections.singletonMap("message", Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+	}
+
+
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/DashboardApi.java

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
+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.model.util.Response;
@@ -46,7 +47,19 @@ public interface DashboardApi {
             produces = { "application/json" })
     ResponseEntity<Response<BeneficiaryWidgetResponseBean>> getDashboardWidgetForBeneficiary(HttpServletRequest request,
     		@Parameter(description = "The company id", required = true) @PathVariable(value = "companyId", required = true) Long companyId);
-    
 
+    @Operation(summary = "Api to get Application details",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @GetMapping(value = "/application",
+            produces = { "application/json" })
+    @PreAuthorize("hasRole('ROLE_SUPER_ADMIN') || hasRole('ROLE_INSTRUCTOR_MANAGER')")
+    ResponseEntity<Response<ApplicationWidgetResponseBean>> getApplicationDetails(HttpServletRequest request);
 
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java

@@ -119,7 +119,7 @@ public interface UserApi {
     @RequestMapping(value = "/reset-password/initiate",
             produces = {"application/json"},
             method = RequestMethod.POST)
-    ResponseEntity<Response<String>> initiatePasswordReset(
+    ResponseEntity<Response<Void>> initiatePasswordReset(HttpServletRequest request,
             @Parameter(description = "Initiate password reset request object", required = true) @Valid @RequestBody InitiatePasswordResetReq initiatePasswordResetReq);
 
     @Operation(summary = "Api to reset password",
@@ -132,7 +132,7 @@ public interface UserApi {
     @RequestMapping(value = "/reset-password",
             produces = {"application/json"},
             method = RequestMethod.POST)
-    ResponseEntity<Response<Boolean>> resetPassword(
+    ResponseEntity<Response<Boolean>> resetPassword(HttpServletRequest request,
             @Parameter(description = "Reset password request object", required = true) @Valid @RequestBody ResetPasswordReq resetPasswordReq);
     @Operation(summary = "Api to change user password",
             responses = {

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/CustomUserDetailsService.java

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.web.rest.api.impl;
 
 import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.enums.RoleStatusEnum;
 import net.gepafin.tendermanagement.repositories.UserRepository;
 
 import org.slf4j.Logger;
@@ -35,7 +36,10 @@ public class CustomUserDetailsService implements UserDetailsService {
         String email = loginParts[0];
         String hubId = loginParts[1];
 
-		UserEntity user = userRepository.findByEmailIgnoreCaseAndHubUniqueUuid(email, hubId)
+        UserEntity user = userRepository.findUserExcludingRoleType(
+                email,
+                hubId,
+                RoleStatusEnum.ROLE_BENEFICIARY.getValue())
 				.orElseThrow(
 		                () -> new UsernameNotFoundException("User " + email + " was not found in the database"));
         return createSpringSecurityUser(user);

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DashboardApiController.java

@@ -6,6 +6,7 @@ import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
 import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
+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.model.util.Response;
@@ -49,5 +50,14 @@ public class DashboardApiController implements DashboardApi {
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(new Response<>(widgetResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY)));
     }
+    @Override
+    public ResponseEntity<Response<ApplicationWidgetResponseBean>> getApplicationDetails(HttpServletRequest request) {
 
+        /** This code is responsible for creating user action logs for the "Get complete application page" operation. **/
+        loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW).actionContext(UserActionContextEnum.GET_APPLICATION_DETAILS).build());
+
+        ApplicationWidgetResponseBean widgetResponseBean= dashboardService.getApplicationDetails(request);
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new Response<>(widgetResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY)));
+    }
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java

@@ -125,20 +125,35 @@ public class UserApiController implements UserApi {
     @Override
     public ResponseEntity<Response<Boolean>> changePassword(HttpServletRequest httpServletRequest, @Valid @RequestBody ChangePasswordRequest request) {
         log.info("Change Password attempt for email: {}", request.getEmail());
+
+        /** This code is responsible for "Change user password" operation. **/
+        loggingUtil.logUserAction(UserActionRequest.builder().request(httpServletRequest).actionType(UserActionLogsEnum.UPDATE)
+                .actionContext(UserActionContextEnum.CHANGE_USER_PASSWORD).build());
+
         userService.changePassword(httpServletRequest, request);
         return ResponseEntity.ok(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.SUCCESS_PASSWORD_CHANGED)));
     }
     @Override
-    public ResponseEntity<Response<String>> initiatePasswordReset(InitiatePasswordResetReq request) {
+    public ResponseEntity<Response<Void>> initiatePasswordReset(HttpServletRequest httpServletRequest,InitiatePasswordResetReq request) {
         log.info("Initiating password reset for email: {}", request.getEmail());
-        String resetToken = userService.initiatePasswordReset(request);
+
+        /** This code is responsible for "Initiating Password Reset Request" operation. **/
+        loggingUtil.logUserAction(UserActionRequest.builder().request(httpServletRequest).actionType(UserActionLogsEnum.UPDATE)
+                .actionContext(UserActionContextEnum.INITIATE_PASSWORD_RESET_REQUEST).build());
+
+        userService.initiatePasswordReset(request);
         log.info("Password reset token generated for email: {}", request.getEmail());
-        return ResponseEntity.ok(new Response<>(resetToken, Status.SUCCESS, Translator.toLocale(GepafinConstant.RESET_PASSWORD_INITIATED)));
+        return ResponseEntity.ok(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.RESET_PASSWORD_INITIATED)));
     }
 
     @Override
-    public ResponseEntity<Response<Boolean>> resetPassword(ResetPasswordReq request) {
+    public ResponseEntity<Response<Boolean>> resetPassword(HttpServletRequest httpServletRequest,ResetPasswordReq request) {
         log.info("Resetting password for username: {}", request.getEmail());
+
+        /** This code is responsible for "Resest user password" operation. **/
+        loggingUtil.logUserAction(UserActionRequest.builder().request(httpServletRequest).actionType(UserActionLogsEnum.UPDATE)
+                .actionContext(UserActionContextEnum.RESET_USER_PASSWORD).build());
+
         Boolean success = userService.resetPassword(request);
         if (success) {
             log.info("Password reset successfully for username: {}", request.getEmail());

src/main/resources/application-production.properties

@@ -24,7 +24,7 @@ default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
 # TEST DEPLOY Configuration
 
 #Login to Odessa, Appointment Creation, Upload document Configuration
-appointment.base.url=https://demo.galileonetwork.it/gateway/rest
+appointment.base.url=https://prd.galileonetwork.it/gateway/rest
 appointment.portal.user=UtenzaAPIPortal@621
 appointment.portal.password=u13nzaAP1P0rtal
 appointment.portal.source=GEPAFINPORTAL

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -1961,6 +1961,17 @@
             </column>
         </addColumn>
     </changeSet>
+    <changeSet id="02-12-2024_1" author="Rajesh Khore">
+        <sql dbms="postgresql">select
+            setval('gepafin_schema.system_email_template_id_seq', (select
+            max(id)+1
+            from gepafin_schema.system_email_template), false)
+        </sql>
+        <sqlFile dbms="postgresql"
+                 path="db/dump/insert_system_email_template_for_user_28_11_2024.sql"/>
+        <sqlFile dbms="postgresql"
+                 path="db/dump/insert_system_email_template_for_reset_password_28_11_2024.sql"/>
+    </changeSet>
     <changeSet id="03-12-2024_1" author="Piyush">
         <sqlFile dbms="postgresql"
                  path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_03_12_2024_1.sql"/>
@@ -1970,19 +1981,20 @@
         <sqlFile dbms="postgresql"
                  path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/>
     </changeSet>
-<!--    <changeSet id="19-12-2024_1" author="Nisha Kashyap">-->
+
-<!--    <addColumn tableName="USER_WITH_COMPANY">-->
+    <changeSet id="19-12-2024_4" author="Nisha Kashyap">
-<!--        <column name="contact_name" type="VARCHAR(255)"/>-->
+	    <addColumn tableName="USER_WITH_COMPANY">
-<!--        <column name="contact_email" type="VARCHAR(255)"/>-->
+	        <column name="contact_name" type="VARCHAR(255)"/>
-<!--        <column name="PEC" type="VARCHAR(255)"/>-->
+	        <column name="contact_email" type="VARCHAR(255)"/>
-<!--        <column name="EMAIL" type="VARCHAR(255)"/>-->
+	        <column name="PEC" type="VARCHAR(255)"/>
-<!--        <column name="JSON" type="TEXT"/>-->
+	        <column name="EMAIL" type="VARCHAR(255)"/>
-<!--    </addColumn>-->
+	        <column name="JSON" type="TEXT"/>
-<!--        <dropColumn tableName="COMPANY" columnName="contact_name"/>-->
+	    </addColumn>
-<!--        <dropColumn tableName="COMPANY" columnName="contact_email"/>-->
+	        <dropColumn tableName="COMPANY" columnName="contact_name"/>
-<!--        <dropColumn tableName="COMPANY" columnName="PEC"/>-->
+	        <dropColumn tableName="COMPANY" columnName="contact_email"/>
-<!--        <dropColumn tableName="COMPANY" columnName="EMAIL"/>-->
+	        <dropColumn tableName="COMPANY" columnName="PEC"/>
-<!--</changeSet>-->
+	        <dropColumn tableName="COMPANY" columnName="EMAIL"/>
+	</changeSet>
 
     <changeSet id="04-12-2024_3" author="Piyush">
         <addColumn tableName="hub">
@@ -2042,7 +2054,7 @@
         </addColumn>
     </changeSet>
 
-    <changeSet id="19-12-2024_1" author="Nisha kashyap">
+    <changeSet id="19-12-2024_1" author="Nisha Kashyap">
         <!-- Insert data for Intructor manager role -->
         <insert tableName="role">
             <column name="role_name" value="instructor manager"/>
@@ -2081,6 +2093,11 @@
             <column name="closing_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
         </addColumn>
     </changeSet>
+    <changeSet id="03-01-2025_RK_191100" author="Rajesh Khore">
+        <addColumn tableName="application_evaluation">
+            <column name="ACTIVE_DAYS" type="INTEGER"></column>
+        </addColumn>
+    </changeSet>
 
     <changeSet id="13-12-2024_1" author="Piyush Kag">
         <createTable tableName="notification">
@@ -2139,6 +2156,13 @@
         <sqlFile dbms="postgresql"
                  path="db/dump/update_json_template_for_notification_31_12_2024.sql"/>
     </changeSet>
+    <changeSet id="03-01-2024_NK_125210" author="Nisha Kashyap">
+        <sql>
+            TRUNCATE TABLE FORM_FIELD RESTART IDENTITY;
+        </sql>
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_form_field_data_03_01_2025.sql"/>
+    </changeSet>
 
     <changeSet id="07-01-2025_NK_063910" author="Nisha Kashyap">
         <createTable tableName="expiration_config">

src/main/resources/db/dump/insert_system_email_template_for_reset_password_28_11_2024.sql

@@ -0,0 +1,60 @@
+INSERT INTO gepafin_schema.system_email_template
+(template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date,email_scenario)
+VALUES
+(
+ 'Password Reset Link Email (Italian)',
+ 'PASSWORD_RESET',
+ '<table border="0" style="background: #f5f5f5; text-align: center; width: 100%; max-width: 600px; padding: 20px;" align="center" cellpadding="0" cellspacing="0">
+      <tbody>
+        <tr>
+          <td>
+            <table>
+              <thead>
+                <tr>
+                  <th>
+                    <p style="font-weight: 600; color: #000; font-family: open sans; font-size: 26px; margin: 0; padding-bottom: 20px;">Richiesta di Reimpostazione Password</p>
+                  </th>
+                </tr>
+              </thead>
+              <tbody align="left">
+                <tr>
+                  <td>
+                    <p style="margin: 8px 0px;">Gentile {{user_name}},</p>
+                    <p style="margin: 8px 0px;">Hai richiesto di reimpostare la tua password.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <p style="margin: 8px 0px;">Cordiali saluti,</p>
+                    <p style="margin: 8px 0px;"><strong>{{email_signature}}</strong></p>
+                  </td>
+                </tr>
+                   <tr>
+                                  <td style="padding-top: 20px;">
+                                    <!-- Button added here -->
+                                    <a href="{{reset_password_link}}" style="background-color: #007bff;
+                                        color: #fff;
+                                        font-family: open sans;
+                                        border-radius: 5px;
+                                        box-sizing: border-box;
+                                        cursor: pointer;
+                                        font-size: 14px;
+                                        font-weight: bold;
+                                        width: 100%;
+                                        max-width: 280px;
+                                        padding: 12px 25px;">Reimposta la Password</a>
+                                  </td>
+                                </tr>
+              </tbody>
+            </table>
+          </td>
+        </tr>
+      </tbody>
+    </table>',
+ 'Richiesta di Reimpostazione Password',
+ NULL,
+ true,
+ false,
+ CURRENT_TIMESTAMP,
+ CURRENT_TIMESTAMP,
+ 'PASSWORD_RESET_REQUEST');

src/main/resources/db/dump/insert_system_email_template_for_user_28_11_2024.sql

@@ -0,0 +1,29 @@
+INSERT INTO gepafin_schema.system_email_template
+(template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date, email_scenario)
+VALUES
+(
+    'Welcome Email for New User',
+    'USER_ONBOARDING',
+    '<html>
+        <body style="font-family: Arial, sans-serif; color: #000; line-height: 1.6;">
+            <div style="padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;">
+                <p><strong>Benvenuto!</strong></p>
+                <p>Ciao {{user_name}},</p>
+                <p>Siamo lieti di averti con noi. Di seguito trovi alcune informazioni utili:</p>
+                <ul>
+                    <li><strong>Nome Utente:</strong> {{user_email}}</li>
+                </ul>
+                <p>Per accedere, utilizza il tuo indirizzo email registrato. Se hai bisogno di supporto, non esitare a contattarci.</p>
+                <p>Distinti saluti,</p>
+                <p><strong>{{email_signature}}</strong></p>
+            </div>
+        </body>
+    </html>',
+    'Welcome - {{user_name}}',
+    NULL,
+    true,
+    false,
+    CURRENT_TIMESTAMP,
+    CURRENT_TIMESTAMP,
+    'USER_CREATION'
+);

src/main/resources/db/dump/update_form_field_data_03_01_2025.sql

@@ -0,0 +1,101 @@
+INSERT INTO FORM_FIELD (SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
+VALUES
+(1, 'textinput', 'Testo Breve', 'Per risposte concise (nomi, titoli, brevi descrizioni)',
+    '[{"name": "label", "value": "Testo Breve"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(2, 'textarea', 'Testo Lungo', 'Campo di testo esteso per paragrafi, descrizioni, proposte',
+    '[{"name": "label", "value": "Testo Lungo"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(3, 'wysiwyg', 'Campo di Testo Formattato', 'Editor avanzato per testo con formattazione',
+    '[{"name": "label", "value": "Testo Formattato"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": false, "minLength": null, "maxLength": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(4, 'numberinput', 'Campo Numerico', 'Per l''inserimento di valori numerici (quantità, importi, percentuali)',
+    '[{"name": "label", "value": "Numero"}, {"name": "placeholder", "value": "0"}, {"name": "step", "value": "0"},{"name": "isRequestedAmount","value": false}]',
+    '{"isRequired": false, "min": null, "max": null, "pattern": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(5, 'radio', 'Scelta Singola', 'Gruppo di opzioni per selezione singola',
+    '[{"name": "label", "value": "Scelta Singola"}, {"name": "options", "value": []}]',
+    '{"isRequired": false, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(6, 'select', 'Menu a Tendina', 'Selezione da opzioni predefinite',
+    '[{"name": "label", "value": "Menu a Tendina"}, {"name": "options", "value": []}]',
+    '{"isRequired": false, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(7, 'checkboxes', 'Scelta Multipla', 'Gruppo di opzioni per selezione singola o multipla',
+    '[{"name": "label", "value": "Scelta Multipla"}, {"name": "options", "value": []}]',
+    '{"isRequired": false, "min": null, "max": null, "custom": null}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(8, 'switch', 'Casella di Spunta', 'Per selezioni binarie, accettazioni, conferme',
+    '[{"name": "label", "value": "Casella di Spunta"}]',
+    '{"isRequired": false}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(9, 'datepicker', 'Data', 'Selezione di data',
+    '[{"name": "label", "value": "Data"}]',
+    '{"isRequired": false}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(10, 'fileupload', 'Caricamento File', 'Per l''upload di documenti o immagini',
+    '[{"name": "label", "value": "Caricamento File"}, {"name": "mime", "value": []}]',
+    '{"isRequired": false, "maxSize": 100000}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(11, 'textinput', 'Campo Partita IVA', 'Specifico per l''inserimento del numero di Partita IVA',
+    '[{"name": "label", "value": "Partita IVA"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": true, "custom": "isPIVA"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(12, 'textinput', 'Campo Codice Fiscale','Specifico per l''inserimento del Codice Fiscale italiano per persone fisiche e giuridiche',
+    '[{"name": "label", "value": "Codice Fiscale"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": true, "custom": "isCodiceFiscale"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(13, 'textinput', 'Campo CAP','Per l''inserimento del Codice di Avviamento Postale',
+    '[{"name": "label", "value": "CAP"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": true, "custom": "isCAP"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(14, 'textinput', 'Campo IBAN', 'Per l''inserimento del codice IBAN',
+    '[{"name": "label", "value": "IBAN"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": true, "custom": "isIBAN"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(15, 'textinput', 'Campo Email', 'Per l''inserimento di indirizzi email standard (non PEC)',
+    '[{"name": "label", "value": "Campo Email"}, {"name": "placeholder", "value": "nome@esempio.it"}]',
+    '{"isRequired": false, "custom": "isEmail"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(16, 'textinput', 'Campo PEC', 'Specifico per l''inserimento di un indirizzo di Posta Elettronica Certificata',
+    '[{"name": "label", "value": "Campo PEC"}, {"name": "placeholder", "value": "nome@pec.it"}]',
+    '{"isRequired": false, "custom": "isEmailPEC"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(17, 'textinput', 'Campo URL', 'Per l''inserimento di indirizzi web',
+    '[{"name": "label", "value": "Indirizzo URL"}, {"name": "placeholder", "value": ""}]',
+    '{"isRequired": false, "custom": "isUrl"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(18, 'textinput', 'Marca da bollo', 'Per inserire codice di marca da bollo',
+    '[{"name": "label", "value": "Marca da bollo"}, {"name": "placeholder", "value": "Numero identificativo"}]',
+    '{"isRequired": false, "custom": "isMarcaDaBollo"}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(19, 'paragraph', 'Paragrafo', 'Semplice testo formattato',
+    '[{"name": "text", "value": ""}]',
+    '{}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+
+(20, 'table', 'Tabella', 'Tabella',
+    '[{"name": "label", "value": "Tabella"}, {"name": "table_columns", "value": []}]',
+    '{}',
+    CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);