From c183b69046cc22a019dd3eb03812143105f4f461 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 7 Jan 2025 18:17:23 +0530
Subject: [PATCH 01/43] Fixed issue during user creation from SPID

---
 src/main/java/net/gepafin/tendermanagement/dao/UserDao.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
index 1c06ccaf..0ffa0b42 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
@@ -190,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()))) {

From d95f2833db0ad00ca9d15ac7f4a08b60a23addd5 Mon Sep 17 00:00:00 2001
From: piyushkag <piyush1.kag1@gmail.com>
Date: Wed, 8 Jan 2025 17:11:45 +0530
Subject: [PATCH 02/43] Added RabbitMQ config for production.

---
 src/main/resources/application-production.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties
index 07dd31ff..2cbd72a3 100644
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -32,7 +32,8 @@ appointment.portal.context=GEPAFINPORTAL
 flagDaFirmare=true
 
 # RabbitMQ properties for STOMP broker relay for Notification
-spring.rabbitmq.host=rabbitmq.bflows.ai
+#spring.rabbitmq.host=rabbitmq.bflows.ai
+spring.rabbitmq.host=172.21.0.2
 spring.rabbitmq.port=61613
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest

From 48be636d65bf2a1aefd901ef64ff326d266920ae Mon Sep 17 00:00:00 2001
From: Rinaldo <66477605+rbonazzo-KZ@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:26:35 +0100
Subject: [PATCH 03/43] Update application-production.properties

Correct rabbitMQ address for production
---
 src/main/resources/application-production.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties
index 2cbd72a3..1a210195 100644
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -33,8 +33,8 @@ flagDaFirmare=true
 
 # RabbitMQ properties for STOMP broker relay for Notification
 #spring.rabbitmq.host=rabbitmq.bflows.ai
-spring.rabbitmq.host=172.21.0.2
+spring.rabbitmq.host=172.18.0.5
 spring.rabbitmq.port=61613
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
-spring.rabbitmq.virtual-host=/
\ No newline at end of file
+spring.rabbitmq.virtual-host=/

From 97d7878ec810a1e9f1e57e3a74ffcd04f448181e Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Thu, 9 Jan 2025 18:10:31 +0530
Subject: [PATCH 04/43] Removed delega check from create application API

---
 .../java/net/gepafin/tendermanagement/dao/ApplicationDao.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index e281615f..c8185408 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -219,7 +219,7 @@ public class ApplicationDao {
     }
 
     public ApplicationEntity createApplicationEntity(UserEntity user, CallEntity call, UserWithCompanyEntity userWithCompany) {
-        validateDelegation(user,userWithCompany);
+//        validateDelegation(user,userWithCompany);
         ApplicationEntity entity = new ApplicationEntity();
         entity.setUserId(user.getId());
         entity.setCompanyId(userWithCompany.getCompanyId());

From e18716ed6289ba010718eb2e2849128d5d6f9664 Mon Sep 17 00:00:00 2001
From: nisha <nisha.kashyap@innogent.in>
Date: Wed, 15 Jan 2025 15:01:07 +0530
Subject: [PATCH 05/43] Fixed evaluation issue

---
 .../gepafin/tendermanagement/dao/ApplicationEvaluationDao.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 7cced04a..8c89b510 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -618,7 +618,7 @@ public class ApplicationEvaluationDao {
             entity.setIsDeleted(false);
             setIfUpdated(entity::getNote, entity::setNote, req.getNote());
             setIfUpdated(entity::getMotivation, entity::setMotivation, req.getMotivation());
-            if(Boolean.TRUE.equals(req.getApplicationStatus().equals(ApplicationStatusForEvaluation.APPROVED)) && (req.getAmountAccepted()==null || req.getAmountAccepted().compareTo(BigDecimal.ZERO) < 0)){
+            if(req.getApplicationStatus()!=null && (Boolean.TRUE.equals(req.getApplicationStatus().equals(ApplicationStatusForEvaluation.APPROVED)) && (req.getAmountAccepted()==null || req.getAmountAccepted().compareTo(BigDecimal.ZERO) < 0))){
                 throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.AMOUNT_ACCEPTED_REQUIRED_WHILE_APPROVING_APPLICATION));
             }
             if (req.getAmountAccepted() != null && req.getAmountAccepted().compareTo(BigDecimal.ZERO) > 0) {

From 3fff35d0d156b985bf3cae868561642b919d4e40 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Wed, 15 Jan 2025 15:11:29 +0530
Subject: [PATCH 06/43] Updated code

---
 .../tendermanagement/dao/CompanyDao.java      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java
index 1b3a6798..b014b779 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java
@@ -143,17 +143,20 @@ public class CompanyDao {
 		entity.setNumberOfEmployees(request.getNumberOfEmployees());
 		entity.setAnnualRevenue(request.getAnnualRevenue());
 		entity.setHub(userEntity.getHub());
-		Map<String, Object> vatCheckResponse = request.getVatCheckResponse();
 		if (request.getVatCheckResponse() != null) {
-			if (vatCheckResponse.containsKey("dettaglio")) {
-				Map<String, Object> dettaglio = (Map<String, Object>) vatCheckResponse.get("dettaglio");
-				if (dettaglio != null) {
-					if (dettaglio.containsKey("codice_ateco")) {
-						Object codiceAtecoObj = dettaglio.get("codice_ateco");
-						String codiceAteco = (codiceAtecoObj != null) ? codiceAtecoObj.toString() : null;
+			Map<String, Object> vatCheckResponse = request.getVatCheckResponse();
+			Map<String, Object> data = (Map<String, Object>) vatCheckResponse.get("data");
+			if (data != null) {
+				if (data.containsKey("dettaglio")) {
+					Map<String, Object> dettaglio = (Map<String, Object>) data.get("dettaglio");
+					if (dettaglio != null) {
+						if (dettaglio.containsKey("codice_ateco")) {
+							Object codiceAtecoObj = dettaglio.get("codice_ateco");
+							String codiceAteco = (codiceAtecoObj != null) ? codiceAtecoObj.toString() : null;
 
-						if (codiceAteco != null) {
-							entity.setCodiceAteco(codiceAteco);
+							if (codiceAteco != null) {
+								entity.setCodiceAteco(codiceAteco);
+							}
 						}
 					}
 				}

From 491d8495e6d203b6ef057944a084746a115a512a Mon Sep 17 00:00:00 2001
From: harish <harish.bagora1@gmail.com>
Date: Thu, 16 Jan 2025 13:20:23 +0530
Subject: [PATCH 07/43] Saml redirect url issue

---
 .../gepafin/tendermanagement/config/SamlFailureHandler.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java b/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java
index 52b30dbd..bdbd0801 100644
--- a/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java
+++ b/src/main/java/net/gepafin/tendermanagement/config/SamlFailureHandler.java
@@ -58,14 +58,16 @@ public class SamlFailureHandler implements AuthenticationFailureHandler {
 					feBaseUrl = hub.getDomainName();
 				}
 			}
-			response.sendRedirect(feBaseUrl + "/login");
+			String redirectUrl = feBaseUrl + "/login";
+			response.sendRedirect(redirectUrl);
+			logger.info("SAML redirect Url: " + redirectUrl);
 		} catch (Exception e) {
 			logger.error("Error processing SAML failure handler", e);
 		}
 	}
 	
 	public static String extractInResponseTo(String message) {
-		String regex = "InResponseTo attribute \\[([a-zA-Z0-9\\-]+)\\]";
+		String regex = "InResponseTo attribute \\[([a-zA-Z0-9\\-_]+)\\]";
 
 		Pattern pattern = Pattern.compile(regex);
 		Matcher matcher = pattern.matcher(message);

From e7a93c1f4c9f7c3840faf3a0ca9f283fefb8c1ad Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Fri, 17 Jan 2025 14:31:38 +0530
Subject: [PATCH 08/43] Resolved conflicts

---
 .../constants/GepafinConstant.java            |   1 +
 .../tendermanagement/dao/ApplicationDao.java  | 151 +++++++++++++++++-
 src/main/resources/message_en.properties      |   1 +
 src/main/resources/message_it.properties      |   8 +-
 4 files changed, 155 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 7fe87275..9df65dfe 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -369,5 +369,6 @@ public class GepafinConstant {
     public static final String APPLICATION_PER_STATUS="applicationPerStatus";
 
 
+    public static final String CALL_END_DATE_PASSED="call.end.date.passed";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 0bc667cf..41efcb9c 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -49,7 +49,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -870,7 +872,7 @@ public class ApplicationDao {
 			ApplicationRequest applicationRequest, Long callId, UserEntity userEntity) {
 		CallEntity call = callService.validateCall(callId);
         UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(userEntity.getId(),companyEntity.getId());
-
+        checkCallEndDate(call);
 //		call = callService.validatePublishedCall(call.getId());
 //		checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
 		ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, userWithCompanyEntity);
@@ -888,7 +890,7 @@ public class ApplicationDao {
     public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) {
 
         ApplicationEntity applicationEntity = validateApplication(applicationId);
-
+        checkCallEndDate(applicationEntity.getCall());
         //cloned entity for old application data
         ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity);
 
@@ -1117,7 +1119,7 @@ public class ApplicationDao {
 	public ApplicationSignedDocumentResponse uploadSignedDocument(HttpServletRequest request, Long applicationId,
 			MultipartFile file) {
 		ApplicationEntity applicationEntity = validateApplication(applicationId);
-
+        checkCallEndDate(applicationEntity.getCall());
         //cloned entity for old data
         ApplicationEntity oldApplicationData = Utils.getClonedEntityForData(applicationEntity);
 
@@ -1250,7 +1252,8 @@ public class ApplicationDao {
 
         ApplicationEntity applicationEntity = validateApplication(applicationId);
         ApplicationEntity oldApplicationEntity = Utils.getClonedEntityForData(applicationEntity);
-        
+        checkCallEndDate(applicationEntity.getCall());
+
         UserEntity userEntity = userService.validateUser(applicationEntity.getUserId());
         validator.validateUserWithCompany(request, applicationEntity.getCompanyId());
         if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.DRAFT.getValue().equals(applicationEntity.getStatus()))) {
@@ -1391,4 +1394,144 @@ public class ApplicationDao {
             throw new RuntimeException("Error while creating ZIP file", e);
         }
     }
+
+    public PageableResponseBean<List<ApplicationResponse>> getAllApplicationByPagination(UserEntity userEntity, Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean) {
+        Integer pageNo = null;
+        Integer pageLimit = null;
+        if (applicationPageableRequestBean.getGlobalFilters() != null) {
+            pageNo = applicationPageableRequestBean.getGlobalFilters().getPage();
+            pageLimit = applicationPageableRequestBean.getGlobalFilters().getLimit();
+        }
+        if (pageLimit == null || pageLimit <= 0) {
+            pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT;
+        }
+        if (pageNo == null || pageNo <= 0) {
+            pageNo = GepafinConstant.DEFAULT_PAGE;
+        }
+        Specification<ApplicationEntity> spec = search(callId, companyId, applicationPageableRequestBean, userEntity);
+        Page<ApplicationEntity> entityPage = applicationRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
+        // Prepare the response
+
+
+        List<ApplicationResponse> applicationResponses = entityPage.getContent().stream()
+                .map(application -> {
+                    ApplicationResponse response = getApplicationResponse(application);
+                    return response;
+                })
+                .collect(Collectors.toList());
+
+
+        PageableResponseBean<List<ApplicationResponse>> pageableResponseBean = new PageableResponseBean<>();
+        pageableResponseBean.setBody(applicationResponses);
+        pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1); // Page numbers typically start from 0, so add 1 for user-friendly indexing
+        pageableResponseBean.setTotalPages(entityPage.getTotalPages());
+        pageableResponseBean.setTotalRecords(entityPage.getTotalElements());
+        pageableResponseBean.setPageSize(entityPage.getSize());
+
+        return pageableResponseBean;
+    }
+
+    public Specification<ApplicationEntity> search(Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean, UserEntity userEntity) {
+        return (root, query, criteriaBuilder) -> {
+
+            List<Predicate> predicates = getPredicates(applicationPageableRequestBean, criteriaBuilder, root, callId, companyId, userEntity);
+            SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true);
+
+            if (applicationPageableRequestBean.getGlobalFilters() != null
+                    && applicationPageableRequestBean.getGlobalFilters().getSortBy() != null &&
+                    applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName() != null && Boolean.FALSE.equals(
+                    isEmpty(applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName()))) {
+                sortBy.setColumnName(applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName());
+                sortBy.setSortDesc(true);
+                if (applicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc() != null) {
+                    sortBy.setSortDesc(applicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc());
+                }
+            }
+
+            query.orderBy(criteriaBuilder.desc(root.get(sortBy.getColumnName())));
+            if (Boolean.FALSE.equals(sortBy.getSortDesc())) {
+                query.orderBy(criteriaBuilder.asc(root.get(sortBy.getColumnName())));
+            }
+            return query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0]))).getRestriction();
+        };
+    }
+
+
+    private List<Predicate> getPredicates(ApplicationPageableRequestBean applicationPageableRequestBean,
+                                          CriteriaBuilder criteriaBuilder, Root<ApplicationEntity> root, Long callId, Long companyId, UserEntity userEntity) {
+
+        Integer year = null;
+        String search = null;
+        if (applicationPageableRequestBean.getGlobalFilters() != null) {
+            year = applicationPageableRequestBean.getGlobalFilters().getYear();
+            search = applicationPageableRequestBean.getGlobalFilters().getSearch();
+        }
+        List<Predicate> predicates = new ArrayList<>();
+
+        Boolean isBeneficiary = validator.checkIsBeneficiary();
+        if (isBeneficiary) {
+            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_ID), userEntity.getId()));
+        }
+        if (year != null && year > 0) {
+            int filterYear = applicationPageableRequestBean.getGlobalFilters().getYear();
+
+// Create LocalDateTime boundaries for the start and end of the year
+            LocalDateTime startOfYear = LocalDateTime.of(filterYear, 1, 1, 0, 0);
+            LocalDateTime endOfYear = LocalDateTime.of(filterYear, 12, 31, 23, 59, 59);
+
+// Add the range comparison to filter records within the year
+            predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), startOfYear, endOfYear));
+
+        }
+        // Search in `title` and `message` (if search term is provided)
+        if (search != null && !search.isEmpty()) {
+            Predicate titlePredicate = criteriaBuilder.like(
+                    criteriaBuilder.upper(root.get(GepafinConstant.COMMENTS)),
+                    "%" + search.toUpperCase() + "%"
+            );
+            predicates.add(criteriaBuilder.or(titlePredicate));
+        }
+
+        // Filter by `status` (if status list is provided)
+        if (applicationPageableRequestBean.getStatus() != null && !applicationPageableRequestBean.getStatus().isEmpty()) {
+            List<String> statusValues = applicationPageableRequestBean.getStatus().stream()
+                    .map(ApplicationStatusTypeEnum::name) // Convert enum to string
+                    .toList();
+            predicates.add(root.get(GepafinConstant.STATUS).in(statusValues));
+        }
+
+        if (callId != null) {
+            CallEntity call = callService.validateCall(callId);
+            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.CALL).get(GepafinConstant.ID), callId));
+        }
+
+        // Optional companyId filter
+        if (companyId != null) {
+            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.COMPANY_ID), companyId));
+        }
+        predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED)));
+
+        predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.HUB_ID), userEntity.getHub().getId()));
+
+
+        return predicates;
+
+    }
+    public void checkCallEndDate(CallEntity call) {
+        LocalDateTime now = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
+
+        LocalDateTime callEndDateTime = LocalDateTime.of(
+                call.getEndDate().toLocalDate(),
+                call.getEndTime()
+        );
+
+        if (now.isAfter(callEndDateTime)) {
+            throw new CustomValidationException(
+                    Status.BAD_REQUEST,
+                    Translator.toLocale(GepafinConstant.CALL_END_DATE_PASSED)
+            );
+        }
+    }
+
+
 }
diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index c743b3fa..f335111d 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -347,3 +347,4 @@ notification.deleted.successfully=Notification deleted successfully.
 notification.updated.successfully=Notification updated successfully.
 user.with.company.not.found = User with company not found for user or company.
 amount.accepted.required=Amount accepted is required while approving the application.
+call.end.date.passed=Call end date and time has been passed.
diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties
index 14a5dbb5..6f060604 100644
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -304,7 +304,6 @@ beneficiary.call.duplicate = Una chiamata preferita con questo ID di chiamata e
 user.must.be.associated.with.company.to.create.application=Devi essere associato a un'azienda per poter presentare domanda per questa applicazione.
 company.id.required.for.preferred.call=ID azienda obbligatorio quando si richiedono solo chiamate preferite.
 response.days.not.null=I giorni di risposta non devono essere nulli e maggiori di zero.
-application.cannot.approved.or.rejected=La domanda non pu� essere approvata o rifiutata perch� l'emendamento � attivo.
 valid.vatnumber.message=Il numero di partita IVA � valido.
 application.cannot.approved.or.rejected=La domanda non pu? essere approvata o rifiutata perch? l'emendamento ? attivo.
 
@@ -338,4 +337,9 @@ notification.sent.successfully=Notifica inviata con successo.
 notification.deleted.successfully=Notifica eliminata con successo.
 notification.updated.successfully=Notifica aggiornata con successo.
 user.with.company.not.found = Utente con azienda non trovato per utente o azienda.
-amount.accepted.required=L'importo accettato � obbligatorio durante l'approvazione della domanda.
+amount.accepted.required=L'importo accettato � obbligatorio durante l'approvazione della domanda.
+
+user.action.fetched.successfully = Dettagli sull'azione dell'utente recuperati correttamente.
+action.context.labels.fetched.successfully = Etichette del contesto dell'azione recuperate correttamente.
+amount.accepted.required=L'importo accettato � obbligatorio durante l'approvazione della domanda.
+call.end.date.passed=La data e l'ora di fine della chiamata sono state trascorse.

From 9ddb7aaf3cf9886bf3af7d8433e0da1287e84b78 Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Fri, 17 Jan 2025 15:14:22 +0530
Subject: [PATCH 09/43] Resolved Conflicts

---
 .../constants/GepafinConstant.java            |   4 +-
 .../tendermanagement/dao/ApplicationDao.java  | 127 +-----------------
 .../tendermanagement/dao/FlowFormDao.java     |   2 +
 .../model/response/ApplicationResponse.java   |   3 +
 .../response/NextOrPreviousFormResponse.java  |   5 +
 src/main/resources/message_en.properties      |   2 +-
 src/main/resources/message_it.properties      |   2 +-
 7 files changed, 16 insertions(+), 129 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 9df65dfe..98cfa8d1 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -367,8 +367,6 @@ public class GepafinConstant {
     public static final String COUNT="count";
     public static final String APPLICATION_PER_CALL="applicationPerCall";
     public static final String APPLICATION_PER_STATUS="applicationPerStatus";
-
-
-    public static final String CALL_END_DATE_PASSED="call.end.date.passed";
+    public static final String CALL_EXPIRED="call.expired";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 41efcb9c..c3ec4f47 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -186,6 +186,7 @@ public class ApplicationDao {
 //        callService.validatePublishedCall(formEntity.getCall().getId());
         validateFormFields(applicationRequestBean,formEntity);
         ApplicationEntity applicationEntity = validateApplication(applicationId);
+        checkCallEndDate(applicationEntity.getCall());
         validator.validateUserWithCompany(request, applicationEntity.getCompanyId());
         if(Boolean.FALSE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.DRAFT.getValue()))) {
             throw new CustomValidationException(Status.BAD_REQUEST,Translator.toLocale(GepafinConstant.APPLICATION_NOT_IN_DRAFT_STATUS));
@@ -405,6 +406,7 @@ public class ApplicationDao {
         responseBean.setProgress(progress);
         responseBean.setCallTitle(applicationEntity.getCall().getName());
         responseBean.setCallEndDate(applicationEntity.getCall().getEndDate());
+        responseBean.setCallEndTime(applicationEntity.getCall().getEndTime());
         responseBean.setModifiedDate(applicationEntity.getCall().getUpdatedDate());
         responseBean.setCallId(applicationEntity.getCall().getId());
         responseBean.setSubmissionDate(applicationEntity.getSubmissionDate());
@@ -1394,129 +1396,6 @@ public class ApplicationDao {
             throw new RuntimeException("Error while creating ZIP file", e);
         }
     }
-
-    public PageableResponseBean<List<ApplicationResponse>> getAllApplicationByPagination(UserEntity userEntity, Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean) {
-        Integer pageNo = null;
-        Integer pageLimit = null;
-        if (applicationPageableRequestBean.getGlobalFilters() != null) {
-            pageNo = applicationPageableRequestBean.getGlobalFilters().getPage();
-            pageLimit = applicationPageableRequestBean.getGlobalFilters().getLimit();
-        }
-        if (pageLimit == null || pageLimit <= 0) {
-            pageLimit = GepafinConstant.DEFAULT_PAGE_LIMIT;
-        }
-        if (pageNo == null || pageNo <= 0) {
-            pageNo = GepafinConstant.DEFAULT_PAGE;
-        }
-        Specification<ApplicationEntity> spec = search(callId, companyId, applicationPageableRequestBean, userEntity);
-        Page<ApplicationEntity> entityPage = applicationRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
-        // Prepare the response
-
-
-        List<ApplicationResponse> applicationResponses = entityPage.getContent().stream()
-                .map(application -> {
-                    ApplicationResponse response = getApplicationResponse(application);
-                    return response;
-                })
-                .collect(Collectors.toList());
-
-
-        PageableResponseBean<List<ApplicationResponse>> pageableResponseBean = new PageableResponseBean<>();
-        pageableResponseBean.setBody(applicationResponses);
-        pageableResponseBean.setCurrentPage(entityPage.getNumber() + 1); // Page numbers typically start from 0, so add 1 for user-friendly indexing
-        pageableResponseBean.setTotalPages(entityPage.getTotalPages());
-        pageableResponseBean.setTotalRecords(entityPage.getTotalElements());
-        pageableResponseBean.setPageSize(entityPage.getSize());
-
-        return pageableResponseBean;
-    }
-
-    public Specification<ApplicationEntity> search(Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean, UserEntity userEntity) {
-        return (root, query, criteriaBuilder) -> {
-
-            List<Predicate> predicates = getPredicates(applicationPageableRequestBean, criteriaBuilder, root, callId, companyId, userEntity);
-            SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true);
-
-            if (applicationPageableRequestBean.getGlobalFilters() != null
-                    && applicationPageableRequestBean.getGlobalFilters().getSortBy() != null &&
-                    applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName() != null && Boolean.FALSE.equals(
-                    isEmpty(applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName()))) {
-                sortBy.setColumnName(applicationPageableRequestBean.getGlobalFilters().getSortBy().getColumnName());
-                sortBy.setSortDesc(true);
-                if (applicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc() != null) {
-                    sortBy.setSortDesc(applicationPageableRequestBean.getGlobalFilters().getSortBy().getSortDesc());
-                }
-            }
-
-            query.orderBy(criteriaBuilder.desc(root.get(sortBy.getColumnName())));
-            if (Boolean.FALSE.equals(sortBy.getSortDesc())) {
-                query.orderBy(criteriaBuilder.asc(root.get(sortBy.getColumnName())));
-            }
-            return query.where(criteriaBuilder.and(predicates.toArray(new Predicate[0]))).getRestriction();
-        };
-    }
-
-
-    private List<Predicate> getPredicates(ApplicationPageableRequestBean applicationPageableRequestBean,
-                                          CriteriaBuilder criteriaBuilder, Root<ApplicationEntity> root, Long callId, Long companyId, UserEntity userEntity) {
-
-        Integer year = null;
-        String search = null;
-        if (applicationPageableRequestBean.getGlobalFilters() != null) {
-            year = applicationPageableRequestBean.getGlobalFilters().getYear();
-            search = applicationPageableRequestBean.getGlobalFilters().getSearch();
-        }
-        List<Predicate> predicates = new ArrayList<>();
-
-        Boolean isBeneficiary = validator.checkIsBeneficiary();
-        if (isBeneficiary) {
-            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_ID), userEntity.getId()));
-        }
-        if (year != null && year > 0) {
-            int filterYear = applicationPageableRequestBean.getGlobalFilters().getYear();
-
-// Create LocalDateTime boundaries for the start and end of the year
-            LocalDateTime startOfYear = LocalDateTime.of(filterYear, 1, 1, 0, 0);
-            LocalDateTime endOfYear = LocalDateTime.of(filterYear, 12, 31, 23, 59, 59);
-
-// Add the range comparison to filter records within the year
-            predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), startOfYear, endOfYear));
-
-        }
-        // Search in `title` and `message` (if search term is provided)
-        if (search != null && !search.isEmpty()) {
-            Predicate titlePredicate = criteriaBuilder.like(
-                    criteriaBuilder.upper(root.get(GepafinConstant.COMMENTS)),
-                    "%" + search.toUpperCase() + "%"
-            );
-            predicates.add(criteriaBuilder.or(titlePredicate));
-        }
-
-        // Filter by `status` (if status list is provided)
-        if (applicationPageableRequestBean.getStatus() != null && !applicationPageableRequestBean.getStatus().isEmpty()) {
-            List<String> statusValues = applicationPageableRequestBean.getStatus().stream()
-                    .map(ApplicationStatusTypeEnum::name) // Convert enum to string
-                    .toList();
-            predicates.add(root.get(GepafinConstant.STATUS).in(statusValues));
-        }
-
-        if (callId != null) {
-            CallEntity call = callService.validateCall(callId);
-            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.CALL).get(GepafinConstant.ID), callId));
-        }
-
-        // Optional companyId filter
-        if (companyId != null) {
-            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.COMPANY_ID), companyId));
-        }
-        predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED)));
-
-        predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.HUB_ID), userEntity.getHub().getId()));
-
-
-        return predicates;
-
-    }
     public void checkCallEndDate(CallEntity call) {
         LocalDateTime now = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
 
@@ -1528,7 +1407,7 @@ public class ApplicationDao {
         if (now.isAfter(callEndDateTime)) {
             throw new CustomValidationException(
                     Status.BAD_REQUEST,
-                    Translator.toLocale(GepafinConstant.CALL_END_DATE_PASSED)
+                    Translator.toLocale(GepafinConstant.CALL_EXPIRED)
             );
         }
     }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
index faec3489..bf68f3b9 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
@@ -296,6 +296,8 @@ public class FlowFormDao {
 				applicationDao.processForm(formEntity, applicationEntity));
 		nextOrPreviousFormResponse.setCallId(applicationEntity.getCall().getId());
 		nextOrPreviousFormResponse.setCallTitle(applicationEntity.getCall().getName());
+		nextOrPreviousFormResponse.setCallEndDate(applicationEntity.getCall().getEndDate());
+		nextOrPreviousFormResponse.setCallEndTime(applicationEntity.getCall().getEndTime());
 		nextOrPreviousFormResponse.setCompanyId(applicationEntity.getCompanyId());
 		nextOrPreviousFormResponse.setCompanyName(company.getCompanyName());
 		
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationResponse.java
index 1aae69e2..2c659838 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationResponse.java
@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.model.response.ApplicationFormFieldResponseB
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 @Data
@@ -18,6 +19,8 @@ public class ApplicationResponse{
 
     private LocalDateTime callEndDate;
 
+    private LocalTime callEndTime;
+
     private LocalDateTime modifiedDate;
 
     private Integer progress;
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java
index bea417a1..6bed05fc 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java
@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 @Data
 public class NextOrPreviousFormResponse {
@@ -20,6 +21,10 @@ public class NextOrPreviousFormResponse {
 	private Long completedSteps;
 	
 	private Long currentStep;
+
+	private LocalDateTime callEndDate;
+
+	private LocalTime callEndTime;
 	
 	private Long companyId;
 	
diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index f335111d..101f74f9 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -347,4 +347,4 @@ notification.deleted.successfully=Notification deleted successfully.
 notification.updated.successfully=Notification updated successfully.
 user.with.company.not.found = User with company not found for user or company.
 amount.accepted.required=Amount accepted is required while approving the application.
-call.end.date.passed=Call end date and time has been passed.
+call.expired=Call has been expired.
diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties
index 6f060604..c5b07696 100644
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -342,4 +342,4 @@ amount.accepted.required=L'importo accettato � obbligatorio durante l'approvaz
 user.action.fetched.successfully = Dettagli sull'azione dell'utente recuperati correttamente.
 action.context.labels.fetched.successfully = Etichette del contesto dell'azione recuperate correttamente.
 amount.accepted.required=L'importo accettato � obbligatorio durante l'approvazione della domanda.
-call.end.date.passed=La data e l'ora di fine della chiamata sono state trascorse.
+call.expired=La chiamata � scaduta.

From e496d7b19984cdd786d2a63b788cd18c6d3cba49 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Mon, 20 Jan 2025 12:17:35 +0530
Subject: [PATCH 10/43] Fixed error while moving file to deleted folder

---
 .../service/impl/AmazonS3ServiceImpl.java                 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java
index 8221117a..9909f732 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java
@@ -153,11 +153,17 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
 		}
 	}
 
+    private String decodeS3Key(String key) {
+        return URLDecoder.decode(key, StandardCharsets.UTF_8);
+    }
+
     @Override
     public UploadFileOnAmazonS3Response moveFile(String fileName, String oldPath, String newPath) {
         try {
+            log.info("Original Paths - oldPath: {}, newPath: {}", oldPath, newPath);
+
+            oldPath = decodeS3Key(cleanOldPath(oldPath));
             newPath = cleanNewPath(oldPath, newPath);
-            oldPath = cleanOldPath(oldPath);
             log.info("Moving file from {} to {} in bucket {}", oldPath, newPath, bucketName);
 
             CopyObjectRequest copyRequest = new CopyObjectRequest(bucketName, oldPath, bucketName, newPath);

From 69f97a08eea33ae750e88d99127f64221554599a Mon Sep 17 00:00:00 2001
From: harish <harish.bagora1@gmail.com>
Date: Tue, 21 Jan 2025 22:39:55 +0530
Subject: [PATCH 11/43] Fixed isRequested amount issue

---
 .../tendermanagement/dao/ApplicationDao.java  | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index c3ec4f47..e894acb5 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -495,27 +495,24 @@ public class ApplicationDao {
         VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
         List<ContentResponseBean> contentResponseBeans = formDao.convertFormEntityToFormResponseBean(formEntity).getContent();
 
-        contentResponseBeans.stream()
-                .filter(content -> "numberinput".equals(content.getName()))
-                .map(ContentResponseBean::getSettings)
-                .flatMap(List::stream)
-                .filter(setting -> "isRequestedAmount".equals(setting.getName()) && Boolean.TRUE.equals(setting.getValue()))
-                .findFirst()
-                .ifPresent(setting -> {
-                    Object fieldValue = applicationFormFieldRequestBean.getFieldValue();
-                    if(fieldValue!=null) {
-                        if (fieldValue instanceof String) {
-                            try {
-                                BigDecimal amountRequested = new BigDecimal((String) fieldValue);
-                                applicationFormEntity.getApplication().setAmountRequested(amountRequested);
-                            } catch (NumberFormatException e) {
-                                throw new IllegalArgumentException("Field value is not a valid number: " + fieldValue, e);
-                            }
-                        } else {
-                            throw new IllegalArgumentException("Field value is not a String: " + fieldValue);
-                        }
-                    }
-                });
+	        contentResponseBeans.stream()
+	                .filter(content -> "numberinput".equals(content.getName()) && content.getId().toString().equals(applicationFormFieldRequestBean.getFieldId()))
+	                .map(ContentResponseBean::getSettings)
+	                .flatMap(List::stream)
+	                .filter(setting -> "isRequestedAmount".equals(setting.getName()) && Boolean.TRUE.equals(setting.getValue()))
+	                .findFirst()
+	                .ifPresent(setting -> {
+	                	
+	                    Object fieldValue = applicationFormFieldRequestBean.getFieldValue();
+	                    if(fieldValue!=null) {
+	                            try {
+	                                BigDecimal amountRequested = new BigDecimal(fieldValue.toString());
+	                                applicationFormEntity.getApplication().setAmountRequested(amountRequested);
+	                            } catch (NumberFormatException e) {
+	                                throw new IllegalArgumentException("Field value is not a valid number: " + fieldValue, e);
+	                            }
+	                    }
+	                });
 
 
         ApplicationFormFieldEntity oldApplicationFormFieldData = null;

From 33844b0f30d854061da574a7702ae600b3487970 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Wed, 22 Jan 2025 16:38:46 +0530
Subject: [PATCH 12/43] Added validation for the requested amount in the
 application.

---
 .../gepafin/tendermanagement/constants/GepafinConstant.java    | 1 +
 .../java/net/gepafin/tendermanagement/dao/ApplicationDao.java  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 98cfa8d1..11b0fc10 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -368,5 +368,6 @@ public class GepafinConstant {
     public static final String APPLICATION_PER_CALL="applicationPerCall";
     public static final String APPLICATION_PER_STATUS="applicationPerStatus";
     public static final String CALL_EXPIRED="call.expired";
+	public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index e894acb5..de86e69f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1258,6 +1258,9 @@ public class ApplicationDao {
         if (Boolean.FALSE.equals(ApplicationStatusTypeEnum.DRAFT.getValue().equals(applicationEntity.getStatus()))) {
             throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_NOT_IN_DRAFT_STATUS));
         }
+        if (applicationEntity.getAmountRequested() == null || applicationEntity.getAmountRequested().compareTo(BigDecimal.ZERO) <= 0 ) {
+            throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO));
+        }
         List<FlowEdgesEntity> flowEdgesList = flowEdgesRepository.findByCallId(applicationEntity.getCall().getId());
         Long totalSteps = flowFormDao.calculateTotalSteps(flowEdgesList);
         Integer completedSteps = flowFormDao.getCompletedSteps(applicationEntity);

From a9fdfed85a78d25f0f336fa2618883b1c1dde0c1 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Wed, 22 Jan 2025 16:39:10 +0530
Subject: [PATCH 13/43] Resolved conflicts

---
 src/main/resources/message_en.properties | 1 +
 src/main/resources/message_it.properties | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index 101f74f9..3762684a 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -348,3 +348,4 @@ notification.updated.successfully=Notification updated successfully.
 user.with.company.not.found = User with company not found for user or company.
 amount.accepted.required=Amount accepted is required while approving the application.
 call.expired=Call has been expired.
+amount.request.should.greated.then.zero=Requested amount should not be empty and should be greater than zero.
diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties
index c5b07696..4223b4f1 100644
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -343,3 +343,4 @@ user.action.fetched.successfully = Dettagli sull'azione dell'utente recuperati c
 action.context.labels.fetched.successfully = Etichette del contesto dell'azione recuperate correttamente.
 amount.accepted.required=L'importo accettato � obbligatorio durante l'approvazione della domanda.
 call.expired=La chiamata � scaduta.
+amount.request.should.greated.then.zero=L'importo richiesto non deve essere vuoto e deve essere maggiore di zero.

From 15aac663018c00818efc7e957519443486f74484 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Wed, 22 Jan 2025 18:04:46 +0530
Subject: [PATCH 14/43] Fixed motivation field issue

---
 .../net/gepafin/tendermanagement/dao/EmailNotificationDao.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
index 88e6954a..3988b35a 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -265,7 +265,7 @@ public class EmailNotificationDao {
         bodyPlaceholders.put("{{protocol_number}}", applicationEntity.getProtocol().getProtocolNumber().toString());
         bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatCreatedDate(applicationEntity.getProtocol().getCreatedDate()));
         bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(applicationEntity.getProtocol().getTime(), GepafinConstant.HH_MM_SS));
-        bodyPlaceholders.put("{{form_text}}", applicationEvaluationEntity.getNote());
+        bodyPlaceholders.put("{{form_text}}", applicationEvaluationEntity.getMotivation());
 
         sendEmail(applicationEntity, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE, bodyPlaceholders, null,null);
     }

From 15eea97fe503e56a3d4f76ba6a0441d5388a3a01 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 23 Jan 2025 18:51:31 +0530
Subject: [PATCH 15/43] Updated code for create assigned application

---
 .../dao/AssignedApplicationsDao.java          | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
index cc281df7..f9a3476f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
@@ -8,7 +8,6 @@ import net.gepafin.tendermanagement.entities.ApplicationEntity;
 import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.CompanyEntity;
-import net.gepafin.tendermanagement.entities.FaqEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
@@ -80,8 +79,13 @@ public class AssignedApplicationsDao {
         log.info("Assigning application to pre-Instructor with details: {}", applicationId, userId);
 
         AssignedApplicationsEntity assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null);
-        if (assignedApplications != null) {
+        if (assignedApplications != null && assignedApplications.getUserId().equals(userId)) {
             throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_ASSIGNED));
+        } else if(assignedApplications != null) {
+        	assignedApplications = reassignApplication(userId, assignedByUser, assignedApplications);
+        	AssignedApplicationsResponse assignApplicationToInstructorResponse = convertEntityToResponse(assignedApplications);
+            log.info("Application re-assigned succesfully {}", assignApplicationToInstructorResponse);
+            return assignApplicationToInstructorResponse;
         }
         ApplicationEntity application = applicationService.validateApplication(applicationId);
 
@@ -107,6 +111,30 @@ public class AssignedApplicationsDao {
         return assignApplicationToInstructorResponse;
     }
 
+	private AssignedApplicationsEntity reassignApplication(Long userId, UserEntity assignedByUser,
+			AssignedApplicationsEntity assignedApplication) {
+		
+		AssignedApplicationsEntity oldAssignedApplicationEntity = Utils.getClonedEntityForData(assignedApplication);
+		
+		setIfUpdated(assignedApplication::getAssignedBy, assignedApplication::setAssignedBy, assignedByUser.getId());
+		setIfUpdated(assignedApplication::getUserId, assignedApplication::setUserId, userId);
+		assignedApplication.setAssignedAt(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
+		Optional<ApplicationEvaluationEntity> entityOptional = applicationEvaluationRepository.findByAssignedApplicationsEntity_IdAndIsDeletedFalse(assignedApplication.getId());
+		if(entityOptional.isPresent()) { 
+			ApplicationEvaluationEntity oldApplicationEvaluationEntity = Utils.getClonedEntityForData(entityOptional.get());
+			setIfUpdated(entityOptional.get()::getUserId, entityOptional.get()::setUserId, userId);
+			applicationEvaluationRepository.save(entityOptional.get());
+			/** This code is responsible for adding a version history log for the "Create Application" operation. **/
+	        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluationEntity).newData(entityOptional.get()).build());
+
+		};
+		assignedApplication = assignedApplicationsRepository.save(assignedApplication);
+		/** This code is responsible for adding a version history log for the "Create Application" operation. **/
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationEntity).newData(assignedApplication).build());
+
+		return assignedApplication;
+	}
+
     public AssignedApplicationsEntity createAssignmentEntity(ApplicationEntity application, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest) {
         AssignedApplicationsEntity assignApplication = new AssignedApplicationsEntity();
         assignApplication.setApplication(application);

From f64b37b9f592c7796dee13804150ea8395c68e5f Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Wed, 29 Jan 2025 13:00:18 +0530
Subject: [PATCH 16/43] Fixed issue for evaluation expiration

---
 .../tendermanagement/dao/NotificationDao.java      | 14 ++++++++++++++
 .../ApplicationAmendmentRequestRepository.java     |  4 ++--
 .../ApplicationEvaluationRepository.java           |  2 +-
 .../scheduler/ApplicationEvaluationScheduler.java  |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java
index 9acacdb0..5308f163 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java
@@ -192,6 +192,20 @@ public class NotificationDao {
         }
     }
 
+    public void sendNotificationToInstructorManager(Map<String, String> placeHolders, ApplicationEvaluationEntity applicationEvaluationEntity, NotificationTypeEnum notificationTypeEnum) {
+
+        List<UserEntity> userEntities=userRepository.findByRoleEntity_RoleTypeAndHubId(RoleStatusEnum.ROLE_INSTRUCTOR_MANAGER.getValue(),applicationEvaluationEntity.getAssignedApplicationsEntity().getApplication().getHubId());
+        for (UserEntity user:userEntities) {
+            Long instructorId=user.getId();
+            ApplicationEntity application = applicationService.validateApplication(applicationEvaluationEntity.getApplicationId());
+            if (instructorId != null) {
+                NotificationReq notificationreq = createNotificationReq(notificationTypeEnum.getValue(), placeHolders, instructorId, application.getUserWithCompany(),
+                        null);
+                sendNotification(notificationreq);
+            }
+        }
+    }
+
     public List<Long> getAllCompanyIdsForUser(Long userId) {
 
         return userWithCompanyRepository.findActiveCompanyIdsByUserId(userId);
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
index 3c89993c..1192f334 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
@@ -57,7 +57,7 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
 
     @Query("SELECT a FROM ApplicationAmendmentRequestEntity a " +
             "WHERE a.isDeleted = false " +
-            "AND a.status <> 'CLOSE' " +
+            "AND a.status NOT IN('CLOSE','EXPIRED') " +
             "AND a.endDate < :currentTime")
     List<ApplicationAmendmentRequestEntity> findAmendmentsDueForExpiration(LocalDateTime currentTime);
     
@@ -70,7 +70,7 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
     	       "AND NOT EXISTS ( " +
     	       "    SELECT 1 FROM ApplicationAmendmentRequestEntity activeAmendment" +
     	       "    WHERE activeAmendment.applicationEvaluationEntity.id = a.applicationEvaluationEntity.id " +
-    	       "    AND activeAmendment.status <> 'CLOSE' " +
+    	       "    AND activeAmendment.status  NOT IN('CLOSE','EXPIRED') " +
     	       "    AND activeAmendment.isDeleted = false) ")
 	Set<ApplicationEvaluationEntity> findEvaluationsWithoutActiveAmendmentsByIds(@Param("applicationEvaluationIds") Set<Long> applicationEvaluationIds);
 
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java
index cf0b9c66..d8e13228 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationRepository.java
@@ -32,7 +32,7 @@ public interface ApplicationEvaluationRepository extends JpaRepository<Applicati
             "WHERE aar.id = :evaluationId AND aar.isDeleted = false)")
     ApplicationEntity findApplicationByEvaluationId(Long evaluationId);
 
-    @Query("SELECT a FROM ApplicationEvaluationEntity a WHERE a.isDeleted = false AND a.endDate < :currentDate")
+    @Query("SELECT a FROM ApplicationEvaluationEntity a WHERE a.isDeleted = false  AND a.status = 'OPEN' AND a.endDate < :currentDate")
     List<ApplicationEvaluationEntity> findAllByIsDeletedFalseAndEndDateBefore(@Param("currentDate") LocalDateTime currentDate);
 
     @Query("SELECT a FROM ApplicationEvaluationEntity a " +
diff --git a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java
index e7249645..c43aca10 100644
--- a/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java
+++ b/src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationEvaluationScheduler.java
@@ -90,7 +90,7 @@ public class ApplicationEvaluationScheduler {
 					Map<String, String> placeHolders = notificationDao.sendNotificationToBeneficiary(application, NotificationTypeEnum.EVALUATION_EXPIRED);
 					notificationDao.sendNotificationToSuperUser(application,placeHolders,NotificationTypeEnum.EVALUATION_EXPIRED);
 					notificationDao.sendNotificationToInstructor(placeHolders,evaluation,NotificationTypeEnum.EVALUATION_EXPIRED);
-
+					notificationDao.sendNotificationToInstructorManager(placeHolders,evaluation,NotificationTypeEnum.EVALUATION_EXPIRED);
 
 					// Logging version history for the update operation
 					loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(httpServletRequest)

From a065c264033dff187e6d6b6dda7b0fe2a63cb4b7 Mon Sep 17 00:00:00 2001
From: Piyush <piyush1.kag1@gmail.com>
Date: Fri, 31 Jan 2025 19:04:58 +0530
Subject: [PATCH 17/43] Resolved conflicts

---
 .../constants/GepafinConstant.java            | 40 +++++++++++++++++++
 .../dao/EmailNotificationDao.java             | 10 ++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 11b0fc10..0601f8e5 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -369,5 +369,45 @@ public class GepafinConstant {
     public static final String APPLICATION_PER_STATUS="applicationPerStatus";
     public static final String CALL_EXPIRED="call.expired";
 	public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
+
+
+
+    public static final String EVALUATION_FORM_CREATED_SUCCESSFULLY = "evaluation.form.created.successfully";
+    public static final String EVALUATION_FORM_UPDATED_SUCCESSFULLY = "evaluation.form.updated.successfully";
+    public static final String EVALUATION_FORM_DELETED_SUCCESSFULLY = "evaluation.form.deleted.successfully";
+    public static final String EVALUATION_FORM_FETCHED_SUCCESSFULLY = "evaluation.form.fetched.successfully";
+
+    public static final String EVALUATION_FORM_NOT_FOUND = "evaluation.form.not.found";
+
+    public static final String EVALUATION_V2_STEP_2 = "EVALUATION_V2_STEP_2";
+
+    public static final String EITHER_APPLICATION_ID_OR_ASSIGNED_APPLICATION_ID_MUST_BE_PROVIDED = "either.applicationId.or.assignedApplicationId.must.be.provided";
+    public static final String ASSIGNED_APPLICATION_STATUS_UPDATED_SUCCESSFULLY = "assigned.application.status.updated.successfully";
+
+    public static final String REQUIRED_REQUESTED_AMOUNT_MSG = "validation.required.requested.amount";
+    public static final String CRITERIA_TABLE_COLUMNS="criteria_table_columns";
+
+    public static final String DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA= "<html>\n" +
+            "   <body style=\"font-family: Arial, sans-serif; color: #000; line-height: 1.6;\">\n" +
+            "      <div style=\"padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;\">\n" +
+            "         <p><strong>RICHIESTA INTEGRAZIONE DOCUMENTALE</strong></p>\n" +
+            "         <p>Buongiorno,</p>\n" +
+            "         <p>In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Bando \n" +
+            "            <strong>{{call_name}}</strong> di cui al <strong>Protocollo n. {{protocol_number}} del\n" +
+            "            {{protocol_date}} e {{protocol_time}}</strong>, alla luce dell'attività istruttoria svolta,\n" +
+            "            segnaliamo quanto segue:\n" +
+            "         </p>\n" +
+            "         {{note}}\n" +
+            "         <p>Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione caricandola all'interno dello sportello\n" +
+            "            online <a href=\"{{platform_link}}\">{{platform_link}}</a> entro e <strong>non oltre {{response_days}} giorni</strong> dal ricevimento della presente comunicazione,\n" +
+            "            precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento.\n" +
+            "         </p>\n" +
+            "         <p>La documentazione trasmessa e le informazioni fornite saranno processate dall'istruttore assegnatario della pratica.\n" +
+            "         </p>\n" +
+            "         <p>Distinti Saluti,</p>\n" +
+            "         <p><strong>{{email_signature}}</strong></p>\n" +
+            "      </div>\n" +
+            "   </body>\n" +
+            "</html>";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
index 3988b35a..7bc8010d 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -94,7 +94,15 @@ public class EmailNotificationDao {
         subjectPlaceholders.put("{{company_name}}", company.getCompanyName());
 //        bodyPlaceholders.put("{{legal_mail}}", legalMail);
         String subject = Utils.replacePlaceholders(systemEmailTemplateResponse.getSubject(), subjectPlaceholders);
-        String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders);
+        String body;
+        if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.DOCUMENTATION_INTEGRATION_REQUEST)) {
+            bodyPlaceholders.put("{{email_signature}}", hubEntity.getEmailSignature());
+            bodyPlaceholders.put("{{platform_link}}",hubEntity.getDomainName());
+            body = Utils.replacePlaceholders(GepafinConstant.DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA, bodyPlaceholders);
+        }
+        else {
+           body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders);
+        }
 
         return new EmailContentResponse(subject, body, systemEmailTemplateResponse);
     }

From b4061d72574a7e9771881205ec1122d1a57a6519 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 4 Feb 2025 17:43:10 +0530
Subject: [PATCH 18/43] Resolved conflict

---
 .../constants/GepafinConstant.java              | 16 ++++++++++++++++
 .../dao/EmailNotificationDao.java               |  4 ++++
 .../db/changelog/db.changelog-1.0.0.xml         |  4 ++++
 ...template_application_rejected_04_02_2025.sql | 17 +++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 src/main/resources/db/dump/update_system_email_template_application_rejected_04_02_2025.sql

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 0601f8e5..0a357530 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -409,5 +409,21 @@ public class GepafinConstant {
             "      </div>\n" +
             "   </body>\n" +
             "</html>";
+
+
+    public static final String APPLICATION_REJECTED_SVILUPPUMBRIA = "<html>\n" +
+            "    <body style=\"font-family: Arial, sans-serif; color: #000; line-height: 1.6;\">\n" +
+            "        <div style=\"padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;\">\n" +
+            "            <p>Buongiorno,</p>\n" +
+            "            <p>Si comunica che, in riferimento alla domanda a valere sul bando “<strong>{{call_name}}</strong>” di cui al\n" +
+            "            <strong>Protocollo n. {{protocol_number}} del {{protocol_date}} alle {{protocol_time}}</strong>,\n" +
+            "            la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.</p>\n" +
+            "            <p>Le motivazioni sono le seguenti: <strong>{{form_text}}</strong></p>\n" +
+            "            <p>Vi ricordiamo che i Beneficiari che hanno presentato richieste valutate non ammissibili entro 10 giorni dalla data di ricevimento della presente potranno finoltrare richiesta di chiarimenti e/o osservazioni alla scrivente Società ai sensi e per gli effetti dell’art.10 bis della L.241/1990 e s.m.i.</p>\n" +
+            "            <p>Distinti Saluti,</p>\n" +
+            "            <p><strong>{{email_signature}}</strong></p>\n" +
+            "        </div>\n" +
+            "    </body>\n" +
+            "</html>";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
index 7bc8010d..bcdf4069 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -100,6 +100,10 @@ public class EmailNotificationDao {
             bodyPlaceholders.put("{{platform_link}}",hubEntity.getDomainName());
             body = Utils.replacePlaceholders(GepafinConstant.DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA, bodyPlaceholders);
         }
+        if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE)) {
+            bodyPlaceholders.put("{{email_signature}}", hubEntity.getEmailSignature());
+            body = Utils.replacePlaceholders(GepafinConstant.APPLICATION_REJECTED_SVILUPPUMBRIA, bodyPlaceholders);
+        }
         else {
            body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders);
         }
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index 25ff1bf2..969a2a9d 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2203,4 +2203,8 @@
             <column name="date_rejected" type="TIMESTAMP WITHOUT TIME ZONE"></column>
         </addColumn>
     </changeSet>
+     <changeSet id="04-02-2025_RK_174000" author="Rajesh Khore">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_system_email_template_application_rejected_04_02_2025.sql"/>
+    </changeSet>
 </databaseChangeLog>
diff --git a/src/main/resources/db/dump/update_system_email_template_application_rejected_04_02_2025.sql b/src/main/resources/db/dump/update_system_email_template_application_rejected_04_02_2025.sql
new file mode 100644
index 00000000..67815ab0
--- /dev/null
+++ b/src/main/resources/db/dump/update_system_email_template_application_rejected_04_02_2025.sql
@@ -0,0 +1,17 @@
+UPDATE gepafin_schema.system_email_template
+SET html_content =  '<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>Buongiorno,</p>
+                                 <p>Si comunica che, in riferimento alla domanda a valere sul bando “<strong>{{call_name}}</strong>” di cui al
+                                 <strong>Protocollo n. {{protocol_number}} del {{protocol_date}} alle {{protocol_time}}</strong>,
+                                 la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.</p>
+                                 <p>Le motivazioni sono le seguenti: <strong>{{form_text}}</strong></p>
+                                 <p>Vi ricordiamo che i Beneficiari che hanno presentato richieste valutate non ammissibili entro 10 giorni dalla data di ricevimento della presente potranno formulare ricorso al Gestore tramite modello disponibile nello sportello online
+                                 <a href="{{platform_link}}">{{platform_link}}</a>.</p>
+                                 <p>Distinti Saluti,</p>
+                                 <p><strong>{{email_signature}}</strong></p>
+                             </div>
+                         </body>
+                     </html>'
+WHERE "type" = 'INADMISSIBILITY_NOTIFICATION';
\ No newline at end of file

From a6ef4ab9f8b6b2d7bc60ff08946806a3e6b0a7cf Mon Sep 17 00:00:00 2001
From: Piyush <piyush1.kag1@gmail.com>
Date: Wed, 5 Feb 2025 12:14:10 +0530
Subject: [PATCH 19/43] Updated email content for
 DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA

---
 .../net/gepafin/tendermanagement/constants/GepafinConstant.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 0a357530..9b185c56 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -393,7 +393,7 @@ public class GepafinConstant {
             "         <p><strong>RICHIESTA INTEGRAZIONE DOCUMENTALE</strong></p>\n" +
             "         <p>Buongiorno,</p>\n" +
             "         <p>In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Bando \n" +
-            "            <strong>{{call_name}}</strong> di cui al <strong>Protocollo n. {{protocol_number}} del\n" +
+            "            “<strong>{{call_name}}</strong>“ di cui al <strong>Protocollo n. {{protocol_number}} del\n" +
             "            {{protocol_date}} e {{protocol_time}}</strong>, alla luce dell'attività istruttoria svolta,\n" +
             "            segnaliamo quanto segue:\n" +
             "         </p>\n" +

From 709e173d43a2fa1d35c9a7700bbdc94f60fe05a0 Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Wed, 5 Feb 2025 12:39:03 +0530
Subject: [PATCH 20/43] Fixed issue for email updation  in company

---
 .../java/net/gepafin/tendermanagement/dao/CompanyDao.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java
index b014b779..3a527d9f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java
@@ -230,8 +230,8 @@ public class CompanyDao {
 			String responseJson = companyRequest.getVatCheckResponse() != null ? Utils.convertMapIntoJsonString(companyRequest.getVatCheckResponse()) : null;
 			setIfUpdated(userWithCompanyEntity::getJson, userWithCompanyEntity::setJson, responseJson);
 		}
-		setIfUpdated(userWithCompanyEntity::getPec, userWithCompanyEntity::setPec, userWithCompanyEntity.getPec());
-		setIfUpdated(userWithCompanyEntity::getEmail, userWithCompanyEntity::setEmail, userWithCompanyEntity.getEmail());
+		setIfUpdated(userWithCompanyEntity::getPec, userWithCompanyEntity::setPec, companyRequest.getPec());
+		setIfUpdated(userWithCompanyEntity::getEmail, userWithCompanyEntity::setEmail, companyRequest.getEmail());
 		setIfUpdated(userWithCompanyEntity::getContactName, userWithCompanyEntity::setContactName, companyRequest.getContactName());
 		setIfUpdated(userWithCompanyEntity::getContactEmail, userWithCompanyEntity::setContactEmail, companyRequest.getContactEmail());
 		setIfUpdated(userWithCompanyEntity::getIsLegalRepresentant, userWithCompanyEntity::setIsLegalRepresentant, companyRequest.getIsLegalRepresentant());

From 610aece1f6ca5153e54e21bb7ec652331026afaf Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 6 Feb 2025 15:11:42 +0530
Subject: [PATCH 21/43] Done ticket GEPAFINBE-162

---
 pom.xml                                       |   6 +
 .../constants/GepafinConstant.java            |   1 +
 .../tendermanagement/dao/ApplicationDao.java  | 202 +++++++++++++++---
 .../tendermanagement/util/FieldValidator.java |  24 ++-
 .../gepafin/tendermanagement/util/Utils.java  |  25 ++-
 src/main/resources/message_en.properties      |   1 +
 src/main/resources/message_it.properties      |   3 +-
 7 files changed, 227 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index c463be91..a42534bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,6 +245,12 @@
 			<artifactId>reactor-netty</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>net.objecthunter</groupId>
+			<artifactId>exp4j</artifactId>
+			<version>0.4.8</version>
+		</dependency>
+
 	</dependencies>
 <repositories>
     <repository>
diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 9010e157..f6d9ac42 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -407,5 +407,6 @@ public class GepafinConstant {
     public static final String ASSIGNED_APPLICATION_STATUS_UPDATED_SUCCESSFULLY = "assigned.application.status.updated.successfully";
 
     public static final String REQUIRED_REQUESTED_AMOUNT_MSG = "validation.required.requested.amount";
+    public static final String FORMULA_AMOUNT_NOT_MATCHED="formula.amount.not.matches.requested.amount";
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 794e7796..f43a030f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -31,6 +31,7 @@ import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundExceptio
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 
 import org.h2.util.IOUtils;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,11 +50,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -94,29 +100,29 @@ public class ApplicationDao {
 
     @Autowired
     private FlowDataRepository flowDataRepository;
-    
+
     @Autowired
     private  UserCompanyDelegationRepository userCompanyDelegationRepository;
-    
+
     @Autowired
     private Validator validator;
-    
+
     @Autowired
     private CompanyService companyService;
     @Autowired
     private S3PathConfig s3PathConfig;
-    
+
     @Autowired
     private SystemEmailTemplatesService systemEmailTemplatesService;
     @Autowired
     private AssignedApplicationsRepository assignedApplicationsRepository;
-    
+
     @Value("${default_System_Receiver_Email}")
 	private String defaultSystemReceiverEmail;
-    
+
     @Value("${rinaldo_email}")
 	private String rinaldoEmail;
-    
+
     @Value("${carlo_email}")
 	private String carloEmail;
 
@@ -125,37 +131,37 @@ public class ApplicationDao {
 
     @Autowired
     private AmazonS3Service amazonS3Service;
-    
+
     @Autowired
     private ApplicationSignedDocumentRepository applicationSignedDocumentRepository;
-    
+
 //    @Value("${aws.s3.url.folder.signed.document}")
 //    private String signedDocumentS3Folder;
-    
+
     @Value("${default.hub.uuid}")
     private String defaultHubUuid;
-    
+
     @Autowired
     private UserService userService;
 
     @Autowired
     private S3PathConfig s3ConfigBean;
-    
+
     @Autowired
     private ProtocolDao protocolDao;
-    
+
     @Autowired
     private HubService hubService;
 
     @Autowired
     private EmailNotificationDao emailNotificationDao;
-    
+
     @Autowired
     private FormDao formDao;
 
     @Autowired
     private EmailLogDao emailLogDao;
-    
+
     @Autowired
     private UserWithCompanyRepository userWithCompanyRepository;
 
@@ -183,6 +189,7 @@ public class ApplicationDao {
     @Autowired
     private ApplicationEvaluationRepository applicationEvaluationRepository;
 
+
     public ApplicationResponseBean createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long formId, Long applicationId) {
         FormEntity formEntity = formService.validateForm(formId);
 //        callService.validatePublishedCall(formEntity.getCall().getId());
@@ -258,7 +265,7 @@ public class ApplicationDao {
 
 //        List<ContentResponseBean> contentResponseBeans = Utils.convertJsonStringToList(
 //                applicationFormEntity.getForm().getContent(), ContentResponseBean.class);
-    	
+
     	List<ContentResponseBean> contentResponseBeans = formDao.convertFormEntityToFormResponseBean(applicationFormEntity.getForm()).getContent();
 
         for (ApplicationFormFieldEntity applicationFormFieldEntity : applicationFormFieldEntities) {
@@ -309,7 +316,7 @@ public class ApplicationDao {
             );
         }
         ApplicationEntity oldApplicationDataEntity = Utils.getClonedEntityForData(applicationEntity);
-        
+
         validator.validateUserWithCompany(request, applicationEntity.getCompanyId());
         applicationEntity.setIsDeleted(true);
         applicationEntity = applicationRepository.save(applicationEntity);
@@ -356,9 +363,9 @@ public class ApplicationDao {
 //
 //        return applicationResponses;
 //    }
-    
+
     public List<ApplicationResponse> getAllApplications(UserEntity userEntity, Long callId, Long companyId,List<ApplicationStatusTypeEnum> statusList) {
-    	
+
         log.info("Fetching applications for RoleType: {}", userEntity.getRoleEntity().getRoleType());
 
         Specification<ApplicationEntity> spec = search(userEntity, callId, companyId,statusList);
@@ -482,15 +489,18 @@ public class ApplicationDao {
 
     public List<ApplicationFormFieldEntity> createOrUpdateMultipleFormFields(List<ApplicationFormFieldRequestBean> formFieldResponseBeans,
             ApplicationFormEntity applicationFormEntity, FormEntity formEntity) {
+        FieldValidator fieldValidator = FieldValidator.create();
 
         List<ApplicationFormFieldEntity> existingFields = applicationFormFieldRepository.findByApplicationFormId(applicationFormEntity.getId());
 
-        return formFieldResponseBeans.stream().map(requestBean -> createOrUpdateApplicationFormField(requestBean, applicationFormEntity, existingFields, formEntity))
+        List<ApplicationFormFieldEntity>  applicationFormFieldEntities=formFieldResponseBeans.stream().map(requestBean -> createOrUpdateApplicationFormField(requestBean, applicationFormEntity, existingFields, formEntity,fieldValidator))
                 .collect(Collectors.toList());
+        fieldValidator.validate();
+        return applicationFormFieldEntities;
     }
 
     public ApplicationFormFieldEntity createOrUpdateApplicationFormField(ApplicationFormFieldRequestBean applicationFormFieldRequestBean,
-            ApplicationFormEntity applicationFormEntity, List<ApplicationFormFieldEntity> applicationFormFieldEntities, FormEntity formEntity) {
+            ApplicationFormEntity applicationFormEntity, List<ApplicationFormFieldEntity> applicationFormFieldEntities, FormEntity formEntity,FieldValidator fieldValidator) {
 
         ApplicationFormFieldEntity applicationFormFieldEntity = new ApplicationFormFieldEntity();
 
@@ -506,7 +516,7 @@ public class ApplicationDao {
 	                .filter(setting -> "isRequestedAmount".equals(setting.getName()) && Boolean.TRUE.equals(setting.getValue()))
 	                .findFirst()
 	                .ifPresent(setting -> {
-	                	
+
 	                    Object fieldValue = applicationFormFieldRequestBean.getFieldValue();
 	                    if(fieldValue!=null) {
 	                            try {
@@ -538,6 +548,7 @@ public class ApplicationDao {
                 }
             }
         }
+       calculationProcessForFormula(applicationFormEntity,contentResponseBeans,applicationFormFieldRequestBean,fieldValidator);
         Utils.setIfUpdated(applicationFormFieldEntity::getFieldId, applicationFormFieldEntity::setFieldId, applicationFormFieldRequestBean.getFieldId());
 
         if (applicationFormFieldRequestBean.getFieldValue() != null) {
@@ -560,7 +571,6 @@ public class ApplicationDao {
                 VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplicationFormFieldData).newData(applicationFormField).build());
 
         log.info("Version history logged for action: {}, Field ID: {}", actionType, applicationFormFieldEntity.getFieldId());
-
         return applicationFormField;
     }
 
@@ -818,7 +828,7 @@ public class ApplicationDao {
     	if(formApplicationResponse.getContent() != null && formApplicationResponse.getFormFields() != null) {
     		formApplicationResponses.add(formApplicationResponse);
     	}
-		
+
 	}
 
 	public FormApplicationResponse processForm(FormEntity formEntity, ApplicationEntity applicationEntity) {
@@ -954,7 +964,7 @@ public class ApplicationDao {
         return (int) Math.round(progress);
     }
     public void validateFormFields(ApplicationRequestBean request, FormEntity formEntity) {
-    
+
 //        List<ContentResponseBean> contentResponseBeans=Utils.convertJsonStringToList(formEntity.getContent(),ContentResponseBean.class);
     	List<ContentResponseBean> contentResponseBeans=formDao.convertFormEntityToFormResponseBean(formEntity).getContent();
 
@@ -1034,7 +1044,7 @@ public class ApplicationDao {
 		SystemEmailTemplateResponse systemEmailTemplateResponse = systemEmailTemplatesService
 				.retrieveTemplateByTypeAndCall(SystemEmailTemplatesEntityTypeEnum.APPLICATION_SUBMISSION_TO_USER_AND_COMPANY,
 						hub, null);
-		
+
 		// Create the map for subject placeholders
 		Map<String, String> subjectPlaceholders = new HashMap<>();
 		subjectPlaceholders.put("{{call_name}}", call.getName());
@@ -1211,17 +1221,17 @@ public class ApplicationDao {
 	}
 
 	public ApplicationSignedDocumentResponse getSignedDocument(HttpServletRequest request, Long applicationId) {
-		
+
 		ApplicationEntity applicationEntity = validateApplication(applicationId);
 //		validator.validateUserWithCompany(request, applicationEntity.getCompanyId());
-		
+
 		if (validator.checkIsPreInstructor()) {
 			ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluationByApplicationId(applicationId);
 			validator.validatePreInstructor(request, applicationEvaluationEntity.getUserId());
 		} else {
 			validator.validateUserId(request, applicationEntity.getUserId());
 		}
-		
+
 		ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository
 				.findByApplicationIdAndStatus(applicationId, ApplicationSignedDocumentStatusEnum.ACTIVE.getValue());
 		if(applicationSignedDocument == null) {
@@ -1230,11 +1240,11 @@ public class ApplicationDao {
 		}
 		return convertApplicationSignedDocumentToApplicationSignedDocumentResponse(applicationSignedDocument);
 	}
-	
+
 	public void deleteSignedDocument(HttpServletRequest request, Long applicationId) {
 		ApplicationEntity applicationEntity = validateApplication(applicationId);
 		validator.validateUserWithCompany(request, applicationEntity.getCompanyId());
-		
+
 		ApplicationSignedDocumentEntity applicationSignedDocument = applicationSignedDocumentRepository
 				.findByApplicationIdAndStatus(applicationId, ApplicationSignedDocumentStatusEnum.ACTIVE.getValue());
                 //cloned entity for old data
@@ -1539,5 +1549,135 @@ public class ApplicationDao {
         }
     }
 
+    public void calculationProcessForFormula(ApplicationFormEntity applicationFormEntity, List<ContentResponseBean> contentResponseBeans, ApplicationFormFieldRequestBean applicationFormFieldRequestBean,FieldValidator fieldValidator) {
+        List<String> formulaValue = new ArrayList<>();
+        String formulaValueOpt=null;
+        String label=null;
+        for (ContentResponseBean contentResponseBean:contentResponseBeans){
+            if(contentResponseBean.getId().equals(applicationFormFieldRequestBean.getFieldId())){
+                for (SettingResponseBean settingResponseBean:contentResponseBean.getSettings()){
+                    if (settingResponseBean.getName().equals("label")){
+                        label= String.valueOf(settingResponseBean.getValue());
+                    }
+                    if(settingResponseBean.getName().equals("formula")){
+                        String value= (String) settingResponseBean.getValue();
+                        formulaValueOpt=value;
+                        formulaValue=Utils.extractValues(value);
+                    }
+                }
+            }
+        }
+        Map<String, String> mappedFormulaValue = new HashMap<>();
+        Object fieldValue = applicationFormFieldRequestBean.getFieldValue();
+        if (formulaValueOpt != null && fieldValue==null) {
+            fieldValue=0;
+        }
+
+        for (ContentResponseBean contentResponseBean : contentResponseBeans) {
+            String contentId = contentResponseBean.getId();
+
+            // Extract variable values once per contentResponseBean to avoid repeated stream operations
+            Set<String> variableValues = contentResponseBean.getSettings().stream()
+                    .filter(setting -> "variable".equals(setting.getName()))
+                    .flatMap(setting -> {
+                        Object value = setting.getValue(); // Get the raw value
+                        if (value instanceof String) {
+                            return Stream.of((String) value); // Handle single String case
+                        } else if (value instanceof List) {
+                            return ((List<?>) value).stream()
+                                    .filter(item -> item instanceof String) // Ensure it's a String
+                                    .map(item -> (String) item); // Convert to String
+                        } else {
+                            return Stream.empty(); // Ignore unexpected types
+                        }
+                    })
+                    .collect(Collectors.toSet()); // Collect into a Set for uniqueness
+
+            for (String formula : formulaValue) {
+                if (variableValues.contains(formula)) { // O(1) lookup instead of O(n)
+                    mappedFormulaValue.put(formula, contentId);
+                }
+            }
+        }
+        Map<String, String> updatedMappedFormulaValue = new HashMap<>();
+
+        for (Map.Entry<String, String> entry : mappedFormulaValue.entrySet()) {
+            String variable = entry.getKey();
+            String contentId = entry.getValue();
+
+            // Repository call using contentId
+            Optional<ApplicationFormFieldEntity> optionalEntity = applicationFormFieldRepository.findByApplicationFormIdAndFieldId(applicationFormEntity.getId(),contentId);
+            // If entity is found, extract fieldValue and fieldId
+            optionalEntity.ifPresent(entity -> {
+                String entityFieldValue = entity.getFieldValue(); // Assuming getter method exists
+                String fieldId = entity.getFieldId();       // Assuming getter method exists
+                String tableType = contentResponseBeans.stream()
+                        .filter(content -> content.getId().equals(fieldId)) // Match Content ID with fieldId
+                        .flatMap(content -> content.getSettings().stream()) // Extract settings
+                        .filter(setting -> "criteria_table_columns".equals(setting.getName())) // Match name
+                        .map(setting -> setting.getName()) // Return the name of the setting
+                        .findFirst() // Get the first match
+                        .orElse(null); // Default to null if no match
+
+                if(tableType!=null){
+                    JSONObject jsonObject = new JSONObject(entityFieldValue);
+
+                    // Extract the value of total
+                    entityFieldValue = jsonObject.getString("total");
+
+                }
+
+                updatedMappedFormulaValue.put(fieldId, entityFieldValue);
+            });
+        }
+        if(formulaValueOpt==null || formulaValueOpt.isEmpty()){
+            return;
+        }
+        double finalValue = evaluateFormula(formulaValueOpt, mappedFormulaValue, updatedMappedFormulaValue);
+
+        fieldValidator.formulaValidation(fieldValue, finalValue, label);
+    }
+
+
+    public static double evaluateFormula(String formula, Map<String, String> mappedFormulaValue, Map<String, String> updatedMappedFormulaValue) {
+        // Step 1: Extract all placeholders (variables) like {rest}, {another_var}, etc.
+        Pattern pattern = Pattern.compile("\\{(.*?)\\}");
+        Matcher matcher = pattern.matcher(formula);
+        List<String> variables = new ArrayList<>();
+
+        while (matcher.find()) {
+            variables.add(matcher.group(1)); // Extract variable names inside the curly braces
+        }
+
+        // Step 2: Replace placeholders with corresponding fieldValue
+        Map<String, Double> variableValues = new HashMap<>();
+
+        for (String variable : variables) {
+            String fieldId = mappedFormulaValue.get(variable);
+            if (fieldId != null && updatedMappedFormulaValue.containsKey(fieldId)) {
+                String fieldValueStr = updatedMappedFormulaValue.get(fieldId);
+                try {
+                    double fieldValue = Double.parseDouble(fieldValueStr); // Assuming fieldValue is numeric
+                    variableValues.put(variable, fieldValue);
+                } catch (NumberFormatException e) {
+                    // Handle invalid number format gracefully (e.g., log an error or default to 0)
+                    variableValues.put(variable, 0.0);
+                }
+            }
+        }
+
+        // Step 3: Replace variables in the formula with their corresponding values
+        String expression = formula;
+        for (String variable : variables) {
+            Double value = variableValues.get(variable);
+            if (value != null) {
+                // Replace {variable} with its corresponding value in the formula
+                expression = expression.replace("{" + variable + "}", String.valueOf(value));
+            }
+        }
+
+        // Step 4: Evaluate the mathematical expression
+        return Utils.evaluateExpression(expression);
+    }
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
index 9fb108ae..1d335735 100644
--- a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
+++ b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
@@ -2,6 +2,10 @@ package net.gepafin.tendermanagement.util;
 
 import java.text.MessageFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,12 +13,18 @@ import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.dao.FormDao;
 import net.gepafin.tendermanagement.dao.VatCheckDao;
+import net.gepafin.tendermanagement.entities.ApplicationFormEntity;
+import net.gepafin.tendermanagement.entities.ApplicationFormFieldEntity;
+import net.gepafin.tendermanagement.model.request.ApplicationFormFieldRequestBean;
 import net.gepafin.tendermanagement.model.request.ContentRequestBean;
 import net.gepafin.tendermanagement.model.response.ContentResponseBean;
 import net.gepafin.tendermanagement.model.response.SettingResponseBean;
+import net.gepafin.tendermanagement.repositories.ApplicationFormFieldRepository;
+import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 import net.gepafin.tendermanagement.web.rest.api.errors.ValidationException;
 import org.apache.commons.lang3.StringUtils;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 
@@ -232,5 +242,17 @@ public class FieldValidator {
 		// Now contentRequestBean is populated with the data from the JSON
 		return contentRequestBean;
 	}
-
+	public FieldValidator formulaValidation(Object fieldValue, double finalValue, String label) {
+		if (fieldValue != null) {
+			try {
+				double fieldValueAsDouble = Double.parseDouble(fieldValue.toString());  // Convert fieldValue to double
+				if (Double.compare(finalValue, fieldValueAsDouble) != 0) {  // Compare doubles safely
+					errors.add(MessageFormat.format(Translator.toLocale(GepafinConstant.FORMULA_AMOUNT_NOT_MATCHED), label));
+				}
+			} catch (NumberFormatException e) {
+				throw new CustomValidationException(Status.BAD_REQUEST, "Invalid field value: " + fieldValue);
+			}
+		}
+		return this;
+	}
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java
index 2f063173..68e8c8b0 100644
--- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java
+++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java
@@ -11,6 +11,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -27,6 +28,8 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.model.request.GlobalFilters;
+import net.objecthunter.exp4j.Expression;
+import net.objecthunter.exp4j.ExpressionBuilder;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,6 +57,9 @@ import javax.crypto.Cipher;
 import javax.crypto.Mac;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 
@@ -753,6 +759,23 @@ public class Utils {
 	private static Map<String, Object> defaultErrorResponse() {
 		return Collections.singletonMap("message", Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
 	}
+	public static List<String> extractValues(String input) {
+		List<String> extractedValues = new ArrayList<>();
+		Pattern pattern = Pattern.compile("\\{(.*?)\\}"); // Regex to match {value}
+		Matcher matcher = pattern.matcher(input);
 
-
+		while (matcher.find()) {
+			extractedValues.add(matcher.group(1)); // Extract value inside {}
+		}
+		return extractedValues;
+	}
+	public static double evaluateExpression(String expression) {
+		try {
+			Expression exp = new ExpressionBuilder(expression).build();
+			return exp.evaluate();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Double.NaN;  // Return NaN if the expression is invalid
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index 6e058a9f..ab9b1d8c 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -367,5 +367,6 @@ either.applicationId.or.assignedApplicationId.must.be.provided=Either applicatio
 assigned.application.status.updated.successfully=Assigned application status updated successfully.
 
 validation.required.requested.amount=The Requested Amount configuration should be mandatory.
+formula.amount.not.matches.requested.amount= The {0} does not matches to calculated amount.
 
 
diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties
index 624c7dfe..c7f83aed 100644
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -358,6 +358,5 @@ either.applicationId.or.assignedApplicationId.must.be.provided = "� necessario
 assigned.application.status.updated.successfully=Stato dell'applicazione assegnata aggiornato con successo.
 
 validation.required.requested.amount=La configurazione dell'importo richiesto � obbligatoria.
-
-
+formula.amount.not.matches.requested.amount=Il {0} non corrisponde all'importo calcolato.
 

From 8d78f32234cf65498269061b274bccb6c26c336f Mon Sep 17 00:00:00 2001
From: Piyush <piyush1.kag1@gmail.com>
Date: Thu, 6 Feb 2025 16:58:30 +0530
Subject: [PATCH 22/43] Added new form field data

---
 .../resources/db/changelog/db.changelog-1.0.0.xml  |  8 ++++++++
 .../db/dump/update_form_field_data_06-02-2025.sql  | 14 ++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 src/main/resources/db/dump/update_form_field_data_06-02-2025.sql

diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index ff297cba..eab66c3d 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2379,4 +2379,12 @@
         <sqlFile dbms="postgresql"
                  path="db/dump/update_system_email_template_application_rejected_04_02_2025.sql"/>
     </changeSet>
+
+    <changeSet id="06-02-2025_PK_165700" author="Piyush Kag">
+
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_form_field_data_06-02-2025.sql"/>
+
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/src/main/resources/db/dump/update_form_field_data_06-02-2025.sql b/src/main/resources/db/dump/update_form_field_data_06-02-2025.sql
new file mode 100644
index 00000000..970f442b
--- /dev/null
+++ b/src/main/resources/db/dump/update_form_field_data_06-02-2025.sql
@@ -0,0 +1,14 @@
+
+INSERT INTO FORM_FIELD (ID, SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
+VALUES
+(
+    22,
+    22,
+    'switch',
+    'Casella di spunta "Checklist"',
+    'Per selezioni binarie, accettazioni, conferme',
+    '[{"name":"label","value":"Casella di Spunta"},{"name":"isChecklistItem","value":true}]',
+    '{"isRequired":false}',
+    CURRENT_TIMESTAMP,
+    CURRENT_TIMESTAMP
+);
\ No newline at end of file

From 8cce4f483bc85535320a9a41af814dbdd42bf3fa Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Thu, 6 Feb 2025 15:03:49 +0530
Subject: [PATCH 23/43] Updated code

---
 .../net/gepafin/tendermanagement/dao/EmailNotificationDao.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
index bcdf4069..8133e5f7 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -100,7 +100,7 @@ public class EmailNotificationDao {
             bodyPlaceholders.put("{{platform_link}}",hubEntity.getDomainName());
             body = Utils.replacePlaceholders(GepafinConstant.DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA, bodyPlaceholders);
         }
-        if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE)) {
+        else if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE)) {
             bodyPlaceholders.put("{{email_signature}}", hubEntity.getEmailSignature());
             body = Utils.replacePlaceholders(GepafinConstant.APPLICATION_REJECTED_SVILUPPUMBRIA, bodyPlaceholders);
         }

From 322b49792a79d944f98bbdd8a8b6461215a3dc52 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 6 Feb 2025 20:15:14 +0530
Subject: [PATCH 24/43] Done ticket GEPAFINBE-164

---
 .../tendermanagement/dao/AssignedApplicationsDao.java    | 2 ++
 .../java/net/gepafin/tendermanagement/dao/CallDao.java   | 9 ++++++++-
 .../gepafin/tendermanagement/entities/CallEntity.java    | 6 ++++++
 .../model/request/CreateCallRequestStep1.java            | 4 ++++
 .../model/request/UpdateCallRequestStep1.java            | 4 ++++
 .../model/response/AssignedApplicationsResponse.java     | 3 +++
 .../model/response/CallDetailsResponseBean.java          | 4 ++++
 .../tendermanagement/model/response/CallResponse.java    | 4 ++++
 src/main/resources/db/changelog/db.changelog-1.0.0.xml   | 7 +++++++
 9 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
index 9729fd85..05c65292 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
@@ -200,6 +200,8 @@ public class AssignedApplicationsDao {
         if(applicationEvaluationEntity.isPresent()){
             assignedApplicationsResponse.setEvaluationEndDate(applicationEvaluationEntity.get().getEndDate());
         }
+        assignedApplicationsResponse.setNumberOfCheck(application.getCall().getNumberOfCheck());
+        assignedApplicationsResponse.setProductId(application.getCall().getProductId());
         return assignedApplicationsResponse;
     }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
index ce9fefd9..277fb68c 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
@@ -201,6 +201,8 @@ public class CallDao {
 		callEntity.setStartTime(DateTimeUtil.parseTime(createCallRequest.getStartTime()));
 		callEntity.setEndTime(DateTimeUtil.parseTime(createCallRequest.getEndTime()));
 		callEntity.setHub(userEntity.getHub());
+		callEntity.setNumberOfCheck(createCallRequest.getNumberOfCheck());
+		callEntity.setProductId(createCallRequest.getProductId());
 		callEntity = callRepository.save(callEntity);
 		
 		/** This code is responsible for adding a version history log for the "Create Call" operation. **/
@@ -607,6 +609,8 @@ public class CallDao {
 		setIfUpdated(callEntity::getEndTime, callEntity::setEndTime, DateTimeUtil.parseTime(updateCallRequest.getEndTime()));
 		setIfUpdated(callEntity::getConfidi, callEntity::setConfidi, updateCallRequest.getConfidi());
 		setIfUpdated(callEntity::getEvaluationVersion, callEntity::setEvaluationVersion, updateCallRequest.getEvaluationVersion().getValue());
+		setIfUpdated(callEntity::getNumberOfCheck, callEntity::setNumberOfCheck, updateCallRequest.getNumberOfCheck());
+		setIfUpdated(callEntity::getProductId, callEntity::setProductId, updateCallRequest.getProductId());
 		callEntity = callRepository.save(callEntity);
 		
 		/** This code is responsible for adding a version history log for the "update call step 1" operation **/
@@ -713,7 +717,8 @@ public class CallDao {
 		callDetailsResponseBean.setPhoneNumber(callEntity.getPhoneNumber());
 		callDetailsResponseBean.setCreatedDate(callEntity.getCreatedDate());
 		callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate());
-
+		callDetailsResponseBean.setNumberOfCheck(callEntity.getNumberOfCheck());
+		callDetailsResponseBean.setProductId(callEntity.getProductId());
 		return callDetailsResponseBean;
 	}
 
@@ -737,6 +742,8 @@ public class CallDao {
 		createCallResponseBean.setFaq(faqService.getFaqByCallId(callEntity.getId()));
 		createCallResponseBean.setAimedTo(amiedTo);
 		createCallResponseBean.setCheckList(checkList);
+		createCallResponseBean.setNumberOfCheck(callEntity.getNumberOfCheck());
+		createCallResponseBean.setProductId(callEntity.getProductId());
 		return createCallResponseBean;
 	}
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
index 990d27a1..a9098234 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
@@ -91,5 +91,11 @@ public class CallEntity extends BaseEntity {
 
     @Column(name = "evaluationVersion")
     private String evaluationVersion;
+
+    @Column(name = "NUMBER_OF_CHECK")
+    private BigDecimal numberOfCheck;
+
+    @Column(name = "PRODUCT_ID")
+    private BigDecimal productId;
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
index 75c2a3d0..ca8abd99 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
@@ -24,6 +24,10 @@ public class CreateCallRequestStep1 {
 
     private BigDecimal amountMax;
 
+    private BigDecimal numberOfCheck;
+
+    private BigDecimal productId;
+
     private List<LookUpDataReq> aimedTo;
 
     private String documentationRequested;
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
index d63e5754..2ebda4b5 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
@@ -41,6 +41,10 @@ public class UpdateCallRequestStep1 {
 
 	private List<FaqReq> faq;
 
+	private BigDecimal numberOfCheck;
+
+	private BigDecimal productId;
+
 	private EvaluationVersionEnum evaluationVersion;
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
index 83c1ab0a..8597cafa 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -23,6 +24,8 @@ public class AssignedApplicationsResponse extends BaseBean {
     private LocalDateTime callEndDate;
     private String companyName;
     private LocalDateTime evaluationEndDate;
+    private BigDecimal numberOfCheck;
+    private BigDecimal productId;
     private EvaluationVersionEnum evaluationVersion;
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java
index ebe82d1e..256a564b 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java
@@ -57,5 +57,9 @@ public class CallDetailsResponseBean {
 
     private Long preferredCallId;
 
+    private BigDecimal numberOfCheck;
+
+    private BigDecimal productId;
+
     private EvaluationVersionEnum evaluationVersion;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java
index 01c36068..6390e91c 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java
@@ -50,6 +50,10 @@ public class CallResponse {
 
     private String phoneNumber;
 
+    private BigDecimal numberOfCheck;
+
+    private BigDecimal productId;
+
     @JsonSerialize(using = DynamicLocalTimeSerializer.class)
     private LocalTime startTime;
 
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index ff297cba..2b7fbb71 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2379,4 +2379,11 @@
         <sqlFile dbms="postgresql"
                  path="db/dump/update_system_email_template_application_rejected_04_02_2025.sql"/>
     </changeSet>
+
+    <changeSet id="06-02-2025_NK_155519" author="Nisha Kashyap">
+        <addColumn tableName="call">
+            <column name="number_of_check" type="numeric"></column>
+            <column name="product_id" type="numeric"></column>
+        </addColumn>
+    </changeSet>
 </databaseChangeLog>

From da677ca039ee67f8fa94556c311073a2826a3ed7 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 6 Feb 2025 20:33:40 +0530
Subject: [PATCH 25/43] Created a new endpoint to update user

---
 .../gepafin/tendermanagement/dao/UserDao.java | 54 +++++++++++++++++++
 .../request/UpdateUserReqForBeneficiary.java  | 18 +++++++
 .../tendermanagement/service/UserService.java |  2 +
 .../service/impl/UserServiceImpl.java         |  6 +++
 .../web/rest/api/UserApi.java                 | 20 ++++++-
 .../web/rest/api/impl/UserApiController.java  | 18 ++++++-
 6 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
index 0ffa0b42..acb098ef 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
@@ -20,6 +20,7 @@ import net.gepafin.tendermanagement.util.LoggingUtil;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.util.Validator;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
+import net.gepafin.tendermanagement.web.rest.api.errors.ForbiddenAccessException;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 
@@ -597,5 +598,58 @@ public class UserDao {
         return userResponseBeans;
     }
 
+    public UserResponseBean updateUserDetails(HttpServletRequest request , Long userId, UpdateUserReqForBeneficiary userReq){
+        log.info("Updating user by beneficiary with ID: {}", userId);
+        UserEntity userEntity = validator.validateUserId(request, userId);
+       
+        UserEntity oldUserEntity = Utils.getClonedEntityForData(userEntity);
+        log.info("Current user details: {}", userEntity);
+        log.info("New user details: {}", userReq);
+
+        HubEntity hubEntity = hubService.valdateHub(userEntity.getHub().getId());
+        String beneficiaryRoleType = RoleStatusEnum.ROLE_BENEFICIARY.getValue();
+
+        if (validator.checkIsBeneficiary()) {
+            // Validate if the new email already exists for another beneficiary in the same hub
+            boolean emailExistsForBeneficiary = userRepository.existsByEmailIgnoreCaseForBeneficiaries(
+                    userReq.getEmail(), hubEntity.getUniqueUuid(), beneficiaryRoleType);
+
+            if (emailExistsForBeneficiary) {
+                throw new CustomValidationException(Status.VALIDATION_ERROR,
+                        Translator.toLocale(GepafinConstant.EMAIL_ALREADY_EXISTS));
+            }
+
+            setIfUpdated(userEntity::getEmail,userEntity::setEmail,userReq.getEmail()); // Only update email if role is beneficiary
+        }
+
+        BeneficiaryEntity oldBeneficiaryEntity = null;
+
+        if(userEntity.getBeneficiary()!=null) {
+            oldBeneficiaryEntity = Utils.getClonedEntityForData(userEntity.getBeneficiary());
+            setIfUpdated(userEntity.getBeneficiary()::getFirstName, userEntity.getBeneficiary()::setFirstName, userReq.getFirstName());
+            setIfUpdated(userEntity.getBeneficiary()::getLastName, userEntity.getBeneficiary()::setLastName, userReq.getLastName());
+            setIfUpdated(userEntity.getBeneficiary()::getOrganization, userEntity.getBeneficiary()::setOrganization, userReq.getOrganization());
+            setIfUpdated(userEntity.getBeneficiary()::getAddress, userEntity.getBeneficiary()::setAddress, userReq.getAddress());
+            setIfUpdated(userEntity.getBeneficiary()::getPhoneNumber, userEntity.getBeneficiary()::setPhoneNumber, userReq.getPhoneNumber());
+            setIfUpdated(userEntity.getBeneficiary()::getDateOfBirth, userEntity.getBeneficiary()::setDateOfBirth, userReq.getDateOfBirth());
+            setIfUpdated(userEntity.getBeneficiary()::getCity, userEntity.getBeneficiary()::setCity, userReq.getCity());
+            setIfUpdated(userEntity.getBeneficiary()::getCountry, userEntity.getBeneficiary()::setCountry, userReq.getCountry());
+
+            /** This code is responsible for adding a version history log for the "Update beneficiary details " operation **/
+            loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(oldBeneficiaryEntity).newData(userEntity.getBeneficiary()).build());
+        }
+
+        userEntity = userRepository.save(userEntity);
+
+        /** This code is responsible for adding a version history log for the "Update user details by beneficiary" operation **/
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(oldUserEntity).newData(userEntity).build());
+
+        return convertUserEntityToUserResponse(userEntity);
+    }
+
+
+
+
+
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java
new file mode 100644
index 00000000..3516db8f
--- /dev/null
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java
@@ -0,0 +1,18 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class UpdateUserReqForBeneficiary {
+    private String firstName;
+    private String lastName;
+    private String email;
+    private String phoneNumber;
+    private String organization;
+    private String address;
+    private String city;
+    private String country;
+    private LocalDateTime dateOfBirth;
+}
diff --git a/src/main/java/net/gepafin/tendermanagement/service/UserService.java b/src/main/java/net/gepafin/tendermanagement/service/UserService.java
index 6a92a667..d13d8dff 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/UserService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/UserService.java
@@ -47,4 +47,6 @@ public interface UserService {
     public UserEntity getUserEntityById(Long userId);
     List<UserResponseBean> getAllUsers(HttpServletRequest request, List<Long> roleIds);
 
+    UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq);
+
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java
index b959ba61..320cb616 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java
@@ -130,4 +130,10 @@ public class UserServiceImpl implements UserService {
     	UserEntity user=validator.validateUser(request);
         return userDao.getAllUsers(user, roleIds);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq) {
+        return userDao.updateUserDetails(request , userId, userReq);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java
index 6dc45bec..b5517cd6 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java
@@ -47,7 +47,7 @@ public interface UserApi {
         return new ResponseEntity<Response<JWTToken>>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    @Operation(summary = "Api to update user",
+    @Operation(summary = "Api to update user (Only for super admin)",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -243,6 +243,24 @@ public interface UserApi {
     @RequestMapping("favicon.ico")
     @ResponseBody
 	void returnNoFavicon();
+
+    @Operation(summary = "Api to update user",
+            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)}))})
+    @RequestMapping(value = "/{userId}/update-details",
+            produces = {"application/json"},
+            method = RequestMethod.PUT)
+    default ResponseEntity<Response<UserResponseBean>> updateUserDetails(HttpServletRequest request,
+                                                                  @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId,
+                                                                  @Parameter(description = "User request object", required = true) @Valid @RequestBody UpdateUserReqForBeneficiary userReq) {
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+    }
     
     
     
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java
index 0d649943..35088a3b 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java
@@ -247,5 +247,21 @@ public class UserApiController implements UserApi {
     public void returnNoFavicon() {
         // Do nothing
     }
-    
+
+    @Override
+    public ResponseEntity<Response<UserResponseBean>> updateUserDetails(HttpServletRequest request,
+                                                                 @PathVariable("userId") Long userId,
+                                                                 @Valid @RequestBody UpdateUserReqForBeneficiary userReq) {
+        log.info("Update User for Beneficiary- User ID: {}, Request Body: {}", userId, userReq);
+
+        /** This code is responsible for "Updating user details by beneficiary" operation. **/
+        loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE)
+                .actionContext(UserActionContextEnum.UPDATE_USER_DETAILS).build());
+
+        UserResponseBean updatedUser = userService.updateUserDetails(request, userId, userReq);
+
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(new Response<>(updatedUser, Status.SUCCESS, Translator.toLocale(GepafinConstant.USER_UPDATED_SUCCESS_MSG)));
+    }
+
 }
\ No newline at end of file

From 93f663826caa28810f2a9dfef921d7b562cd776c Mon Sep 17 00:00:00 2001
From: nisha <nisha.kashyap@innogent.in>
Date: Thu, 6 Feb 2025 21:24:33 +0530
Subject: [PATCH 26/43] Added two fields in application evaluation object

---
 .../tendermanagement/dao/ApplicationEvaluationDao.java       | 5 +++++
 .../model/response/ApplicationEvaluationFormResponse.java    | 2 ++
 .../model/response/ApplicationEvaluationResponse.java        | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 75ce444c..2c36b86c 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -295,6 +295,9 @@ public class ApplicationEvaluationDao {
         response.setEvaluationEndDate(entity.getEndDate());
         response.setCreatedDate(entity.getCreatedDate());
         response.setUpdatedDate(entity.getUpdatedDate());
+        response.setNumberOfCheck(entity.getAssignedApplicationsEntity().getApplication().getCall().getNumberOfCheck());
+        response.setProductId(entity.getAssignedApplicationsEntity().getApplication().getCall().getProductId());
+
     }
 
 
@@ -1153,6 +1156,8 @@ public class ApplicationEvaluationDao {
         response.setEvaluationEndDate(entity.getEndDate());
         LocalDateTime callEndDate = application.getCall().getEndDate();
         response.setCallEndDate(callEndDate);
+        response.setNumberOfCheck(call.getNumberOfCheck());
+        response.setProductId(call.getProductId());
         setCriteriaResponses(entity, application.getId(), response, evaluationCriterias);
         setChecklistResponses(entity, application.getId(), response, checklistEntities);
         setFileResponses(entity, application.getId(), response, applicationFormEntities);
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
index f51378e0..f71cf808 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
@@ -44,5 +44,7 @@ public class ApplicationEvaluationFormResponse {
     private LocalDateTime dateAccepted;
     private LocalDateTime dateRejected;
     private EvaluationVersionEnum evaluationVersion;
+    private BigDecimal numberOfCheck;
+    private BigDecimal productId;
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
index 4afd57eb..312e6f35 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
@@ -44,6 +44,8 @@ public class ApplicationEvaluationResponse {
     private BigDecimal amountAccepted;
     private LocalDateTime dateAccepted;
     private LocalDateTime dateRejected;
+    private BigDecimal numberOfCheck;
+    private BigDecimal productId;
     private EvaluationVersionEnum evaluationVersion;
     
 }

From 9be0cf07a5523ce47ba93f7229d216dd777af3b3 Mon Sep 17 00:00:00 2001
From: piyushkag <piyush1.kag1@gmail.com>
Date: Fri, 7 Feb 2025 15:51:46 +0530
Subject: [PATCH 27/43] Fixed issue in application validation

---
 .../net/gepafin/tendermanagement/util/FieldValidator.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
index 951a6b3a..d311547a 100644
--- a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
+++ b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
@@ -173,11 +173,6 @@ public class FieldValidator {
                     throw new RuntimeException(e);
                 }
                 break;
-
-			default:
-				// If the custom rule is unknown, just log or add an error (optional)
-				errors.add(MessageFormat.format(Translator.toLocale(GepafinConstant.VALIDATION_FIELD_CUSTOM), fieldId, customRule));
-				break;
 		}
 
 		return this;

From f4c1956cb3d0b077ad59d3334dc7fb6a93807fcd Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Mon, 27 Jan 2025 18:24:09 +0530
Subject: [PATCH 28/43] Fixed issue in pdf

---
 src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
index a2e437cd..eda1d70f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
@@ -339,8 +339,9 @@ public class PdfDao {
                 for (String key : orderedKeys) {
                     if (stateFieldMap.containsKey(key)) {  // Only add data cell if key is in stateFieldMap
                         Object value = row.getOrDefault(key, ""); // Fetch value or use empty string if key not present
-                      String fieldValue= (String) value;
-                                if(Boolean.TRUE.equals(Utils.isItalianFormattedAmount(fieldValue))  ){
+//                      String fieldValue= (String) value;
+                        String fieldValue = value != null ? value.toString() : "";
+                      if(Boolean.TRUE.equals(Utils.isItalianFormattedAmount(fieldValue))  ){
                             fieldValue= String.valueOf(Utils.convertToItalianFormat(fieldValue));
                         }
 //                      PdfPCell dataCell = new PdfPCell(new Phrase(fieldValue != null ?fieldValue: "", textFont));

From 2374b802e0ba5d6a01a6dd3a3e7a5e65b3800b5f Mon Sep 17 00:00:00 2001
From: nisha <nisha.kashyap@innogent.in>
Date: Sat, 8 Feb 2025 12:37:11 +0530
Subject: [PATCH 29/43] Updated default email in production properties

---
 .../net/gepafin/tendermanagement/dao/ApplicationDao.java   | 7 ++++++-
 src/main/resources/application-production.properties       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index f43a030f..0fafe735 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1124,8 +1124,13 @@ public class ApplicationDao {
         }
         emailLogRequest.setRecipientEmails(hub.getEmail());
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()),emailLogRequest);
+        List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
+                .map(String::trim)
+                .filter(email -> !email.isEmpty())
+                .toList();
+
         emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
-        emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(defaultSystemReceiverEmail),emailLogRequest);
+        emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail,emailLogRequest);
         emailLogRequest.setRecipientEmails(rinaldoEmail);
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail),emailLogRequest);
     }
diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties
index c6a9cce8..cbf5dd3d 100644
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -16,7 +16,7 @@ spid.ipd.base.url=https://login.regione.umbria.it
 active.profile.folder=production
 
 isMailSendingEnabled = true
-default_System_Receiver_Email=c.moretti@gepafin.it
+default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
 gepafin_email=bandi@pec.gepafin.it
 rinaldo_email=rinaldo.bonazzo@bflows.net
 carlo_email=carlo.mancosu@bflows.net

From 109a0e1960fe1084002a2533f6bd2fcf686769f1 Mon Sep 17 00:00:00 2001
From: nisha <nisha.kashyap@innogent.in>
Date: Sat, 8 Feb 2025 12:37:11 +0530
Subject: [PATCH 30/43] Updated default email in production properties

---
 .../net/gepafin/tendermanagement/dao/ApplicationDao.java   | 7 ++++++-
 src/main/resources/application-production.properties       | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index de86e69f..af16c5b8 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1110,8 +1110,13 @@ public class ApplicationDao {
         }
         emailLogRequest.setRecipientEmails(hub.getEmail());
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()),emailLogRequest);
+        List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
+                .map(String::trim)
+                .filter(email -> !email.isEmpty())
+                .toList();
+
         emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
-        emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(defaultSystemReceiverEmail),emailLogRequest);
+        emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail,emailLogRequest);
         emailLogRequest.setRecipientEmails(rinaldoEmail);
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail),emailLogRequest);
     }
diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties
index 1a210195..8c181965 100644
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -16,7 +16,7 @@ spid.ipd.base.url=https://login.regione.umbria.it
 active.profile.folder=production
 
 isMailSendingEnabled = true
-default_System_Receiver_Email=c.moretti@gepafin.it
+default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
 gepafin_email=bandi@pec.gepafin.it
 rinaldo_email=rinaldo.bonazzo@bflows.net
 carlo_email=carlo.mancosu@bflows.net

From e9200c6fb38f86c568e4f0caf423a65d3e9ca15c Mon Sep 17 00:00:00 2001
From: Piyush <piyush1.kag1@gmail.com>
Date: Mon, 10 Feb 2025 14:56:47 +0530
Subject: [PATCH 31/43] Done ticket GEPAFINBE-153

---
 .../constants/GepafinConstant.java            |  13 ++
 .../tendermanagement/dao/ApplicationDao.java  |  23 ++-
 .../tendermanagement/dao/DashboardDao.java    | 160 ++++++++++++++----
 .../enums/UserActionContextEnum.java          |   1 +
 .../ApplicationPageableRequestBean.java       |   2 +
 .../model/response/ApplicationWidget.java     |  19 +++
 .../BeneficiaryStatisticsResponseBean.java    |  17 ++
 .../repositories/ApplicationRepository.java   |  63 +++++++
 .../service/DashboardService.java             |   8 +-
 .../service/impl/DashboardServiceImpl.java    |  13 +-
 .../web/rest/api/DashboardApi.java            |  20 ++-
 .../rest/api/impl/DashboardApiController.java |  15 +-
 src/main/resources/message_en.properties      |   2 +-
 src/main/resources/message_it.properties      |   2 +-
 14 files changed, 300 insertions(+), 58 deletions(-)
 create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/ApplicationWidget.java
 create mode 100644 src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryStatisticsResponseBean.java

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 3170aafd..ce019638 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -405,5 +405,18 @@ public class GepafinConstant {
     public static final String ASSIGNED_APPLICATION_STATUS_UPDATED_SUCCESSFULLY = "assigned.application.status.updated.successfully";
 
     public static final String REQUIRED_REQUESTED_AMOUNT_MSG = "validation.required.requested.amount";
+
+
+    public static final String REQUESTED_VS_APPROVED_AMOUNTS="requestedVsApprovedAmount";
+    public static final String MONTH="month";
+    public static final String TOTAL_REQUESTED="totalRequested";
+    public static final String TOTAL_APPROVED="totalApproved";
+
+    public static final String NUMBER_OF_APPLICATION="numberOfApplication";
+
+
+    public static final String COMPANY_ID_NOT_NULL_MSG = "company.id.not.null";
+    public static final String USER_WITH_COMPANY="userWithCompany";
+
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 174313ca..7d15e8b1 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1404,6 +1404,9 @@ public class ApplicationDao {
     public PageableResponseBean<List<ApplicationResponse>> getAllApplicationByPagination(UserEntity userEntity, Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean) {
         Integer pageNo = null;
         Integer pageLimit = null;
+
+        UserWithCompanyEntity userWithCompany= userWithCompanyRepository.findByUserIdAndCompanyIdAndIsDeletedFalse(userEntity.getId(), companyId).orElse(null);
+
         if (applicationPageableRequestBean.getGlobalFilters() != null) {
             pageNo = applicationPageableRequestBean.getGlobalFilters().getPage();
             pageLimit = applicationPageableRequestBean.getGlobalFilters().getLimit();
@@ -1414,7 +1417,7 @@ public class ApplicationDao {
         if (pageNo == null || pageNo <= 0) {
             pageNo = GepafinConstant.DEFAULT_PAGE;
         }
-        Specification<ApplicationEntity> spec = search(callId, companyId, applicationPageableRequestBean, userEntity);
+        Specification<ApplicationEntity> spec = search(callId,companyId, userWithCompany.getId(), applicationPageableRequestBean, userEntity);
         Page<ApplicationEntity> entityPage = applicationRepository.findAll(spec, PageRequest.of(pageNo - 1, pageLimit));
         // Prepare the response
 
@@ -1437,10 +1440,10 @@ public class ApplicationDao {
         return pageableResponseBean;
     }
 
-    public Specification<ApplicationEntity> search(Long callId, Long companyId, ApplicationPageableRequestBean applicationPageableRequestBean, UserEntity userEntity) {
+    public Specification<ApplicationEntity> search(Long callId, Long companyId, Long userWithCompanyId, ApplicationPageableRequestBean applicationPageableRequestBean, UserEntity userEntity) {
         return (root, query, criteriaBuilder) -> {
 
-            List<Predicate> predicates = getPredicates(applicationPageableRequestBean, criteriaBuilder, root, callId, companyId, userEntity);
+            List<Predicate> predicates = getPredicates(applicationPageableRequestBean, criteriaBuilder, root, callId,companyId, userWithCompanyId, userEntity);
             SortBy sortBy = new SortBy(GepafinConstant.CREATED_DATE, true);
 
             if (applicationPageableRequestBean.getGlobalFilters() != null
@@ -1464,13 +1467,15 @@ public class ApplicationDao {
 
 
     private List<Predicate> getPredicates(ApplicationPageableRequestBean applicationPageableRequestBean,
-                                          CriteriaBuilder criteriaBuilder, Root<ApplicationEntity> root, Long callId, Long companyId, UserEntity userEntity) {
+                                          CriteriaBuilder criteriaBuilder, Root<ApplicationEntity> root, Long callId,Long companyId, Long userWithCompanyId, UserEntity userEntity) {
 
         Integer year = null;
         String search = null;
+        Integer daysRange = null;
         if (applicationPageableRequestBean.getGlobalFilters() != null) {
             year = applicationPageableRequestBean.getGlobalFilters().getYear();
             search = applicationPageableRequestBean.getGlobalFilters().getSearch();
+            daysRange = applicationPageableRequestBean.getDaysRange();
         }
         List<Predicate> predicates = new ArrayList<>();
 
@@ -1512,16 +1517,24 @@ public class ApplicationDao {
         }
 
         // Optional companyId filter
+        if (userWithCompanyId != null) {
+            predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.USER_WITH_COMPANY).get(GepafinConstant.ID), userWithCompanyId));
+        }
         if (companyId != null) {
             predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.COMPANY_ID), companyId));
         }
+
+        if (daysRange != null && daysRange >= 0) {
+            LocalDateTime today = LocalDateTime.now();
+            LocalDateTime pastDate = today.minusDays(daysRange);
+            predicates.add(criteriaBuilder.between(root.get(GepafinConstant.CREATED_DATE), pastDate, today));
+        }
         predicates.add(criteriaBuilder.isFalse(root.get(GepafinConstant.IS_DELETED)));
 
         predicates.add(criteriaBuilder.equal(root.get(GepafinConstant.HUB_ID), userEntity.getHub().getId()));
 
 
         return predicates;
-
     }
     public void checkCallEndDate(CallEntity call) {
         LocalDateTime now = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
index d88319e1..31468d57 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
@@ -61,7 +61,7 @@ public class DashboardDao {
 		SuperAdminWidgetResponseBean widgetResponseBean = new SuperAdminWidgetResponseBean();
 		widgetResponseBean.setWidget1(createWidget1(requestedUserEntity));
 		Map<String, Object> widgetBars =getStatistics(requestedUserEntity);
-        widgetResponseBean.setWidgetBars(widgetBars);
+		widgetResponseBean.setWidgetBars(widgetBars);
 		return widgetResponseBean;
 	}
 
@@ -193,7 +193,7 @@ public class DashboardDao {
 
 		return stats;
 	}
-//	public Page<UserActionEntity> getUserAction(UserEntity requestedUserEntity){
+	//	public Page<UserActionEntity> getUserAction(UserEntity requestedUserEntity){
 //		Pageable pageable = PageRequest.of(0, 20); // Get the first 20 records
 //		List<String> roles=List.of(RoleStatusEnum.ROLE_PRE_INSTRUCTOR.getValue(),RoleStatusEnum.ROLE_GEPAFIN_OPERATOR.getValue(),RoleStatusEnum.ROLE_INSTRUCTOR_MANAGER.getValue());
 //		Page<UserActionEntity> userActionEntities=userActionsRepository.findActionsByRoleNamesAndHubId(roles,requestedUserEntity.getHub().getId(),pageable);
@@ -274,16 +274,16 @@ public class DashboardDao {
 				.build();
 	}
 
-    public AmendmentWidgetResponseBean getAmendmentDetails(UserEntity userEntity) {
-        AmendmentWidgetResponseBean amendmentWidgetResponseBean = initializeAmendmentResponseBean();
+	public AmendmentWidgetResponseBean getAmendmentDetails(UserEntity userEntity) {
+		AmendmentWidgetResponseBean amendmentWidgetResponseBean = initializeAmendmentResponseBean();
 
-        Long hubId = userEntity.getHub().getId();
+		Long hubId = userEntity.getHub().getId();
 		List<Long> applicationIds = getApplicationIdsForUserOrHub(userEntity,hubId);
         setAmendmentCounts(applicationIds,amendmentWidgetResponseBean, hubId);
         calculateExpiringRequestsIn48Hours(applicationIds,amendmentWidgetResponseBean, hubId);
 		calculateAverageResponseDays(applicationIds,amendmentWidgetResponseBean,hubId);
-        return amendmentWidgetResponseBean;
-    }
+		return amendmentWidgetResponseBean;
+	}
 	public List<Long> getApplicationIdsForUserOrHub(UserEntity userEntity, Long hubId) {
 		if (validator.checkIsPreInstructor()) {
 			return assignedApplicationsRepository.findApplicationIdsByUserIdAndIsDeletedFalse(userEntity.getId());
@@ -294,27 +294,27 @@ public class DashboardDao {
 
     private void setAmendmentCounts(List<Long> applicationIds,AmendmentWidgetResponseBean responseBean, Long hubId) {
 
-        Long totalAmendment = applicationAmendmentRequestRepository.countAmendmentsByApplicationIds(applicationIds);
-        if (totalAmendment != null) {
-            responseBean.setTotalAmendments(totalAmendment);
-        }
+		Long totalAmendment = applicationAmendmentRequestRepository.countAmendmentsByApplicationIds(applicationIds);
+		if (totalAmendment != null) {
+			responseBean.setTotalAmendments(totalAmendment);
+		}
 
-        Long awaitingAmendments = applicationAmendmentRequestRepository.countAmendmentsByApplicationIdsAndStatus(
-                applicationIds, ApplicationAmendmentRequestEnum.AWAITING.getValue());
-        if (awaitingAmendments != null) {
-            responseBean.setWaitingForResponseAmendments(awaitingAmendments);
-        }
-        Long responseRecievedAmendments = applicationAmendmentRequestRepository.countAmendmentsByApplicationIdsAndStatus(
-                applicationIds, ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED.getValue());
-        if (responseRecievedAmendments != null) {
-            responseBean.setResponseReceivedAmendments(responseRecievedAmendments);
-        }
-        Long expiredAmendments = applicationAmendmentRequestRepository.countAmendmentsByApplicationIdsAndStatus(
-                applicationIds, ApplicationAmendmentRequestEnum.EXPIRED.getValue());
-        if (expiredAmendments != null) {
-            responseBean.setExpiredAmendments(expiredAmendments);
-        }
-    }
+		Long awaitingAmendments = applicationAmendmentRequestRepository.countAmendmentsByApplicationIdsAndStatus(
+				applicationIds, ApplicationAmendmentRequestEnum.AWAITING.getValue());
+		if (awaitingAmendments != null) {
+			responseBean.setWaitingForResponseAmendments(awaitingAmendments);
+		}
+		Long responseRecievedAmendments = applicationAmendmentRequestRepository.countAmendmentsByApplicationIdsAndStatus(
+				applicationIds, ApplicationAmendmentRequestEnum.RESPONSE_RECEIVED.getValue());
+		if (responseRecievedAmendments != null) {
+			responseBean.setResponseReceivedAmendments(responseRecievedAmendments);
+		}
+		Long expiredAmendments = applicationAmendmentRequestRepository.countAmendmentsByApplicationIdsAndStatus(
+				applicationIds, ApplicationAmendmentRequestEnum.EXPIRED.getValue());
+		if (expiredAmendments != null) {
+			responseBean.setExpiredAmendments(expiredAmendments);
+		}
+	}
 
 		private void calculateExpiringRequestsIn48Hours(List<Long> applicationIds ,AmendmentWidgetResponseBean responseBean, Long hubId) {
 
@@ -354,8 +354,8 @@ public class DashboardDao {
 	}
 
 	public AssignedApplicationWidgetResponseBean getApplicationDetailsForEvaluation(UserEntity userEntity) {
-	   Long userId = userEntity.getId();
-	   Long hubId = userEntity.getHub().getId();
+		Long userId = userEntity.getId();
+		Long hubId = userEntity.getHub().getId();
 
 		Object[] results;
 		List<Long> applicationIds;
@@ -403,7 +403,107 @@ public class DashboardDao {
 		return response;
 	}
 
+	public static List<String> getStatusList() {
+		return List.of(
+				ApplicationStatusTypeEnum.SUBMIT.getValue(),
+				ApplicationStatusTypeEnum.EVALUATION.getValue(),
+				ApplicationStatusTypeEnum.APPROVED.getValue(),
+				ApplicationStatusTypeEnum.REJECTED.getValue(),
+				ApplicationStatusTypeEnum.SOCCORSO.getValue(),
+				ApplicationStatusTypeEnum.APPOINTMENT.getValue(),
+				ApplicationStatusTypeEnum.NDG.getValue(),
+				ApplicationStatusTypeEnum.ADMISSIBLE.getValue()
+		);
+	}
+	public BeneficiaryStatisticsResponseBean getStatisticsPageForBeneficiary(UserEntity userEntity, CompanyEntity company) {
+		BeneficiaryStatisticsResponseBean widgetResponseBean = initializeBeneficiaryStatisticsBean();
+		UserWithCompanyEntity userWithCompanyEntity = companyService.getUserWithCompany(userEntity.getId(), company.getId());
+		Long hubId = userEntity.getHub().getId();
+		List<String> statusList = getStatusList();
+		Long submittedApplication = applicationRepository.countSubmittedApplicationsByHubIdAndUserId(hubId, userEntity.getId(), userWithCompanyEntity.getId(),statusList);
+		Long approvedApplication = getApplicationCountByStatus(hubId, userEntity.getId(), userWithCompanyEntity.getId(), ApplicationStatusTypeEnum.APPROVED);
+		BigDecimal successRate = getSuccessRate(hubId, userEntity.getId(), userWithCompanyEntity.getId());
+		BigDecimal totalAmountRequested = applicationRepository.sumAmountRequestedByHubIdAndUserId(hubId, userEntity.getId(), userWithCompanyEntity.getId());
+
+		updateApplicationWidget(widgetResponseBean.getApplicationWidget(), submittedApplication, approvedApplication, successRate,totalAmountRequested);
+
+		Map<String, Object> widgetBars = getApplicationStatistics(userEntity,userWithCompanyEntity.getId());
+		widgetResponseBean.setApplicationWidgetBars(widgetBars);
+		return widgetResponseBean;
+	}
+	private BeneficiaryStatisticsResponseBean initializeBeneficiaryStatisticsBean() {
+		return BeneficiaryStatisticsResponseBean.builder()
+				.applicationWidget(ApplicationWidget.builder()
+						.submittedApplication(0L)
+						.approvedApplication(0L)
+						.successRate(BigDecimal.ZERO)
+						.totalAmountFinanced(BigDecimal.ZERO)
+						.build())
+				.build();
+	}
+	private Long getApplicationCountByStatus(Long hubId, Long userId, Long userWithCompanyId, ApplicationStatusTypeEnum status) {
+		return applicationRepository.countSubmittedApplicationsByHubIdAndUserIdAndStatus(hubId, userId, userWithCompanyId, status.getValue());
+	}
+	private BigDecimal getSuccessRate(Long hubId, Long userId, Long userWithCompanyId) {
+		return applicationRepository.findSuccessRateByHubIdAndUserIdAndUserWithCompanyId(hubId, userId, userWithCompanyId);
+	}
+	private void updateApplicationWidget(ApplicationWidget applicationWidget, Long submittedApplication, Long approvedApplication, BigDecimal successRate, BigDecimal totalAmountRequested) {
+		applicationWidget.setSubmittedApplication(submittedApplication != null ? submittedApplication : 0L);
+		applicationWidget.setApprovedApplication(approvedApplication != null ? approvedApplication : 0L);
+		applicationWidget.setSuccessRate(successRate != null ? successRate : BigDecimal.ZERO);
+		applicationWidget.setTotalAmountFinanced(totalAmountRequested != null ? totalAmountRequested : BigDecimal.ZERO);
+	}
+
+	public Map<String, Object> getApplicationStatistics(UserEntity requestedUser,Long userWithCompanyId) {
+		Map<String, Object> stats = new HashMap<>();
+
+		Map<String, Long> statusData = new HashMap<>();
+		for (ApplicationStatusTypeEnum status : ApplicationStatusTypeEnum.values()) {
+			statusData.put(status.name(), 0L);
+		}
+
+		// Get applications per status
+		List<Object[]> applicationsByStatus = applicationRepository.findApplicationsByStatusAndUserIdAndUserWithCompanyId(
+				requestedUser.getHub().getId(),
+				requestedUser.getId(),
+				userWithCompanyId
+		);
+
+		applicationsByStatus.forEach(result -> {
+			String status = (String) result[0];
+			Long count = (Long) result[1];
+			statusData.put(status, count);
+		});
+
+		List<Map<String, Object>> statusList = statusData.entrySet().stream().map(entry -> {
+			Map<String, Object> statusMap = new HashMap<>();
+			statusMap.put(GepafinConstant.STATUS, entry.getKey());
+			statusMap.put(GepafinConstant.NUMBER_OF_APPLICATION, entry.getValue());
+			return statusMap;
+		}).collect(Collectors.toList());
+
+		stats.put(GepafinConstant.APPLICATION_PER_STATUS, statusList);
+
+
+		// Requested VS Approved Amounts
+		List<Object[]> requestedVsApprovedAmounts = applicationRepository.findRequestedVsApprovedAmountsPerMonth(
+				requestedUser.getHub().getId(),
+				requestedUser.getId(),
+				userWithCompanyId
+		);
+
+		stats.put(GepafinConstant.REQUESTED_VS_APPROVED_AMOUNTS, requestedVsApprovedAmounts.stream().map(result -> {
+			Map<String, Object> data = new HashMap<>();
+			data.put(GepafinConstant.MONTH, result[0]);
+			data.put(GepafinConstant.TOTAL_REQUESTED, result[1]);
+			data.put(GepafinConstant.TOTAL_APPROVED, result[2]);
+			return data;
+		}).toList());
 
 
 
-}
+
+		return stats;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java
index 4a4d1109..bdae22ca 100644
--- a/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java
+++ b/src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java
@@ -145,6 +145,7 @@ public enum UserActionContextEnum {
     GET_APPLICATION_DETAILS("GET_APPLICATION_DETAILS"),
     GET_AMENDMENT_DETAILS("GET_AMENDMENT_DETAILS"),
     GET_APPLICATION_DETAILS_FOR_EVALUATION("GET_APPLICATION_DETAILS_FOR_EVALUATION"),
+    GET_STATISTICS_PAGE_FOR_BENEFICIARY("GET_STATISTICS_PAGE_FOR_BENEFICIARY"),
 
     /** Evaluation criteria action context **/
     GET_EVALUATION_CRITERIA("GET_EVALUATION_CRITERIA"),
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationPageableRequestBean.java b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationPageableRequestBean.java
index dcb2aebc..153164d6 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationPageableRequestBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/ApplicationPageableRequestBean.java
@@ -10,5 +10,7 @@ public class ApplicationPageableRequestBean {
 
     private GlobalFilters globalFilters;
 
+    private Integer daysRange;
+
     private List<ApplicationStatusTypeEnum> status;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationWidget.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationWidget.java
new file mode 100644
index 00000000..0cad7598
--- /dev/null
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationWidget.java
@@ -0,0 +1,19 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class ApplicationWidget {
+
+    private Long submittedApplication;
+
+    private BigDecimal successRate;
+
+    private Long approvedApplication;
+
+    private BigDecimal totalAmountFinanced;
+}
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryStatisticsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryStatisticsResponseBean.java
new file mode 100644
index 00000000..c9e88ef2
--- /dev/null
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryStatisticsResponseBean.java
@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+@Data
+@Builder
+public class BeneficiaryStatisticsResponseBean {
+
+
+    private  ApplicationWidget applicationWidget;
+
+    private Map<String, Object> applicationWidgetBars;
+}
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
index 086b0807..67ff18cd 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
@@ -92,5 +92,68 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 	@Query("SELECT a.id FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.isDeleted = false")
 	List<Long> findApplicationIdsByHubId(@Param("hubId") Long hubId);
 
+	@Query("SELECT CASE WHEN COUNT(CASE WHEN a.submissionDate IS NOT NULL THEN 1 ELSE NULL END) > 0 THEN " +
+			"CAST((SUM(CASE WHEN a.status = 'APPROVED' THEN 1 ELSE 0 END) * 100.0) / " +
+			"COUNT(CASE WHEN a.submissionDate IS NOT NULL THEN 1 ELSE NULL END) AS BigDecimal) " +
+			"ELSE CAST(0 AS BigDecimal) END " +
+			"FROM ApplicationEntity a " +
+			"WHERE a.hubId = :hubId AND a.userId = :userId AND a.userWithCompany.id = :userWithCompanyId " +
+			"AND a.isDeleted = false")
+	BigDecimal findSuccessRateByHubIdAndUserIdAndUserWithCompanyId(
+			@Param("hubId") Long hubId,
+			@Param("userId") Long userId,
+			@Param("userWithCompanyId") Long userWithCompanyId);
 
+
+	@Query("SELECT a.status, COUNT(a.id) FROM ApplicationEntity a WHERE a.isDeleted = false AND a.userId = :userId AND a.userWithCompany.id = :userWithCompanyId AND a.call.hub.id = :hubId GROUP BY a.status")
+	List<Object[]> findApplicationsByStatusAndUserIdAndUserWithCompanyId(@Param("hubId") Long hubId,
+																		 @Param("userId") Long userId,
+																		 @Param("userWithCompanyId") Long userWithCompanyId);
+
+	@Query("""
+    SELECT TO_CHAR(a.submissionDate, 'Mon') AS month,
+           SUM(a.amountRequested) AS totalRequested,
+           SUM(a.amountAccepted) AS totalApproved
+    FROM ApplicationEntity a
+    WHERE a.isDeleted = false
+    AND a.status = 'APPROVED'
+    AND a.call.hub.id = :hubId
+    AND a.userId = :userId
+    AND a.userWithCompany.id = :userWithCompanyId
+    GROUP BY TO_CHAR(a.submissionDate, 'Mon'), EXTRACT(YEAR FROM a.submissionDate), EXTRACT(MONTH FROM a.submissionDate)
+    ORDER BY EXTRACT(YEAR FROM a.submissionDate), EXTRACT(MONTH FROM a.submissionDate)
+""")
+	List<Object[]> findRequestedVsApprovedAmountsPerMonth(
+			@Param("hubId") Long hubId,
+			@Param("userId") Long userId,
+			@Param("userWithCompanyId") Long userWithCompanyId
+	);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a " +
+			"WHERE a.hubId = :hubId " +
+			"AND a.userId = :userId " +
+			"AND a.userWithCompany.id = :userWithCompanyId " +
+			"AND a.isDeleted = false " +
+			"AND a.status IN :statusList " +
+			"AND a.submissionDate IS NOT NULL")
+	Long countSubmittedApplicationsByHubIdAndUserId(
+			@Param("hubId") Long hubId,
+			@Param("userId") Long userId,
+			@Param("userWithCompanyId") Long userWithCompanyId,
+			@Param("statusList") List<String> statusList
+			);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a " +
+			"WHERE a.hubId = :hubId " +
+			"AND a.userId = :userId " +
+			"AND a.userWithCompany.id = :userWithCompanyId " +
+			"AND a.status = :status " +
+			"AND a.isDeleted = false")
+	Long countSubmittedApplicationsByHubIdAndUserIdAndStatus(
+			@Param("hubId") Long hubId,
+			@Param("userId") Long userId,
+			@Param("userWithCompanyId") Long userWithCompanyId,
+			@Param("status") String status);
+	@Query("SELECT SUM(a.amountAccepted) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.userId = :userId AND a.status = 'APPROVED' AND a.userWithCompany.id = :userWithCompanyId AND a.isDeleted = false")
+	BigDecimal sumAmountRequestedByHubIdAndUserId(@Param("hubId") Long hubId, @Param("userId") Long userId, @Param("userWithCompanyId") Long userWithCompanyId);
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/service/DashboardService.java b/src/main/java/net/gepafin/tendermanagement/service/DashboardService.java
index f2076f0c..713a83c9 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/DashboardService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/DashboardService.java
@@ -1,11 +1,7 @@
 package net.gepafin.tendermanagement.service;
 
 import jakarta.servlet.http.HttpServletRequest;
-import net.gepafin.tendermanagement.model.response.AmendmentWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.*;
 
 public interface DashboardService {
 
@@ -16,4 +12,6 @@ public interface DashboardService {
     public AmendmentWidgetResponseBean getAmendmentDetails(HttpServletRequest request);
     public AssignedApplicationWidgetResponseBean getApplicationDetailsForEvaluation(HttpServletRequest request);
 
+    public BeneficiaryStatisticsResponseBean getStatisticsPageForBeneficiary(HttpServletRequest request,Long companyId);
+
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/DashboardServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/DashboardServiceImpl.java
index a3cf0482..5dca39fd 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/DashboardServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/DashboardServiceImpl.java
@@ -4,11 +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.AmendmentWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.service.DashboardService;
 import net.gepafin.tendermanagement.util.Validator;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,4 +48,11 @@ public class DashboardServiceImpl implements DashboardService {
         UserEntity userEntity = validator.validateUser(request);
         return   dashboardDao.getApplicationDetailsForEvaluation(userEntity);
     }
+
+    @Override
+    public BeneficiaryStatisticsResponseBean getStatisticsPageForBeneficiary(HttpServletRequest request, Long companyId) {
+        UserEntity userEntity = validator.validateUser(request);
+        CompanyEntity company = validator.validateUserWithCompany(request, companyId);
+        return   dashboardDao.getStatisticsPageForBeneficiary(userEntity,company);
+    }
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/DashboardApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/DashboardApi.java
index 2fe77d1b..16a81c1d 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/DashboardApi.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/DashboardApi.java
@@ -6,11 +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.AmendmentWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
 import org.springframework.http.MediaType;
@@ -90,5 +86,17 @@ public interface DashboardApi {
             produces = { "application/json" })
     @PreAuthorize("hasRole('ROLE_SUPER_ADMIN') || hasRole('ROLE_INSTRUCTOR_MANAGER')|| hasRole('ROLE_PRE_INSTRUCTOR')")
     ResponseEntity<Response<AssignedApplicationWidgetResponseBean>> getApplicationDetailsForEvaluation(HttpServletRequest request);
-    
+    @Operation(summary = "Api to get Statistics page for beneficiary",
+            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 = "/beneficiary/statistic/company/{companyId}",
+            produces = { "application/json" })
+    ResponseEntity<Response<BeneficiaryStatisticsResponseBean>> getStatisticsPageForBeneficiary(HttpServletRequest request,
+                                                                                                @Parameter(description = "The company id", required = true) @PathVariable(value = "companyId", required = true) Long companyId);
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DashboardApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DashboardApiController.java
index 7a4a489c..0f299122 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DashboardApiController.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DashboardApiController.java
@@ -6,11 +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.AmendmentWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.ApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.AssignedApplicationWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
-import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.DashboardService;
 import net.gepafin.tendermanagement.util.LoggingUtil;
@@ -83,6 +79,15 @@ 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<BeneficiaryStatisticsResponseBean>> getStatisticsPageForBeneficiary(HttpServletRequest request, Long companyId) {
 
+        /** This code is responsible for creating user action logs for the "Get statistics page for beneficiary" operation. **/
+        loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.VIEW).actionContext(UserActionContextEnum.GET_STATISTICS_PAGE_FOR_BENEFICIARY).build());
+
+        BeneficiaryStatisticsResponseBean widgetResponseBean= dashboardService.getStatisticsPageForBeneficiary(request, companyId);
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new Response<>(widgetResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY)));
+    }
 
 }
diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties
index 451dec92..b3c5f259 100644
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -365,5 +365,5 @@ evaluation.form.not.found=Evaluation form not found.
 assigned.application.status.updated.successfully=Assigned application status updated successfully.
 
 validation.required.requested.amount=The Requested Amount configuration should be mandatory.
-
+company.id.not.null=Company ID cannot be null.
 
diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties
index 66595c92..3ba36fcf 100644
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -356,6 +356,6 @@ evaluation.form.not.found=Modulo di valutazione non trovato.
 assigned.application.status.updated.successfully=Stato dell'applicazione assegnata aggiornato con successo.
 
 validation.required.requested.amount=La configurazione dell'importo richiesto � obbligatoria.
-
+company.id.not.null=L'ID dell'azienda non pu? essere nullo.
 
 

From bba7efe6dbe60ea729fbf8e4036b16690761d396 Mon Sep 17 00:00:00 2001
From: Piyush <piyush1.kag1@gmail.com>
Date: Mon, 10 Feb 2025 20:27:17 +0530
Subject: [PATCH 32/43] Updated null to 0

---
 .../java/net/gepafin/tendermanagement/dao/DashboardDao.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
index 0e7f7802..29304f15 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java
@@ -510,8 +510,8 @@ public class DashboardDao {
 		stats.put(GepafinConstant.REQUESTED_VS_APPROVED_AMOUNTS, requestedVsApprovedAmounts.stream().map(result -> {
 			Map<String, Object> data = new HashMap<>();
 			data.put(GepafinConstant.MONTH, result[0]);
-			data.put(GepafinConstant.TOTAL_REQUESTED, result[1]);
-			data.put(GepafinConstant.TOTAL_APPROVED, result[2]);
+			data.put(GepafinConstant.TOTAL_REQUESTED, result[1]!= null ? result[1] : 0L);
+			data.put(GepafinConstant.TOTAL_APPROVED, result[2] != null ? result[2] : 0L);
 			return data;
 		}).toList());
 		return stats;

From acab068ef1b10597b22a78214cca906863fae92f Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 11 Feb 2025 11:38:56 +0530
Subject: [PATCH 33/43] Done ticket GEPAFINBE-166

---
 .../constants/GepafinConstant.java            | 92 ++++++-------------
 .../dao/EmailNotificationDao.java             | 14 +--
 .../dao/SystemEmailTemplatesDao.java          |  6 +-
 .../entities/SystemEmailTemplatesEntity.java  |  7 +-
 .../SystemEmailTemplatesRespository.java      |  3 +
 .../db/changelog/db.changelog-1.0.0.xml       | 20 ++++
 ...nt_mail_notification_mail_31_01_2024_1.sql | 65 +++++++++++++
 7 files changed, 126 insertions(+), 81 deletions(-)
 create mode 100644 src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql

diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
index 80f30960..35b2d6c1 100644
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -180,27 +180,27 @@ public class GepafinConstant {
     public static final String UNAUTHORIZED = "UNAUTHORIZED";
     public static final String COMPANY_ID_MANDATORY = "company.id.mandatory";
     public static final String USER_ALREADY_CONNECTED_TO_COMPANY = "user.already.connected.to.company";
-	public static final String YYYY_MM_DD_DASH = "yyyy-MM-dd";
-	public static final String YYYY_MM_DD_SLASH = "yyyy/MM/dd";
-	public static final String DELEGATION_TEMPLATE = "DELEGATION_TEMPLATE";
-	public static final String VALIDATION_ERROR_MISSING_FIRSTNAME = "validation.error.missing.firstName";
-	public static final String VALIDATION_ERROR_MISSING_LASTNAME = "validation.error.missing.lastName";
-	public static final String VALIDATION_ERROR_MISSING_CODICEFISCALE = "validation.error.missing.codiceFiscale";
-	public static final String DELEGATION_FILE_UPLOAD_SUCCESS = "delegation.file.upload.success";
-	public static final String DELEGATION_FETCH_SUCCESS = "delegation.fetch.success";
-	public static final String DELEGATION_TEMPLATE_GENERATION_ERROR = "delegation.template.generation.error";
-	public static final String VALIDATION_ERROR_FILE_EMPTY = "validation.error.file.empty";
-	public static final String VALIDATION_ERROR_FILE_INVALIDTYPE = "validation.error.file.invalidType";
-	public static final String UPLOAD_ERROR_S3 = "upload.error.s3";
+    public static final String YYYY_MM_DD_DASH = "yyyy-MM-dd";
+    public static final String YYYY_MM_DD_SLASH = "yyyy/MM/dd";
+    public static final String DELEGATION_TEMPLATE = "DELEGATION_TEMPLATE";
+    public static final String VALIDATION_ERROR_MISSING_FIRSTNAME = "validation.error.missing.firstName";
+    public static final String VALIDATION_ERROR_MISSING_LASTNAME = "validation.error.missing.lastName";
+    public static final String VALIDATION_ERROR_MISSING_CODICEFISCALE = "validation.error.missing.codiceFiscale";
+    public static final String DELEGATION_FILE_UPLOAD_SUCCESS = "delegation.file.upload.success";
+    public static final String DELEGATION_FETCH_SUCCESS = "delegation.fetch.success";
+    public static final String DELEGATION_TEMPLATE_GENERATION_ERROR = "delegation.template.generation.error";
+    public static final String VALIDATION_ERROR_FILE_EMPTY = "validation.error.file.empty";
+    public static final String VALIDATION_ERROR_FILE_INVALIDTYPE = "validation.error.file.invalidType";
+    public static final String UPLOAD_ERROR_S3 = "upload.error.s3";
 
     public static final String CALL_NOT_STARTED_YET = "call.not.started.yet";
     public static final String CALL_ALREADY_ENDED = "call.already.ended";
     public static final String APPLICATION_STATUS_UPDATED_SUCCESSFULLY = "application.status.updated.successfully";
     public static final String APPLICATION_ALREADY_IN_PREVIOUS_STATUS = "application.already.in.provided.status";
-	public static final String DELEGATION_NOT_FOUND = "delegation.not.found";
-	public static final String USER_COMPANY_RELATION_NOT_FOUND = "user.company.relation.not.found";
-	public static final String DELEGATION_DELETE_SUCCESS = "delegation.delete.success";
-	public static final String HH_MM_SS = "HH:mm:ss";
+    public static final String DELEGATION_NOT_FOUND = "delegation.not.found";
+    public static final String USER_COMPANY_RELATION_NOT_FOUND = "user.company.relation.not.found";
+    public static final String DELEGATION_DELETE_SUCCESS = "delegation.delete.success";
+    public static final String HH_MM_SS = "HH:mm:ss";
 
     public static final String USER_NOT_AUTHORIZED_TO_CREATE_APPLICATION = "user.not.authorized.create.application";
     public static final String APPLICATION_SUBMITTED_CANNOT_CHANGE = "application.submitted.cannot.change";
@@ -218,11 +218,11 @@ public class GepafinConstant {
     public static final String USER_ID_AND_BENEFICIARY_ID_ERROR = "userId.and.beneficiaryId.error";
     public static final String EITHER_USER_OR_BENEFICIARY_ID_REQUIRED = "either.user.or.beneficiary.id.required";
     public static final String USER_NOT_FOUND_WITH_BENEFICIARYID_MSG = "User.not.found.with.the.given.beneficiaryID";
-	public static final String PERMISSION_DENIED = "permission.denied";
-	public static final String SIGNED_DOCUMENT_FILE_UPLOAD_SUCCESS = "signed.document.file.upload.success";
-	public static final String GET_SIGNED_DOCUMENT_FILE_SUCCESS = "get.signed.document.file.success";
-	public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found";
-	public static final String DELETE_SIGNED_DOCUMENT_FILE_SUCCESS = "delete.signed.document.file.success";
+    public static final String PERMISSION_DENIED = "permission.denied";
+    public static final String SIGNED_DOCUMENT_FILE_UPLOAD_SUCCESS = "signed.document.file.upload.success";
+    public static final String GET_SIGNED_DOCUMENT_FILE_SUCCESS = "get.signed.document.file.success";
+    public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found";
+    public static final String DELETE_SIGNED_DOCUMENT_FILE_SUCCESS = "delete.signed.document.file.success";
     public static final String DD_MM_YYYY = "dd/MM/yyyy";
 
     public static final String DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY="dashboard.widget.fetched.successfully";
@@ -251,16 +251,16 @@ public class GepafinConstant {
     public static final String DELETE_ASSIGNED_APPLICATION_SUCCESS_MSG = "assigned.application.deleted.success";
     public static final String GET_ASSIGNED_APPLICATION_SUCCESS_MSG = "assigned.application.get.success";
     public static final String ASSIGNED_APPLICATION_UPDATE_SUCCESSFULLY_MSG = "assigned.application.update.successfully";
-    
+
     public static final String HUB_CREATE_SUCCESS = "hub_create_success";
     public static final String HUB_UPDATE_SUCCESS = "hub_update_success";
     public static final String HUB_GET_SUCCESS = "hub_get_success";
     public static final String HUB_GET_ALL_SUCCESS = "hub_get_all_success";
     public static final String HUB_DELETE_SUCCESS = "hub_delete_success";
     public static final String HUB_NOT_FOUND = "hub_not_found";
-	public static final String EVALUATIONCRITERIA_INVALID = "evaluationCriteria.invalid";
+    public static final String EVALUATIONCRITERIA_INVALID = "evaluationCriteria.invalid";
     public static final String  APPLICATION_NOT_IN_DRAFT_STATUS="application.not.in.draft.status";
-	public static final String GET_ERROR_S3 = "get.error.s3";
+    public static final String GET_ERROR_S3 = "get.error.s3";
     public static final String BENEFICIARY_EMAIL_NOT_FOUND_MSG = "beneficiary.email.not.found.msg";
     public static final String ADDED_S3_PATH_STRUCTURE ="added.s3.path.structure";
     public static final String S3_PATH_STRUCTURE_BY_TYPE ="fetched.s3.path.structure.by.type.successfully";
@@ -391,7 +391,7 @@ public class GepafinConstant {
     public static final String NON_EMPTY_TABLES="nonEmptyTables";
     public static final String VALIDATION_IN_TABLE = "validation.table.message";
     public static final String CALL_EXPIRED="call.expired";
-	public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
+    public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
 
 
 
@@ -410,44 +410,8 @@ public class GepafinConstant {
     public static final String REQUIRED_REQUESTED_AMOUNT_MSG = "validation.required.requested.amount";
     public static final String FORMULA_AMOUNT_NOT_MATCHED="formula.amount.not.matches.requested.amount";
     public static final String CRITERIA_TABLE_COLUMNS="criteria_table_columns";
-
-    public static final String DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA= "<html>\n" +
-            "   <body style=\"font-family: Arial, sans-serif; color: #000; line-height: 1.6;\">\n" +
-            "      <div style=\"padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;\">\n" +
-            "         <p><strong>RICHIESTA INTEGRAZIONE DOCUMENTALE</strong></p>\n" +
-            "         <p>Buongiorno,</p>\n" +
-            "         <p>In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Bando \n" +
-            "            “<strong>{{call_name}}</strong>“ di cui al <strong>Protocollo n. {{protocol_number}} del\n" +
-            "            {{protocol_date}} e {{protocol_time}}</strong>, alla luce dell'attività istruttoria svolta,\n" +
-            "            segnaliamo quanto segue:\n" +
-            "         </p>\n" +
-            "         {{note}}\n" +
-            "         <p>Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione caricandola all'interno dello sportello\n" +
-            "            online <a href=\"{{platform_link}}\">{{platform_link}}</a> entro e <strong>non oltre {{response_days}} giorni</strong> dal ricevimento della presente comunicazione,\n" +
-            "            precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento.\n" +
-            "         </p>\n" +
-            "         <p>La documentazione trasmessa e le informazioni fornite saranno processate dall'istruttore assegnatario della pratica.\n" +
-            "         </p>\n" +
-            "         <p>Distinti Saluti,</p>\n" +
-            "         <p><strong>{{email_signature}}</strong></p>\n" +
-            "      </div>\n" +
-            "   </body>\n" +
-            "</html>";
-
-
-    public static final String APPLICATION_REJECTED_SVILUPPUMBRIA = "<html>\n" +
-            "    <body style=\"font-family: Arial, sans-serif; color: #000; line-height: 1.6;\">\n" +
-            "        <div style=\"padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;\">\n" +
-            "            <p>Buongiorno,</p>\n" +
-            "            <p>Si comunica che, in riferimento alla domanda a valere sul bando “<strong>{{call_name}}</strong>” di cui al\n" +
-            "            <strong>Protocollo n. {{protocol_number}} del {{protocol_date}} alle {{protocol_time}}</strong>,\n" +
-            "            la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.</p>\n" +
-            "            <p>Le motivazioni sono le seguenti: <strong>{{form_text}}</strong></p>\n" +
-            "            <p>Vi ricordiamo che i Beneficiari che hanno presentato richieste valutate non ammissibili entro 10 giorni dalla data di ricevimento della presente potranno finoltrare richiesta di chiarimenti e/o osservazioni alla scrivente Società ai sensi e per gli effetti dell’art.10 bis della L.241/1990 e s.m.i.</p>\n" +
-            "            <p>Distinti Saluti,</p>\n" +
-            "            <p><strong>{{email_signature}}</strong></p>\n" +
-            "        </div>\n" +
-            "    </body>\n" +
-            "</html>";
 }
 
+
+   
+
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
index 8133e5f7..3988b35a 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
@@ -94,19 +94,7 @@ public class EmailNotificationDao {
         subjectPlaceholders.put("{{company_name}}", company.getCompanyName());
 //        bodyPlaceholders.put("{{legal_mail}}", legalMail);
         String subject = Utils.replacePlaceholders(systemEmailTemplateResponse.getSubject(), subjectPlaceholders);
-        String body;
-        if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.DOCUMENTATION_INTEGRATION_REQUEST)) {
-            bodyPlaceholders.put("{{email_signature}}", hubEntity.getEmailSignature());
-            bodyPlaceholders.put("{{platform_link}}",hubEntity.getDomainName());
-            body = Utils.replacePlaceholders(GepafinConstant.DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA, bodyPlaceholders);
-        }
-        else if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE)) {
-            bodyPlaceholders.put("{{email_signature}}", hubEntity.getEmailSignature());
-            body = Utils.replacePlaceholders(GepafinConstant.APPLICATION_REJECTED_SVILUPPUMBRIA, bodyPlaceholders);
-        }
-        else {
-           body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders);
-        }
+        String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders);
 
         return new EmailContentResponse(subject, body, systemEmailTemplateResponse);
     }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java b/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java
index 514506f5..8808abfd 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java
@@ -33,10 +33,10 @@ public class SystemEmailTemplatesDao {
 	public SystemEmailTemplateResponse retrieveTemplate(SystemEmailTemplatesEntityTypeEnum type, HubEntity hub, Locale language) {
 		SystemEmailTemplatesEntity dbSystemEmailTemplatesEntity = null;
 		if(hub != null){
-//			dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository
-//					.findByTypeAndCallId(type.getValue(), call.getId());
+			dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository
+					.findByTypeAndHubEntityId(type.getValue(), hub.getId());
 		}
-		if(dbSystemEmailTemplatesEntity == null) {
+		if(dbSystemEmailTemplatesEntity == null){
 			dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository
 					.findByType(type.getValue());
 		}
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java
index dac3a432..8a3c964b 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java
@@ -38,7 +38,12 @@ public class SystemEmailTemplatesEntity extends BaseEntity {
 
 	@Column(name = "email_scenario")
 	private String emailScenario;
-    
+
+	@ManyToOne
+	@JoinColumn(name = "HUB_ID")
+	private HubEntity hubEntity;
+
+
 	public enum SystemEmailTemplatesEntityTypeEnum {
 
 		APPLICATION_SUBMISSION_TO_USER_AND_COMPANY("APPLICATION_SUBMISSION_TO_USER_AND_COMPANY"),
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java b/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java
index 9e3e9bb9..d86c7216 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java
@@ -13,5 +13,8 @@ public interface SystemEmailTemplatesRespository extends JpaRepository<SystemEma
 
 	@Query("select s from SystemEmailTemplatesEntity s where s.type=:type and s.isDeleted =false and s.system = true")
 	SystemEmailTemplatesEntity findByType(@Param("type") String type);
+	
+	@Query("select s from SystemEmailTemplatesEntity s where s.type=:type and s.hubEntity.id=:hubId and s.isDeleted =false and s.system = false")
+	SystemEmailTemplatesEntity findByTypeAndHubEntityId(@Param("type") String type, @Param("hubId") Long hubId);
 
 }
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index 8b6833b4..cb626eb9 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2390,6 +2390,26 @@
 
         <sqlFile dbms="postgresql"
                  path="db/dump/update_form_field_data_06-02-2025.sql"/>
+    </changeSet>
+
+    <changeSet id="11-02-2025_RK_111500" author="Rajesh Khore">
+        <addColumn tableName="system_email_template">
+            <column name="hub_id" type="INTEGER">
+                <constraints foreignKeyName="fk_hub_id"
+                             references="hub(id)" />
+            </column>
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="11-02-2025_RK_111515" 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_updating_amendment_mail_notification_mail_31_01_2024_1.sql"/>
 
     </changeSet>
 
diff --git a/src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql b/src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql
new file mode 100644
index 00000000..e148c879
--- /dev/null
+++ b/src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql
@@ -0,0 +1,65 @@
+INSERT INTO gepafin_schema.system_email_template (template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date, email_scenario, hub_id)
+VALUES
+(
+    'Instructional Aid/Request for Documentation Integration Template For Sviluppumbria',
+    'DOCUMENTATION_INTEGRATION_REQUEST',
+    '<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>RICHIESTA INTEGRAZIONE DOCUMENTALE</strong></p>
+              <p>Buongiorno,</p>
+              <p>In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Bando
+                  "<strong>{{call_name}}</strong>" di cui al <strong>Protocollo n. {{protocol_number}} del
+                 {{protocol_date}} e {{protocol_time}}</strong>, alla luce dell''attività istruttoria svolta,
+                 segnaliamo quanto segue:
+              </p>
+              {{note}}
+              <p>Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione caricandola all''interno dello sportello
+                 online <a href="{{platform_link}}">{{platform_link}}</a> entro e <strong>non oltre {{response_days}} giorni</strong> dal ricevimento della presente comunicazione,
+                 precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento.
+              </p>
+              <p>La documentazione trasmessa e le informazioni fornite saranno processate dall''istruttore assegnatario della pratica.
+              </p>
+              <p>Distinti Saluti,</p>
+              <p><strong>{{email_signature}}</strong></p>
+           </div>
+        </body>
+     </html>',
+    'BANDO {{call_name}}- Domanda di concessione di finanziamento agevolato {{company_name}}',
+    NULL,
+    false,
+    false,
+    CURRENT_TIMESTAMP,
+    CURRENT_TIMESTAMP,
+    'APPLICATION_AMENDMENT_REQUESTED',
+    2
+);
+
+INSERT INTO gepafin_schema.system_email_template (template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date, email_scenario, hub_id)
+VALUES
+(
+    'Notification of Inadmissibility Template',
+    'INADMISSIBILITY_NOTIFICATION',
+    '<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>Buongiorno,</p>
+                 <p>Si comunica che, in riferimento alla domanda a valere sul bando “<strong>{{call_name}}</strong>” di cui al
+                 <strong>Protocollo n. {{protocol_number}} del {{protocol_date}} alle {{protocol_time}}</strong>,
+                 la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.</p>
+                 <p>Le motivazioni sono le seguenti: <strong>{{form_text}}</strong></p>
+                 <p>Vi ricordiamo che i Beneficiari che hanno presentato richieste valutate non ammissibili entro 10 giorni dalla data di ricevimento della presente potranno finoltrare richiesta di chiarimenti e/o osservazioni alla scrivente Società ai sensi e per gli effetti dell’art.10 bis della L.241/1990 e s.m.i.</p>
+                 <p>Distinti Saluti,</p>
+                 <p><strong>{{email_signature}}</strong></p>
+             </div>
+         </body>
+     </html>',
+    'BANDO {{call_name}} – Esito negativo istruttoria di ammissibilità {{company_name}}',
+    NULL,
+    false,
+    false,
+    CURRENT_TIMESTAMP,
+    CURRENT_TIMESTAMP,
+    'APPLICATION_REJECTED',
+    2
+);
\ No newline at end of file

From 6bb531789a0d2276e54644f71ca0e56c6e5648c6 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 11 Feb 2025 18:24:18 +0530
Subject: [PATCH 34/43] Changes in create Application api for gepafin

---
 .../tendermanagement/dao/ApplicationDao.java     | 16 ++++++++++++++++
 .../repositories/ApplicationRepository.java      |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 35ecc113..fb2a1749 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -888,6 +888,10 @@ public class ApplicationDao {
         checkCallEndDate(call);
 //		call = callService.validatePublishedCall(call.getId());
 //		checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
+        HubEntity hubEntity = hubService.valdateHub(call.getHub().getId());
+        if(hubEntity.getUniqueUuid().equals(defaultHubUuid)){
+            checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
+        }
 		ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, userWithCompanyEntity);
 		applicationEntity.setComments(applicationRequest.getComments());
 		applicationEntity = saveApplicationEntity(applicationEntity);
@@ -900,6 +904,18 @@ public class ApplicationDao {
 //        }
 //    }
 
+    public void checkIfApplicationExists(CallEntity call, UserWithCompanyEntity userWithCompanyEntity, UserEntity userEntity){
+
+        List<ApplicationEntity> applications = applicationRepository.findByUserIdAndUserWithCompany_IdAndCall_IdAndIsDeletedFalseAndStatusNot(
+                userEntity.getId(), userWithCompanyEntity.getId(), call.getId(), ApplicationStatusTypeEnum.REJECTED.name()
+        );
+
+        if (!applications.isEmpty()) {
+            throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_EXISTS));
+        }
+    }
+
+
     public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) {
 
         ApplicationEntity applicationEntity = validateApplication(applicationId);
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
index 2434fac9..5ed76d55 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
@@ -158,4 +158,8 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 			@Param("status") String status);
 	@Query("SELECT SUM(a.amountAccepted) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.userId = :userId AND a.status = 'APPROVED' AND a.userWithCompany.id = :userWithCompanyId AND a.isDeleted = false")
 	BigDecimal sumAmountRequestedByHubIdAndUserId(@Param("hubId") Long hubId, @Param("userId") Long userId, @Param("userWithCompanyId") Long userWithCompanyId);
+
+	List<ApplicationEntity> findByUserIdAndUserWithCompany_IdAndCall_IdAndIsDeletedFalseAndStatusNot(
+			Long userId, Long userWithCompanyId, Long callId, String status
+	);
 }

From 8a08fd6b3e95054afd31cbed2ab489c43bbf221d Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 11 Feb 2025 18:24:55 +0530
Subject: [PATCH 35/43] updated code

---
 .../net/gepafin/tendermanagement/entities/CallEntity.java    | 4 ++--
 .../model/request/CreateCallRequestStep1.java                | 4 ++--
 .../model/request/UpdateCallRequestStep1.java                | 4 ++--
 .../model/response/ApplicationEvaluationResponse.java        | 4 ++--
 .../model/response/AssignedApplicationsResponse.java         | 4 ++--
 .../model/response/CallDetailsResponseBean.java              | 4 ++--
 .../tendermanagement/model/response/CallResponse.java        | 4 ++--
 src/main/resources/db/changelog/db.changelog-1.0.0.xml       | 5 +++++
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
index a9098234..36c370d1 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
@@ -93,9 +93,9 @@ public class CallEntity extends BaseEntity {
     private String evaluationVersion;
 
     @Column(name = "NUMBER_OF_CHECK")
-    private BigDecimal numberOfCheck;
+    private Long numberOfCheck;
 
     @Column(name = "PRODUCT_ID")
-    private BigDecimal productId;
+    private Long productId;
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
index ca8abd99..c54a1454 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
@@ -24,9 +24,9 @@ public class CreateCallRequestStep1 {
 
     private BigDecimal amountMax;
 
-    private BigDecimal numberOfCheck;
+    private Long numberOfCheck;
 
-    private BigDecimal productId;
+    private Long productId;
 
     private List<LookUpDataReq> aimedTo;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
index 2ebda4b5..ad55d544 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java
@@ -41,9 +41,9 @@ public class UpdateCallRequestStep1 {
 
 	private List<FaqReq> faq;
 
-	private BigDecimal numberOfCheck;
+	private Long numberOfCheck;
 
-	private BigDecimal productId;
+	private Long productId;
 
 	private EvaluationVersionEnum evaluationVersion;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
index 312e6f35..44f27c13 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
@@ -44,8 +44,8 @@ public class ApplicationEvaluationResponse {
     private BigDecimal amountAccepted;
     private LocalDateTime dateAccepted;
     private LocalDateTime dateRejected;
-    private BigDecimal numberOfCheck;
-    private BigDecimal productId;
+    private Long numberOfCheck;
+    private Long productId;
     private EvaluationVersionEnum evaluationVersion;
     
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
index 8597cafa..37311ff6 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
@@ -24,8 +24,8 @@ public class AssignedApplicationsResponse extends BaseBean {
     private LocalDateTime callEndDate;
     private String companyName;
     private LocalDateTime evaluationEndDate;
-    private BigDecimal numberOfCheck;
-    private BigDecimal productId;
+    private Long numberOfCheck;
+    private Long productId;
     private EvaluationVersionEnum evaluationVersion;
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java
index 256a564b..76e892d1 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java
@@ -57,9 +57,9 @@ public class CallDetailsResponseBean {
 
     private Long preferredCallId;
 
-    private BigDecimal numberOfCheck;
+    private Long numberOfCheck;
 
-    private BigDecimal productId;
+    private Long productId;
 
     private EvaluationVersionEnum evaluationVersion;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java
index 6390e91c..a566ab37 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java
@@ -50,9 +50,9 @@ public class CallResponse {
 
     private String phoneNumber;
 
-    private BigDecimal numberOfCheck;
+    private Long numberOfCheck;
 
-    private BigDecimal productId;
+    private Long productId;
 
     @JsonSerialize(using = DynamicLocalTimeSerializer.class)
     private LocalTime startTime;
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index cb626eb9..37c34586 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2413,4 +2413,9 @@
 
     </changeSet>
 
+    <changeSet id="11-02-2025_NK_180615" author="Nisha Kashyap">
+        <modifyDataType tableName="call" columnName="number_of_check" newDataType="INTEGER"/>
+        <modifyDataType tableName="call" columnName="product_id" newDataType="INTEGER"/>
+    </changeSet>
+
 </databaseChangeLog>

From 3b3182cc1fd9f7c3054524e297f1cea08ad1722d Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 11 Feb 2025 18:24:18 +0530
Subject: [PATCH 36/43] Resolved conflict

---
 .../tendermanagement/dao/ApplicationDao.java  | 16 ++++++
 .../repositories/ApplicationRepository.java   | 56 +++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index af16c5b8..8bc2eb00 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -874,6 +874,10 @@ public class ApplicationDao {
         checkCallEndDate(call);
 //		call = callService.validatePublishedCall(call.getId());
 //		checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
+        HubEntity hubEntity = hubService.valdateHub(call.getHub().getId());
+        if(hubEntity.getUniqueUuid().equals(defaultHubUuid)){
+            checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
+        }
 		ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, userWithCompanyEntity);
 		applicationEntity.setComments(applicationRequest.getComments());
 		applicationEntity = saveApplicationEntity(applicationEntity);
@@ -886,6 +890,18 @@ public class ApplicationDao {
 //        }
 //    }
 
+    public void checkIfApplicationExists(CallEntity call, UserWithCompanyEntity userWithCompanyEntity, UserEntity userEntity){
+
+        List<ApplicationEntity> applications = applicationRepository.findByUserIdAndUserWithCompany_IdAndCall_IdAndIsDeletedFalseAndStatusNot(
+                userEntity.getId(), userWithCompanyEntity.getId(), call.getId(), ApplicationStatusTypeEnum.REJECTED.name()
+        );
+
+        if (!applications.isEmpty()) {
+            throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_EXISTS));
+        }
+    }
+
+
     public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) {
 
         ApplicationEntity applicationEntity = validateApplication(applicationId);
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
index c46c52c7..d57b7d0c 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java
@@ -77,4 +77,60 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 	List<Long> findApplicationIdsByHubId(@Param("hubId") Long hubId);
 
 
+
+	@Query("SELECT a.status, COUNT(a.id) FROM ApplicationEntity a WHERE a.isDeleted = false AND a.userId = :userId AND a.userWithCompany.id = :userWithCompanyId AND a.call.hub.id = :hubId GROUP BY a.status")
+	List<Object[]> findApplicationsByStatusAndUserIdAndUserWithCompanyId(@Param("hubId") Long hubId,
+																		 @Param("userId") Long userId,
+																		 @Param("userWithCompanyId") Long userWithCompanyId);
+
+	@Query("""
+    SELECT TO_CHAR(a.submissionDate, 'Mon') AS month,
+           SUM(a.amountRequested) AS totalRequested,
+           SUM(a.amountAccepted) AS totalApproved
+    FROM ApplicationEntity a
+    WHERE a.isDeleted = false
+    AND a.status = 'APPROVED'
+    AND a.call.hub.id = :hubId
+    AND a.userId = :userId
+    AND a.userWithCompany.id = :userWithCompanyId
+    GROUP BY TO_CHAR(a.submissionDate, 'Mon'), EXTRACT(YEAR FROM a.submissionDate), EXTRACT(MONTH FROM a.submissionDate)
+    ORDER BY EXTRACT(YEAR FROM a.submissionDate), EXTRACT(MONTH FROM a.submissionDate)
+""")
+	List<Object[]> findRequestedVsApprovedAmountsPerMonth(
+			@Param("hubId") Long hubId,
+			@Param("userId") Long userId,
+			@Param("userWithCompanyId") Long userWithCompanyId
+	);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a " +
+			"WHERE a.hubId = :hubId " +
+			"AND a.userId = :userId " +
+			"AND a.userWithCompany.id = :userWithCompanyId " +
+			"AND a.isDeleted = false " +
+			"AND a.status IN :statusList " +
+			"AND a.submissionDate IS NOT NULL")
+	Long countSubmittedApplicationsByHubIdAndUserId(
+			@Param("hubId") Long hubId,
+			@Param("userId") Long userId,
+			@Param("userWithCompanyId") Long userWithCompanyId,
+			@Param("statusList") List<String> statusList
+			);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a " +
+			"WHERE a.hubId = :hubId " +
+			"AND a.userId = :userId " +
+			"AND a.userWithCompany.id = :userWithCompanyId " +
+			"AND a.status = :status " +
+			"AND a.isDeleted = false")
+	Long countSubmittedApplicationsByHubIdAndUserIdAndStatus(
+			@Param("hubId") Long hubId,
+			@Param("userId") Long userId,
+			@Param("userWithCompanyId") Long userWithCompanyId,
+			@Param("status") String status);
+	@Query("SELECT SUM(a.amountAccepted) FROM ApplicationEntity a WHERE a.hubId = :hubId AND a.userId = :userId AND a.status = 'APPROVED' AND a.userWithCompany.id = :userWithCompanyId AND a.isDeleted = false")
+	BigDecimal sumAmountRequestedByHubIdAndUserId(@Param("hubId") Long hubId, @Param("userId") Long userId, @Param("userWithCompanyId") Long userWithCompanyId);
+
+	List<ApplicationEntity> findByUserIdAndUserWithCompany_IdAndCall_IdAndIsDeletedFalseAndStatusNot(
+			Long userId, Long userWithCompanyId, Long callId, String status
+	);
 }

From 740b8b8725074dc709dfa242fe05d207ebb23b5c Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Thu, 13 Feb 2025 12:40:47 +0530
Subject: [PATCH 37/43] Done ticket GEPAFINBE-168

---
 .../tendermanagement/dao/ApplicationDao.java  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index fb2a1749..623d88c8 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1133,20 +1133,22 @@ public class ApplicationDao {
 //        mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null);
 //        mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null);
 //        mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null);
-        if(validator.isProductionProfileActivated()) {
-            emailLogRequest.setRecipientEmails(carloEmail);
+      if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))) {
+          if (validator.isProductionProfileActivated()) {
+              emailLogRequest.setRecipientEmails(carloEmail);
 //        	mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
-            emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
-        }
+              emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
+          }
+          List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
+                  .map(String::trim)
+                  .filter(email -> !email.isEmpty())
+                  .toList();
+
+          emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
+          emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
+      }
         emailLogRequest.setRecipientEmails(hub.getEmail());
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()),emailLogRequest);
-        List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
-                .map(String::trim)
-                .filter(email -> !email.isEmpty())
-                .toList();
-
-        emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
-        emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail,emailLogRequest);
         emailLogRequest.setRecipientEmails(rinaldoEmail);
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail),emailLogRequest);
     }

From ad8a8daf2d87fb9a6aae9527d43fa31d64fc8e2d Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Thu, 13 Feb 2025 12:40:47 +0530
Subject: [PATCH 38/43] Done ticket GEPAFINBE-168

---
 .../tendermanagement/dao/ApplicationDao.java  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 8bc2eb00..caa7fee0 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1119,20 +1119,22 @@ public class ApplicationDao {
 //        mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null);
 //        mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null);
 //        mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null);
-        if(validator.isProductionProfileActivated()) {
-            emailLogRequest.setRecipientEmails(carloEmail);
+      if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))) {
+          if (validator.isProductionProfileActivated()) {
+              emailLogRequest.setRecipientEmails(carloEmail);
 //        	mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
-            emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
-        }
+              emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
+          }
+          List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
+                  .map(String::trim)
+                  .filter(email -> !email.isEmpty())
+                  .toList();
+
+          emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
+          emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
+      }
         emailLogRequest.setRecipientEmails(hub.getEmail());
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()),emailLogRequest);
-        List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
-                .map(String::trim)
-                .filter(email -> !email.isEmpty())
-                .toList();
-
-        emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
-        emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail,emailLogRequest);
         emailLogRequest.setRecipientEmails(rinaldoEmail);
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail),emailLogRequest);
     }

From ac27800c5094a747bdadf773a0dbe19fb9c1ac41 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 13 Feb 2025 14:46:31 +0530
Subject: [PATCH 39/43] Updated code

---
 .../tendermanagement/dao/ApplicationEvaluationDao.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 2c36b86c..ef01dea6 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -153,7 +153,7 @@ public class ApplicationEvaluationDao {
         Long hubId = application.getHubId();
         HubEntity hub = hubService.valdateHub(hubId);
 
-        Long initialDays = (hub != null) ? hub.getEvaluationExpirationDays() : 0L;
+        Long initialDays = (hub != null) ? hub.getEvaluationExpirationDays() : 30L;
 
         entity.setApplicationId(application.getId());
         entity.setAssignedApplicationsEntity(assignedApplications);
@@ -165,10 +165,10 @@ public class ApplicationEvaluationDao {
         entity.setMotivation(req.getMotivation());
         entity.setIsDeleted(false);
         entity.setInitialDays(initialDays);
-        entity.setRemainingDays(30L);
+        entity.setRemainingDays(initialDays);
         entity.setSuspendedDays(0L);
         entity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
-        entity.setEndDate(DateTimeUtil.DateServerToUTC(application.getSubmissionDate().plusDays(30)));
+        entity.setEndDate(DateTimeUtil.DateServerToUTC(application.getSubmissionDate().plusDays(initialDays)));
         entity.setEvaluationVersion(application.getEvaluationVersion());
         entity.setStatus(ApplicationEvaluationStatusTypeEnum.OPEN.getValue());
         return entity;

From 32617b0291fd7bf485348023d8f665a8e9f6fcc7 Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Thu, 13 Feb 2025 17:57:48 +0530
Subject: [PATCH 40/43] Fixed validation issue for table

---
 .../tendermanagement/util/FieldValidator.java | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
index d311547a..7a4e24b8 100644
--- a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
+++ b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
@@ -224,32 +224,32 @@ public class FieldValidator {
 				return;
 			}
 
-			for (int rowIndex = 0; rowIndex < fieldValueList.size(); rowIndex++) {
-				Map<String, Object> field = fieldValueList.get(rowIndex);
-
-				boolean hasSingleNonNullPredefinedFalse = false;
-
-				for (Map.Entry<String, Boolean> entry : stateFieldMap.entrySet()) {
-					String stateKey = entry.getKey();
-					Boolean isPredefinedFalse = Boolean.FALSE.equals(entry.getValue());
-
-						if (isPredefinedFalse) {
-							Object fieldValue = field.get(stateKey);
-							if (fieldValue != null && !StringUtils.isEmpty(fieldValue.toString())) {
-								hasSingleNonNullPredefinedFalse = true;
-								break;
-							}
-						}
-				}
-
-				if (!hasSingleNonNullPredefinedFalse) {
-					errors.add(MessageFormat.format(
-							Translator.toLocale(GepafinConstant.VALIDATION_IN_TABLE),
-							fieldId));
-					break;
-				}
-
-			}
+//			for (int rowIndex = 0; rowIndex < fieldValueList.size(); rowIndex++) {
+//				Map<String, Object> field = fieldValueList.get(rowIndex);
+//
+//				boolean hasSingleNonNullPredefinedFalse = false;
+//
+//				for (Map.Entry<String, Boolean> entry : stateFieldMap.entrySet()) {
+//					String stateKey = entry.getKey();
+//					Boolean isPredefinedFalse = Boolean.FALSE.equals(entry.getValue());
+//
+//						if (isPredefinedFalse) {
+//							Object fieldValue = field.get(stateKey);
+//							if (fieldValue != null && !StringUtils.isEmpty(fieldValue.toString())) {
+//								hasSingleNonNullPredefinedFalse = true;
+//								break;
+//							}
+//						}
+//				}
+//
+//				if (!hasSingleNonNullPredefinedFalse) {
+//					errors.add(MessageFormat.format(
+//							Translator.toLocale(GepafinConstant.VALIDATION_IN_TABLE),
+//							fieldId));
+//					break;
+//				}
+//
+//			}
 
 		} catch (Exception e) {
 		}

From 73b738e6f9bd330d399fd501f13ba62a0a1a5b01 Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Thu, 13 Feb 2025 19:23:27 +0530
Subject: [PATCH 41/43] Updated response for email template in amendment

---
 .../tendermanagement/dao/ApplicationAmendmentRequestDao.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
index 0e138227..ab5a159b 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -1083,7 +1083,7 @@ public class ApplicationAmendmentRequestDao {
         List<ApplicationAmendmentRequestResponse> response = new ArrayList<>();
         if (applicationAmendmentRequestEntity != null) {
             response = applicationAmendmentRequestEntity.stream()
-                    .map(entity -> convertEntityToResponse(entity, false))
+                    .map(entity -> convertEntityToResponse(entity, true))
                     .collect(Collectors.toList());
         }
         return response;

From 268f7dc387e6e532a7c3288a29989909fe2b86ea Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 13 Feb 2025 19:32:14 +0530
Subject: [PATCH 42/43] Updated code for email in application submission

---
 .../tendermanagement/dao/ApplicationDao.java  | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 9c65b574..18e522dc 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -1132,22 +1132,28 @@ public class ApplicationDao {
 //        mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null);
 //        mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null);
 //        mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null);
-      if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))) {
-          if (validator.isProductionProfileActivated()) {
-              emailLogRequest.setRecipientEmails(carloEmail);
-//        	mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
-              emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
-          }
-          List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
-                  .map(String::trim)
-                  .filter(email -> !email.isEmpty())
-                  .toList();
+//      if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))) {
+//          if (validator.isProductionProfileActivated()) {
+//              emailLogRequest.setRecipientEmails(carloEmail);
+////        	mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
+//              emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
+//          }
+//          List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
+//                  .map(String::trim)
+//                  .filter(email -> !email.isEmpty())
+//                  .toList();
+//
+//          emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
+//          emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
+//      }
+
+        List<String> hubEmails = Arrays.stream(hub.getEmail().split(","))
+                .map(String::trim)
+                .filter(email -> !email.isEmpty())
+                .toList();
 
-          emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
-          emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
-      }
         emailLogRequest.setRecipientEmails(hub.getEmail());
-        emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()),emailLogRequest);
+        emailNotificationDao.sendMail(hub.getId(), subject, body,hubEmails,emailLogRequest);
         emailLogRequest.setRecipientEmails(rinaldoEmail);
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail),emailLogRequest);
     }

From 555a5d777a80d4ea211f50816f69bffb3875bb38 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Fri, 14 Feb 2025 10:14:39 +0530
Subject: [PATCH 43/43] Fixed table validation issue

---
 .../tendermanagement/util/FieldValidator.java    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
index 7a4e24b8..edde130a 100644
--- a/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
+++ b/src/main/java/net/gepafin/tendermanagement/util/FieldValidator.java
@@ -251,6 +251,22 @@ public class FieldValidator {
 //
 //			}
 
+
+			boolean hasAtLeastOneNonEmptyPredefinedFalse = fieldValueList.stream()
+					.anyMatch(field -> stateFieldMap.entrySet().stream()
+							.filter(entry -> Boolean.FALSE.equals(entry.getValue()))  // Check only predefined: false fields
+							.anyMatch(entry -> {
+								Object fieldValue = field.get(entry.getKey());
+								return fieldValue != null && !StringUtils.isEmpty(fieldValue.toString());
+							})
+					);
+
+			if (!hasAtLeastOneNonEmptyPredefinedFalse) {
+				errors.add(MessageFormat.format(
+						Translator.toLocale(GepafinConstant.VALIDATION_IN_TABLE),
+						fieldId));
+			}
+
 		} catch (Exception e) {
 		}
 	}