fix: update scheduler to fetch data every 5 minutes instead of 24 hours

Author: milsman2

.github/workflows/auto-merge-on-release.yml

@@ -0,0 +1,83 @@
+name: Auto-merge on successful release pipeline
+
+on:
+  workflow_call:
+    inputs:
+      head_branch:
+        description: 'Branch name to find PR for'
+        required: false
+        type: string
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Auto-merge matching PR
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            // Support both automatic workflow_run triggers and explicit workflow_call inputs.
+            const run = context.payload.workflow_run;
+            let head_branch = '';
+            if (run && run.head_branch) {
+              head_branch = run.head_branch;
+            } else if (context.payload && context.payload.inputs && context.payload.inputs.head_branch) {
+              head_branch = context.payload.inputs.head_branch;
+            }
+
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+
+            if (!head_branch) {
+              core.info('No head_branch provided; nothing to do.');
+              return;
+            }
+
+            core.info(`Auto-merge triggered for branch: ${head_branch}`);
+
+            // Find an open PR whose head ref matches the branch
+            const prs = await github.rest.pulls.list({
+              owner,
+              repo,
+              head: `${owner}:${head_branch}`,
+              state: 'open',
+            });
+
+            if (!prs.data || prs.data.length === 0) {
+              core.info(`No open pull request found for branch ${head_branch}`);
+              return;
+            }
+
+            const pr = prs.data[0];
+
+            if (pr.draft) {
+              core.info(`Pull request #${pr.number} is a draft; skipping merge.`);
+              return;
+            }
+
+            try {
+              const res = await github.rest.pulls.merge({
+                owner,
+                repo,
+                pull_number: pr.number,
+                merge_method: 'merge',
+                commit_title: head_branch,
+                commit_message: '',
+              });
+
+              if (res.data.merged) {
+                core.info(`Successfully merged PR #${pr.number} (branch ${head_branch}).`);
+              } else {
+                core.info(`Merge attempt returned: ${JSON.stringify(res.data)}`);
+              }
+            } catch (err) {
+              core.setFailed(`Failed to merge PR #${pr.number}: ${err}`);
+            }
+
+      - name: Done
+        run: echo "auto-merge finished"

.github/workflows/ci-cd.yaml

@@ -23,7 +23,7 @@ jobs:
     needs: [lint, cache]
     uses: milsman2/python-app-template/.github/workflows/pytest.yaml@main
 
-  docker:
+  docker-build-and-image-scan:
     if: github.event_name == 'push'
     needs: test
     uses: milsman2/python-app-template/.github/workflows/docker-build-and-scan.yaml@main
@@ -37,8 +37,16 @@ jobs:
 
   release:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
-    needs: [test, docker]
+    needs: [test, docker-build-and-image-scan]
     uses: ./.github/workflows/release.yaml
     permissions:
       contents: write
     secrets: inherit
+
+  trigger-auto-merge:
+    needs: release
+    if: needs.release.result == 'success'
+    uses: ./.github/workflows/auto-merge-on-release.yml
+    with:
+      head_branch: ${{ github.ref_name }}
+    secrets: inherit

src/sample_python_app/app/scheduler.py

@@ -37,7 +37,7 @@ def shutdown(signum, frame):
     scheduler.add_job(
         fetcher.fetch,
         trigger="interval",
-        hours=24,
+        minutes=5,
         next_run_time=datetime.now(UTC),
         misfire_grace_time=3600,
         coalesce=True,