fix: prevent ensure-entitlement commands from overwriting existing org entitlement tier#2235
Closed
fix: prevent ensure-entitlement commands from overwriting existing org entitlement tier#2235
Conversation
…g entitlement tier
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
Contributor
|
Closing this PR as this should be handled on tier-client. |
Contributor
|
replaced by adobe/spacecat-shared#1547 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaced by adobe/spacecat-shared#1547
Summary
ensure entitlement siteandensure entitlement imsorgSlack commands unconditionally calledtierClient.createEntitlement('FREE_TRIAL'), which overwrites any existing non-PAID entitlement tier (e.g.PLG,PRE_ONBOARD) toFREE_TRIAL.checkValidEntitlement(). If one exists, the current tier is preserved and only a site enrollment is created if missing. A newFREE_TRIALentitlement is only created when none exists for the product on the org.Changes
src/support/slack/actions/entitlement-modal-utils.js—createEntitlementsForProducts()checks for existing entitlement before creating;postEntitlementMessages()reports distinct outcomessrc/support/slack/actions/entitlement-modals.js—ensureEntitlementImsOrgModal()checks for existing entitlement before creatingtest/support/slack/actions/entitlement-modal-utils.test.js— updated and added tests for all three entitlement result pathstest/support/slack/actions/entitlement-modals.test.js— added test for "existing entitlement preserved" path; 100% coverageTest plan
ensure entitlement site <url>on a site whose org has aPLGentitlement — verify tier staysPLG, enrollment is created if missing, Slack message says "already exists" or "already existed — created enrollment"ensure entitlement site <url>on a site with no existing entitlement — verifyFREE_TRIALentitlement and enrollment are created as beforeensure entitlement imsorgon an org with an existingPAIDentitlement — verify tier staysPAIDensure entitlement imsorgon an org with no entitlement — verifyFREE_TRIALis createdPlease ensure your pull request adheres to the following guidelines:
describe here the problem you're solving.
If the PR is changing the API specification:
yet. Ideally, return a 501 status code with a message explaining the feature is not implemented yet.
If the PR is changing the API implementation or an entity exposed through the API:
If the PR is introducing a new audit type:
Related Issues
Thanks for contributing!