From b31e5e6c06e2c5569b0208af2808676caf740be9 Mon Sep 17 00:00:00 2001
From: Mariya <mariya@sminnovations.in>
Date: Thu, 7 Mar 2024 13:30:38 +0530
Subject: [PATCH] removed getting null values from result upload

---
 .../presentation/dashboard/HomeFragment.kt    | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index a79414d..67a5cea 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -159,14 +159,16 @@ class HomeFragment : Fragment() {
 
                     val resultList = MolbioV2ResultRequest(mutableListOf())
                     originalUserDataList.forEach { userData ->
-                        Log.d(
-                            ": USER DATA",
-                            originalUserDataList.count().toString() + " : " + userData._id
-                        )
+                        Log.d(": USER DATA", originalUserDataList.count().toString() + " : " + userData._id)
                         var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
                         // Upload results after processing all userData to avoid duplicates and ensure all modifications are done
                         if(accessToken.isNotEmpty()) {
-                            if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION) {
+
+                            if (!userData.localFlag && userData.testStatus == true) {
+                                hemoCubeViewModel.bulkAddResultTestToDb(userData)
+                            }
+
+                            if (!userData.molbioFlag && isTokenAvailable && Constants.MOLBIO_INTEGRATION && userData.testStatus == true) {
                                 val currentTimeFormatted = SimpleDateFormat(
                                     "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
                                     Locale.getDefault()
@@ -179,11 +181,9 @@ class HomeFragment : Fragment() {
                                         rawData = userData,
                                         analysisId = userData._id,
                                         analysisDate = currentTimeFormatted,
-                                        analysisStatus = userData.classificationResult
-                                            ?: "defaultStatus", // Handle possible nulls
+                                        analysisStatus = userData.classificationResult ?: "defaultStatus", // Handle possible nulls
                                         thresholds = bufferIntensityThreshold,
-                                        interpretation = userData.classificationResult
-                                            ?: "defaultInterpretation", // Handle possible nulls
+                                        interpretation = userData.classificationResult ?: "defaultInterpretation", // Handle possible nulls
                                         testId = userData._id,
                                         testTime = currentTimeFormatted,
                                         collectionTime = currentTimeFormatted,
@@ -193,23 +193,19 @@ class HomeFragment : Fragment() {
                             }
                         }
                     }
+
                     Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())
 
                     resultList.results?.forEach { result ->
                         val userData = result.rawData
                         Log.d("UserData", userData.toString())
-                        if (userData != null) {
-                            if (!userData.localFlag) {
-                                hemoCubeViewModel.bulkAddResultTestToDb(userData)
 
-                            }
-                        }
                     }
                     resultList.results?.forEach { result ->
                         result.rawData?.let { sanitizeDoubleValues(it) }
                     }
 
-// Then, check if there are any results to upload.
+                    // Then, check if there are any results to upload.
                     if (resultList.results?.isNotEmpty() == true) {
                         hemoCubeViewModel.uploadResult(resultList)
                         Log.d("resultcount1", "Uploading sanitized results")