removed getting null values from result upload
This commit is contained in:
@@ -159,14 +159,16 @@ class HomeFragment : Fragment() {
|
|||||||
|
|
||||||
val resultList = MolbioV2ResultRequest(mutableListOf())
|
val resultList = MolbioV2ResultRequest(mutableListOf())
|
||||||
originalUserDataList.forEach { userData ->
|
originalUserDataList.forEach { userData ->
|
||||||
Log.d(
|
Log.d(": USER DATA", originalUserDataList.count().toString() + " : " + userData._id)
|
||||||
": USER DATA",
|
|
||||||
originalUserDataList.count().toString() + " : " + userData._id
|
|
||||||
)
|
|
||||||
var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
|
var accessToken = sharedPreference.getString(Constants.ACCESS_TOKEN, "").toString()
|
||||||
// Upload results after processing all userData to avoid duplicates and ensure all modifications are done
|
// Upload results after processing all userData to avoid duplicates and ensure all modifications are done
|
||||||
if(accessToken.isNotEmpty()) {
|
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(
|
val currentTimeFormatted = SimpleDateFormat(
|
||||||
"yyyy-MM-dd'T'HH:mm:ssZZZZZ",
|
"yyyy-MM-dd'T'HH:mm:ssZZZZZ",
|
||||||
Locale.getDefault()
|
Locale.getDefault()
|
||||||
@@ -179,11 +181,9 @@ class HomeFragment : Fragment() {
|
|||||||
rawData = userData,
|
rawData = userData,
|
||||||
analysisId = userData._id,
|
analysisId = userData._id,
|
||||||
analysisDate = currentTimeFormatted,
|
analysisDate = currentTimeFormatted,
|
||||||
analysisStatus = userData.classificationResult
|
analysisStatus = userData.classificationResult ?: "defaultStatus", // Handle possible nulls
|
||||||
?: "defaultStatus", // Handle possible nulls
|
|
||||||
thresholds = bufferIntensityThreshold,
|
thresholds = bufferIntensityThreshold,
|
||||||
interpretation = userData.classificationResult
|
interpretation = userData.classificationResult ?: "defaultInterpretation", // Handle possible nulls
|
||||||
?: "defaultInterpretation", // Handle possible nulls
|
|
||||||
testId = userData._id,
|
testId = userData._id,
|
||||||
testTime = currentTimeFormatted,
|
testTime = currentTimeFormatted,
|
||||||
collectionTime = currentTimeFormatted,
|
collectionTime = currentTimeFormatted,
|
||||||
@@ -193,23 +193,19 @@ class HomeFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())
|
Log.d("USER DATA LIST SIZE", resultList.results?.count().toString())
|
||||||
|
|
||||||
resultList.results?.forEach { result ->
|
resultList.results?.forEach { result ->
|
||||||
val userData = result.rawData
|
val userData = result.rawData
|
||||||
Log.d("UserData", userData.toString())
|
Log.d("UserData", userData.toString())
|
||||||
if (userData != null) {
|
|
||||||
if (!userData.localFlag) {
|
|
||||||
hemoCubeViewModel.bulkAddResultTestToDb(userData)
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
resultList.results?.forEach { result ->
|
resultList.results?.forEach { result ->
|
||||||
result.rawData?.let { sanitizeDoubleValues(it) }
|
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) {
|
if (resultList.results?.isNotEmpty() == true) {
|
||||||
hemoCubeViewModel.uploadResult(resultList)
|
hemoCubeViewModel.uploadResult(resultList)
|
||||||
Log.d("resultcount1", "Uploading sanitized results")
|
Log.d("resultcount1", "Uploading sanitized results")
|
||||||
|
|||||||
Reference in New Issue
Block a user