fix get itemId

Author: vaneck237

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

@@ -513,7 +513,6 @@ private void fillClaimFromRestore(Claim claim) {
     private void fillClaimFromDatabase(String claimUUID) {
         new Thread(() -> {
             JSONObject claimObject = sqlHandler.getClaim(claimUUID);
-            Log.e("claim", claimObject.toString());
             if (claimObject == null) {
                 showDialog(getResources().getString(R.string.ClaimNotFound), (dialog, which) -> finish());
             } else {
@@ -814,8 +813,10 @@ private boolean saveClaim() {
         ArrayList<ContentValues> claimItemCVs = new ArrayList<>(lvItemList.size());
         for (int i = 0; i < lvItemList.size(); i++) {
             ContentValues claimItemCV = new ContentValues();
+            String itemId = sqlHandler.getItemId(lvItemList.get(i).get("Code"));
 
             claimItemCV.put("ClaimUUID", claimUUID);
+            claimItemCV.put("ItemId", itemId);
             claimItemCV.put("ItemCode", lvItemList.get(i).get("Code"));
             claimItemCV.put("ItemPrice", lvItemList.get(i).get("Price"));
             claimItemCV.put("ItemQuantity", lvItemList.get(i).get("Quantity"));

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

@@ -41,7 +41,7 @@ public class SQLHandler extends SQLiteOpenHelper {
     private static final String CreateTableClaimAdmins = "CREATE TABLE IF NOT EXISTS tblClaimAdmins(Code TEXT, HFCode TEXT ,Name TEXT);";
     private static final String CreateTableReferences = "CREATE TABLE IF NOT EXISTS tblReferences(Code TEXT, Name TEXT, Type TEXT, Price TEXT);";
     private static final String createTableClaimDetails = "CREATE TABLE IF NOT EXISTS tblClaimDetails(ClaimUUID TEXT, ClaimDate TEXT, HFCode TEXT, ClaimAdmin TEXT, ClaimCode TEXT, GuaranteeNumber TEXT, InsureeNumber TEXT, StartDate TEXT, EndDate TEXT, ICDCode TEXT, Comment TEXT, Total TEXT, ICDCode1 TEXT, ICDCode2 TEXT, ICDCode3 TEXT, ICDCode4 TEXT, VisitType TEXT, ReferalHF TEXT, ReferralCode TEXT, PatientCondition TEXT,PreAuthorization Int );";
-    private static final String createTableClaimItems = "CREATE TABLE IF NOT EXISTS tblClaimItems(ClaimUUID TEXT, ItemCode TEXT, ItemPrice TEXT, ItemQuantity TEXT);";
+    private static final String createTableClaimItems = "CREATE TABLE IF NOT EXISTS tblClaimItems(ClaimUUID TEXT, ItemId TEXT, ItemCode TEXT, ItemPrice TEXT, ItemQuantity TEXT);";
     private static final String createTableClaimServices = "CREATE TABLE IF NOT EXISTS tblClaimServices(ClaimUUID TEXT,ServiceId TEXT, ServiceCode TEXT, ServicePrice TEXT, ServiceQuantity TEXT, ServicePackageType TEXT, SubServicesItems TEXT);";
     private static final String createTableClaimUploadStatus = "CREATE TABLE IF NOT EXISTS tblClaimUploadStatus(ClaimUUID TEXT, UploadDate TEXT, UploadStatus TEXT, UploadMessage TEXT);";
     private static final String CreateTableServices = "CREATE TABLE IF NOT EXISTS tblServices(Id text, Code text, Name text, Type text, Price text, PackageType text);";
@@ -500,7 +500,7 @@ public JSONArray getAllPendingClaims() {
     public JSONArray getClaimItems(String claimUUID) {
         return getQueryResultAsJsonArray(
                 "tblClaimItems",
-                new String[]{"ItemCode", "ItemPrice", "ItemQuantity"},
+                new String[]{"ItemId","ItemCode", "ItemPrice", "ItemQuantity"},
                 "ClaimUUID = ?",
                 new String[]{claimUUID}
         );
@@ -718,6 +718,22 @@ public String getServiceId(String code) {
         return id;
     }
 
+    public String getItemId(String code) {
+        String id = "";
+        try (Cursor c = db.query("tblItems", new String[]{"Id"}, "LOWER(Code) = LOWER(?)", new String[]{code}, null, null, null, "1")) {
+            c.moveToFirst();
+            if (!c.isAfterLast()) {
+                String result = c.getString(0);
+                if (!TextUtils.isEmpty(result)) {
+                    id = result;
+                }
+            }
+        } catch (SQLException e) {
+            Log.d("ErrorOnFetchingData", String.format("Error while getting price of %s", code), e);
+        }
+        return id;
+    }
+
     public void InsertService(String Id, String Code, String Name, String Type, String Price, String PackageType) {
         try {
             ContentValues cv = new ContentValues();

claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaimGQL.java

@@ -25,7 +25,6 @@ public static List<PendingClaimGQL> fromJson(@NonNull JSONArray array) throws Ex
             JSONArray arrayItems = claim.getJSONArray("items");
             JSONArray arrayServices = claim.getJSONArray("services");
             JSONObject details = claim.getJSONObject("details");
-            Log.e("details", details.toString());
             claims.add( new PendingClaimGQL(
                     /* hfCode = */ details.getString("HFCode"),
                     /* claimAdmin */ details.getString("ClaimAdmin"),
@@ -297,7 +296,6 @@ public static List<PendingClaimGQL.Service> fromJson(@NonNull JSONArray array) t
             List<PendingClaimGQL.Service> list = new ArrayList<>();
             for (int i = 0; i < array.length(); i++) {
                 JSONObject service = array.getJSONObject(i);
-                Log.e("service", service.toString());
                 JSONArray arrSubServices = new JSONArray();
                 JSONArray arrSubItems = new JSONArray();
                 if (service.has("SubServicesItems")){

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

@@ -123,6 +123,11 @@ public PostNewClaims.Result create(
             preAuthorization = true;
         }
 
+        String referFrom = "";
+        if(referFromId != 0){
+            referFrom = " referFromId: " + referFromId;
+        }
+
         String QUERY_DOCUMENT = QueryDocumentMinifier.minify(
                 "mutation {"
                         + "  createClaim(input: {"
@@ -133,7 +138,7 @@ public PostNewClaims.Result create(
                         + " dateTo: \"" + DateUtils.toDateString(claim.getEndDate()) + "\""
                         + " icdId: " + diagnosisId
                         + " dateClaimed: \"" + DateUtils.toDateString(claim.getClaimDate()) + "\""
-                        + " referFromId: " + referFromId
+                        + referFrom
                         + " referralCode: \"" + claim.getReferralCode() + "\""
                         + " patientCondition: \"" + claim.getPatientCondition() + "\""
                         + " preAuthorization: " + preAuthorization

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

@@ -49,8 +49,11 @@ public List<PostNewClaims.Result> execute(
             int adminId = Integer.parseInt(new FetchClaimAdmin().execute(pendingClaim.getClaimAdmin()));
             int icdId = Integer.parseInt(new FetchDiagnose().execute(pendingClaim.getIcdCode()));
             String hfId = sqlHandler.getHfId(pendingClaim.getHealthFacilityCode());
-            String referFromId = sqlHandler.getHfId(pendingClaim.getReferalHF());
-            results.add(createClaimGraphQLRequest.create(pendingClaim,Integer.parseInt(hfId),adminId,insureeId,icdId, Integer.parseInt(referFromId)));
+            int referFromId = 0;
+            if(pendingClaim.getReferalHF() != null && !pendingClaim.getReferalHF().isEmpty()){
+                referFromId = Integer.parseInt(sqlHandler.getHfId(pendingClaim.getReferalHF()));
+            }
+            results.add(createClaimGraphQLRequest.create(pendingClaim,Integer.parseInt(hfId),adminId,insureeId,icdId, referFromId));
         }
         return results;
     }