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

feat: Add API usage billing #3729

Merged
merged 30 commits into from
May 17, 2024
Merged

feat: Add API usage billing #3729

merged 30 commits into from
May 17, 2024

Commits on Apr 8, 2024

  1. Fix naming and add api usage model

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    7d8e8a2 View commit details
    Browse the repository at this point in the history

  2. Add task to bill monthly users

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    2e3b185 View commit details
    Browse the repository at this point in the history

  3. Add api call billing to __init__.py

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    5034e38 View commit details
    Browse the repository at this point in the history

  4. Add migration to fix naming and add api billing

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    976e2ce View commit details
    Browse the repository at this point in the history

  5. Create tasks for billing API usage

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    fb2652e View commit details
    Browse the repository at this point in the history

  6. Create exceptions for API usage billing

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    89188ed View commit details
    Browse the repository at this point in the history

  7. Add missing plan constants

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    09a4bf0 View commit details
    Browse the repository at this point in the history

  8. Add new addon names

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b27c773 View commit details
    Browse the repository at this point in the history

  9. Add API usage tracking

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    db81e9f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into feat/add_api_usage_billing

    @zachaysan
    zachaysan committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    c312fc6 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Do not prorate

    @zachaysan
    zachaysan committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    a7a45c3 View commit details
    Browse the repository at this point in the history

  2. Update tests to match prorate setting

    @zachaysan
    zachaysan committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    d469194 View commit details
    Browse the repository at this point in the history

  3. Add docstring, comments, and an additional select related param

    @zachaysan
    zachaysan committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    e9b5806 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/add_api_usage_billing

    @zachaysan
    zachaysan committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    a0cf44b View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Tweak comment language

    @zachaysan
    zachaysan committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    50d65ab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/add_api_usage_billing

    @zachaysan
    zachaysan committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    6c108b4 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Add docstring comment as suggested by Matt

    @zachaysan
    zachaysan committed May 3, 2024
    Configuration menu
    Copy the full SHA
    5142c39 View commit details
    Browse the repository at this point in the history

  2. Run the task more frequently

    @zachaysan
    zachaysan committed May 3, 2024
    Configuration menu
    Copy the full SHA
    33251c1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/add_api_usage_billing

    @zachaysan
    zachaysan committed May 3, 2024
    Configuration menu
    Copy the full SHA
    7288d49 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Fix many conflicts and merge branch 'main' into feat/add_api_usage_bi… 

    …lling
    @zachaysan
    zachaysan committed May 10, 2024
    Configuration menu
    Copy the full SHA
    792b975 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/add_api_usage_billing

    @zachaysan
    zachaysan committed May 10, 2024
    Configuration menu
    Copy the full SHA
    5061750 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Add api calls test for empty given count

    @zachaysan
    zachaysan committed May 13, 2024
    Configuration menu
    Copy the full SHA
    9ed8615 View commit details
    Browse the repository at this point in the history

  2. Add organisations tasks test coverage

    @zachaysan
    zachaysan committed May 13, 2024
    Configuration menu
    Copy the full SHA
    c6f2b46 View commit details
    Browse the repository at this point in the history

  3. Add add_1000_api_calls test coverage

    @zachaysan
    zachaysan committed May 13, 2024
    Configuration menu
    Copy the full SHA
    b007844 View commit details
    Browse the repository at this point in the history

  4. Add work around for test coverage

    @zachaysan
    zachaysan committed May 13, 2024
    Configuration menu
    Copy the full SHA
    0ae1aeb View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/add_api_usage_billing

    @zachaysan
    zachaysan committed May 13, 2024
    Configuration menu
    Copy the full SHA
    637a8be View commit details
    Browse the repository at this point in the history

  6. Trigger build

    @zachaysan
    zachaysan committed May 13, 2024
    Configuration menu
    Copy the full SHA
    2c5a43d View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Update api/tests/unit/organisations/test_unit_organisations_tasks.py 

    Co-authored-by: Matthew Elwell <matthew.elwell@flagsmith.com>
    @zachaysan @matthewelwell
    zachaysan and matthewelwell committed May 17, 2024
    Configuration menu
    Copy the full SHA
    23ed02b View commit details
    Browse the repository at this point in the history

  2. Add assertion for tasks being passed in

    @zachaysan
    zachaysan committed May 17, 2024
    Configuration menu
    Copy the full SHA
    f4edbd7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/add_api_usage_billing

    @zachaysan
    zachaysan committed May 17, 2024
    Configuration menu
    Copy the full SHA
    3410d36 View commit details
    Browse the repository at this point in the history