CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 64 Packages Projects Releases Wiki Activity

FINERACT-1955: Timezone handling of Savings account

Browse Source
This commit is contained in:
jmarta
2023-10-24 16:00:57 +02:00
committed by Adam Saghy
parent 6cb8ae0ed3
commit 71afd6dead
74 changed files with 1584 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/auditing/CustomAuditingHandlerTest.java
+4 -4
View File
@@ -54,7 +54,7 @@ public class CustomAuditingHandlerTest {
CustomAuditingHandler testInstance = new CustomAuditingHandler(PersistentEntities.of(mappingContext));
AbstractAuditableWithUTCDateTimeCustom targetObject = Mockito.spy(AbstractAuditableWithUTCDateTimeCustom.class);
targetObject = testInstance.markCreated(targetObject);
OffsetDateTime now = OffsetDateTime.now(DateUtils.getDateTimeZoneOfTenant());
OffsetDateTime now = DateUtils.getAuditOffsetDateTime();
assertTrue(targetObject.getCreatedDate().isPresent());
assertEquals(now.getYear(), targetObject.getCreatedDate().get().getYear());
@@ -70,7 +70,7 @@ public class CustomAuditingHandlerTest {
CustomAuditingHandler testInstance = new CustomAuditingHandler(PersistentEntities.of(mappingContext));
AbstractAuditableWithUTCDateTimeCustom targetObject = Mockito.spy(AbstractAuditableWithUTCDateTimeCustom.class);
targetObject = testInstance.markModified(targetObject);
OffsetDateTime now = OffsetDateTime.now(DateUtils.getDateTimeZoneOfTenant());
OffsetDateTime now = DateUtils.getAuditOffsetDateTime();
assertTrue(targetObject.getLastModifiedDate().isPresent());
assertEquals(now.getYear(), targetObject.getLastModifiedDate().get().getYear());
@@ -86,7 +86,7 @@ public class CustomAuditingHandlerTest {
CustomAuditingHandler testInstance = new CustomAuditingHandler(PersistentEntities.of(mappingContext));
AbstractAuditableCustom targetObject = Mockito.spy(AbstractAuditableCustom.class);
targetObject = testInstance.markModified(targetObject);
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
LocalDateTime now = DateUtils.getLocalDateTimeOfSystem();
assertTrue(targetObject.getLastModifiedDate().isPresent());
assertEquals(now.getYear(), targetObject.getLastModifiedDate().get().getYear());
@@ -102,7 +102,7 @@ public class CustomAuditingHandlerTest {
CustomAuditingHandler testInstance = new CustomAuditingHandler(PersistentEntities.of(mappingContext));
AbstractAuditableCustom targetObject = Mockito.spy(AbstractAuditableCustom.class);
targetObject = testInstance.markCreated(targetObject);
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
LocalDateTime now = DateUtils.getLocalDateTimeOfSystem();
assertTrue(targetObject.getCreatedDate().isPresent());
assertEquals(now.getYear(), targetObject.getCreatedDate().get().getYear());
fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/auditing/CustomDateTimeProviderTest.java
+3 -5
View File
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.temporal.TemporalAccessor;
import java.util.Optional;
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
@@ -36,14 +35,13 @@ public class CustomDateTimeProviderTest {
@BeforeEach
public void init() {
ThreadLocalContextUtil.setTenant(new FineractPlatformTenant(1L, "default", "Default", "Asia/Kolkata", null));
}
@Test
public void instanceDateProvider() {
Optional<TemporalAccessor> dateTimeProvider = CustomDateTimeProvider.INSTANCE.getNow();
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
LocalDateTime now = DateUtils.getLocalDateTimeOfSystem();
assertTrue(dateTimeProvider.isPresent());
assertTrue(dateTimeProvider.get() instanceof LocalDateTime);
@@ -56,8 +54,8 @@ public class CustomDateTimeProviderTest {
@Test
public void tenantDateProvider() {
Optional<TemporalAccessor> dateTimeProvider = CustomDateTimeProvider.TENANT.getNow();
OffsetDateTime now = OffsetDateTime.now(DateUtils.getDateTimeZoneOfTenant());
Optional<TemporalAccessor> dateTimeProvider = CustomDateTimeProvider.UTC.getNow();
OffsetDateTime now = DateUtils.getAuditOffsetDateTime();
assertTrue(dateTimeProvider.isPresent());
assertTrue(dateTimeProvider.get() instanceof OffsetDateTime);
fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/service/DateUtilsTest.java
+5 -5
View File
@@ -56,22 +56,22 @@ public class DateUtilsTest {
@Test
public void getLocalDateOfTenant() {
assertEquals(LocalDate.now(ZoneId.of("Asia/Kolkata")), DateUtils.getLocalDateOfTenant());
assertTrue(DateUtils.isEqualTenantDate(LocalDate.now(ZoneId.of("Asia/Kolkata"))));
}
@Test
public void getLocalDateTimeOfTenant() {
assertEquals(LocalDateTime.now(ZoneId.of("Asia/Kolkata")).truncatedTo(ChronoUnit.SECONDS), DateUtils.getLocalDateTimeOfTenant());
assertTrue(DateUtils.isEqualTenantDateTime(LocalDateTime.now(ZoneId.of("Asia/Kolkata")), ChronoUnit.SECONDS));
}
@Test
public void getOffsetDateTimeOfTenant() {
assertEquals(OffsetDateTime.now(ZoneId.of("Asia/Kolkata")).truncatedTo(ChronoUnit.SECONDS), DateUtils.getOffsetDateTimeOfTenant());
assertTrue(DateUtils.isEqualTenantDateTime(OffsetDateTime.now(ZoneId.of("Asia/Kolkata")), ChronoUnit.SECONDS));
}
@Test
public void getLocalDateTimeOfSystem() {
assertEquals(LocalDateTime.now(ZoneId.systemDefault()).truncatedTo(ChronoUnit.SECONDS), DateUtils.getLocalDateTimeOfSystem());
assertTrue(DateUtils.isEqualSystemDateTime(LocalDateTime.now(ZoneId.systemDefault()), ChronoUnit.SECONDS));
}
@Test
@@ -83,6 +83,6 @@ public class DateUtilsTest {
@Test
public void getBusinesLocalDate() {
assertEquals(LocalDate.of(2022, 6, 12), DateUtils.getBusinessLocalDate());
assertTrue(DateUtils.isEqualBusinessDate(LocalDate.of(2022, 6, 12)));
}
}