BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #255 from Kitzanos/call-date-time-issue

Browse Source 
Fixed issue for Call date-time check
This commit is contained in:
rajeshkhore
2025-04-01 12:10:22 +05:30
committed by GitHub
parent e46e595b94 ed62ed2791
commit 586f872b34
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -942,7 +942,7 @@ public class ApplicationDao {
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_IN_PREVIOUS_STATUS)); throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_IN_PREVIOUS_STATUS));
} }
if (status.equals(ApplicationStatusTypeEnum.SUBMIT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.READY.getValue()))) { if (status.equals(ApplicationStatusTypeEnum.SUBMIT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.READY.getValue()))) {
callService.validatePublishedCall(applicationEntity.getCall().getId(), userEntity.getHub().getId()); // callService.validatePublishedCall(applicationEntity.getCall().getId(), userEntity.getHub().getId());
Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub()); Long protocolNumber = protocolDao.getProtocolNumber(userEntity.getHub());
ProtocolEntity protocolEntity = protocolDao.createProtocolEntity(applicationEntity, protocolNumber, userEntity.getHub().getId(),true); ProtocolEntity protocolEntity = protocolDao.createProtocolEntity(applicationEntity, protocolNumber, userEntity.getHub().getId(),true);
applicationEntity.setProtocol(protocolEntity); applicationEntity.setProtocol(protocolEntity);
@@ -1665,19 +1665,21 @@ public class ApplicationDao {
public void checkCallEndDate(CallEntity call) { public void checkCallEndDate(CallEntity call) {
LocalDateTime now = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
callService.validatePublishedCall(call.getId(), call.getHub().getId());
LocalDateTime callEndDateTime = LocalDateTime.of( // LocalDateTime now = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
call.getEndDate().toLocalDate(), //
call.getEndTime() // LocalDateTime callEndDateTime = LocalDateTime.of(
); // call.getEndDate().toLocalDate(),
// call.getEndTime()
if (now.isAfter(callEndDateTime)) { // );
throw new CustomValidationException( //
Status.BAD_REQUEST, // if (now.isAfter(callEndDateTime)) {
Translator.toLocale(GepafinConstant.CALL_EXPIRED) // throw new CustomValidationException(
); // Status.BAD_REQUEST,
} // Translator.toLocale(GepafinConstant.CALL_EXPIRED)
// );
// }
} }
public void calculationProcessForFormula(ApplicationFormEntity applicationFormEntity, List<ContentResponseBean> contentResponseBeans, ApplicationFormFieldRequestBean applicationFormFieldRequestBean,FieldValidator fieldValidator) { public void calculationProcessForFormula(ApplicationFormEntity applicationFormEntity, List<ContentResponseBean> contentResponseBeans, ApplicationFormFieldRequestBean applicationFormFieldRequestBean,FieldValidator fieldValidator) {

4
src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
View File

@@ -959,8 +959,8 @@ public class CallDao {
Status.NOT_FOUND, Status.NOT_FOUND,
Translator.toLocale(GepafinConstant.CALL_NOT_PUBLISHED)); Translator.toLocale(GepafinConstant.CALL_NOT_PUBLISHED));
} }
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = DateTimeUtil.LocalDateServerToEurope(LocalDate.now());
LocalTime currentTime = LocalTime.now(); LocalTime currentTime = DateTimeUtil.LocalTimeServerToEurope(LocalTime.now());
if (currentDate.isBefore(callEntity.getStartDate().toLocalDate()) || if (currentDate.isBefore(callEntity.getStartDate().toLocalDate()) ||
(currentDate.isEqual(callEntity.getStartDate().toLocalDate()) && currentTime.isBefore(callEntity.getStartTime()))) { (currentDate.isEqual(callEntity.getStartDate().toLocalDate()) && currentTime.isBefore(callEntity.getStartTime()))) {

11
src/main/java/net/gepafin/tendermanagement/util/DateTimeUtil.java
View File

@@ -4,6 +4,7 @@ import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationExceptio
import net.gepafin.tendermanagement.web.rest.api.errors.Status; import net.gepafin.tendermanagement.web.rest.api.errors.Status;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.ZoneId; import java.time.ZoneId;
@@ -27,6 +28,16 @@ public class DateTimeUtil {
LocalDateTime localDatetime = ldtZoned.withZoneSameInstant(ZoneId.of("Europe/Rome")).toLocalDateTime(); LocalDateTime localDatetime = ldtZoned.withZoneSameInstant(ZoneId.of("Europe/Rome")).toLocalDateTime();
return localDatetime; return localDatetime;
} }
public static LocalDate LocalDateServerToEurope(LocalDate systemDate) {
ZonedDateTime zonedDateTime = systemDate.atStartOfDay(ZoneId.systemDefault());
return zonedDateTime.withZoneSameInstant(ZoneId.of("Europe/Rome")).toLocalDate();
}
public static LocalTime LocalTimeServerToEurope(LocalTime systemTime) {
ZonedDateTime zonedDateTime = systemTime.atDate(LocalDate.now()).atZone(ZoneId.systemDefault());
return zonedDateTime.withZoneSameInstant(ZoneId.of("Europe/Rome")).toLocalTime();
}
public static LocalDateTime getPreviousMonthDate(int month) { public static LocalDateTime getPreviousMonthDate(int month) {
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();