-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #419 from OpenSRP/issue-138-update-family-member-n…
…ames Update family member names if Family name is changed
- Loading branch information
Showing
6 changed files
with
300 additions
and
4 deletions.
There are no files selected for viewing
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
23 changes: 23 additions & 0 deletions
23
opensrp-chw-core/src/main/java/org/smartregister/chw/core/dao/FamilyMemberDao.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package org.smartregister.chw.core.dao; | ||
|
|
||
| import org.smartregister.chw.core.model.CoreFamilyMemberModel; | ||
| import org.smartregister.dao.AbstractDao; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class FamilyMemberDao extends AbstractDao { | ||
|
|
||
| public static List<CoreFamilyMemberModel> familyMembersToUpdateLastName(String baseEntityId) { | ||
| String sql = String.format("SELECT DISTINCT fm.entity_type, fm.last_name, fm.base_entity_id,fm.relational_id FROM ec_family_member fm " + | ||
| "INNER JOIN ec_family f on '" + baseEntityId + "' = fm.relational_id " + | ||
| "WHERE f.first_name = fm.last_name"); | ||
|
|
||
| DataMap<CoreFamilyMemberModel> dataMap = cursor -> | ||
| new CoreFamilyMemberModel(getCursorValue(cursor, "last_name"), | ||
| getCursorValue(cursor, "base_entity_id"), | ||
| getCursorValue(cursor, "relational_id"), | ||
| getCursorValue(cursor, "entity_type")); | ||
|
|
||
| return readData(sql, dataMap); | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
opensrp-chw-core/src/main/java/org/smartregister/chw/core/model/CoreFamilyMemberModel.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package org.smartregister.chw.core.model; | ||
|
|
||
| public class CoreFamilyMemberModel { | ||
| private final String lastName; | ||
| private final String baseEntityId; | ||
| private final String familyBaseEntityId; | ||
| private final String entityType; | ||
|
|
||
| public CoreFamilyMemberModel(String lastName, String baseEntityId, String familyBaseEntityId, String entityType) { | ||
| this.lastName = lastName; | ||
| this.baseEntityId = baseEntityId; | ||
| this.familyBaseEntityId = familyBaseEntityId; | ||
| this.entityType = entityType; | ||
| } | ||
|
|
||
| public String getEntityType() { | ||
| return entityType; | ||
| } | ||
|
|
||
| public String getLastName() { | ||
| return lastName; | ||
| } | ||
|
|
||
| public String getBaseEntityId() { | ||
| return baseEntityId; | ||
| } | ||
|
|
||
| public String getFamilyBaseEntityId() { | ||
| return familyBaseEntityId; | ||
| } | ||
| } |
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
46 changes: 46 additions & 0 deletions
46
opensrp-chw-core/src/test/java/org/smartregister/chw/core/dao/FamilyMemberDaoTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package org.smartregister.chw.core.dao; | ||
|
|
||
| import net.sqlcipher.MatrixCursor; | ||
| import net.sqlcipher.database.SQLiteDatabase; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.MockitoAnnotations; | ||
| import org.smartregister.chw.core.model.CoreFamilyMemberModel; | ||
| import org.smartregister.repository.Repository; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class FamilyMemberDaoTest extends FamilyMemberDao { | ||
|
|
||
| @Mock | ||
| private Repository repository; | ||
|
|
||
| @Mock | ||
| private SQLiteDatabase database; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| MockitoAnnotations.initMocks(this); | ||
| setRepository(repository); | ||
| Mockito.doReturn(database).when(repository).getReadableDatabase(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetActiveAlerts() { | ||
| MatrixCursor matrixCursor = new MatrixCursor(new String[]{"last_name", "base_entity_id", "relational_id", "entity_type"}); | ||
| matrixCursor.addRow(new Object[]{"demo_last_name", "123456", "654321", "Update"}); | ||
| Mockito.doReturn(matrixCursor).when(database).rawQuery(Mockito.any(), Mockito.any()); | ||
|
|
||
| List<CoreFamilyMemberModel> familyMembers = FamilyMemberDao.familyMembersToUpdateLastName("123456"); | ||
|
|
||
| Mockito.verify(database).rawQuery(Mockito.anyString(), Mockito.any()); | ||
|
|
||
| Assert.assertNotNull(familyMembers); | ||
| Assert.assertEquals(familyMembers.get(0).getLastName(), "demo_last_name"); | ||
| } | ||
|
|
||
| } |
82 changes: 82 additions & 0 deletions
82
...e/src/test/java/org/smartregister/chw/core/utils/ProcessFamilyMembersClientEventTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package org.smartregister.chw.core.utils; | ||
|
|
||
| import org.apache.commons.lang3.tuple.Pair; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.MockitoAnnotations; | ||
| import org.powermock.api.mockito.PowerMockito; | ||
| import org.powermock.core.classloader.annotations.PrepareForTest; | ||
| import org.powermock.modules.junit4.PowerMockRunner; | ||
| import org.smartregister.Context; | ||
| import org.smartregister.chw.core.dao.FamilyMemberDao; | ||
| import org.smartregister.chw.core.model.CoreFamilyMemberModel; | ||
| import org.smartregister.clientandeventmodel.Client; | ||
| import org.smartregister.clientandeventmodel.Event; | ||
| import org.smartregister.domain.tag.FormTag; | ||
| import org.smartregister.family.FamilyLibrary; | ||
| import org.smartregister.family.activity.FamilyWizardFormActivity; | ||
| import org.smartregister.family.domain.FamilyMetadata; | ||
| import org.smartregister.repository.AllSharedPreferences; | ||
| import org.smartregister.view.activity.BaseProfileActivity; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.smartregister.chw.core.dao.FamilyMemberDao.familyMembersToUpdateLastName; | ||
|
|
||
| @RunWith(PowerMockRunner.class) | ||
| public class ProcessFamilyMembersClientEventTest { | ||
|
|
||
| @Mock | ||
| private Context context; | ||
| @Mock | ||
| private AllSharedPreferences allSharedPreferences; | ||
| private FamilyMetadata metadata; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| MockitoAnnotations.initMocks(this); | ||
| FamilyLibrary.init(context, null, 1, 1); | ||
| FamilyLibrary.getInstance().setMetadata(getMetadata()); | ||
| } | ||
|
|
||
| @PrepareForTest({FamilyMemberDao.class}) | ||
| @Test | ||
| public void processFamilyMemberUpdateFamilyNameShouldReturnEventAndClient() { | ||
| PowerMockito.mockStatic(FamilyMemberDao.class); | ||
| PowerMockito.when(familyMembersToUpdateLastName("6543421")).thenReturn(Collections.singletonList(new CoreFamilyMemberModel("demo", "123456", "6543421", "Update Family Member Registration"))); | ||
| List<Pair<Client, Event>> familyEventClient = CoreJsonFormUtils.processFamilyMemberUpdateFamilyName("6543421", "demo", formTag(allSharedPreferences), allSharedPreferences); | ||
| assertNotNull(familyEventClient); | ||
| assertEquals(familyEventClient.size(), 1); | ||
| assertNotNull(familyEventClient.get(0).getRight()); | ||
| assertNotNull(familyEventClient.get(0).getLeft()); | ||
| } | ||
|
|
||
| protected FamilyMetadata getMetadata() { | ||
| BaseProfileActivity activity = Mockito.mock(BaseProfileActivity.class); | ||
| if (metadata == null) { | ||
| metadata = new FamilyMetadata(FamilyWizardFormActivity.class, FamilyWizardFormActivity.class, activity.getClass(), "UNIQUE_IDENTIFIER_KEY", true); | ||
| metadata.updateFamilyRegister("FAMILY_REGISTER", "FAMILY", "FAMILY_REGISTRATION", "UPDATE_FAMILY_REGISTRATION", "FAMILY_REGISTER", "FAMILY_HEAD", "PRIMARY_CAREGIVER"); | ||
| metadata.updateFamilyMemberRegister("FAMILY_MEMBER_REGISTER", "FAMILY_MEMBER", "FAMILY_MEMBER_REGISTRATION", "UPDATE_FAMILY_MEMBER_REGISTRATION", "FAMILY_MEMBER_REGISTER", "FAMILY"); | ||
| metadata.updateFamilyDueRegister("FAMILY_MEMBER", 20, true); | ||
| metadata.updateFamilyActivityRegister("FAMILY_MEMBER", Integer.MAX_VALUE, false); | ||
| metadata.updateFamilyOtherMemberRegister("FAMILY_MEMBER", Integer.MAX_VALUE, false); | ||
| } | ||
| return metadata; | ||
| } | ||
|
|
||
| protected static FormTag formTag(AllSharedPreferences allSharedPreferences) { | ||
| FormTag formTag = new FormTag(); | ||
| formTag.providerId = allSharedPreferences.fetchRegisteredANM(); | ||
| formTag.appVersion = FamilyLibrary.getInstance().getApplicationVersion(); | ||
| formTag.databaseVersion = FamilyLibrary.getInstance().getDatabaseVersion(); | ||
| return formTag; | ||
| } | ||
| } | ||
|
|
||
|
|