feat: sync strategy override + multi-level schedules

apps/mgmt-ui/src/components/logs/SyncRunsTable.tsx

@@ -123,6 +123,13 @@ export default function SyncRunsTable(props: SyncRunsTableProps) {
       sortable: false,
       filterable: false,
     },
+    {
+      field: 'strategy',
+      headerName: 'Strategy',
+      width: 160,
+      sortable: false,
+      filterable: true,
+    },
     {
       field: 'errorMessage',
       headerName: 'Error Message',

apps/mgmt-ui/src/components/syncs/syncConfig/SyncConfigDetailsPanel.tsx

@@ -55,6 +55,7 @@ function SyncConfigDetailsPanelImpl({ syncConfigId }: SyncConfigDetailsPanelImpl
   const { entities = [], isLoading: isLoadingEntities } = useEntities();
   const { entitiesWhitelistConfig, isLoading: isLoadingLekkoConfigs } = useLekkoConfigs();
   const [syncPeriodSecs, setSyncPeriodSecs] = useState<number | undefined>();
+  const [fullSyncEveryNIncrementals, setFullSyncEveryNIncrementals] = useState<number | undefined>();
   const [isSaving, setIsSaving] = useState<boolean>(false);
   const [providerId, setProviderId] = useState<string | undefined>();
   const [destinationId, setDestinationId] = useState<string | undefined>();
@@ -80,6 +81,7 @@ function SyncConfigDetailsPanelImpl({ syncConfigId }: SyncConfigDetailsPanelImpl
         ? syncConfig?.config?.defaultConfig?.periodMs / 1000
         : ONE_HOUR_SECONDS
     );
+    setFullSyncEveryNIncrementals(syncConfig?.config?.defaultConfig?.fullSyncEveryNIncrementals ?? undefined);
     setAutoStartOnConnection(syncConfig?.config?.defaultConfig?.autoStartOnConnection ?? true);
     setStrategy(syncConfig?.config?.defaultConfig?.strategy ?? 'full then incremental');
     setCommonObjects(syncConfig?.config?.commonObjects?.map((o) => o.object) ?? []);
@@ -120,6 +122,7 @@ function SyncConfigDetailsPanelImpl({ syncConfigId }: SyncConfigDetailsPanelImpl
             ...syncConfig.config.defaultConfig,
             periodMs: syncPeriodSecs ? syncPeriodSecs * 1000 : ONE_HOUR_SECONDS,
             strategy,
+            fullSyncEveryNIncrementals: fullSyncEveryNIncrementals ?? undefined,
             autoStartOnConnection,
           },
           commonObjects: commonObjects.map((object) => ({ object } as CommonObjectConfig)),
@@ -290,6 +293,26 @@ function SyncConfigDetailsPanelImpl({ syncConfigId }: SyncConfigDetailsPanelImpl
               For Incremental: we will use this strategy when available for the provider and object otherwise we will
               use full sync. Please refer to provider docs for more details.
             </FormHelperText>
+            {strategy === 'full then incremental' && (
+              <>
+                <Typography variant="subtitle1">Run Full Sync every N incremental Syncs</Typography>
+                <TextField
+                  value={fullSyncEveryNIncrementals}
+                  size="small"
+                  label="Run Full Sync every N incremental Syncs"
+                  variant="outlined"
+                  type="number"
+                  helperText="All values < 1 will be taken to mean 'never'"
+                  onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                    let value: number | undefined = parseInt(event.target.value, 10);
+                    if (Number.isNaN(value) || value < 1) {
+                      value = undefined;
+                    }
+                    setFullSyncEveryNIncrementals(value);
+                  }}
+                />
+              </>
+            )}
           </Stack>
           <Stack className="gap-2">
             <SwitchWithLabel

openapi/v2/mgmt/components/schemas/objects/sync_config_data.yaml

@@ -1,28 +1,7 @@
 type: object
 properties:
   default_config:
-    type: object
-    description: Configuration options for "how" to sync.
-    properties:
-      period_ms:
-        type: integer
-        minimum: 60000
-        example: 60000
-        description: The period (in milliseconds) to run the sync.
-      strategy:
-        type: string
-        enum:
-          - full then incremental
-          - full only
-        description: \"full then incremental\" will run a full sync on the first run, then incremental syncs. \"full only\" will run a full sync on every run.
-      auto_start_on_connection:
-        type: boolean
-        description: |
-          If true, the sync will start automatically when the connection is created.
-          Default: true
-    required:
-      - period_ms
-      - strategy
+    $ref: ./sync_strategy_config.yaml
   common_objects:
     description: A list of Supaglue objects to be synced.
     type: array
@@ -33,6 +12,8 @@ properties:
           type: string
           description: The Supaglue object name
           example: contact
+        sync_strategy_override:
+          $ref: ./sync_strategy_config.yaml
       required:
         - object
   standard_objects:
@@ -45,6 +26,8 @@ properties:
           type: string
           description: The Provider object name (case sensitive)
           example: Contact
+        sync_strategy_override:
+          $ref: ./sync_strategy_config.yaml
       required:
         - object
   custom_objects:
@@ -57,6 +40,8 @@ properties:
           type: string
           description: The custom object name (case sensitive). For Salesforce, this should end with `__c`.
           example: MyCustomObject__c
+        sync_strategy_override:
+          $ref: ./sync_strategy_config.yaml
       required:
         - object
   entities:

openapi/v2/mgmt/components/schemas/objects/sync_strategy_config.yaml

@@ -0,0 +1,25 @@
+type: object
+description: Configuration options for "how" to sync.
+properties:
+  period_ms:
+    type: integer
+    minimum: 60000
+    example: 60000
+    description: The period (in milliseconds) to run the sync.
+  strategy:
+    type: string
+    enum:
+      - full then incremental
+      - full only
+    description: \"full then incremental\" will run a full sync on the first run, then incremental syncs. \"full only\" will run a full sync on every run.
+  auto_start_on_connection:
+    type: boolean
+    description: |
+      If true, the sync will start automatically when the connection is created.
+      Default: true
+  full_sync_every_n_incrementals:
+    type: number
+    description: If set, Supaglue will run a full sync after N consecutive incremental syncs.
+required:
+  - period_ms
+  - strategy

openapi/v2/mgmt/openapi.yaml

@@ -165,6 +165,8 @@ components:
       $ref: ./components/schemas/objects/sync_config.yaml
     sync_config_data:
       $ref: ./components/schemas/objects/sync_config_data.yaml
+    sync_strategy_config:
+      $ref: ./components/schemas/objects/sync_strategy_config.yaml
     create_provider_config:
       $ref: ./components/schemas/objects/create_provider_config.yaml
     update_provider_config:

packages/core/mappers/sync.ts

@@ -5,16 +5,21 @@ import { parseCustomerIdPk } from '../lib';
 export const fromSyncModel = (model: SyncModel): Sync => {
   // `strategy` looks like { type: 'full then incremental', ...otherProps }
 
-  const { type: strategyType, ...otherStrategyProps } = model.strategy as { type: SyncStrategyType } & Record<
-    string,
-    unknown
-  >;
+  const {
+    type: strategyType,
+    fullSyncEveryNIncrementals,
+    ...otherStrategyProps
+  } = model.strategy as {
+    type: SyncStrategyType;
+    fullSyncEveryNIncrementals?: number;
+  } & Record<string, unknown>;
 
   // TODO: don't do type assertion
   const base = {
     id: model.id,
     connectionId: model.connectionId,
     strategyType,
+    fullSyncEveryNIncrementals,
     syncConfigId: model.syncConfigId,
     ...otherStrategyProps,
     state: model.state as SyncState,

packages/core/mappers/sync_run.ts

@@ -10,6 +10,7 @@ export const fromSyncRunModelAndSync = (args: SyncRunModelExpanded): SyncRun =>
     id,
     syncId: sync.id,
     status: status as SyncRunStatus,
+    strategy: args.strategy as 'full' | 'incremental',
     errorMessage,
     startTimestamp,
     endTimestamp,