Use different default hour/minute on the schedule editor.

Fix problem when a schedule is both on a table and connection.

Author: piotrczarnas

dqops/src/main/frontend/src/components/ScheduleView/index.tsx

@@ -20,7 +20,8 @@ interface IScheduleViewProps {
 }
 type TMinutes = { minutes: number; day: number; hour: number };
 
-const defaultMinutes = { minutes: 15, day: 15, hour: 15 };
+const defaultMinutes = { minutes: 15, day: 0, hour: 0 };
+const defaultHourForDaily = 8;
 
 const ScheduleView = ({
   schedule,
@@ -29,7 +30,7 @@ const ScheduleView = ({
 }: IScheduleViewProps) => {
   const [mode, setMode] = useState('');
   const [minutes, setMinutes] = useState<TMinutes>(defaultMinutes);
-  const [hour, setHour] = useState(15);
+  const [hour, setHour] = useState(defaultHourForDaily);
   const { table, column }: { table: string; column: string } = useDecodedParams();
 
   const { isCronScheduled, userProfile } = useSelector(
@@ -166,7 +167,7 @@ const ScheduleView = ({
     };
 
     setMinutes(defaultMinutes);
-    setHour(15);
+    setHour(defaultHourForDaily);
     checkCronExpresion();
   }, [schedule]);
 

dqops/src/main/java/com/dqops/execution/checks/scheduled/ScheduledTargetChecksFindServiceImpl.java

@@ -19,6 +19,7 @@
 import com.dqops.checks.defaults.DefaultObservabilityConfigurationService;
 import com.dqops.metadata.basespecs.AbstractSpec;
 import com.dqops.metadata.id.HierarchyNode;
+import com.dqops.metadata.scheduling.CheckRunScheduleGroup;
 import com.dqops.metadata.scheduling.DefaultSchedulesSpec;
 import com.dqops.metadata.scheduling.MonitoringScheduleSpec;
 import com.dqops.metadata.search.*;
@@ -32,7 +33,9 @@
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * Service that finds all checks that should be executed for a given schedule.
@@ -74,10 +77,6 @@ public ScheduledChecksCollection findChecksForSchedule(UserHome userHome, Monito
                 userHome.getConnections(), scheduleRootsSearchFilters);
 
         for (ScheduleRootResult scheduleRoot : scheduleRoots.getResults()) {
-            ScheduledChecksSearchFilters scheduledChecksSearchFilters = new ScheduledChecksSearchFilters();
-            scheduledChecksSearchFilters.setEnabled(true);
-            scheduledChecksSearchFilters.setSchedule(schedule);
-            scheduledChecksSearchFilters.setSchedulingGroups(scheduleRoot.getSchedulingGroups());
             HierarchyNode scheduleRootNode = scheduleRoot.getScheduleRootNode();
 
             if (scheduleRootNode instanceof ConnectionWrapper) {
@@ -88,6 +87,37 @@ public ScheduledChecksCollection findChecksForSchedule(UserHome userHome, Monito
                     TableSpec clonedTableSpec = scheduledTableWrapper.getSpec().deepClone();
                     this.defaultObservabilityConfigurationService.applyDefaultChecksOnTableAndColumns(scheduledConnectionWrapper.getSpec(), clonedTableSpec, userHome);
 
+                    Set<CheckRunScheduleGroup> schedulingGroupsForTable = scheduleRoot.getSchedulingGroups();
+                    DefaultSchedulesSpec tableSchedulesOverride = clonedTableSpec.getSchedulesOverride();
+                    if (tableSchedulesOverride != null && !tableSchedulesOverride.isDefault()) {
+                        schedulingGroupsForTable = new HashSet<>(schedulingGroupsForTable);
+
+                        if (tableSchedulesOverride.getScheduleForCheckSchedulingGroup(CheckRunScheduleGroup.profiling) != null) {
+                            schedulingGroupsForTable.remove(CheckRunScheduleGroup.profiling);
+                        }
+
+                        if (tableSchedulesOverride.getScheduleForCheckSchedulingGroup(CheckRunScheduleGroup.monitoring_daily) != null) {
+                            schedulingGroupsForTable.remove(CheckRunScheduleGroup.monitoring_daily);
+                        }
+
+                        if (tableSchedulesOverride.getScheduleForCheckSchedulingGroup(CheckRunScheduleGroup.monitoring_monthly) != null) {
+                            schedulingGroupsForTable.remove(CheckRunScheduleGroup.monitoring_monthly);
+                        }
+
+                        if (tableSchedulesOverride.getScheduleForCheckSchedulingGroup(CheckRunScheduleGroup.partitioned_daily) != null) {
+                            schedulingGroupsForTable.remove(CheckRunScheduleGroup.partitioned_daily);
+                        }
+
+                        if (tableSchedulesOverride.getScheduleForCheckSchedulingGroup(CheckRunScheduleGroup.partitioned_monthly) != null) {
+                            schedulingGroupsForTable.remove(CheckRunScheduleGroup.partitioned_monthly);
+                        }
+                    }
+
+                    ScheduledChecksSearchFilters scheduledChecksSearchFilters = new ScheduledChecksSearchFilters();
+                    scheduledChecksSearchFilters.setEnabled(true);
+                    scheduledChecksSearchFilters.setSchedule(schedule);
+                    scheduledChecksSearchFilters.setSchedulingGroups(schedulingGroupsForTable);
+
                     Collection<AbstractCheckSpec<?,?,?,?>> scheduledChecks = this.hierarchyNodeTreeSearcher.findScheduledChecks(
                             clonedTableSpec, scheduledChecksSearchFilters);
 
@@ -106,6 +136,11 @@ public ScheduledChecksCollection findChecksForSchedule(UserHome userHome, Monito
                 TableSpec clonedTableSpec = originalTableSpec.deepClone();
                 this.defaultObservabilityConfigurationService.applyDefaultChecksOnTableAndColumns(connectionWrapper.getSpec(), clonedTableSpec, userHome);
 
+                ScheduledChecksSearchFilters scheduledChecksSearchFilters = new ScheduledChecksSearchFilters();
+                scheduledChecksSearchFilters.setEnabled(true);
+                scheduledChecksSearchFilters.setSchedule(schedule);
+                scheduledChecksSearchFilters.setSchedulingGroups(scheduleRoot.getSchedulingGroups());
+
                 Collection<AbstractCheckSpec<?,?,?,?>> scheduledChecks = this.hierarchyNodeTreeSearcher.findScheduledChecks(
                         clonedTableSpec, scheduledChecksSearchFilters);