search

makerspace / makeradmin

Stockholm Makerspace member administration and store.
20 stars 15 forks source link

Use makeradmin as the truth for products, create products in stripe on startup #375

Open BerglundDaniel opened 9 months ago

BerglundDaniel commented 9 months ago

The aim of this PR is to switch over from stripe as the truth for some products to makeradmin. I.e. to start using what was made in PR #374

Summary by CodeRabbit

coderabbitai[bot] commented 9 months ago

Walkthrough

The recent changes enhance Stripe integration with Makeradmin, focusing on membership products and subscription management. The firstrun.py setup script now includes logic for creating specific products with different subscription types. Various files saw updates to better align product creation and payment handling with Stripe’s APIs. New functions and improved handling of scenarios ensure a smoother user experience and more robust backend operations.

Changes

File(s) Change Summary
README.md Added details on required membership products, Stripe-Makeradmin connection, and test instructions.
api/src/firstrun.py Added subscription type metadata and conditional block for creating Stripe data based on user input.
api/src/shop/README.md Introduced new file detailing Makeradmin and Stripe relationships and interactions.
api/src/shop/stripe_product_price.py Updated functions for handling Stripe product pricing, recurring intervals, and unit conversions.
api/src/shop/stripe_util.py Modified price calculation logic to use PriceType instead of StripeRecurring.
api/src/shop/models.py Updated Product class repr method and made created_at in Transaction class non-nullable.
api/src/shop/pay.py Revised payment processing and subscription setup logic.
api/src/shop/shop_data.py Added type annotations and a new function for retrieving product data by special ID.
api/src/shop/stripe_charge.py Updated type handling for error parameters and payment source IDs.
api/src/shop/stripe_customer.py Improved error handling and metadata verification for Stripe customers.
api/src/shop/stripe_discounts.py Modified type annotations and discount fraction assignment logic.
api/src/shop/stripe_event.py Updated event handling logic, type annotations, and metadata processing.
api/src/shop/stripe_payment_intent.py Added assertions and parameters for payment intent creation, including test mode handling.
api/src/shop/stripe_setup.py Updated Stripe API version in setup function.
api/src/shop/stripe_setup_intent.py Added assertion for setup intent error handling.
api/src/shop/views.py Updated function signatures and removed redundant imports related to Stripe subscriptions.

Poem

In the code a rabbit hops, Through Stripe fields and Makeradmin crops, Memberships bloom with metadata clear, Subscriptions flow without a tear. Errors handled, payments right, A seamless process, day and night. Cheers to code, where changes bring, A smoother world, and joy they sing! 🐰✨

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share - [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)
Tips ### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit .` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai generate interesting stats about this repository and render them as a table.` - `@coderabbitai show all the console.log statements in this repository.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` - `@coderabbitai help me debug CodeRabbit configuration file.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (invoked as PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai full review` to do a full review from scratch and review all the files again. - `@coderabbitai summary` to regenerate the summary of the PR. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai configuration` to show the current CodeRabbit configuration for the repository. - `@coderabbitai help` to get help. Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. ### CodeRabbit Configration File (`.coderabbit.yaml`) - You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository. - Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information. - If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json` ### Documentation and Community - Visit our [Documentation](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit. - Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.
amrsoll commented 8 months ago

It seems the test fail primarily because of the lack of API keys to Stripe?

raise Exception("Stripe keys in .env must both be set to either 'live' or 'test'. Please check your configuration.")

I might be missing something, but I don't see them being passed to the automation system. I would suggest to put the Stripe test keys in a secret - say STRIPE_TEST_API_KEY - and pass that in the environment

.github/workflows/makeradmin.yml

STRIPE_PRIVATE_KEY="$STRIPE_TEST_API_KEY" make test

That should hopefully pass on the API key to the container test from docker-compose.test.yml any other env vars can be passed on in the same way.

amrsoll commented 8 months ago

I see that is it getting handled in #410 :)

BerglundDaniel commented 8 months ago

The key checks are also for developing so that you don't accidentally runt the tests with the live keys for instance.

HalfVoxel commented 2 months ago

I have made a bunch of fixes to this PR now. Locally, all tests pass for me. I haven't had time to go through the rest of the code yet.