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

DDS-1682: Change command from quarterly to monthly usage and save to csv #1485

Merged
merged 8 commits into from
Nov 3, 2023

Conversation

i-oden
Copy link
Member

@i-oden i-oden commented Nov 3, 2023

Read this before submitting the PR

  1. Always create a Draft PR first
  2. Go through sections 1-5 below, fill them in and check all the boxes
  3. Make sure that the branch is updated; if there's an "Update branch" button at the bottom of the PR, rebase or update branch.
  4. When all boxes are checked, information is filled in, and the branch is updated: mark as Ready For Review and tag reviewers (top right)
  5. Once there is a submitted review, implement the suggestions (if reasonable, otherwise discuss) and request an new review.

If there is a field which you are unsure about, enter the edit mode of this description or go to the PR template; There are invisible comments providing descriptions which may be of help.

1. Description / Summary

Duplicate of #1476

Issues with the original PR due to unsigned merge that complicated the rebase.

2. Jira task / GitHub issue

#1476
DDS-1682

3. Type of change

What type of change(s) does the PR contain?

Check the relevant boxes below. For an explanation of the different sections, enter edit mode of this PR description template.

  • New feature
    • Breaking: Why / How? Add info here.
    • Non-breaking
  • Database change: Remember the to include a new migration version, or explain here why it's not needed.
  • Bug fix
  • Security Alert fix
  • Documentation
  • Workflow
  • Tests only

4. Additional information

5. Actions / Scans

Check the boxes when the specified checks have passed.

For information on what the different checks do and how to fix it if they're failing, enter edit mode of this description or go to the PR template.

  • Black
  • Prettier
  • Yamllint
  • Tests
  • CodeQL
  • Trivy
  • Snyk

Copy link

codecov bot commented Nov 3, 2023

Codecov Report

Merging #1485 (cc371b4) into dev (8e0730e) will increase coverage by 0.31%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##              dev    #1485      +/-   ##
==========================================
+ Coverage   91.17%   91.48%   +0.31%     
==========================================
  Files          29       29              
  Lines        4542     4617      +75     
==========================================
+ Hits         4141     4224      +83     
+ Misses        401      393       -8     
Files Coverage Δ
dds_web/__init__.py 92.50% <100.00%> (+0.06%) ⬆️
dds_web/commands.py 88.96% <100.00%> (+3.34%) ⬆️
dds_web/database/models.py 96.17% <ø> (-0.01%) ⬇️

@i-oden i-oden requested a review from rv0lt November 3, 2023 09:48
@i-oden i-oden marked this pull request as ready for review November 3, 2023 09:48
@i-oden
Copy link
Member Author

i-oden commented Nov 3, 2023

I have double checked that the original branch and this one are identical except for the difference in the ID of the migration version

@i-oden i-oden changed the title Dds 1682 change quarterly usage command to tertiary 3 Change command from quarterly to monthly usage and save to csv Nov 3, 2023
@i-oden i-oden changed the title Change command from quarterly to monthly usage and save to csv DDS-1682: Change command from quarterly to monthly usage and save to csv Nov 3, 2023
@i-oden i-oden assigned rv0lt and unassigned valyo Nov 3, 2023
@rv0lt
Copy link
Member

rv0lt commented Nov 3, 2023

just to confirm, it is ok to merge already right?

@i-oden
Copy link
Member Author

i-oden commented Nov 3, 2023

just to confirm, it is ok to merge already right?

Yes, it's ok to merge!

@rv0lt rv0lt merged commit 5423eb4 into dev Nov 3, 2023
21 of 22 checks passed
@rv0lt rv0lt deleted the DDS-1682-change-quarterly-usage-command-to-tertiary_3 branch November 3, 2023 10:16
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.

3 participants