fix(dossier): on fork merge, always remove previous champ version #11144
Conversation
This file contains 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
If champ type_de_champ gets out of sync with its type, the persisted champ will not be part of the filled champs collection. In the merge code, we need to remove the previous champ, disregarding its type. The problem should have been caught earlier, but our unique index is not actually unique because our version of PG misses `NULLS NOT DISTINCT`. The unique index only works for champs in repetitions.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #11144 +/- ##
==========================================
- Coverage 84.48% 84.47% -0.02%
==========================================
Files 1186 1187 +1
Lines 26240 26250 +10
Branches 4946 4948 +2
==========================================
+ Hits 22170 22175 +5
- Misses 4070 4075 +5 ☔ View full report in Codecov by Sentry. |
LeSim
approved these changes
Dec 17, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Merged
via the queue into
demarches-simplifiees:main
with commit Dec 17, 2024
bd90a79
18 checks passed
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.
Si le
type_de_champd'un champ se désynchronise avec sontype, le champ persisté ne fera pas partie de la collectionfilled_champs. Dans le code de merge des fork, nous devons supprimer le champ précédent, sans tenir compte de son type. Le problème aurait dû être détecté plus tôt, mais notre index unique n'est pas réellement unique parce que notre version de PG ne prend pas en chargeNULLS NOT DISTINCT. L'index unique ne fonctionne que pour les champs dans les répétitions.https://demarches-simplifiees.sentry.io/issues/6122522207/events/068fb3ab31a14bc1aaf23c5d9cf036af/