Improvements to library

joiskash · joiskash · commit 5a909fbebcf9 · 2021-10-01T18:12:06.000+05:30
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,8 +30,15 @@ android {
     repositories {
         maven {
             url = uri("https://maven.pkg.github.com/digitalhealthintegration/recovers-integration-sample")
+            credentials {
+                username =  System.getenv('GITHUB_USER')
+                password =  System.getenv('GITHUB_TOKEN')
+            }
         }
     }
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 
@@ -41,8 +48,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'org.jetbrains:annotations:15.0'
-    implementation 'com.iprd:intent-proto:0'
+    implementation('com.iprd:intent-proto:0.19')
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'org.json:json:20180813'
 }
diff --git a/app/src/main/java/com/iprd/testapplication/MainActivity.java b/app/src/main/java/com/iprd/testapplication/MainActivity.java
@@ -17,6 +17,8 @@
 import org.json.JSONObject;
 import com.iprd.intent_proto.*;
 
+import java.util.ArrayList;
+
 public class MainActivity extends AppCompatActivity {
 
     public static int NEW_REQUEST_CODE = 401;
@@ -42,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Button btnEdit = findViewById(R.id.btnEdit);
         Button btnRecall = findViewById(R.id.btnRecall);
         btnNew.setOnClickListener(v -> {
-            openSmartHealthAppWithCampaignDetails();
+            openSmartHealthAppWithCampaignDetailsUsingMessagingProtocol();
         });
 
         btnEdit.setOnClickListener(v -> {
@@ -72,6 +74,55 @@ void openSmartHealthApp() {
         }
     }
 
+    void openSmartHealthAppWithCampaignDetailsUsingMessagingProtocol() {
+        KeyTypeValue keyTypeValue = new KeyTypeValue("key", "type", "value");
+        ArrayList<KeyTypeValue> udf = new ArrayList<>();
+        udf.add(keyTypeValue);
+        ArrayList<Integer> verticals = new ArrayList<>();
+        verticals.add(2);
+        CampaignDataClass campaignDataClass =
+                new CampaignDataClassBuilder()
+                        .setId("6ecb0566-7006-4382-9cdc-202d9010858a")
+                        .setName("Oyo State June 2021 Health Campaign")
+                        .setUrl("https://health.oyostate.gov.ng/tomotiya/")
+                        .setVerticals(verticals)
+                        .setLocationPrecision(2)
+                        .setTimePrecision(5)
+                        .setUdf(udf)
+                        .build();
+
+        FamilyMemberDataClass[] familyMemberDataClasses = new FamilyMemberDataClass[]{
+                new FamilyMemberDataBuilder()
+                        .setDob("1993-09-12")
+                        .setGender("M")
+                        .setHead(true)
+                        .setMemberID("1234")
+                        .setName("kash")
+                        .setStatus(FamilyMemberDataClass.Status.New)
+                        .build()
+        };
+
+        FamilySurveyMessageRequest familySurveyMessageRequest =
+                new FamilySurveyMessageRequestBuilder()
+                        .setCampaign(campaignDataClass)
+                        .setFamilyID("tempID")
+                        .setHcwUserName("tempUser")
+                        .setPrimaryContactPhone("123456")
+                        .setVerificationMethod("BIOMETRIC")
+                        .setFamilyMembers(familyMemberDataClasses)
+                        .build();
+
+        Intent sendIntent = new Intent();
+        sendIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        sendIntent.putExtra(BUNDLE_INPUT_JSON, familySurveyMessageRequest.toJsonString());
+        sendIntent.setAction("HOME_SCREEN_IPRD");
+        sendIntent.setComponent(new ComponentName("com.iprd.opencamplink", "com.iprd.opencamplink.records.OpenCampLinkHomeActivity"));
+        Intent chooser = Intent.createChooser(sendIntent, "IPRD OCL");
+        if (sendIntent.resolveActivity(getPackageManager()) != null) {
+            startActivityForResult(chooser, NEW_REQUEST_CODE);
+        }
+    }
+
     void openSmartHealthAppWithCampaignDetails() {
         inputJson = "{\n" +
                 "  \"campaign\": {\n" +
diff --git a/intent-proto/build.gradle b/intent-proto/build.gradle
@@ -34,35 +34,37 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.1'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.3'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation "com.google.truth:truth:1.1.3"
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation "androidx.core:core-ktx:+"
+    implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
-
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/digitalhealthintegration/recovers-integration-sample")
-            credentials {
-                username =  System.getenv('GITHUB_USER')
-                password =  System.getenv('GITHUB_TOKEN')
+afterEvaluate {
+    publishing {
+        repositories {
+            maven {
+                name = "GitHubPackages"
+                url = uri("https://maven.pkg.github.com/digitalhealthintegration/recovers-integration-sample")
+                credentials {
+                    username =  System.getenv('GITHUB_USER')
+                    password =  System.getenv('GITHUB_TOKEN')
+                }
             }
         }
-    }
-    publications {
-        gpr(MavenPublication) {
-            artifact("$buildDir/outputs/aar/${artifactId}-debug.aar")
-            groupId 'com.iprd'
-            artifactId 'intent-proto'
-            version '0.1'
+        publications {
+            gpr(MavenPublication) {
+                from components.release
+                groupId 'com.iprd'
+                artifactId 'intent-proto'
+                version '0.19'
+            }
         }
     }
 }
+
 repositories {
     mavenCentral()
 }
diff --git a/intent-proto/src/main/java/com/iprd/intent_proto/BaseRequestMessage.java b/intent-proto/src/main/java/com/iprd/intent_proto/BaseRequestMessage.java
@@ -1,9 +1,13 @@
 package com.iprd.intent_proto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BaseRequestMessage {
     public CampaignDataClass getCampaign() {
         return campaign;
@@ -15,4 +19,9 @@ void setCampaign(CampaignDataClass campaign) {
 
     @JsonProperty("campaign")
     private CampaignDataClass campaign;
+
+    public String toJsonString() throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.writeValueAsString(this);
+    }
 }
diff --git a/intent-proto/src/main/java/com/iprd/intent_proto/CampaignDataClass.java b/intent-proto/src/main/java/com/iprd/intent_proto/CampaignDataClass.java
@@ -1,6 +1,7 @@
 package com.iprd.intent_proto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.json.JSONObject;
@@ -10,6 +11,7 @@
 
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CampaignDataClass {
     public String getId() {
         return id;
diff --git a/intent-proto/src/main/java/com/iprd/intent_proto/FamilyMemberDataBuilder.java b/intent-proto/src/main/java/com/iprd/intent_proto/FamilyMemberDataBuilder.java
@@ -28,15 +28,11 @@ public FamilyMemberDataBuilder setGender(String value) {
         return this;
     }
 
-    public FamilyMemberDataBuilder setStatus(String value) {
-        familyMemberDataClass.setStatus(value);
-        return this;
-    }
-
     public FamilyMemberDataBuilder setStatus(FamilyMemberDataClass.Status value) {
         familyMemberDataClass.setStatus(value);
         return this;
     }
+
     private FamilyMemberDataClass familyMemberDataClass;
 
     public FamilyMemberDataBuilder(){
diff --git a/intent-proto/src/main/java/com/iprd/intent_proto/FamilyMemberDataClass.java b/intent-proto/src/main/java/com/iprd/intent_proto/FamilyMemberDataClass.java
@@ -5,13 +5,14 @@
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class FamilyMemberDataClass {
     public FamilyMemberDataClass(){
 
     }
 
     public enum Status{
-        NEW,UPDATE,DELETE;
+        New, Update, Delete; // Using Caps for first letter because of backward compatibility
     }
     @JsonProperty("memberId")
     private String memberID;
@@ -42,19 +43,6 @@ public enum Status{
     void setGender(String value) { this.gender = value; }
 
     public Status getStatus() { return status; }
-    void setStatus(String value) {
-        switch (value){
-            case "New":
-                this.status = Status.NEW;
-                break;
-            case "Updated":
-                this.status = Status.UPDATE;
-                break;
-            case "Deleted":
-                this.status = Status.DELETE;
-                break;
-        }
-    }
     void setStatus(Status value) {
         this.status = value;
     }
diff --git a/intent-proto/src/main/java/com/iprd/intent_proto/FamilySurveyMessageRequest.java b/intent-proto/src/main/java/com/iprd/intent_proto/FamilySurveyMessageRequest.java
@@ -1,10 +1,14 @@
 package com.iprd.intent_proto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class FamilySurveyMessageRequest extends BaseRequestMessage {
     public FamilySurveyMessageRequest(){}
 
@@ -105,4 +109,15 @@ public String getFamilySurveyResponse() {
     void setFamilySurveyResponse(String value) {
         this.familySurveyResponse = value;
     }
+
+    @Override
+    public String toJsonString() {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            return mapper.writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }
diff --git a/intent-proto/src/main/java/com/iprd/intent_proto/KeyTypeValue.java b/intent-proto/src/main/java/com/iprd/intent_proto/KeyTypeValue.java
@@ -3,12 +3,14 @@
 import android.annotation.SuppressLint;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Objects;
 
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class KeyTypeValue {
 
     @JsonProperty("k")
diff --git a/intent-proto/src/main/java/com/iprd/intent_proto/ResponseMessage.java b/intent-proto/src/main/java/com/iprd/intent_proto/ResponseMessage.java
@@ -1,11 +1,13 @@
 package com.iprd.intent_proto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.json.JSONArray;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResponseMessage {
 
     public String getFamilyId() {
@@ -68,4 +70,5 @@ void setFamilyMembers(JSONArray familyMembers) {
     private String resultText;
     @JsonProperty("family Members")
     private JSONArray familyMembers;
+
 }
diff --git a/intent-proto/src/test/java/com/iprd/intent_proto/BaseBaseRequestMessageBuilderUnitTest.java b/intent-proto/src/test/java/com/iprd/intent_proto/BaseBaseRequestMessageBuilderUnitTest.java
@@ -14,7 +14,7 @@
  */
 public class BaseBaseRequestMessageBuilderUnitTest {
     @Test
-    public void build_withJsonString_correctRequestMessageBuilt() {
+    public void build_withObjects_correctRequestMessageBuilt() {
         KeyTypeValue keyTypeValue = new KeyTypeValue("key", "type", "value");
         ArrayList<KeyTypeValue> udf = new ArrayList<>();
         udf.add(keyTypeValue);
@@ -38,7 +38,7 @@ public void build_withJsonString_correctRequestMessageBuilt() {
                         .setHead(true)
                         .setMemberID("1234")
                         .setName("kash")
-                        .setStatus("NEW")
+                        .setStatus(FamilyMemberDataClass.Status.New)
                         .build()
         };
 
diff --git a/intent-proto/src/test/java/com/iprd/intent_proto/FamilySurveyMessageRequestUnitTest.java b/intent-proto/src/test/java/com/iprd/intent_proto/FamilySurveyMessageRequestUnitTest.java
@@ -23,7 +23,7 @@
  */
 public class FamilySurveyMessageRequestUnitTest {
     @Test
-    public void build_withJsonString_correctFamilySurveyDataClassParsed() throws JSONException, JsonProcessingException {
+    public void jsonString_new_correctFamilySurveyDataClassParsed() throws JSONException, JsonProcessingException {
         String inputJson = "{\n" +
                 "  \"campaign\": {\n" +
                 "    \"id\": \"6ecb0566-7006-4382-9cdc-202d9010858a\",\n" +
@@ -119,7 +119,7 @@ public void build_withJsonString_correctFamilySurveyDataClassParsed() throws JSO
     }
 
     @Test
-    public void build_withJsonStringEditMode_correctFamilySurveyDataClassParsed() throws JSONException, JsonProcessingException {
+    public void jsonString_edit_correctFamilySurveyDataClassParsed() throws JSONException, JsonProcessingException {
         String shortId = "ABBCD";
         String inputJson = "{\"familyId\": \"789\",\"hcwUserName\": \"nks@apra.in\",\"primaryContactPhone\": \"+918923645896\",\"openCampLinkId\":\""+shortId+"\",\"familySurveyResponse\":\"\",\"familyMembers\": [{\"memberId\": \"13\",\"name\": \"Paul\",\"dob\": \"1998-05-03\",\"gender\": \"M\",\"status\": \"New\"},{\"memberId\": \"12\",\"name\": \"Roma\", \"dob\": \"1997-06-12\",\"gender\": \"F\",\"status\": \"Delete\"},{\"memberId\": \"11\",\"name\": \"Matt\",\"dob\": \"1993-09-25\",\"gender\": \"M\",\"status\": \"Update\"}]};\n";
         ObjectMapper objectMapper = new ObjectMapper();
@@ -155,5 +155,4 @@ public void build_withJsonStringEditMode_correctFamilySurveyDataClassParsed() th
         };
         assertArrayEquals(familySurveyMessageRequest.getFamilyMembers(),familyMemberDataClasses);
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,15 @@ android {`
`30`	`30`	`repositories {`
`31`	`31`	`maven {`
`32`	`32`	`url = uri("https://maven.pkg.github.com/digitalhealthintegration/recovers-integration-sample")`
	`33`	`+ credentials {`
	`34`	`+ username = System.getenv('GITHUB_USER')`
	`35`	`+ password = System.getenv('GITHUB_TOKEN')`
	`36`	`+ }`
`33`	`37`	`}`
`34`	`38`	`}`
	`39`	`+ testOptions {`
	`40`	`+ unitTests.returnDefaultValues = true`
	`41`	`+ }`
`35`	`42`	`}`
`36`	`43`
`37`	`44`
`@@ -41,8 +48,9 @@ dependencies {`
`41`	`48`	`implementation 'com.google.android.material:material:1.3.0'`
`42`	`49`	`implementation 'androidx.constraintlayout:constraintlayout:2.0.4'`
`43`	`50`	`implementation 'org.jetbrains:annotations:15.0'`
`44`		`- implementation 'com.iprd:intent-proto:0'`
	`51`	`+ implementation('com.iprd:intent-proto:0.19')`
`45`	`52`	`testImplementation 'junit:junit:4.+'`
`46`	`53`	`androidTestImplementation 'androidx.test.ext:junit:1.1.2'`
`47`	`54`	`androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'`
	`55`	`+ testImplementation 'org.json:json:20180813'`
`48`	`56`	`}`