Optimize native forms v2 #522

bennsimon · 2020-05-29T14:46:58Z

Make number of contact schedules shown on summary configurable
Add contact_no to globals for quick check, when its opened from register Activity
Fix null GA
Fix incorrect count of profile contact container relevant required fields
Optimized native forms
Support use of boolean is_first_contact as due check strategy
Make ProfileActivity.class configurable

add contact no to globals when quick check is opened from register

fix required field counts

codeclimate · 2020-05-29T14:51:35Z

opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileContactsFragment.java

@@ -130,6 +133,25 @@ protected void onResumption() {
        }
    }

+    private void populatePreviousContactMissingEssentials(HashMap<String, String> clientDetails) {


Method populatePreviousContactMissingEssentials has a Cognitive Complexity of 6 (exceeds 5 allowed). Consider refactoring.

codeclimate · 2020-05-29T14:51:35Z

opensrp-anc/src/main/java/org/smartregister/anc/library/util/ANCJsonFormUtils.java

+        }
+    }
+
+    private static void updateLocationTree(@NonNull JSONArray fields,


Method updateLocationTree has a Cognitive Complexity of 15 (exceeds 5 allowed). Consider refactoring.

codeclimate · 2020-05-29T14:51:35Z

opensrp-anc/src/main/java/org/smartregister/anc/library/util/ANCJsonFormUtils.java

@@ -187,6 +241,28 @@ public static JSONObject getFieldJSONObject(JSONArray jsonArray, String key) {
        }
    }

+    protected static void processLocationFields(@NonNull JSONArray fields) throws JSONException {


Method processLocationFields has a Cognitive Complexity of 17 (exceeds 5 allowed). Consider refactoring.

codeclimate · 2020-06-24T09:17:08Z

opensrp-anc/src/main/java/org/smartregister/anc/library/util/ANCJsonFormUtils.java

@@ -222,31 +302,60 @@ private static void getDobStrings(JSONArray fields) throws JSONException {
        }
    }

-    private static void initializeFirstContactValues(JSONArray fields) throws JSONException {
+    private static String initializeFirstContactValues(JSONArray fields) throws JSONException {


Method initializeFirstContactValues has a Cognitive Complexity of 10 (exceeds 5 allowed). Consider refactoring.

codeclimate · 2020-06-24T09:17:09Z

opensrp-anc/src/main/java/org/smartregister/anc/library/util/ANCJsonFormUtils.java

@@ -222,31 +302,60 @@ private static void getDobStrings(JSONArray fields) throws JSONException {
        }
    }

-    private static void initializeFirstContactValues(JSONArray fields) throws JSONException {
+    private static String initializeFirstContactValues(JSONArray fields) throws JSONException {


Method initializeFirstContactValues has 28 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2020-06-24T09:17:09Z

opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java

+        return getProperties(AncLibrary.getInstance().getApplicationContext()).getProperty(ConstantsUtils.Properties.DUE_CHECK_STRATEGY, "");
+    }
+
+    public static HashMap<String, HashMap<String, String>> buildRepeatingGroupValues(@NonNull JSONArray fields, String fieldName) throws JSONException {


Method buildRepeatingGroupValues has a Cognitive Complexity of 18 (exceeds 5 allowed). Consider refactoring.

codeclimate · 2020-06-24T09:17:09Z

opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java

+        return getProperties(AncLibrary.getInstance().getApplicationContext()).getProperty(ConstantsUtils.Properties.DUE_CHECK_STRATEGY, "");
+    }
+
+    public static HashMap<String, HashMap<String, String>> buildRepeatingGroupValues(@NonNull JSONArray fields, String fieldName) throws JSONException {


Method buildRepeatingGroupValues has 27 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2020-06-24T09:17:09Z

opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java

+
+    }
+
+    public static void createPreviousVisitFromGroup(@NonNull String strGroup, @NonNull String baseEntityId) throws JSONException {


Method createPreviousVisitFromGroup has 30 lines of code (exceeds 25 allowed). Consider refactoring.

codeclimate · 2020-06-24T09:17:12Z

Code Climate has analyzed commit dd5c4c3 and detected 16 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Complexity	16

View more on Code Climate.

…optimize-native-forms-v2

coveralls · 2020-07-01T06:31:34Z

Pull Request Test Coverage Report for Build 3231

163 of 406 (40.15%) changed or added relevant lines in 27 files are covered.
45 unchanged lines in 8 files lost coverage.
Overall coverage decreased (-0.01%) to 45.932%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ProfileActivity.java	0	1	0.0%
opensrp-anc/src/main/java/org/smartregister/anc/library/model/ContactSummaryModel.java	3	4	75.0%
opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PreviousContactRepository.java	5	6	83.33%
opensrp-anc/src/main/java/org/smartregister/anc/library/presenter/ContactPresenter.java	0	2	0.0%
opensrp-anc/src/main/java/org/smartregister/anc/library/task/LoadContactSummaryDataTask.java	3	5	60.0%
opensrp-anc/src/main/java/org/smartregister/anc/library/AncLibrary.java	0	3	0.0%
opensrp-anc/src/main/java/org/smartregister/anc/library/event/PatientRemovedEvent.java	0	3	0.0%
opensrp-anc/src/main/java/org/smartregister/anc/library/interactor/ContactInteractor.java	0	3	0.0%
opensrp-anc/src/main/java/org/smartregister/anc/library/adapter/LastContactAdapter.java	18	22	81.82%
opensrp-anc/src/main/java/org/smartregister/anc/library/util/AncMetadata.java	1	5	20.0%

Files with Coverage Reduction	New Missed Lines	%
opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ContactSummarySendActivity.java	1	39.39%
opensrp-anc/src/main/java/org/smartregister/anc/library/interactor/RegisterInteractor.java	1	50.35%
opensrp-anc/src/main/java/org/smartregister/anc/library/presenter/ContactWizardJsonFormFragmentPresenter.java	1	0%
opensrp-anc/src/main/java/org/smartregister/anc/library/util/ConstantsUtils.java	1	0%
opensrp-anc/src/main/java/org/smartregister/anc/library/domain/Contact.java	2	36.84%
opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java	2	52.74%
opensrp-anc/src/main/java/org/smartregister/anc/library/util/ANCJsonFormUtils.java	4	65.19%
opensrp-anc/src/main/java/org/smartregister/anc/library/activity/MainContactActivity.java	33	56.0%

Totals
Change from base Build 3120:	-0.01%
Covered Lines:	3856
Relevant Lines:	8395

💛 - Coveralls

dubdabasoduba · 2020-07-03T07:34:25Z

@bennsimon is this ready for review?

dubdabasoduba · 2020-07-05T13:11:24Z

gradle.properties

 android.debug.obsoleteApi=true

 ## PUBLISHING VARS
-VERSION_NAME=2.0.1-SNAPSHOT
+VERSION_NAME=2.0.3.13-LOCAL-SNAPSHOT


Change this version name

dubdabasoduba · 2020-07-05T13:11:39Z

opensrp-anc/build.gradle

@@ -143,7 +143,7 @@ dependencies {

    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation('org.smartregister:opensrp-client-native-form:1.7.28-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:1.9.2-r117-OPTIMIZED-LOCAL-SNAPSHOT@aar') {


Update to the correct version name

dubdabasoduba · 2020-07-05T13:13:47Z

opensrp-anc/src/main/java/org/smartregister/anc/library/activity/MainContactActivity.java

@@ -90,6 +93,12 @@ private void initializeMainContactContainers() {
            process(contactForms);
            requiredFieldsMap.put(ConstantsUtils.JsonFormUtils.ANC_TEST_TASKS_ENCOUNTER_TYPE, 0);

+            if (StringUtils.isNotBlank(formInvalidFields) && contactNo > 1 && !PatientRepository.isFirstVisit(baseEntityId)) {
+                String[] pair = formInvalidFields.split(":");


Should check the size of this string array. Otherwise, you will get an out of bounds exception

dubdabasoduba · 2020-07-05T13:14:26Z

opensrp-anc/src/main/java/org/smartregister/anc/library/activity/MainContactActivity.java

@@ -318,7 +328,7 @@ private void processRequiredStepsField(JSONObject object) throws Exception {
            Iterator<String> keys = object.keys();
            while (keys.hasNext()) {
                String key = keys.next();
-                if (key.startsWith(RuleConstant.STEP)) {
+                if (key.startsWith(RuleConstant.STEP) && !object.getJSONObject(key).has("skipped")) {


Move the skipped string to constants

dubdabasoduba · 2020-07-05T13:14:44Z

opensrp-anc/src/main/java/org/smartregister/anc/library/activity/MainContactActivity.java

+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == RESULT_OK && data != null) {
+            formInvalidFields = data.getStringExtra("formInvalidFields");


Move this string to constants

dubdabasoduba · 2020-07-05T13:16:58Z

reference-app/build.gradle

@@ -130,7 +130,7 @@ android {
        }

        debug {
-            resValue "string", 'opensrp_url', '"https://anc-stage.smartregister.org/opensrp/"'
+            resValue "string", 'opensrp_url', '"https://opensrp-jembi-eregister.smartregister.org/opensrp/"' //TODO should be changed to anc staging url


Update this to use the ANC reference app URL

dubdabasoduba · 2020-07-05T13:17:25Z

reference-app/build.gradle

+//    implementation('org.smartregister:opensrp-client-native-form:1.7.30-OPTIMIZE_FORMS-SNAPSHOT@aar') {
+//        transitive = true
+//        exclude group: 'com.android.support', module: 'recyclerview-v7'
+//        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        exclude group: 'com.android.support', module: 'cardview-v7'
+//        exclude group: 'com.android.support', module: 'support-media-compat'
+//        exclude group: 'com.android.support', module: 'support-v4'
+//        exclude group: 'com.android.support', module: 'design'
+//        exclude group: 'org.yaml', module: 'snakeyaml'
+//        exclude group: 'io.ona.rdt-capture', module: 'lib'
+//    }


Why have you disabled this?

add check got contact summar model to avoid duplicates

keymane · 2020-07-14T06:53:29Z

Here is an overview of what got changed by this pull request:

Complexity increasing per file
==============================
- opensrp-anc/src/main/java/org/smartregister/anc/library/model/ContactSummaryModel.java  1
- opensrp-anc/src/main/java/org/smartregister/anc/library/activity/MainContactActivity.java  1
- opensrp-anc/src/test/java/org/smartregister/anc/library/activity/BaseActivityUnitTest.java  1
- opensrp-anc/src/main/java/org/smartregister/anc/library/task/LoadContactSummaryDataTask.java  5
- opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileContactsFragment.java  1
- opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ContactSummarySendActivity.java  3
- opensrp-anc/src/main/java/org/smartregister/anc/library/presenter/ContactSummaryPresenter.java  2

See the complete overview on Codacy

Migrate to oauth2

- Update dependencies to com.github.lecho:hellocharts-android:1.5.8 and id.zelory:compressor:2.1.1 - Update 2.0.3.40-LOCAL-SNAPSHOT

bennsimon added 8 commits April 6, 2020 11:31

make number of contacts schedule displayed on summary configurable

30df989

add contact no to globals when quick check is opened from register

fix null GA

a500ed1

fix required field counts

updated code to tests native forms performance improvement

45d6334

code cleanup

3063c0e

fix gibberish text and crash in ct

2537fe1

update to local snapshot

7deff81

update code with latest optimization code

f430666

update popStack

0c8f1b6

codeclimate bot reviewed May 29, 2020

View reviewed changes

add contact sequencing logic

dd5c4c3

codeclimate bot reviewed Jun 24, 2020

View reviewed changes

bennsimon changed the base branch from master to develop June 24, 2020 09:19

bennsimon added 2 commits June 24, 2020 12:41

remove due check strategy config

bdc4954

make anc profile activity configurable

b72675e

bennsimon self-assigned this Jun 25, 2020

bennsimon marked this pull request as draft June 25, 2020 13:14

bennsimon added 3 commits June 25, 2020 16:16

update snapshot version

3f54903

Merge branch 'develop' of github.com:OpenSRP/opensrp-client-anc into …

8c27ed4

…optimize-native-forms-v2

remove unneeded column

aa26c46

bennsimon requested a review from dubdabasoduba June 25, 2020 13:26

bennsimon added 5 commits June 26, 2020 16:35

update null check for event details

7e088f6

fix next contact update

1055065

update/fix tests

d37270c

added tests

1f300bf

fix tests

30c223b

bennsimon marked this pull request as ready for review July 3, 2020 07:41

dubdabasoduba requested changes Jul 5, 2020

View reviewed changes

update opensrp url to anc

5932f3d

add check got contact summar model to avoid duplicates

bennsimon and others added 15 commits July 23, 2020 10:23

add anc maternity transfer logic

645a680

update anc maternity transfer logic

af330b4

update logic sor AncMaternityTransferProcessor

b6ef73d

update anc death processing & transfer processor

4c5b152

code cleanup

918e77a

fix tests

c1b7010

add tests

0c2fb1b

fix codacy issue

a6aac1d

fix tests

806543f

remove update of key in repeating grp

7496074

add test

0189abf

migrate to latest core

48b73d0

add 41 weeks limit

96ae2c5

Merge pull request #540 from opensrp/migrate-to-oauth2

1bfa21e

Migrate to oauth2

Fix next page fragment being transacted from diskIO

aaf0e65

- Update dependencies to com.github.lecho:hellocharts-android:1.5.8 and id.zelory:compressor:2.1.1 - Update 2.0.3.40-LOCAL-SNAPSHOT

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Optimize native forms v2 #522

Optimize native forms v2 #522

bennsimon commented May 29, 2020 •

edited

Loading

codeclimate bot May 29, 2020

codeclimate bot May 29, 2020

codeclimate bot May 29, 2020

codeclimate bot Jun 24, 2020

codeclimate bot Jun 24, 2020

codeclimate bot Jun 24, 2020

codeclimate bot Jun 24, 2020

codeclimate bot Jun 24, 2020

codeclimate bot commented Jun 24, 2020

coveralls commented Jul 1, 2020 •

edited

Loading

dubdabasoduba commented Jul 3, 2020

dubdabasoduba Jul 5, 2020

dubdabasoduba Jul 5, 2020

dubdabasoduba Jul 5, 2020

dubdabasoduba Jul 5, 2020

dubdabasoduba Jul 5, 2020

dubdabasoduba Jul 5, 2020

dubdabasoduba Jul 5, 2020

keymane commented Jul 14, 2020


		}

		public static void createPreviousVisitFromGroup(@NonNull String strGroup, @NonNull String baseEntityId) throws JSONException {

Optimize native forms v2 #522

Are you sure you want to change the base?

Optimize native forms v2 #522

Conversation

bennsimon commented May 29, 2020 • edited Loading

codeclimate bot May 29, 2020

Choose a reason for hiding this comment

codeclimate bot May 29, 2020

Choose a reason for hiding this comment

codeclimate bot May 29, 2020

Choose a reason for hiding this comment

codeclimate bot Jun 24, 2020

Choose a reason for hiding this comment

codeclimate bot Jun 24, 2020

Choose a reason for hiding this comment

codeclimate bot Jun 24, 2020

Choose a reason for hiding this comment

codeclimate bot Jun 24, 2020

Choose a reason for hiding this comment

codeclimate bot Jun 24, 2020

Choose a reason for hiding this comment

codeclimate bot commented Jun 24, 2020

coveralls commented Jul 1, 2020 • edited Loading

Pull Request Test Coverage Report for Build 3231

💛 - Coveralls

dubdabasoduba commented Jul 3, 2020

dubdabasoduba Jul 5, 2020

Choose a reason for hiding this comment

dubdabasoduba Jul 5, 2020

Choose a reason for hiding this comment

dubdabasoduba Jul 5, 2020

Choose a reason for hiding this comment

dubdabasoduba Jul 5, 2020

Choose a reason for hiding this comment

dubdabasoduba Jul 5, 2020

Choose a reason for hiding this comment

dubdabasoduba Jul 5, 2020

Choose a reason for hiding this comment

dubdabasoduba Jul 5, 2020

Choose a reason for hiding this comment

keymane commented Jul 14, 2020

bennsimon commented May 29, 2020 •

edited

Loading

coveralls commented Jul 1, 2020 •

edited

Loading