working on new db system

FultonBrowne · May 4, 2020 · 19b2851 · 19b2851
1 parent 5de5aab
commit 19b2851
Showing 1 changed file with 2 additions and 41 deletions.
diff --git a/src/main/java/com/andromeda/araserver/localSearchData/ReadDB.kt b/src/main/java/com/andromeda/araserver/localSearchData/ReadDB.kt
@@ -137,49 +137,10 @@ class ReadDB {
         return skillsFromDB
     }
     fun userReminderDBFormat(client: DocumentClient, key: String, id:String): ArrayList<RemindersModel> {
-        val skillsFromDB = ArrayList<RemindersModel>()
-        val options = FeedOptions()
-        options.partitionKey = PartitionKey("user-$key")
-        val queryResults: FeedResponse<Document> = client.queryDocuments("/dbs/Ara-android-database/colls/Ara-android-collection", "SELECT * FROM c", options)
-        for (i in queryResults.queryIterator) {
-            println(i.id)
-            if(i.id == id){
-                val json = i.get("document") as JSONObject
-                println(json)
-                try {
-                    val model = RemindersModel(header = json.getString("header"), body = try { json.getString("body") }
-                    catch (e:Exception){ "" }, time = try { json.getLong("body") }
-                    catch (e:Exception){ 0L })
-                    skillsFromDB.add(model)
-                }
-                catch (e:Exception){
-                    e.printStackTrace()
-                }
-            }}
-        println(skillsFromDB)
-        return skillsFromDB
+        return arrayListOf(DatabaseClient().get(key, id, RemindersModel::class.java)!!)
     }
     fun userReminderDBFormat(client: DocumentClient, key: String): ArrayList<RemindersModel> {
-        val skillsFromDB = ArrayList<RemindersModel>()
-        val options = FeedOptions()
-        options.partitionKey = PartitionKey("user-$key")
-        val queryResults: FeedResponse<Document> = client.queryDocuments("/dbs/Ara-android-database/colls/Ara-android-collection", "SELECT * FROM c", options)
-        for (i in queryResults.queryIterator) {
-            println(i.id)
-            val json = i.get("document") as JSONObject
-            println(json)
-            try {
-                val model = RemindersModel(header = json.getString("header"), body = try { json.getString("body") }
-                catch (e:Exception){ "" }, time = try { json.getLong("body") }
-                catch (e:Exception){ 0L })
-                skillsFromDB.add(model)
-            }
-            catch (e:Exception){
-                e.printStackTrace()
-            }
-        }
-        println(skillsFromDB)
-        return skillsFromDB
+        return DatabaseClient().getAll(key, RemindersModel::class.java)
     }
 
     fun useHaData(key: String): ArrayList<HaModel> {