eddy/weegschaal-app
Watch
1
0
Fork
You've already forked weegschaal-app
 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

fix: make initDatabase idempotent to prevent empty history after sync

Browse source
This commit is contained in:
Eddy de Vink 2026-06-27 23:27:24 +02:00
commit 3d1263b713
2 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/database/db.ts
View file

@ -1,9 +1,10 @@
import * as SQLite from 'expo-sqlite'
import { Measurement, SyncStatus } from '../types'
let db: SQLite.SQLiteDatabase
let db: SQLite.SQLiteDatabase | null = null
export async function initDatabase(): Promise<void> {
if (db) return
db = await SQLite.openDatabaseAsync('weegschaal.db')
await db.execAsync(`
CREATE TABLE IF NOT EXISTS measurements (
@ -25,7 +26,7 @@ export async function initDatabase(): Promise<void> {
}
export async function insertMeasurement(m: Measurement): Promise<void> {
await db.runAsync(
await db!.runAsync(
`INSERT INTO measurements (id, weight, bmi, bodyFatPercentage, fatMass, musclePercentage, muscleMass, visceralFat, bmr, measuredAt, createdAt, updatedAt, syncStatus)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
[m.id, m.weight, m.bmi, m.bodyFatPercentage, m.fatMass, m.musclePercentage, m.muscleMass, m.visceralFat, m.bmr, m.measuredAt, m.createdAt, m.updatedAt, m.syncStatus]
@ -33,28 +34,28 @@ export async function insertMeasurement(m: Measurement): Promise<void> {
}
export async function getAllMeasurements(): Promise<Measurement[]> {
const rows = await db.getAllAsync<any>(
const rows = await db!.getAllAsync<any>(
'SELECT * FROM measurements ORDER BY measuredAt DESC'
)
return rows as Measurement[]
}
export async function getLatestMeasurement(): Promise<Measurement | null> {
const rows = await db.getAllAsync<any>(
const rows = await db!.getAllAsync<any>(
'SELECT * FROM measurements ORDER BY measuredAt DESC LIMIT 1'
)
return rows.length > 0 ? (rows[0] as Measurement) : null
}
export async function updateMeasurement(id: string, syncStatus: SyncStatus): Promise<void> {
await db.runAsync(
await db!.runAsync(
'UPDATE measurements SET syncStatus = ?, updatedAt = ? WHERE id = ?',
[syncStatus, new Date().toISOString(), id]
)
}
export async function upsertMeasurement(m: Measurement): Promise<void> {
await db.runAsync(
await db!.runAsync(
`INSERT OR REPLACE INTO measurements (id, weight, bmi, bodyFatPercentage, fatMass, musclePercentage, muscleMass, visceralFat, bmr, measuredAt, createdAt, updatedAt, syncStatus)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
[m.id, m.weight, m.bmi, m.bodyFatPercentage, m.fatMass, m.musclePercentage, m.muscleMass, m.visceralFat, m.bmr, m.measuredAt, m.createdAt, m.updatedAt, m.syncStatus]
@ -62,7 +63,7 @@ export async function upsertMeasurement(m: Measurement): Promise<void> {
}
export async function getUnsyncedMeasurements(): Promise<Measurement[]> {
const rows = await db.getAllAsync<any>(
const rows = await db!.getAllAsync<any>(
"SELECT * FROM measurements WHERE syncStatus = 'local' ORDER BY updatedAt ASC"
)
return rows as Measurement[]