#1079 - writing test for registration launched from add member. creat…

…ed worklist factory to capture the creation of worklists to be used in test also.
avniproject · Sep 7, 2023 · be283c6 · be283c6
1 parent 4945c2d
commit be283c6
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 42 deletions.
diff --git a/packages/openchs-android/index.android.js b/packages/openchs-android/index.android.js
@@ -1,4 +1,5 @@
 /* @flow */
 import {AppRegistry} from 'react-native';
+// import App from "./integrationTest/IntegrationTestApp";
 import App from "./src/Avni";
 AppRegistry.registerComponent('Avni', () => App);
diff --git a/packages/openchs-android/integrationTest/BaseIntegrationTest.js b/packages/openchs-android/integrationTest/BaseIntegrationTest.js
@@ -37,6 +37,11 @@ class BaseIntegrationTest {
         this.getService(RuleService).init();
         this.getService(PrivilegeService).deleteRevokedEntities();
     }
+
+    setup() {
+        GlobalContext.getInstance().db.realmDb.deleteAll();
+        return this;
+    }
 }
 
 class TestDb {

diff --git a/packages/openchs-android/integrationTest/IntegrationTestApp.js b/packages/openchs-android/integrationTest/IntegrationTestApp.js
@@ -50,7 +50,11 @@ class IntegrationTestApp extends Component {
 
         if (this.state.isInitialisationDone) {
             return <View style={{flex: 1, alignItems: 'center', justifyContent: 'center', backgroundColor: "black"}}>
-                <Button title="Run Test" onPress={() => new PersonRegisterActionsIntegrationTest().last_page_of_registration_should_show_worklist_correctly(IntegrationTestContext)}/>
+                <Button title="Run Test" onPress={() => {
+                    const personRegisterActionsIntegrationTest = new PersonRegisterActionsIntegrationTest();
+                    // personRegisterActionsIntegrationTest.setup().person_registration_should_show_worklist_correctly(IntegrationTestContext);
+                    personRegisterActionsIntegrationTest.setup().person_registration_via_add_member_should_show_worklist_correctly(IntegrationTestContext);
+                }}/>
             </View>;
         }
         return <View style={{flex: 1, alignItems: 'center', justifyContent: 'center', color: "white", backgroundColor: "black"}}>

diff --git a/packages/openchs-android/integrationTest/PersonRegisterActionsIntegrationTest.js b/packages/openchs-android/integrationTest/PersonRegisterActionsIntegrationTest.js
@@ -1,5 +1,5 @@
 import TestConceptFactory from "../test/model/TestConceptFactory";
-import {Gender, OrganisationConfig, AddressLevel, Concept, Form, SubjectType, WorkList, WorkLists, FormMapping} from "openchs-models";
+import {Gender, Individual, OrganisationConfig, AddressLevel, Concept, Form, SubjectType, WorkList, WorkLists, FormMapping} from "openchs-models";
 import BaseIntegrationTest from "./BaseIntegrationTest";
 import TestFormFactory from "../test/model/form/TestFormFactory";
 import TestFormElementGroupFactory from "../test/model/form/TestFormElementGroupFactory";
@@ -11,19 +11,20 @@ import TestGenderFactory from "../test/model/TestGenderFactory";
 import TestFormMappingFactory from "../test/model/form/TestFormMappingFactory";
 import Reducers from "../src/reducer";
 import TestOrganisationConfigFactory from "../test/model/TestOrganisationConfigFactory";
+import TestSubjectFactory from "../test/model/txn/TestSubjectFactory";
+import WorklistsFactory from "../src/model/WorklistsFactory";
 
 const rule = `({params, imports}) => {
+    console.log("Run started");
     const workLists = params.workLists;
     const context = params.context;
     const WorkItem = imports.models.WorkItem;
     const currentWorkItem = workLists.getCurrentWorkItem();
     const currentWorkList = workLists.currentWorkList;
     const age = _.get(context, 'entity.individual.age');
-    console.log("In the rule");
     if (_.get(context, 'entity.individual.subjectType.name') === 'Family Member') {
         const uniqueID = (new Date()).toString(); 
-        const covidSurvey = new WorkItem(uniqueID,
-            WorkItem.type.ENCOUNTER,
+        const covidSurvey = new WorkItem(uniqueID, WorkItem.type.ENCOUNTER,
             {
                 encounterType: 'Covid Survey',
                 subjectUUID: _.get(context, 'entity.individual.uuid')
@@ -35,19 +36,27 @@ const rule = `({params, imports}) => {
 };`;
 
 class PersonRegisterActionsIntegrationTest extends BaseIntegrationTest {
-    last_page_of_registration_should_show_worklist_correctly(context) {
+    concept; addressLevel; gender;
+
+    setup() {
+        super.setup();
+        this.executeInWrite((db) => {
+            this.concept = db.create(Concept, TestConceptFactory.createWithDefaults({dataType: Concept.dataType.Text}));
+            this.addressLevel = db.create(AddressLevel, TestAddressLevelFactory.createWithDefaults({level: 1}));
+            this.gender = db.create(Gender, TestGenderFactory.createWithDefaults({name: "Male"}));
+        });
+        return this;
+    }
+
+    person_registration_should_show_worklist_correctly(context) {
         context.starting(arguments);
-        let subjectType, gender, addressLevel;
+        let subjectType;
         this.executeInWrite((db) => {
-            const concept = db.create(Concept, TestConceptFactory.createWithDefaults({dataType: Concept.dataType.Text}));
             subjectType = db.create(SubjectType, TestSubjectTypeFactory.createWithDefaults({type: SubjectType.types.Person, name: 'Family Member'}));
             const form = db.create(Form, TestFormFactory.createWithDefaults({formType: Form.formTypes.IndividualProfile}));
             const formElementGroup = TestFormElementGroupFactory.create({form: form});
             TestFormElementFactory.create({concept: concept, displayOrder: 1, formElementGroup: formElementGroup});
             db.create(FormMapping, TestFormMappingFactory.createWithDefaults({subjectType: subjectType, form: form}))
-
-            addressLevel = db.create(AddressLevel, TestAddressLevelFactory.createWithDefaults({level: 1}));
-            gender = db.create(Gender, TestGenderFactory.createWithDefaults({name: "Male"}));
             db.create(OrganisationConfig, TestOrganisationConfigFactory.createWithDefaults({worklistUpdationRule: rule}));
         });
 
@@ -57,9 +66,39 @@ class PersonRegisterActionsIntegrationTest extends BaseIntegrationTest {
         this.dispatch({type: Actions.ON_LOAD, isDraftEntity: false, workLists: workLists});
         this.dispatch({type: Actions.REGISTRATION_ENTER_FIRST_NAME, value: "foo"});
         this.dispatch({type: Actions.REGISTRATION_ENTER_LAST_NAME, value: "bar"});
-        this.dispatch({type: Actions.REGISTRATION_ENTER_GENDER, value: gender});
+        this.dispatch({type: Actions.REGISTRATION_ENTER_GENDER, value: this.gender});
+        this.dispatch({type: Actions.REGISTRATION_ENTER_DOB, value: new Date()});
+        this.dispatch({type: Actions.REGISTRATION_ENTER_ADDRESS_LEVEL, value: this.addressLevel});
+        this.dispatch({type: Actions.NEXT, completed: () => {}});
+        let state = this.getState(Reducers.reducerKeys.personRegister);
+        console.log(state.workListState.workLists.currentWorkList.workItems);
+        // this.dispatch({type: Actions.SAVE, cb: () => {}});
+        context.ending(arguments);
+    }
+
+    person_registration_via_add_member_should_show_worklist_correctly(context) {
+        context.starting(arguments);
+        let householdSubjectType, personSubjectType, household;
+        this.executeInWrite((db) => {
+            householdSubjectType = db.create(SubjectType, TestSubjectTypeFactory.createWithDefaults({type: SubjectType.types.Household, name: 'Family', isGroup: true}));
+            personSubjectType = db.create(SubjectType, TestSubjectTypeFactory.createWithDefaults({type: SubjectType.types.Person, name: 'Family Member', isGroup: false}));
+            const form = db.create(Form, TestFormFactory.createWithDefaults({formType: Form.formTypes.IndividualProfile}));
+            const formElementGroup = TestFormElementGroupFactory.create({form: form});
+            TestFormElementFactory.create({concept: concept, displayOrder: 1, formElementGroup: formElementGroup});
+            db.create(FormMapping, TestFormMappingFactory.createWithDefaults({subjectType: householdSubjectType, form: form}))
+            db.create(OrganisationConfig, TestOrganisationConfigFactory.createWithDefaults({worklistUpdationRule: rule}));
+            household = db.create(Individual, TestSubjectFactory.createWithDefaults({subjectType: householdSubjectType, firstName: "House1", address: this.addressLevel}));
+        });
+
+        this.initialDataSetupComplete();
+
+        const workLists = WorklistsFactory.createForAddMember(null, );
+        this.dispatch({type: Actions.ON_LOAD, isDraftEntity: false, workLists: workLists});
+        this.dispatch({type: Actions.REGISTRATION_ENTER_FIRST_NAME, value: "foo"});
+        this.dispatch({type: Actions.REGISTRATION_ENTER_LAST_NAME, value: "bar"});
+        this.dispatch({type: Actions.REGISTRATION_ENTER_GENDER, value: this.gender});
         this.dispatch({type: Actions.REGISTRATION_ENTER_DOB, value: new Date()});
-        this.dispatch({type: Actions.REGISTRATION_ENTER_ADDRESS_LEVEL, value: addressLevel});
+        this.dispatch({type: Actions.REGISTRATION_ENTER_ADDRESS_LEVEL, value: this.addressLevel});
         this.dispatch({type: Actions.NEXT, completed: () => {}});
         let state = this.getState(Reducers.reducerKeys.personRegister);
         console.log(state.workListState.workLists.currentWorkList.workItems);

diff --git a/packages/openchs-android/src/Avni.js b/packages/openchs-android/src/Avni.js
@@ -1,13 +1,10 @@
 import React, {Component} from 'react';
 import {StatusBar, StyleSheet, View} from 'react-native';
-import Playground from "./Playground";
-import Config from './framework/Config';
 import Colors from "./views/primitives/Colors";
 import { LogBox } from 'react-native';
 import General from "./utility/General";
 
 export default class Avni extends Component {
-
     static styles = StyleSheet.create({
         container: {
             flex: 1,
@@ -19,11 +16,6 @@ export default class Avni extends Component {
 
     render() {
         LogBox.ignoreAllLogs();
-
-        if (Config.PLAYGROUND) {
-            console.log("=====================>>>>>>>Rendering Playground app component");
-            return <Playground/>;
-        }
         General.logDebug("Avni", "=====================>>>>>>>Rendering main app component");
         const App = require('./App').default;
         return (

diff --git a/packages/openchs-android/src/framework/view/AbstractComponent.js b/packages/openchs-android/src/framework/view/AbstractComponent.js
@@ -60,7 +60,7 @@ class AbstractComponent extends Component {
     dispatchAction(action, params) {
         const type = action instanceof Function ? action.Id : action;
         if (General.canLog(General.LogLevel.Debug)) {
-            General.logDebug(`${this.constructor.name}::AC`, `Dispatching action: ${JSON.stringify(type)}`);
+            General.logDebugTemp(`${this.constructor.name}::AC`, `Dispatching action: ${JSON.stringify(type)}`);
         }
         const dispatchResult = this.context.getStore().dispatch({type, ...params});
         if (General.canLog(General.LogLevel.Debug)) {

diff --git a/packages/openchs-android/src/model/WorklistsFactory.js b/packages/openchs-android/src/model/WorklistsFactory.js
@@ -0,0 +1,22 @@
+import General from "../utility/General";
+import {WorkItem, WorkList, WorkLists} from 'openchs-models';
+
+class WorklistsFactory {
+    static createForAddMember(memberSubject, member, individualRelative, isHeadOfHousehold, relativeGender) {
+        const workItem = new WorkItem(General.randomUUID(), WorkItem.type.ADD_MEMBER,
+            {
+                uuid: memberSubject.uuid,
+                subjectTypeName: memberSubject.subjectType.name,
+                member: member,
+                individualRelative: individualRelative,
+                headOfHousehold: isHeadOfHousehold,
+                relativeGender: relativeGender,
+                groupSubjectUUID: member.groupSubject.uuid
+            }
+        );
+        const workList = new WorkList(`${memberSubject.subjectType.name} `, [workItem]);
+        return new WorkLists(workList);
+    }
+}
+
+export default WorklistsFactory;
diff --git a/packages/openchs-android/src/service/AuthService.js b/packages/openchs-android/src/service/AuthService.js
@@ -8,6 +8,7 @@ import StubbedAuthService from "./StubbedAuthService";
 import CognitoAuthService from "./CognitoAuthService";
 import KeycloakAuthService from "./KeycloakAuthService";
 import { IDP_PROVIDERS } from "../model/IdpProviders";
+import General from "../utility/General";
 
 @Service("authService")
 class AuthService extends BaseService {
@@ -42,11 +43,12 @@ class AuthService extends BaseService {
         const settings = this.settingsService.getSettings();
         const serverURL = settings.serverURL;
         const url = `${serverURL}/idp-details`;
-        return getJSON(url, true).then(( authDetails ) => {
+        return getJSON(url, true).then(( idpDetails ) => {
             let newSettings = settings.clone();
-            newSettings.idpType = authDetails.idpType;
-            newSettings = _.merge(newSettings, this._updateCognitoSettings(authDetails.cognito));
-            newSettings = _.merge(newSettings, this._updateKeycloakSettings(authDetails.keycloak));
+            newSettings.idpType = idpDetails.idpType;
+            newSettings = _.merge(newSettings, this._updateCognitoSettings(idpDetails.cognito));
+            newSettings = _.merge(newSettings, this._updateKeycloakSettings(idpDetails.keycloak));
+            General.logDebug("AuthService", newSettings);
             this.settingsService.saveOrUpdate(newSettings);
             return newSettings;
         });

diff --git a/packages/openchs-android/src/service/CognitoAuthService.js b/packages/openchs-android/src/service/CognitoAuthService.js
@@ -6,7 +6,6 @@ import AuthenticationError, {NO_USER} from "./AuthenticationError";
 import General from "../utility/General";
 import ErrorHandler from "../utility/ErrorHandler";
 import UserInfoService from "./UserInfoService";
-import AuthService from "./AuthService";
 import BaseAuthProviderService from "./BaseAuthProviderService";
 
 @Service("cognitoAuthService")

diff --git a/packages/openchs-android/src/service/EncryptionService.js b/packages/openchs-android/src/service/EncryptionService.js
@@ -11,7 +11,6 @@ import {randomBytes} from "react-native-randombytes";
 import GlobalContext from "../GlobalContext";
 import {getGenericPassword} from "react-native-keychain";
 
-
 const CREDENTIAL_USERNAME = "avni-user";
 
 @Service("encryptionService")

diff --git a/packages/openchs-android/src/views/groupSubject/AddNewMemberView.js b/packages/openchs-android/src/views/groupSubject/AddNewMemberView.js
@@ -23,6 +23,7 @@ import GenericDashboardView from "../program/GenericDashboardView";
 import AbstractDataEntryState from "../../state/AbstractDataEntryState";
 import ValidationErrorMessage from "../form/ValidationErrorMessage";
 import WorkListState from "../../state/WorkListState";
+import WorklistsFactory from "../../model/WorklistsFactory";
 
 @Path('/addNewMemberView')
 class AddNewMemberView extends AbstractComponent {
@@ -117,20 +118,9 @@ class AddNewMemberView extends AbstractComponent {
         } else {
             const memberSubject = this.state.member.memberSubject;
             if (!_.isEmpty(this.state.validationResults)) {
-                return
+                return;
             }
-            CHSNavigator.navigateToRegisterView(this, {workLists: new WorkLists(new WorkList(`${memberSubject.subjectType.name} `,
-                    [new WorkItem(General.randomUUID(), WorkItem.type.ADD_MEMBER,
-                        {
-                            uuid: memberSubject.uuid,
-                            subjectTypeName: memberSubject.subjectType.name,
-                            member: this.state.member,
-                            individualRelative: this.state.individualRelative,
-                            headOfHousehold: this.isHeadOfHousehold(),
-                            relativeGender: this.state.relativeGender,
-                            groupSubjectUUID: this.state.member.groupSubject.uuid,
-                        }
-                    )]))});
+            CHSNavigator.navigateToRegisterView(this, {workLists: WorklistsFactory.createForAddMember(memberSubject, this.state.member, this.state.individualRelative, this.isHeadOfHousehold(), this.state.relativeGender)});
         }
     }
 

diff --git a/packages/openchs-android/test/model/TestSubjectTypeFactory.js b/packages/openchs-android/test/model/TestSubjectTypeFactory.js
@@ -2,11 +2,12 @@ import {SubjectType} from "openchs-models";
 import General from "../../src/utility/General";
 
 class TestSubjectTypeFactory {
-    static createWithDefaults({type, name = General.randomUUID()}) {
+    static createWithDefaults({type, name = General.randomUUID(), isGroup = false}) {
         const subjectType = new SubjectType();
         subjectType.uuid = General.randomUUID();
         subjectType.name = name;
         subjectType.type = type;
+        subjectType.group = isGroup;
         return subjectType;
     }
 }

diff --git a/packages/openchs-android/test/model/txn/TestSubjectFactory.js b/packages/openchs-android/test/model/txn/TestSubjectFactory.js
@@ -0,0 +1,16 @@
+import {Individual} from 'openchs-models';
+import General from "../../../src/utility/General";
+
+class TestSubjectFactory {
+    static createWithDefaults({subjectType, firstName, lastName, address}) {
+        const individual = new Individual();
+        individual.uuid = General.randomUUID();
+        individual.subjectType = subjectType;
+        individual.firstName = firstName;
+        individual.lastName = lastName;
+        individual.lowestAddressLevel = address;
+        return individual;
+    }
+}
+
+export default TestSubjectFactory;