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

Use old cycles during unmerge #4452

Merged
merged 10 commits into from
Nov 5, 2024

Conversation

haneslinger
Copy link
Contributor

In contrast to #3904, here's the new workflow

Okay, so we've got a property present in two cycles, one has been merged into:
image
image

see?
image

Now if we unmerge the merged one:
image

We've one got one new property:
image

@haneslinger haneslinger self-assigned this Dec 20, 2023
@haneslinger haneslinger marked this pull request as ready for review December 20, 2023 18:10
@haneslinger
Copy link
Contributor Author

@kflemin @axelstudios the failing test here imply this intented behavoir. why? Is it still?

@kflemin
Copy link
Contributor

kflemin commented Dec 20, 2023

I don't have any historical context for this one. @nllong? @axelstudios? Basically, what we are trying to do here is: when we unmerge 2 properties, we want to associate one of the unmerged properties back to the "old" existing property and create a new property for the other unmerged property. This is in contrast to what happens now: when a property is "unmerged" into 2, it creates 2 new properties.

@kflemin kflemin requested review from axelstudios and removed request for kflemin February 6, 2024 18:21
@haneslinger
Copy link
Contributor Author

@kflemin @axelstudios repinging this

@kflemin
Copy link
Contributor

kflemin commented Aug 13, 2024

Resolution:

  • assign meters to both properties
  • 1 of the unmerged properties should retain the history
  • in the notes of the property that has no history, add a note "unmerged from X" so we still retain a link to the history (db table note)

@haneslinger
Copy link
Contributor Author

@kflemin In the note, what field should I use the reference the other Property?

@kflemin
Copy link
Contributor

kflemin commented Aug 15, 2024

@kflemin In the note, what field should I use the reference the other Property?

Let's reference the property view ID (since users don't have access to property IDs directly).

@kflemin kflemin merged commit 3115750 into develop Nov 5, 2024
9 checks passed
@kflemin kflemin deleted the FIX-3904-Unmerge-cycle-use-old-properties branch November 5, 2024 06:09
@axelstudios axelstudios changed the title Fix: Use old cycles during unmerge Use old cycles during unmerge Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants