Skip to content

Fix method calls in DemographicRelationship #2

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.

Sign up for GitHub

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

Merged
yingbull merged 5 commits into from
Nov 5, 2024
Merged

Fix method calls in DemographicRelationship #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6193ae
fix: change relationships deleted field to boolean
sebastian-j-ibanez Nov 1, 2024
c24f87e
fix: remove null check for boolean type in setDeleted call
sebastian-j-ibanez Nov 4, 2024
4f7617d
fix: change relationships deleted field to boolean
sebastian-j-ibanez Nov 1, 2024
e76b043
fix: remove null check for boolean type in setDeleted call
sebastian-j-ibanez Nov 4, 2024
2b0fa00
Merge branch 'demographic-relationship-fix' of github.com:cc-ar-emr/O…
sebastian-j-ibanez Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/oscarehr/admin/web/MigrateRelationshipsToContactsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static boolean doMigration(LoggedInInfo loggedInInfo) {

dc.setCreated(relationship.getCreationDate());
dc.setCreator(relationship.getCreator());
dc.setDeleted(relationship.getDeleted() != null && "1".equals(relationship.getDeleted()) ? true : false);
dc.setDeleted(relationship.getDeleted());
dc.setDemographicNo(relationship.getDemographicNo());
dc.setRole(relationship.getRelation());
dc.setContactId(String.valueOf(relationship.getRelationDemographicNo()));
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/oscarehr/common/model/Relationships.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class Relationships extends AbstractModel<Integer> {

private String notes;

private String deleted;
private boolean deleted;

private String creator;

Expand Down Expand Up @@ -143,11 +143,11 @@ public void setNotes(String notes) {
this.notes = notes;
}

public String getDeleted() {
public boolean getDeleted() {
return deleted;
}

public void setDeleted(String deleted) {
Copy link
Copy Markdown

@yingbull yingbull Nov 4, 2024

Choose a reason for hiding this comment

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

That's a pretty big change going from a boolean to a string - seems intentional. Is it from an upstream commit? Feels like a rebase issue and changing the method isn't the solution maybe?

Copy link
Copy Markdown
Collaborator Author

@sebastian-j-ibanez sebastian-j-ibanez Nov 4, 2024

Choose a reason for hiding this comment

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

The reason I made this change was because upstream was using a boolean.

This is what Magenta's main, alpaca, and bullfrog has (link):

public void setDeleted(boolean deleted) {
    this.deleted = deleted;
}

public void setDeleted(boolean deleted) {
this.deleted = deleted;
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/oscar/oscarDemographic/data/DemographicRelationship.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void addDemographicRelationship(String demographic, String linkingDemogra
relationships.setNotes(notes);
relationships.setCreator(providerNo);
relationships.setCreationDate(new Date());
relationships.setDeleted(Boolean.FALSE);
relationships.setDeleted(Boolean.FALSE);

RelationshipsDao dao = SpringUtils.getBean(RelationshipsDao.class);
dao.persist(relationships);
Expand All @@ -65,9 +65,9 @@ public void addDemographicRelationship(String demographic, String linkingDemogra
public void deleteDemographicRelationship(String id) {
RelationshipsDao dao = SpringUtils.getBean(RelationshipsDao.class);
Relationships relationships = dao.find(ConversionUtils.fromIntString(id));
if (relationships == null) MiscUtils.getLogger().error("Unable to find demographic relationship to delete");

if(relationships != null) {
if (relationships == null) {
MiscUtils.getLogger().error("Unable to find demographic relationship to delete");
} else {
relationships.setDeleted(Boolean.TRUE);
dao.merge(relationships);
}
Expand Down