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

TRUNK-5929: Switched PersonMergeLog from Hibernate Mappings to Annotations #4936

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

dulmik2003
Copy link

Description of what I changed

Issue I worked on

see https://openmrs.atlassian.net/browse/TRUNK-5929

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

Copy link
Contributor

@ManojLL ManojLL left a comment

Choose a reason for hiding this comment

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

Add Jira ticket ID for PR title

private Person loser;

/**
* serialized data representing the details of the merge
*/
@Transient
Copy link
Contributor

Choose a reason for hiding this comment

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

why did you define this as transient?

Copy link
Author

Choose a reason for hiding this comment

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

I added transient because, without it, a bunch of unit test cases were failing. I also explored an alternative approach that worked without causing any test failures, but it required configuring a very large character length (around 2000 characters) for for this field, like this:
@Column(name = "merged_data", nullable = false, length = 2000)
private String serializedMergedData;

Additionally, the previous PR created for this issue (which was later closed and not merged) also included transient, so I assumed it would be fine to add it rather than configuring an unnecessarily large character length.

If this approach is not ideal, is there a better way to resolve this?

@dulmik2003
Copy link
Author

dulmik2003 commented Feb 23, 2025

Add Jira ticket ID for PR title

Ok. I'll do it.

@dulmik2003 dulmik2003 closed this Feb 23, 2025
@dulmik2003 dulmik2003 changed the title Switched PersonMergeLog from Hibernate Mappings to Annotations TRUNK-5929: Switched PersonMergeLog from Hibernate Mappings to Annotations Feb 23, 2025
@dulmik2003 dulmik2003 reopened this Feb 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants