fixup

Author: vishesh92

engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDaoImpl.java

@@ -29,7 +29,6 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.List;
 
 @Component
@@ -47,9 +46,6 @@ public ResourceScheduleDaoImpl() {
         activeScheduleSearch = createSearchBuilder();
         activeScheduleSearch.and(RESOURCE_TYPE, activeScheduleSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
         activeScheduleSearch.and(ApiConstants.ENABLED, activeScheduleSearch.entity().getEnabled(), SearchCriteria.Op.EQ);
-        activeScheduleSearch.and().op(activeScheduleSearch.entity().getEndDate(), SearchCriteria.Op.NULL);
-        activeScheduleSearch.or(ApiConstants.END_DATE, activeScheduleSearch.entity().getEndDate(), SearchCriteria.Op.GT);
-        activeScheduleSearch.cp();
         activeScheduleSearch.done();
 
         allSearch = createSearchBuilder();
@@ -66,7 +62,6 @@ public List<ResourceScheduleVO> listAllActiveSchedules(ApiCommandResourceType re
         SearchCriteria<ResourceScheduleVO> sc = activeScheduleSearch.create();
         sc.setParameters(RESOURCE_TYPE, resourceType);
         sc.setParameters(ApiConstants.ENABLED, true);
-        sc.setParameters(ApiConstants.END_DATE, new Date());
         return search(sc, null);
     }
 

server/src/test/java/org/apache/cloudstack/schedule/vm/VMScheduleWorkerTest.java

@@ -292,6 +292,29 @@ public void testScheduleNextJobScheduleExpired() {
         Assert.assertNull(actualDate);
     }
 
+    @Test
+    public void testScheduleNextJobNextOccurrenceAfterEndDate() {
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn("* * * * *");
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
+        // endDate is in the future (now < endDate), but the first occurrence (>= startDate)
+        // falls after endDate, so no further jobs can ever be scheduled. The schedule's
+        // declared lifetime hasn't ended yet though, so it must remain enabled until
+        // endDate actually passes (handled separately by the "end time has passed" branch).
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(now, 10));
+        Mockito.when(schedule.getEndDate()).thenReturn(DateUtils.addDays(now, 5));
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(Mockito.mock(UserVm.class));
+
+        Date actualDate = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+
+        Assert.assertNull(actualDate);
+        Mockito.verify(schedule, Mockito.never()).setEnabled(Mockito.anyBoolean());
+        Mockito.verify(resourceScheduleDao, Mockito.never()).persist(Mockito.any());
+    }
+
     @Test
     public void testScheduleNextJobScheduleDisabled() {
         ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);

ui/src/views/compute/ResourceSchedules.vue

@@ -482,9 +482,8 @@ export default {
       Object.assign(this.form, schedule)
       this.form.minMembers = schedule?.details?.minmembers ? Number(schedule.details.minmembers) : null
       this.form.maxMembers = schedule?.details?.maxmembers ? Number(schedule.details.maxmembers) : null
-      // Some weird issue when we directly pass in the moment with tz object
-      this.form.startDate = dayjs(schedule.startdate).tz(schedule.timezone)
-      this.form.endDate = schedule.enddate ? dayjs(dayjs(schedule.enddate).tz(schedule.timezone)) : null
+      this.form.startDate = dayjs(schedule.startdate)
+      this.form.endDate = schedule.enddate ? dayjs(schedule.enddate) : null
       this.showAddModal()
     },
     showAddModal () {