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

feat: allow ignore conflicts on scheduled change #4590

Merged
merged 3 commits into from
Sep 5, 2024

Conversation

matthewelwell
Copy link
Contributor

Changes

This PR sets out to resolve an issue where it's not possible to schedule consecutive change requests on the same feature. For example, in the case where you want to schedule a slow roll out by changing the segment override on a feature to a different percentage value.

To achieve this, I have added a value to the ChangeRequest model which allows the creator to ignore conflicts.

Currently the use case given in the test will only really be useful when using the API directly but this is the use case for a current customer.

How did you test this code?

Added one long integration style test to test the exact use case for a customer.

@matthewelwell matthewelwell requested a review from a team as a code owner September 5, 2024 08:26
@matthewelwell matthewelwell requested review from gagantrivedi and removed request for a team September 5, 2024 08:26
Copy link

vercel bot commented Sep 5, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

3 Skipped Deployments
Name Status Preview Comments Updated (UTC)
docs ⬜️ Ignored (Inspect) Visit Preview Sep 5, 2024 8:42am
flagsmith-frontend-preview ⬜️ Ignored (Inspect) Visit Preview Sep 5, 2024 8:42am
flagsmith-frontend-staging ⬜️ Ignored (Inspect) Visit Preview Sep 5, 2024 8:42am

@github-actions github-actions bot added the api Issue related to the REST API label Sep 5, 2024
Copy link
Contributor

github-actions bot commented Sep 5, 2024

Docker builds report

Image Build Status Security report
ghcr.io/flagsmith/flagsmith-api-test:pr-4590 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-e2e:pr-4590 Finished ✅ Skipped
ghcr.io/flagsmith/flagsmith-frontend:pr-4590 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-api:pr-4590 Finished ✅ Results
ghcr.io/flagsmith/flagsmith-private-cloud:pr-4590 Finished ✅ Results
ghcr.io/flagsmith/flagsmith:pr-4590 Finished ✅ Results

@github-actions github-actions bot added the feature New feature or request label Sep 5, 2024
@matthewelwell matthewelwell removed the request for review from gagantrivedi September 5, 2024 08:28
Copy link
Contributor

github-actions bot commented Sep 5, 2024

Uffizzi Preview deployment-55901 was deleted.

Copy link

codecov bot commented Sep 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.15%. Comparing base (5c02c1e) to head (c868365).
Report is 5 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4590   +/-   ##
=======================================
  Coverage   97.15%   97.15%           
=======================================
  Files        1156     1157    +1     
  Lines       39934    39994   +60     
=======================================
+ Hits        38797    38857   +60     
  Misses       1137     1137           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Sep 5, 2024
Copy link
Member

@gagantrivedi gagantrivedi left a comment

Choose a reason for hiding this comment

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

One question

@matthewelwell matthewelwell added this pull request to the merge queue Sep 5, 2024
Merged via the queue into main with commit a891114 Sep 5, 2024
35 checks passed
@matthewelwell matthewelwell deleted the feat/allow-ignore-conflicts-on-scheduled-change branch September 5, 2024 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api Issue related to the REST API feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants