Trunk 2768

[andreapat]

Still getting errors on 28 tests in PatientServiceTest - all dealing with mergePatients.
Controllers:
PersonFormController.java
Don't know if we need change here - no deathDate info on person is captured
birthDate is and birthdateEstimated is - see method getMiniPerson(person, name, gender, date, age).
deathDate is mentioned but not set on person set on Obs

!!! Maybe deathdate info needs to be added here and gotten from request

No changes needed for PatientFormController.java

There are some comments I put in the code - I need them - they need to stay till the code is finished.

[rkorytkowski]

It should return boolean and not Boolean. If deathdateEsitmate == null return false.

[djazayeri]

Are you sure about this Rafal? shouldn't we leave it null when unset, e.g. in the case where the patient is alive? And thus this method should be getDeathdateEstimated, not isDeathdateEstimated

[rkorytkowski]

It's a convention that isSomething should be returning boolean and getSomething should be returning Boolean. I know it's wrong in other places in this class, but let's do it right for new code.

[djazayeri]

I'm saying that the property is correctly a Boolean, because it should be nullable, and therefore we should have a getDeathdateEstimated method that returns Boolean (and not isDeathdateEstimated method).

[rkorytkowski]

I'm fine with removing isDeathdateEstimated. We have the correct getDeathEstimated a few lines below.

[andreapat]

Got following comment from Rafal:

In api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java:

@@ -945,8 +945,11 @@ public void mergePatients(Patient preferred, Patient notPreferred) throws APIExc
}

    mergedData.setPriorDateOfDeath(preferred.getDeathDate());
    if (preferred.getDeathDate() == null)
    mergedData.setPriorDateOfDeathEstimated(preferred.isDeathdateEstimated());
    if (preferred.getDeathDate() == null || (preferred.getDeathdateEstimated() && !notPreferred.getDeathdateEstimated())) {

I don't follow. What did you want to say here?

---

I don't follow it either. Again, just following instructions - change like birthdateEstimated.
After making all prior mentioned changes there are 2 tests in error (before changes there were 28).
Both these errors were caused by this line:
if (preferred.getDeathDate() == null || (preferred.getDeathdateEstimated() && !notPreferred.getDeathdateEstimated()))

I tried replacing the if statement with:

    if (preferred.getDeathDate() == null)
        preferred.setDeathDate(notPreferred.getDeathDate());

    if (preferred.getDeathdateEstimated() == null)
        preferred.setDeathdateEstimated(notPreferred.getDeathdateEstimated());

This caused the following:
java.lang.AssertionError: prior date of death was not audited expected

at org.openmrs.api.PatientServiceTest.mergePatients_shouldAuditPriorDateOfDeath(PatientServiceTest.java:2866)

PatientServiceTest.java:2866
Assert.assertEquals("prior date of death was not audited", cDate.getTime(), audit.getPersonMergeLogData()
.getPriorDateOfDeath());

Any suggestions on how to handle this?

[rkorytkowski]

Try with:
{code}
mergedData.setPriorDateOfDeathEstimated(preferred.getDeathdateEstimated());
if (preferred.getDeathdateEstimated() == null)
preferred.setDeathdateEstimated(notPreferred.getDeathdateEstimated());

mergedData.setPriorDateOfDeath(preferred.getDeathDate());
if (preferred.getDeathDate() == null)
preferred.setDeathDate(notPreferred.getDeathDate());
{code}

[wluyima]

Did you intend to call setDeathdateEstimated