Skip to content

Commit d718534

Browse files
Forla03Forla03
committed
Database optimization
1 parent 9e0a845 commit d718534

File tree

8 files changed

+170
-53
lines changed

8 files changed

+170
-53
lines changed

‎app/src/main/java/com/example/steplab/data/local/EntityTest.kt‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,56 @@
11
package com.example.steplab.data.local
22

3+
import android.content.Context
4+
import android.util.Log
35
import androidx.room.Entity
46
import androidx.room.PrimaryKey
7+
import org.json.JSONObject
8+
import java.io.File
59

610
@Entity
711
data class EntityTest(
812
@PrimaryKey(autoGenerate = true)
913
val testId: Int = 0,
10-
val testValues: String,
1114
val numberOfSteps: Int,
1215
val additionalNotes: String,
13-
val fileName: String
14-
)
16+
val fileName: String,
17+
val recordedAt: Long = System.currentTimeMillis()
18+
) {
19+
/**
20+
* Loads the complete test data from the JSON file stored in internal storage.
21+
* This method reads the file on-demand, avoiding database bloat.
22+
*
23+
* @param context Android context to access filesDir
24+
* @return JSONObject containing the full test data structure, or null if file doesn't exist or is invalid
25+
*/
26+
fun loadTestData(context: Context): JSONObject? {
27+
return try {
28+
val file = File(context.filesDir, fileName)
29+
if (!file.exists()) {
30+
Log.e("EntityTest", "File not found: $fileName")
31+
return null
32+
}
33+
34+
val content = file.readText()
35+
JSONObject(content)
36+
} catch (e: Exception) {
37+
Log.e("EntityTest", "Error loading test data from $fileName", e)
38+
null
39+
}
40+
}
41+
42+
/**
43+
* Loads only the test_values portion of the JSON file.
44+
*
45+
* @param context Android context to access filesDir
46+
* @return JSONObject containing sensor data keyed by timestamp, or null if not available
47+
*/
48+
fun loadTestValues(context: Context): JSONObject? {
49+
return try {
50+
loadTestData(context)?.optJSONObject("test_values")
51+
} catch (e: Exception) {
52+
Log.e("EntityTest", "Error loading test values from $fileName", e)
53+
null
54+
}
55+
}
56+
}

‎app/src/main/java/com/example/steplab/data/local/MyDatabase.kt‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
88

99
@Database(
1010
entities = [EntityTest::class, EntitySavedConfigurationComparison::class],
11-
version = 3
11+
version = 4
1212
)
1313
abstract class MyDatabase : RoomDatabase() {
1414
abstract fun databaseDao(): DatabaseDao?
@@ -89,6 +89,46 @@ abstract class MyDatabase : RoomDatabase() {
8989
}
9090
}
9191

92+
/**
93+
* Migration from version 3 to 4:
94+
* - Removes the testValues column from EntityTest to eliminate data duplication
95+
* - Adds recordedAt column to store test recording timestamp
96+
* - Test sensor data is now read on-demand from JSON files in filesDir
97+
* - This reduces database size by ~99% and improves query performance
98+
*/
99+
val MIGRATION_3_4 = object : Migration(3, 4) {
100+
override fun migrate(database: SupportSQLiteDatabase) {
101+
// SQLite doesn't support dropping columns directly
102+
// We need to recreate the table without testValues
103+
104+
// 1. Create new table without testValues, with recordedAt
105+
database.execSQL("""
106+
CREATE TABLE IF NOT EXISTS `EntityTest_new` (
107+
`testId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
108+
`numberOfSteps` INTEGER NOT NULL,
109+
`additionalNotes` TEXT NOT NULL,
110+
`fileName` TEXT NOT NULL,
111+
`recordedAt` INTEGER NOT NULL DEFAULT 0
112+
)
113+
""".trimIndent())
114+
115+
// 2. Copy data from old table to new table (excluding testValues)
116+
// Use current time for recordedAt if not available
117+
database.execSQL("""
118+
INSERT INTO EntityTest_new
119+
(testId, numberOfSteps, additionalNotes, fileName, recordedAt)
120+
SELECT testId, numberOfSteps, additionalNotes, fileName, ${System.currentTimeMillis()}
121+
FROM EntityTest
122+
""".trimIndent())
123+
124+
// 3. Drop old table
125+
database.execSQL("DROP TABLE EntityTest")
126+
127+
// 4. Rename new table to original name
128+
database.execSQL("ALTER TABLE EntityTest_new RENAME TO EntityTest")
129+
}
130+
}
131+
92132
/**
93133
* Template for future migrations:
94134
*

‎app/src/main/java/com/example/steplab/ui/configuration/AdapterForTestCard.kt‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,23 @@ class AdapterForTestCard(
4949
holder.number.text = "${position + 1}. "
5050

5151
try {
52-
val testValues = testDataset[position].testValues
53-
if (testValues.isNullOrEmpty()) {
54-
holder.calendar.timeInMillis = System.currentTimeMillis()
52+
// Try to extract timestamp from filename first (faster)
53+
val fileName = testDataset[position].filePathName
54+
val fileNameWithoutExt = fileName.removeSuffix(".json").removeSuffix(".txt")
55+
56+
// Filename format: 2024-11-08_14:30:45
57+
val parts = fileNameWithoutExt.split('_', '-', ':')
58+
if (parts.size >= 6) {
59+
holder.calendar.set(
60+
parts[0].toIntOrNull() ?: 0, // year
61+
(parts[1].toIntOrNull() ?: 1) - 1, // month (0-based)
62+
parts[2].toIntOrNull() ?: 1, // day
63+
parts[3].toIntOrNull() ?: 0, // hour
64+
parts[4].toIntOrNull() ?: 0, // minute
65+
parts[5].toIntOrNull() ?: 0 // second
66+
)
5567
} else {
56-
val timestampKey = JSONObject(testValues).keys().next().toLong()
57-
holder.calendar.timeInMillis = timestampKey
68+
holder.calendar.timeInMillis = System.currentTimeMillis()
5869
}
5970

6071
val day = holder.calendar[Calendar.DAY_OF_MONTH].toString().padStart(2, '0')
@@ -66,8 +77,9 @@ class AdapterForTestCard(
6677

6778
holder.date.text = "$day/$month/$year - $hour:$minute:$second"
6879

69-
} catch (e: JSONException) {
80+
} catch (e: Exception) {
7081
e.printStackTrace()
82+
holder.date.text = "Unknown date"
7183
}
7284

7385
holder.steps.text = context.getString(R.string.number_of_steps_counted) +

‎app/src/main/java/com/example/steplab/ui/configuration/ConfigurationsComparison.kt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,18 @@ class ConfigurationsComparison : AppCompatActivity() {
6464
lifecycleScope.launch(Dispatchers.IO) {
6565
testApp = StepLabApplication.database.databaseDao()?.getTestFromId(testId.toInt())
6666
?: return@launch
67-
jsonObject = JSONObject(testApp.testValues)
67+
68+
// Load sensor data from file instead of database
69+
val testData = testApp.loadTestData(applicationContext)
70+
if (testData == null) {
71+
withContext(Dispatchers.Main) {
72+
Toast.makeText(applicationContext, "Error loading test data", Toast.LENGTH_SHORT).show()
73+
finish()
74+
}
75+
return@launch
76+
}
77+
78+
jsonObject = testData.getJSONObject("test_values")
6879

6980
withContext(Dispatchers.Main) {
7081
setupViews()

‎app/src/main/java/com/example/steplab/ui/main/MainActivity.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ class MainActivity : AppCompatActivity() {
194194

195195
// Parse the final JSON
196196
val json = JSONObject(jsonContent)
197-
val testValues = json.getString("test_values")
198197
val numberOfSteps = json.optInt("number_of_steps", actualSteps)
199198
val additionalNotes = json.optString("additional_notes", fileName)
200199

@@ -213,12 +212,12 @@ class MainActivity : AppCompatActivity() {
213212
val file = File(applicationContext.filesDir, internalFileName)
214213
file.writeText(jsonContent)
215214

216-
// Save metadata in DB
215+
// Save only metadata in DB - sensor data stays in file
217216
val entity = com.example.steplab.data.local.EntityTest(
218-
testValues = testValues,
219217
numberOfSteps = numberOfSteps,
220218
additionalNotes = additionalNotes,
221-
fileName = internalFileName
219+
fileName = internalFileName,
220+
recordedAt = timestamp
222221
)
223222
StepLabApplication.database.databaseDao()?.insertTest(entity)
224223

‎app/src/main/java/com/example/steplab/ui/main/StepLabApplication.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ class StepLabApplication : Application() {
1818
MyDatabase::class.java,
1919
"tests.db"
2020
)
21-
.addMigrations(MyDatabase.MIGRATION_1_2, MyDatabase.MIGRATION_2_3)
21+
.addMigrations(
22+
MyDatabase.MIGRATION_1_2,
23+
MyDatabase.MIGRATION_2_3,
24+
MyDatabase.MIGRATION_3_4
25+
)
2226
.build()
2327
}
2428

‎app/src/main/java/com/example/steplab/ui/test/NewTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ class NewTest : AppCompatActivity(), SensorEventListener {
142142

143143
val file = File(applicationContext.filesDir, fileName)
144144
file.writeText(exportData.toString())
145-
//file.setReadable(true, false)
146145

146+
// Save only metadata to database - sensor data stays in file
147147
val entity = EntityTest(
148148
fileName = fileName,
149149
numberOfSteps = stepCount.toIntOrNull() ?: 0,
150-
testValues = testValuesObj.toString(),
151-
additionalNotes = notes
150+
additionalNotes = notes,
151+
recordedAt = firstTimestamp
152152
)
153153
db.databaseDao()?.insertTest(entity)
154154
}

‎app/src/main/java/com/example/steplab/ui/test/SendTest.kt‎

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ class SendTest : AppCompatActivity() {
4646
try {
4747
val testList = StepLabApplication.database.databaseDao()?.getAllTests()
4848
testList?.forEach { test ->
49+
// Load only metadata - sensor data will be read from file when needed
4950
dataset.add(
5051
CardTest(
5152
test.testId.toString(),
52-
test.testValues ?: "",
53+
"", // testValues no longer stored in database
5354
test.numberOfSteps ?: 0,
5455
test.additionalNotes ?: "",
5556
test.fileName ?: ""
@@ -138,22 +139,25 @@ class SendTest : AppCompatActivity() {
138139
val jsonFileName = "${baseName}_${card.testId}.json"
139140
val jsonFile = File(applicationContext.filesDir, jsonFileName)
140141

141-
// Build JSON structure
142-
val exportData = JSONObject().apply {
143-
put("number_of_steps", card.numberOfSteps)
144-
put("additional_notes", card.additionalNotes)
145-
put("test_values", JSONObject(card.testValues))
142+
// Read the complete test data from the original file
143+
val sourceFile = File(applicationContext.filesDir, card.filePathName)
144+
if (!sourceFile.exists()) {
145+
return
146146
}
147147

148-
// Write JSON file
149-
jsonFile.writeText(exportData.toString())
148+
try {
149+
val jsonContent = sourceFile.readText()
150+
jsonFile.writeText(jsonContent)
150151

151-
val uri = FileProvider.getUriForFile(
152-
applicationContext,
153-
"com.example.steplab.fileprovider",
154-
jsonFile
155-
)
156-
filesToShare.add(uri)
152+
val uri = FileProvider.getUriForFile(
153+
applicationContext,
154+
"com.example.steplab.fileprovider",
155+
jsonFile
156+
)
157+
filesToShare.add(uri)
158+
} catch (e: Exception) {
159+
e.printStackTrace()
160+
}
157161
}
158162

159163
private fun exportTestAsCsv(card: CardTest, existingFile: File) {
@@ -163,29 +167,34 @@ class SendTest : AppCompatActivity() {
163167
val csvFileName = "${baseName}_${card.testId}.csv"
164168
val csvFile = File(applicationContext.filesDir, csvFileName)
165169

166-
// Build JSON structure (need full structure for conversion)
167-
val jsonData = JSONObject().apply {
168-
put("number_of_steps", card.numberOfSteps)
169-
put("additional_notes", card.additionalNotes)
170-
put("test_values", JSONObject(card.testValues))
170+
// Read the complete test data from the original file
171+
val sourceFile = File(applicationContext.filesDir, card.filePathName)
172+
if (!sourceFile.exists()) {
173+
return
171174
}
172175

173-
// Convert to CSV
174-
val converter = JsonToCsvConverter()
175-
val result = converter.convertJsonToCsv(jsonData.toString())
176+
try {
177+
val jsonContent = sourceFile.readText()
176178

177-
if (result.success && result.csvString != null) {
178-
csvFile.writeText(result.csvString)
179-
180-
val uri = FileProvider.getUriForFile(
181-
applicationContext,
182-
"com.example.steplab.fileprovider",
183-
csvFile
184-
)
185-
filesToShare.add(uri)
186-
} else {
187-
// Fallback to JSON if CSV conversion fails
188-
exportTestAsJson(card, existingFile)
179+
// Convert to CSV
180+
val converter = JsonToCsvConverter()
181+
val result = converter.convertJsonToCsv(jsonContent)
182+
183+
if (result.success && result.csvString != null) {
184+
csvFile.writeText(result.csvString)
185+
186+
val uri = FileProvider.getUriForFile(
187+
applicationContext,
188+
"com.example.steplab.fileprovider",
189+
csvFile
190+
)
191+
filesToShare.add(uri)
192+
} else {
193+
// Fallback to JSON if CSV conversion fails
194+
exportTestAsJson(card, existingFile)
195+
}
196+
} catch (e: Exception) {
197+
e.printStackTrace()
189198
}
190199
}
191200

0 commit comments

Comments
 (0)