From 0b44ce47b9e61fb4fbaa09904de21f36ec7faf01 Mon Sep 17 00:00:00 2001
From: "smileomi18@gmail.com" <smi@glab22>
Date: Wed, 2 Aug 2023 19:32:58 +0530
Subject: [PATCH] Added Device Data and HemoCube Schema

---
 .../hpostesting/data/dao/Converters.kt        | 39 +++++++++----------
 .../data/model/patient/HemoCubeTestData.kt    |  7 +---
 .../data/model/patient/UserData.kt            |  9 -----
 .../hemocube/HemoCubeViewModel.kt             |  2 +-
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt b/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt
index 68b71d3..a11ca77 100644
--- a/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/Converters.kt
@@ -1,7 +1,6 @@
 package com.example.hpostesting.data.dao
 
 import androidx.room.TypeConverter
-import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
 import com.google.gson.Gson
 
@@ -25,23 +24,23 @@ class Converters {
         }
     }
 
-    @TypeConverter
-    fun fromLocation(value: String?): HemoCubeTestData.Location? {
-        return if (value != null) {
-            gson.fromJson(value, HemoCubeTestData.Location::class.java)
-        } else {
-            null
-        }
-    }
-
-
-
-    @TypeConverter
-    fun toLocation(location: HemoCubeTestData.Location?): String? {
-        return if (location != null) {
-            gson.toJson(location)
-        } else {
-            null
-        }
-    }
+//    @TypeConverter
+//    fun fromLocation(value: String?): UserData.Location? {
+//        return if (value != null) {
+//            gson.fromJson(value, UserData.Location::class.java)
+//        } else {
+//            null
+//        }
+//    }
+//
+//
+//
+//    @TypeConverter
+//    fun toLocation(location: UserData.Location?): String? {
+//        return if (location != null) {
+//            gson.toJson(location)
+//        } else {
+//            null
+//        }
+//    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
index 9465665..8e19da6 100644
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt
@@ -10,7 +10,7 @@ data class HemoCubeTestData(
     var name: String = "",
     var birthYear: String = "",
     var userImageURL: String = "",
-    var location: Location? = null,
+    var location: UserData.Location? = null,
     var reportUploadTime: String? = "",
     var testType: String? = "HEMOCUBE",
     var testTime: String? = "",
@@ -26,9 +26,4 @@ data class HemoCubeTestData(
     var led2Avarage: Double? = null,
     var deviceRatio: Double? = null,
     var calculatedRatio: Double? = null
-){
-    data class Location(
-    var latitude: Double? = null,
-    var longitude: Double? = null
 )
-}
diff --git a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt b/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt
index a54ef0e..2b3dec6 100644
--- a/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt
+++ b/app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt
@@ -42,14 +42,5 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     name = name,
     birthYear = birthYear,
     userImageURL = userImageURL,
-    location = location,
-    createdBy = createdBy,
-    reportUploadTime = reportUploadTime,
-    testTime = testTime,
     testStatus = testStatus,
-    mobileId = mobileId,
-    deviceSerialNumber = deviceSerialNumber,
-    kitSerial = kitSerial,
-    reportPath = reportPath,
-    resultRatio = resultRatio,
 )
diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
index eb8118c..d0c02c9 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt
@@ -62,7 +62,7 @@ class HemoCubeViewModel @Inject constructor(
     }
 
     private fun addResultTestToDb() {
-        testDetails?.resultRatio = DataHolder.hemocubeResult
+        testDetails?.deviceRatio = DataHolder.hemocubeResult
         testDetails?.resultData = DataHolder.hemoCubeTestData?.resultData.toString()
         testDetails?.location = DataHolder.location
         testDetails?.testTime = SimpleDateFormat(