fix sync claims

Author: vaneck237

claimManagement/src/main/ic_amg-playstore.png

@@ -47,22 +47,22 @@ public List<PostNewClaims.Result> execute(
         for(PendingClaimGQL pendingClaim: claims){
             int insureeId = Integer.parseInt(new FetchInsuree().execute(pendingClaim.getChfId()));
             int adminId = Integer.parseInt(new FetchClaimAdmin().execute(pendingClaim.getClaimAdmin()));
-            int icdId = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode()));
+            int icdId = new FetchDiagnose().execute(pendingClaim.getIcdCode());
             int icd1Id = 0;
             int icd2Id = 0;
             int icd3Id = 0;
             int icd4Id = 0;
-            if(pendingClaim.getIcdCode1() != null){
-                icd1Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode1()));
+            if(pendingClaim.getIcdCode1() != null && !pendingClaim.getIcdCode1().isEmpty()){
+                icd1Id = new FetchDiagnose().execute(pendingClaim.getIcdCode1());
             }
-            if(pendingClaim.getIcdCode2() != null){
-                icd2Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode2()));
+            if(pendingClaim.getIcdCode2() != null && !pendingClaim.getIcdCode2().isEmpty()){
+                icd2Id = new FetchDiagnose().execute(pendingClaim.getIcdCode2());
             }
-            if(pendingClaim.getIcdCode3() != null){
-                icd3Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode3()));
+            if(pendingClaim.getIcdCode3() != null && !pendingClaim.getIcdCode3().isEmpty()){
+                icd3Id = new FetchDiagnose().execute(pendingClaim.getIcdCode3());
             }
-            if(pendingClaim.getIcdCode4() != null){
-                icd4Id = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode4()));
+            if(pendingClaim.getIcdCode4() != null && !pendingClaim.getIcdCode4().isEmpty()){
+                icd4Id = new FetchDiagnose().execute(pendingClaim.getIcdCode4());
             }
             String hfId = sqlHandler.getHfId(pendingClaim.getHealthFacilityCode());
             int referFromId = 0;

claimManagement/src/main/java/org/openimis/imisclaims/usecase/CreateClaims.java

@@ -3,6 +3,7 @@
 import androidx.annotation.WorkerThread;
 import org.openimis.imisclaims.GetDiagnoseIdQuery;
 import org.openimis.imisclaims.network.request.GetDiagnosesGraphQLRequest;
+import org.openimis.imisclaims.util.IdUtils;
 
 public class FetchDiagnose {
 
@@ -19,10 +20,8 @@ public FetchDiagnose(@NonNull GetDiagnosesGraphQLRequest request) {
 
     @NonNull
     @WorkerThread
-    public String execute(@NonNull String code) throws Exception {
+    public int execute(@NonNull String code) throws Exception {
         GetDiagnoseIdQuery.Node node = request.get(code);
-        byte[] bytes = node.id().getBytes();
-        String id = new String(org.apache.commons.codec.binary.Base64.decodeBase64(bytes)).split(":")[1];
-        return id;
+        return IdUtils.getIdFromGraphQLString(node.id());
     }
 }

claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchDiagnose.java

@@ -0,0 +1,21 @@
+package org.openimis.imisclaims.util;
+
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
+
+public class IdUtils {
+
+    private IdUtils() throws IllegalAccessException {
+        throw new IllegalAccessException("This constructor should not be accessed");
+    }
+
+    /**
+     * <a href="https://github.com/graphql-python/graphene-sqlalchemy/issues/126">
+     *     GraphQL encodes Nodes' int ids for some reasons
+     * </a>
+     */
+    public static int getIdFromGraphQLString(@NonNull String id) {
+        return Integer.parseInt(new String(Base64.decode(id, Base64.NO_WRAP)).split(":", 2)[1]);
+    }
+}

claimManagement/src/main/java/org/openimis/imisclaims/util/IdUtils.java

@@ -30,7 +30,7 @@
                 android:ems="10"
                 android:fontFamily="sans-serif-light"
                 android:hint="@string/HealthFacility"
-                android:maxLength="8"></EditText>
+                android:maxLength="15"></EditText>
 
             <EditText
                 android:id="@+id/etClaimAdmin"

claimManagement/src/main/res/layout/activity_claim.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_amg_background"/>
+    <foreground android:drawable="@mipmap/ic_amg_foreground"/>
+</adaptive-icon>

claimManagement/src/main/res/mipmap-anydpi-v26/ic_amg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_amg_background"/>
+    <foreground android:drawable="@mipmap/ic_amg_foreground"/>
+</adaptive-icon>