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.

Sign up for GitHub

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

Jump to bottom

[risk=low][RW-13494] Rename expiration to exhaustion where appropriate #9106

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[risk=low][RW-13494] Rename expiration to exhaustion where appropriate #9106

wants to merge 3 commits into from
+84 −82

Conversation

jmthibault79
Copy link
Collaborator

@jmthibault79 jmthibault79 commented Feb 11, 2025 •
edited
Loading

Same idea as #9104

Tested by running local API+UI as well as running ./checkFreeTierBillingUsage.sh and ./checkInitialCreditsExpiration.sh

PR checklist

  • I have included an issue ID or "no ticket" in the PR title as outlined in CONTRIBUTING.md.
  • I have included a risk tag of the form [risk=no|low|moderate|severe] in the PR title as outlined in CONTRIBUTING.md.
  • I have manually tested this change and my testing process is described above.
  • This change includes appropriate automated tests, and I have documented any behavior that cannot be tested with code.
  • I have added explanatory comments where the logic is not obvious.
  • One or more of the following is true:
    • This change is intended to complete a JIRA story, so I have checked that all AC are met for that story.
    • This change fixes a bug, so I have ensured the steps to reproduce are in the Jira ticket or provided above.
    • This change impacts deployment safety (e.g. removing/altering APIs which are in use), so I have documented the impacts in the description.
    • This change includes a new feature flag, so I have created and linked new JIRA tickets to (a) turn on the feature flag and (b) remove it later.
    • This change modifies the UI, so I have taken screenshots or recordings of the new behavior and notified the PO and UX designer in Slack.
    • This change modifies API behavior, so I have run the relevant E2E tests locally because API changes are not covered by our PR checks.
    • None of the above apply to this change.

@jmthibault79
rename expiration to exhaustion where appropriate
5191c9c 
initialCreditsExhaustionQueue and ExhaustedInitialCreditsEventRequest;
@jmthibault79 jmthibault79 requested review from evrii and removed request for evrii February 11, 2025 22:08
jmthibault79
jmthibault79 commented Feb 11, 2025
View reviewed changes
api/src/main/java/org/pmiops/workbench/initialcredits/InitialCreditsService.java
@@ -149,9 +149,10 @@ public void checkFreeTierBillingUsageForUsers(
/**
* Filter the users to get only the users that have costs higher than the lowest threshold. This
* means we'll be pushing cloud tasks for these users to notify them about their costs but the
* decision to notify or not is left to the FreeCreditExpiry cloud task. Another way to think
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missed an "expiry"

api/src/test/java/org/pmiops/workbench/utils/ArgumentMatchers.java

import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.mockito.ArgumentMatcher;

public class InitialCreditsExpiryTaskMatchers {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unnecessarily specific. these matchers can be used generally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@evrii evrii Awaiting requested review from evrii

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jmthibault79