From 1726b6398b7de6a9d8ee14b4d0df927911fdbf05 Mon Sep 17 00:00:00 2001 From: motakean <122765619+motakean@users.noreply.github.com> Date: Sun, 5 Mar 2023 15:20:07 -0500 Subject: [PATCH 1/3] Update Medicine.kt It's important to seperate the column names with a "_" inbetween. source: https://developer.android.com/training/data-storage/room/defining-data --- app/src/main/java/com/medmapper/v33001/dto/Medicine.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt index 8094740..43c8570 100644 --- a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt +++ b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt @@ -9,7 +9,7 @@ data class Medicine( @PrimaryKey(autoGenerate = true) val medID: Int, @ColumnInfo(name = "name") val name: String?, @ColumnInfo(name = "strength") val strength: String?, - @ColumnInfo(name = "start date") val startDate: String?, - @ColumnInfo(name = "prescription length") val lengthInDays: Int + @ColumnInfo(name = "start_date") val startDate: String?, + @ColumnInfo(name = "prescription_length") val lengthInDays: Int //,@ColumnInfo() val endDate: Date = startDate -) \ No newline at end of file +) From d7703e9afd4b9fe3303efbfdda6858974c57cd58 Mon Sep 17 00:00:00 2001 From: motakean <122765619+motakean@users.noreply.github.com> Date: Sun, 5 Mar 2023 15:38:44 -0500 Subject: [PATCH 2/3] Update Medicine.kt Used kdot documentation to better understand what the data class is functioning as. source: https://kotlinlang.org/docs/kotlin-doc.html#block-tags --- app/src/main/java/com/medmapper/v33001/dto/Medicine.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt index 43c8570..2a773c8 100644 --- a/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt +++ b/app/src/main/java/com/medmapper/v33001/dto/Medicine.kt @@ -3,7 +3,15 @@ package com.medmapper.v33001.dto import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey - +/** + * A data class representing Medicine + * + * @property name; the name of the medicine + * @property strength; the strength of the medicine + * @property start_date; the date the patient started the medicine + * @property preciscription_length; how long the patient should take the medicine + * + */ @Entity(tableName = "Medicine") data class Medicine( @PrimaryKey(autoGenerate = true) val medID: Int, From 535926a1a3509631cb5f4bc61a4881eed74e5f75 Mon Sep 17 00:00:00 2001 From: motakean <122765619+motakean@users.noreply.github.com> Date: Sun, 5 Mar 2023 15:57:54 -0500 Subject: [PATCH 3/3] Update MedicineDAO.kt Instead of using @Query and deleteall, we can use a simple @Delete and delete method to make the code more clear and concise. Source: https://developer.android.com/training/data-storage/room/accessing-data --- app/src/main/java/com/medmapper/v33001/dao/MedicineDAO.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/medmapper/v33001/dao/MedicineDAO.kt b/app/src/main/java/com/medmapper/v33001/dao/MedicineDAO.kt index 271f155..c45bd83 100644 --- a/app/src/main/java/com/medmapper/v33001/dao/MedicineDAO.kt +++ b/app/src/main/java/com/medmapper/v33001/dao/MedicineDAO.kt @@ -14,4 +14,7 @@ interface MedicineDAO { @Query("DELETE FROM Medicine") suspend fun deleteAll() -} \ No newline at end of file + + @Delete + suspend fun delete(medicine: Medicine) +}