Skip to content
This repository has been archived by the owner on Oct 3, 2020. It is now read-only.

Commit

Permalink
working on new db system
Browse files Browse the repository at this point in the history
  • Loading branch information
fulton committed May 4, 2020
1 parent d936f93 commit 5de5aab
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 21 deletions.
3 changes: 1 addition & 2 deletions src/main/java/com/andromeda/araserver/iot/HaGetData.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.andromeda.araserver.iot

import com.andromeda.araserver.localSearchData.ReadDB
import com.andromeda.araserver.util.CosmosClients
import com.google.gson.Gson

class HaGetData {
fun main(url:String): String? {
val mainVal = url.replace("/getha/", "")
return Gson().toJson(ReadDB().useHaData(CosmosClients.client, mainVal))
return Gson().toJson(ReadDB().useHaData(mainVal))
}
}
20 changes: 1 addition & 19 deletions src/main/java/com/andromeda/araserver/localSearchData/ReadDB.kt
Original file line number Diff line number Diff line change
Expand Up @@ -182,25 +182,7 @@ class ReadDB {
return skillsFromDB
}

fun useHaData(client: DocumentClient, key: String): ArrayList<HaModel> {
val skillsFromDB = ArrayList<HaModel>()
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 = HaModel(link = json.getString("header"), key = json.getString("body"))
skillsFromDB.add(model)
return skillsFromDB
}
catch (e:Exception){
e.printStackTrace()
}
}
println(skillsFromDB)
fun useHaData(key: String): ArrayList<HaModel> {
return DatabaseClient().getAll(key, HaModel::class.java)
}

Expand Down

0 comments on commit 5de5aab

Please sign in to comment.