[WIP] - Updated database

app/src/main/java/com/faraphel/tasks_valider/database/TaskDatabase.kt

@@ -3,10 +3,6 @@ package com.faraphel.tasks_valider.database
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.faraphel.tasks_valider.connectivity.task.session.TaskPermission
-import com.faraphel.tasks_valider.connectivity.task.session.TaskSession
-import com.faraphel.tasks_valider.database.api.entities.base.BaseApi
-import com.faraphel.tasks_valider.database.api.entities.*
 import com.faraphel.tasks_valider.database.converters.InstantConverter
 import com.faraphel.tasks_valider.database.dao.GroupDao
 import com.faraphel.tasks_valider.database.dao.GroupStudentDao
@@ -14,13 +10,12 @@ import com.faraphel.tasks_valider.database.dao.StudentDao
 import com.faraphel.tasks_valider.database.dao.TaskDao
 import com.faraphel.tasks_valider.database.dao.TaskGroupDao
 import com.faraphel.tasks_valider.database.dao.TeacherDao
-import com.faraphel.tasks_valider.database.entities.GroupEntity
+import com.faraphel.tasks_valider.database.entities._old.GroupEntity
-import com.faraphel.tasks_valider.database.entities.GroupStudentEntity
+import com.faraphel.tasks_valider.database.entities._old.GroupStudentEntity
-import com.faraphel.tasks_valider.database.entities.StudentEntity
+import com.faraphel.tasks_valider.database.entities._old.StudentEntity
-import com.faraphel.tasks_valider.database.entities.TaskEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskEntity
-import com.faraphel.tasks_valider.database.entities.TaskGroupEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskGroupEntity
-import com.faraphel.tasks_valider.database.entities.TeacherEntity
+import com.faraphel.tasks_valider.database.entities._old.TeacherEntity
-import fi.iki.elonen.NanoHTTPD
 
 
 /**

app/src/main/java/com/faraphel/tasks_valider/database/api/entities/GroupApi.kt

@@ -2,6 +2,6 @@ package com.faraphel.tasks_valider.database.api.entities
 
 import com.faraphel.tasks_valider.database.api.entities.base.BaseJsonApi
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.GroupEntity
+import com.faraphel.tasks_valider.database.entities._old.GroupEntity
 
 class GroupApi(dao: BaseDao<GroupEntity>) : BaseJsonApi<GroupEntity>(dao)

app/src/main/java/com/faraphel/tasks_valider/database/api/entities/GroupStudentApi.kt

@@ -2,6 +2,6 @@ package com.faraphel.tasks_valider.database.api.entities
 
 import com.faraphel.tasks_valider.database.api.entities.base.BaseJsonApi
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.GroupStudentEntity
+import com.faraphel.tasks_valider.database.entities._old.GroupStudentEntity
 
 class GroupStudentApi(dao: BaseDao<GroupStudentEntity>) : BaseJsonApi<GroupStudentEntity>(dao)

app/src/main/java/com/faraphel/tasks_valider/database/api/entities/StudentApi.kt

@@ -2,6 +2,6 @@ package com.faraphel.tasks_valider.database.api.entities
 
 import com.faraphel.tasks_valider.database.api.entities.base.BaseJsonApi
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.StudentEntity
+import com.faraphel.tasks_valider.database.entities._old.StudentEntity
 
 class StudentApi(dao: BaseDao<StudentEntity>) : BaseJsonApi<StudentEntity>(dao)

app/src/main/java/com/faraphel/tasks_valider/database/api/entities/TaskApi.kt

@@ -2,6 +2,6 @@ package com.faraphel.tasks_valider.database.api.entities
 
 import com.faraphel.tasks_valider.database.api.entities.base.BaseJsonApi
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.TaskEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskEntity
 
 class TaskApi(dao: BaseDao<TaskEntity>) : BaseJsonApi<TaskEntity>(dao)

app/src/main/java/com/faraphel/tasks_valider/database/api/entities/TaskGroupApi.kt

@@ -2,6 +2,6 @@ package com.faraphel.tasks_valider.database.api.entities
 
 import com.faraphel.tasks_valider.database.api.entities.base.BaseJsonApi
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.TaskGroupEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskGroupEntity
 
 class TaskGroupApi(dao: BaseDao<TaskGroupEntity>) : BaseJsonApi<TaskGroupEntity>(dao)

app/src/main/java/com/faraphel/tasks_valider/database/api/entities/TeacherApi.kt

@@ -2,6 +2,6 @@ package com.faraphel.tasks_valider.database.api.entities
 
 import com.faraphel.tasks_valider.database.api.entities.base.BaseJsonApi
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.TeacherEntity
+import com.faraphel.tasks_valider.database.entities._old.TeacherEntity
 
 class TeacherApi(dao: BaseDao<TeacherEntity>) : BaseJsonApi<TeacherEntity>(dao)

app/src/main/java/com/faraphel/tasks_valider/database/dao/GroupDao.kt

@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RewriteQueriesToDropUnusedColumns
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.GroupEntity
+import com.faraphel.tasks_valider.database.entities._old.GroupEntity
 
 
 @Dao

app/src/main/java/com/faraphel/tasks_valider/database/dao/GroupStudentDao.kt

@@ -3,7 +3,7 @@ package com.faraphel.tasks_valider.database.dao
 import androidx.room.Dao
 import androidx.room.Query
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.GroupStudentEntity
+import com.faraphel.tasks_valider.database.entities._old.GroupStudentEntity
 
 
 @Dao

app/src/main/java/com/faraphel/tasks_valider/database/dao/StudentDao.kt

@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RewriteQueriesToDropUnusedColumns
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.StudentEntity
+import com.faraphel.tasks_valider.database.entities._old.StudentEntity
 
 
 @Dao

app/src/main/java/com/faraphel/tasks_valider/database/dao/TaskDao.kt

@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.RewriteQueriesToDropUnusedColumns
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.TaskEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskEntity
 
 
 @Dao

app/src/main/java/com/faraphel/tasks_valider/database/dao/TaskGroupDao.kt

@@ -3,7 +3,7 @@ package com.faraphel.tasks_valider.database.dao
 import androidx.room.Dao
 import androidx.room.Query
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.TaskGroupEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskGroupEntity
 
 
 @Dao

app/src/main/java/com/faraphel/tasks_valider/database/dao/TeacherDao.kt

@@ -3,7 +3,7 @@ package com.faraphel.tasks_valider.database.dao
 import androidx.room.Dao
 import androidx.room.Query
 import com.faraphel.tasks_valider.database.dao.base.BaseDao
-import com.faraphel.tasks_valider.database.entities.TeacherEntity
+import com.faraphel.tasks_valider.database.entities._old.TeacherEntity
 
 
 @Dao

app/src/main/java/com/faraphel/tasks_valider/database/entities/ClassEntity.kt

@@ -0,0 +1,12 @@
+package com.faraphel.tasks_valider.database.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
+
+@Entity(tableName = "classes")
+data class ClassEntity (
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo("name") val name: String,
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/SessionEntity.kt

@@ -0,0 +1,27 @@
+package com.faraphel.tasks_valider.database.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
+import java.time.Instant
+
+@Entity(
+    tableName = "sessions",
+    foreignKeys = [
+        ForeignKey(
+            entity = ClassEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["class_id"],
+            onDelete = ForeignKey.CASCADE
+        ),
+    ]
+)
+data class SessionEntity (
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo("name") val name: String? = null,
+    @ColumnInfo("start") val start: Instant,
+
+    @ColumnInfo("class_id") val classId: Long? = null,
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/StudentEntity.kt

@@ -3,10 +3,13 @@ package com.faraphel.tasks_valider.database.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
+import java.util.*
 
 @Entity(tableName = "students")
-class StudentEntity(
+data class StudentEntity (
-    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) override val id: Long = 0,
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    @ColumnInfo("first_name") override val firstName: String,
+    @ColumnInfo("first_name") val firstName: String,
-    @ColumnInfo("last_name") override val lastName: String
+    @ColumnInfo("last_name") val lastName: String,
-) : PersonEntity(id, firstName, lastName)
+    @ColumnInfo("card_id") val cardId: UUID,
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/SubjectEntity.kt

@@ -0,0 +1,12 @@
+package com.faraphel.tasks_valider.database.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
+
+@Entity(tableName = "subjects")
+data class SubjectEntity (
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo("name") val name: String,
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/TaskEntity.kt

@@ -2,12 +2,25 @@ package com.faraphel.tasks_valider.database.entities
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
+import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.faraphel.tasks_valider.database.entities.base.BaseEntity
 
-@Entity(tableName = "tasks")
+@Entity(
+    tableName = "tasks",
+    foreignKeys = [
+        ForeignKey(
+            entity = SubjectEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["subject_id"],
+            onDelete = ForeignKey.CASCADE
+        ),
+    ]
+)
 data class TaskEntity (
     @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
     @ColumnInfo("title") val title: String,
-    @ColumnInfo("description") val description: String,
+    @ColumnInfo("description") val description: String? = null,
+
+    @ColumnInfo("subject_id") val subjectId: Long,
 ) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/TeacherEntity.kt

@@ -3,10 +3,13 @@ package com.faraphel.tasks_valider.database.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
 
+
+// TODO(Faraphel): is this class really required ?
 @Entity(tableName = "teachers")
-class TeacherEntity(
+data class TeacherEntity (
-    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) override val id: Long = 0,
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    @ColumnInfo("first_name") override val firstName: String,
+    @ColumnInfo("first_name") val firstName: String,
-    @ColumnInfo("last_name") override val lastName: String
+    @ColumnInfo("last_name") val lastName: String,
-) : PersonEntity(id, firstName, lastName)
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/TeamEntity.kt

@@ -0,0 +1,26 @@
+package com.faraphel.tasks_valider.database.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
+
+
+@Entity(
+    tableName = "teams",
+    foreignKeys = [
+        ForeignKey(
+            entity = TeamEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["team_id"],
+            onDelete = ForeignKey.CASCADE
+        ),
+    ]
+)
+data class TeamEntity (
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo("name") val name: String? = null,
+
+    @ColumnInfo("team_id") val teamId: Long? = null,
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/ValidationEntity.kt

@@ -0,0 +1,44 @@
+package com.faraphel.tasks_valider.database.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
+import java.time.Instant
+
+@Entity(
+    tableName = "validations",
+    primaryKeys = [
+        "teacher_id",
+        "task_id",
+        "student_id",
+    ],
+    foreignKeys = [
+        ForeignKey(
+            entity = TeacherEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["teacher_id"],
+            onDelete = ForeignKey.CASCADE
+        ),
+        ForeignKey(
+            entity = TaskEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["task_id"],
+            onDelete = ForeignKey.CASCADE
+        ),
+        ForeignKey(
+            entity = StudentEntity::class,
+            parentColumns = ["id"],
+            childColumns = ["student_id"],
+            onDelete = ForeignKey.CASCADE
+        ),
+    ]
+)
+data class ValidationEntity (
+    @ColumnInfo("date") val date: Instant,
+
+    @ColumnInfo("teacher_id") val teacherId: Long,
+    @ColumnInfo("task_id") val taskId: Long,
+    @ColumnInfo("student_id") val studentId: Long,
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/_old/GroupEntity.kt

@@ -1,4 +1,4 @@
-package com.faraphel.tasks_valider.database.entities
+package com.faraphel.tasks_valider.database.entities._old
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/faraphel/tasks_valider/database/entities/_old/GroupStudentEntity.kt

@@ -1,4 +1,4 @@
-package com.faraphel.tasks_valider.database.entities
+package com.faraphel.tasks_valider.database.entities._old
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/faraphel/tasks_valider/database/entities/_old/PersonEntity.kt

@@ -1,4 +1,4 @@
-package com.faraphel.tasks_valider.database.entities
+package com.faraphel.tasks_valider.database.entities._old
 
 import java.util.Locale
 import com.faraphel.tasks_valider.database.entities.base.BaseEntity

app/src/main/java/com/faraphel/tasks_valider/database/entities/_old/StudentEntity.kt

@@ -0,0 +1,12 @@
+package com.faraphel.tasks_valider.database.entities._old
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "students")
+class StudentEntity(
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) override val id: Long = 0,
+    @ColumnInfo("first_name") override val firstName: String,
+    @ColumnInfo("last_name") override val lastName: String
+) : PersonEntity(id, firstName, lastName)

app/src/main/java/com/faraphel/tasks_valider/database/entities/_old/TaskEntity.kt

@@ -0,0 +1,13 @@
+package com.faraphel.tasks_valider.database.entities._old
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.faraphel.tasks_valider.database.entities.base.BaseEntity
+
+@Entity(tableName = "tasks")
+data class TaskEntity (
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo("title") val title: String,
+    @ColumnInfo("description") val description: String,
+) : BaseEntity()

app/src/main/java/com/faraphel/tasks_valider/database/entities/_old/TaskGroupEntity.kt

@@ -1,4 +1,4 @@
-package com.faraphel.tasks_valider.database.entities
+package com.faraphel.tasks_valider.database.entities._old
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/faraphel/tasks_valider/database/entities/_old/TeacherEntity.kt

@@ -0,0 +1,12 @@
+package com.faraphel.tasks_valider.database.entities._old
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "teachers")
+class TeacherEntity(
+    @ColumnInfo("id") @PrimaryKey(autoGenerate = true) override val id: Long = 0,
+    @ColumnInfo("first_name") override val firstName: String,
+    @ColumnInfo("last_name") override val lastName: String
+) : PersonEntity(id, firstName, lastName)

app/src/main/java/com/faraphel/tasks_valider/ui/screen/task/screen.kt

@@ -8,7 +8,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import com.faraphel.tasks_valider.connectivity.task.TaskClient
-import com.faraphel.tasks_valider.database.entities.TaskGroupEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskGroupEntity
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 

app/src/main/java/com/faraphel/tasks_valider/ui/widgets/task/Group.kt

@@ -3,7 +3,7 @@ package com.faraphel.tasks_valider.ui.widgets.task
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import com.faraphel.tasks_valider.database.entities.GroupEntity
+import com.faraphel.tasks_valider.database.entities._old.GroupEntity
 
 @Composable
 fun WidgetGroup(group: GroupEntity) {

app/src/main/java/com/faraphel/tasks_valider/ui/widgets/task/Task.kt

@@ -3,7 +3,7 @@ package com.faraphel.tasks_valider.ui.widgets.task
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import com.faraphel.tasks_valider.database.entities.TaskEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskEntity
 
 @Composable
 fun WidgetTask(task: TaskEntity) {

app/src/main/java/com/faraphel/tasks_valider/ui/widgets/task/TaskGroup.kt

@@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.faraphel.tasks_valider.database.TaskDatabase
-import com.faraphel.tasks_valider.database.entities.TaskGroupEntity
+import com.faraphel.tasks_valider.database.entities._old.TaskGroupEntity
 
 
 @Composable