Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cron for last day of the month #3831

Merged
merged 16 commits into from
Nov 21, 2024
Merged

Conversation

madelondohmen
Copy link
Contributor

@madelondohmen madelondohmen commented Nov 12, 2024

Note: This PR is based on PR #3809

Changes

Small fix when the start day is the 28th, 29th, 30th or 31st of the month. Will be processed as the last day of the month ("L").

Issue link

Closes #3810

Demo

Please add some proof in the form of screenshots or screen recordings to show (off) new functionality, if there are interesting new features for end-users.

QA notes

  • Create a scheduled report
  • Select a date on the 28th (or 29th, 30th or 31st)
  • Select recurrence "Monthly"
  • Check if the cron is something like h m L * * where h is the hour, m the minute and L should be "L"

Code Checklist

  • All the commits in this PR are properly PGP-signed and verified.
  • This PR only contains functionality relevant to the issue.
  • I have written unit tests for the changes or fixes I made.
  • I have checked the documentation and made changes where necessary.
  • I have performed a self-review of my code and refactored it to the best of my abilities.
  • Tickets have been created for newly discovered issues.
  • For any non-trivial functionality, I have added integration and/or end-to-end tests.
  • I have informed others of any required .env changes files if required and changed the .env-dist accordingly.
  • I have included comments in the code to elaborate on what is not self-evident from the code itself, including references to issues and discussions online, or implicit behavior of an interface.

Checklist for code reviewers:

Copy-paste the checklist from the docs/source/templates folder into your comment.


Checklist for QA:

Copy-paste the checklist from the docs/source/templates folder into your comment.

@madelondohmen madelondohmen self-assigned this Nov 12, 2024
@madelondohmen madelondohmen requested a review from a team as a code owner November 12, 2024 16:04
@ammar92
Copy link
Contributor

ammar92 commented Nov 13, 2024

A tip for the next time: It's a bit hard to review this since there's duplicate code due to merging of feature/add-start-time-to-schedule.

I think it would've been better to branch from feature/add-start-time-to-schedule instead and make the PR merge from feature/cron-last-day-of-month to feature/add-start-time-to-schedule

@stephanie0x00
Copy link
Contributor

Checklist for QA:

  • I have checked out this branch, and successfully ran a fresh make reset.
  • I confirmed that there are no unintended functional regressions in this branch:
    • I have managed to pass the onboarding flow
    • Objects and Findings are created properly
    • Tasks are created and completed properly
  • I confirmed that the PR's advertised feature or hotfix works as intended.
  • I checked the logs for errors and/or warnings and made issues where necessary

What works:

Seems to work.

image

What doesn't work:

n/a

Bug or feature?:

n/a

@underdarknl underdarknl merged commit 36e3f7b into main Nov 21, 2024
20 of 21 checks passed
@underdarknl underdarknl deleted the feature/cron-last-day-of-month branch November 21, 2024 13:31
Copy link

sonarcloud bot commented Nov 21, 2024

jpbruinsslot added a commit that referenced this pull request Nov 27, 2024
* main: (60 commits)
  Increase max number of PostgreSQL connections (#3889)
  Fix for task id as valid UUID (#3744)
  Add `auto_calculate_deadline` attribute to Scheduler (#3869)
  Ignore specific url parameters when following location headers (#3856)
  Let mailserver inherit l1 (#3704)
  Change plugins enabling in report flow to checkboxes (#3747)
  Fix rocky katalogus tests and delete unused fixtures (#3884)
  Enable/disable scheduled reports (#3871)
  optimize locking in katalogus.py, reuse available data (#3752)
  Updates boefje clearances and descriptions (#3863)
  Fixes for empty tables (#3844)
  Fix cron for last day of the month (#3831)
  Sub reports for Aggregate Report (#3852)
  Add start time to scheduled reports (#3809)
  Add configuration setting for number of octopoes workers (#3796)
  Limit requesting prior tasks for ranking in scheduler (#3836)
  Let local plugins (files) take precedence over database entries (#3858)
  Skip empty queues in the Rocky worker (#3860)
  Report types listed in a modal @ report plugins (#3718)
  Support a Schedule without a schedule in scheduler (#3834)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Scheduled start date on 28-31th not working as expected
4 participants