check fosa validity

Author: vaneck237

.DS_Store

@@ -27,7 +27,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 32
         versionCode 4
-        versionName "1.1.5"
+        versionName "1.1.6"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {

.github/.DS_Store

@@ -45,7 +45,9 @@
 import org.openimis.imisclaims.domain.entity.PaymentList;
 import org.openimis.imisclaims.domain.entity.Service;
 import org.openimis.imisclaims.domain.entity.SubServiceItem;
+import org.openimis.imisclaims.network.exception.HttpException;
 import org.openimis.imisclaims.tools.Log;
+import org.openimis.imisclaims.usecase.FetchClaimAdmin;
 import org.openimis.imisclaims.usecase.FetchClaimAdmins;
 import org.openimis.imisclaims.usecase.FetchControls;
 import org.openimis.imisclaims.usecase.FetchDiagnosesServicesItems;
@@ -56,6 +58,7 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -553,7 +556,7 @@ public void validateClaimAdminCode(final String claimAdminCode) {
                     if (c.getCount() == 0) {
                         try {
                             progressDialog.dismiss();
-                            doLoggedIn(() -> DownLoadDiagnosesServicesItems(claimAdminCode));
+                            doLoggedIn(() -> CheckFosaValidity(claimAdminCode));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -564,6 +567,33 @@ public void validateClaimAdminCode(final String claimAdminCode) {
         }
     }
 
+    public void CheckFosaValidity (String claimAdminCode){
+        String progress_message = getResources().getString(R.string.checkHfValidity);
+        progressDialog = ProgressDialog.show(this, getResources().getString(R.string.application), progress_message);
+        Thread thread = new Thread() {
+            public void run() {
+                try {
+                    new FetchClaimAdmin().execute(claimAdminCode);
+                    runOnUiThread(() -> {
+                        progressDialog.dismiss();
+                        DownLoadDiagnosesServicesItems(claimAdminCode);
+                    });
+                } catch (HttpException e){
+                    if(e.getCode() == HttpURLConnection.HTTP_NOT_FOUND){
+                        runOnUiThread(() -> {
+                            progressDialog.dismiss();
+                            Toast.makeText(MainActivity.this, getResources().getString(R.string.InvalidHealthFacility), Toast.LENGTH_LONG).show();
+                            ClaimAdminDialogBox();
+                        });
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+        thread.start();
+    }
+
     public void DownLoadDiagnosesServicesItems(@Nullable final String officerCode) {
         if (global.isNetworkAvailable()) {
             String progress_message = getResources().getString(R.string.Diagnoses) + ", " + getResources().getString(R.string.Services) + ", " + getResources().getString(R.string.Items) + "...";

claimManagement/.DS_Store

@@ -51,7 +51,7 @@ public List<PostNewClaims.Result> execute(
         SQLHandler sqlHandler = new SQLHandler(context);
         for(PendingClaimGQL pendingClaim: claims){
             int insureeId = new FetchInsuree().execute(pendingClaim.getChfId());
-            int adminId = Integer.parseInt(new FetchClaimAdmin().execute(pendingClaim.getClaimAdmin()));
+            int adminId = new FetchClaimAdmin().execute(pendingClaim.getClaimAdmin());
             int icdId = new FetchDiagnose().execute(pendingClaim.getIcdCode());
             int icd1Id = 0;
             int icd2Id = 0;

claimManagement/build.gradle

@@ -5,6 +5,7 @@
 
 import org.openimis.imisclaims.GetAdminIdQuery;
 import org.openimis.imisclaims.network.request.GetAdminIdGraphQLRequest;
+import org.openimis.imisclaims.util.IdUtils;
 
 public class FetchClaimAdmin {
 
@@ -21,10 +22,8 @@ public FetchClaimAdmin(@NonNull GetAdminIdGraphQLRequest request) {
 
     @NonNull
     @WorkerThread
-    public String execute(@NonNull String chfId) throws Exception {
-        GetAdminIdQuery.Node node = request.get(chfId);
-        byte[] bytes = node.id().getBytes();
-        String id = new String(org.apache.commons.codec.binary.Base64.decodeBase64(bytes)).split(":")[1];
-        return id;
+    public int execute(@NonNull String claimAdminCode) throws Exception {
+        GetAdminIdQuery.Node node = request.get(claimAdminCode);
+        return IdUtils.getIdFromGraphQLString(node.id());
     }
 }