MODDCB-119 Change the datatype of calendar startDate and endDate (#99)

* MODDCB-119 Change the datatype of calendar startDate and endDate
folio-org · Oct 1, 2024 · 28536f5 · 28536f5
1 parent 28ef066
commit 28536f5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/org/folio/dcb/service/impl/CustomTenantService.java b/src/main/java/org/folio/dcb/service/impl/CustomTenantService.java
@@ -298,8 +298,8 @@ private void createCalendarIfNotExists() {
       log.info("createCalendarIfNotExists:: calendar with name {} doesn't exists, so creating new calendar", DCB_CALENDAR_NAME);
       Calendar newCalendar = Calendar.builder()
         .name(DCB_CALENDAR_NAME)
-        .startDate(LocalDate.now())
-        .endDate(LocalDate.now().plusYears(10))
+        .startDate(LocalDate.now().toString())
+        .endDate(LocalDate.now().plusYears(10).toString())
         .normalHours(List.of(NormalHours.builder()
           .startDay(DayOfWeek.SUNDAY.name())
           .startTime(LocalTime.of(0, 0).toString())

diff --git a/src/main/resources/swagger.api/schemas/Calendar.yaml b/src/main/resources/swagger.api/schemas/Calendar.yaml
@@ -23,11 +23,9 @@ Calendar:
       type: string
     startDate:
       type: string
-      format: date
       description: The first effective date (inclusive, YYYY-MM-DD) of this calendar
     endDate:
       type: string
-      format: date
       description: The first effective date (inclusive, YYYY-MM-DD) of this calendar
     assignments:
       description: A list of all service points that this calendar is assigned to

diff --git a/src/test/java/org/folio/dcb/utils/EntityUtils.java b/src/test/java/org/folio/dcb/utils/EntityUtils.java
@@ -232,8 +232,8 @@ public static TransactionAuditEntity createTransactionAuditEntity(){
   public static CalendarCollection getCalendarCollection(String calendarName) {
     var calendar = Calendar.builder()
       .name(calendarName)
-      .startDate(LocalDate.now())
-      .endDate(LocalDate.now().plusYears(10))
+      .startDate(LocalDate.now().toString())
+      .endDate(LocalDate.now().plusYears(10).toString())
       .assignments(new ArrayList<>())
       .build();
     var calendarCollection = new CalendarCollection();