Merge pull request #101 from mngoe/OP-2533

#OP-2533: add healthfacility validity verification on first connection

Author: zikani03

.gitignore

@@ -80,5 +80,6 @@ fastlane/readme.md
 
 # Custom product flavours
 *custom-flavours.gradle
+.DS_Store
 
 *.DS_Store

claimManagement/src/main/graphql/org.openimis.imisclaim/GetHF.graphql

@@ -1,4 +1,4 @@
-query GetHealthFacility ($offset: Int){
+query GetHealthFacilities ($offset: Int){
     healthFacilities(offset: $offset) {
         pageInfo {
           hasNextPage

claimManagement/src/main/graphql/org.openimis.imisclaim/GetHealthFacility.graphql

@@ -0,0 +1,11 @@
+query GetHealthFacility($code: String){
+    healthFacilities(code: $code) {
+        edges {
+            node {
+                id
+                code
+                name
+            }
+        }
+    }
+}

claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java

@@ -47,6 +47,7 @@
 import org.openimis.imisclaims.domain.entity.Service;
 import org.openimis.imisclaims.domain.entity.SubServiceItem;
 import org.openimis.imisclaims.tools.Log;
+import org.openimis.imisclaims.usecase.CheckHealthFacility;
 import org.openimis.imisclaims.usecase.FetchClaimAdmins;
 import org.openimis.imisclaims.usecase.FetchControls;
 import org.openimis.imisclaims.usecase.FetchDiagnosesServicesItems;
@@ -552,7 +553,7 @@ public void validateClaimAdminCode(final String claimAdminCode) {
                     if (c.getCount() == 0 && c1.getCount() == 0) {
                         try {
                             progressDialog.dismiss();
-                            doLoggedIn(() -> DownLoadDiagnosesServicesItems(claimAdminCode));
+                            doLoggedIn(() -> CheckHealthFacility(claimAdminCode, HealthFacilityName));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -563,6 +564,39 @@ public void validateClaimAdminCode(final String claimAdminCode) {
         }
     }
 
+    public void CheckHealthFacility (String claimAdminCode, String HfCode){
+        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 {
+                    boolean isValidHealthFacility = new CheckHealthFacility().execute(HfCode);
+                    Log.e("is valid", String.valueOf(isValidHealthFacility));
+                    if(isValidHealthFacility){
+                        runOnUiThread(() -> {
+                            progressDialog.dismiss();
+                            DownLoadDiagnosesServicesItems(claimAdminCode);
+                        });
+                    } else {
+                        runOnUiThread(() -> {
+                            progressDialog.dismiss();
+                            Toast.makeText(MainActivity.this, getResources().getString(R.string.InvalidHealthFacility), Toast.LENGTH_LONG).show();
+                            ClaimAdminDialogBox();
+                        });
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(() -> {
+                        progressDialog.dismiss();
+                        Toast.makeText(MainActivity.this, e.getMessage() + "-" + getResources().getString(R.string.SomethingWentWrongServer), Toast.LENGTH_LONG).show();
+                        ClaimAdminDialogBox();
+                    });
+                }
+            }
+        };
+        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/src/main/java/org/openimis/imisclaims/network/request/GetHealthfacilitiesGraphQLRequest.java

@@ -2,11 +2,12 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 import com.apollographql.apollo.api.Input;
-import org.openimis.imisclaims.GetHealthFacilityQuery;
+
+import org.openimis.imisclaims.GetHealthFacilitiesQuery;
 public class GetHealthfacilitiesGraphQLRequest extends BaseGraphQLRequest{
     @NonNull
     @WorkerThread
-    public GetHealthFacilityQuery.HealthFacilities get(@NonNull int page) throws Exception {
-        return makeSynchronous(new GetHealthFacilityQuery(Input.fromNullable(page))).getData().healthFacilities();
+    public GetHealthFacilitiesQuery.HealthFacilities get(@NonNull int page) throws Exception {
+        return makeSynchronous(new GetHealthFacilitiesQuery(Input.fromNullable(page))).getData().healthFacilities();
     }
 }

claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetHealthfacilityGraphQLRequest.java

@@ -0,0 +1,18 @@
+package org.openimis.imisclaims.network.request;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+
+import com.apollographql.apollo.api.Input;
+
+import org.openimis.imisclaims.GetHealthFacilityQuery;
+
+import java.util.List;
+
+public class GetHealthfacilityGraphQLRequest extends BaseGraphQLRequest{
+    @NonNull
+    @WorkerThread
+    public List<GetHealthFacilityQuery.Edge> get (@NonNull String HfCode) throws Exception {
+        return makeSynchronous(new GetHealthFacilityQuery(Input.fromNullable(HfCode))).getData().healthFacilities().edges();
+    }
+}

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

@@ -0,0 +1,27 @@
+package org.openimis.imisclaims.usecase;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+
+import org.openimis.imisclaims.GetHealthFacilityQuery;
+import org.openimis.imisclaims.network.request.GetHealthfacilityGraphQLRequest;
+
+import java.util.List;
+
+public class CheckHealthFacility {
+    @NonNull
+    private final GetHealthfacilityGraphQLRequest request;
+
+    public CheckHealthFacility(){this(new GetHealthfacilityGraphQLRequest());}
+
+    public CheckHealthFacility(@NonNull GetHealthfacilityGraphQLRequest request){
+        this.request = request;
+    }
+
+    @WorkerThread
+    @NonNull
+    public boolean execute(String HfCode) throws Exception {
+        List<GetHealthFacilityQuery.Edge> response = request.get(HfCode);
+        return !response.isEmpty();
+    }
+}

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

@@ -2,7 +2,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 import org.apache.commons.codec.binary.Base64;
-import org.openimis.imisclaims.GetHealthFacilityQuery;
+import org.openimis.imisclaims.GetHealthFacilitiesQuery;
 import org.openimis.imisclaims.domain.entity.HealthFacility;
 import org.openimis.imisclaims.network.request.GetHealthfacilitiesGraphQLRequest;
 import org.openimis.imisclaims.network.util.Mapper;
@@ -27,11 +27,11 @@ public List<HealthFacility> execute() throws Exception{
         int page = 0;
         boolean hasNextPage;
         do{
-            GetHealthFacilityQuery.HealthFacilities response = hfRequest.get(page);
+            GetHealthFacilitiesQuery.HealthFacilities response = hfRequest.get(page);
             healthFacilities.addAll(Mapper.map(
                     response.edges(),
                     dto ->{
-                        GetHealthFacilityQuery.Node node = Objects.requireNonNull(dto.node());
+                        GetHealthFacilitiesQuery.Node node = Objects.requireNonNull(dto.node());
                         byte[] bytes = node.id().getBytes();
                         String id = new String(Base64.decodeBase64(bytes)).split(":")[1];
                         return new HealthFacility(

claimManagement/src/main/res/values-fr/strings.xml

@@ -215,6 +215,8 @@
   <string name="newVersion">Nouvelle version </string>
   <string name="claimUpdate">Mise à jour Claims</string>
   <string name="getVersion">Téléchargement version </string>
+  <string name="InvalidHealthFacility">Formation sanitaire de l\'administrateur invalide</string>
+  <string name="checkHfValidity">Vérification de la formation sanitaire</string>
   <string name="NoServicesPricelist">La formation sanitaire n\'a pas de liste de prix pour les services </string>
   <string name="NoItemsPricelist">La formation sanitaire n\'a pas de liste de prix pour les produits </string>
   <string name="entered">Entrée</string>

claimManagement/src/main/res/values/strings.xml

@@ -251,6 +251,8 @@
     <string name="newVersion">New version </string>
     <string name="claimUpdate">Update Claims</string>
     <string name="getVersion">Downloading version </string>
+    <string name="InvalidHealthFacility">Invalid healthfacility for this claim admin</string>
+    <string name="checkHfValidity">Check healthFacility validity</string>
     <string name="NoServicesPricelist">This healthfacility don\'t have services pricelist</string>
     <string name="NoItemsPricelist">This healthfacility don\'t have items pricelist</string>
     <string name="News">New changes:</string>