From 189cde5ae3e98dd609b106310157634efbbca092 Mon Sep 17 00:00:00 2001 From: visoulier Date: Wed, 20 Mar 2024 08:46:09 +0100 Subject: [PATCH] ajout dto question / reponse --- .../model/dto/{Difficulte.kt => DifficulteDTO.kt} | 2 +- .../java/fr/iut/sciencequest/model/dto/QuestionDTO.kt | 10 ++++++++++ .../java/fr/iut/sciencequest/model/dto/ReponseDTO.kt | 11 +++++++++++ .../model/dto/{Scientifique.kt => ScientifiqueDTO.kt} | 2 +- .../model/dto/{Thematique.kt => ThematiqueDTO.kt} | 2 +- .../java/fr/iut/sciencequest/model/metier/Question.kt | 7 +++++++ .../java/fr/iut/sciencequest/model/metier/Reponse.kt | 9 +++++++++ 7 files changed, 40 insertions(+), 3 deletions(-) rename android/app/src/main/java/fr/iut/sciencequest/model/dto/{Difficulte.kt => DifficulteDTO.kt} (73%) create mode 100644 android/app/src/main/java/fr/iut/sciencequest/model/dto/QuestionDTO.kt create mode 100644 android/app/src/main/java/fr/iut/sciencequest/model/dto/ReponseDTO.kt rename android/app/src/main/java/fr/iut/sciencequest/model/dto/{Scientifique.kt => ScientifiqueDTO.kt} (88%) rename android/app/src/main/java/fr/iut/sciencequest/model/dto/{Thematique.kt => ThematiqueDTO.kt} (73%) create mode 100644 android/app/src/main/java/fr/iut/sciencequest/model/metier/Question.kt create mode 100644 android/app/src/main/java/fr/iut/sciencequest/model/metier/Reponse.kt diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/Difficulte.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt similarity index 73% rename from android/app/src/main/java/fr/iut/sciencequest/model/dto/Difficulte.kt rename to android/app/src/main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt index cd4f41e..fd3231e 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/Difficulte.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt @@ -1,6 +1,6 @@ package fr.iut.sciencequest.model.dto -import kotlinx.serialization.Serializable; +import kotlinx.serialization.Serializable @Serializable data class DifficulteDTO ( diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/QuestionDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/QuestionDTO.kt new file mode 100644 index 0000000..84b66d0 --- /dev/null +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/QuestionDTO.kt @@ -0,0 +1,10 @@ +package fr.iut.sciencequest.model.dto + +import kotlinx.serialization.Serializable + +@Serializable +class QuestionDTO ( + val id: Int, + val question: String, + val reponses: List +) \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ReponseDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ReponseDTO.kt new file mode 100644 index 0000000..7794ee1 --- /dev/null +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ReponseDTO.kt @@ -0,0 +1,11 @@ +package fr.iut.sciencequest.model.dto + +import kotlinx.serialization.Serializable + +@Serializable +class ReponseDTO ( + val id: Int, + val reponse: String, + val question: QuestionDTO, + val scientifique: ScientifiqueDTO +) \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/Scientifique.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt similarity index 88% rename from android/app/src/main/java/fr/iut/sciencequest/model/dto/Scientifique.kt rename to android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt index 89f8eda..605b44c 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/Scientifique.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt @@ -1,7 +1,7 @@ package fr.iut.sciencequest.model.dto import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable; +import kotlinx.serialization.Serializable @Serializable data class ScientifiqueDTO ( diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/Thematique.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt similarity index 73% rename from android/app/src/main/java/fr/iut/sciencequest/model/dto/Thematique.kt rename to android/app/src/main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt index b07da37..a1deae5 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/Thematique.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt @@ -1,6 +1,6 @@ package fr.iut.sciencequest.model.dto -import kotlinx.serialization.Serializable; +import kotlinx.serialization.Serializable @Serializable data class ThematiqueDTO ( diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/metier/Question.kt b/android/app/src/main/java/fr/iut/sciencequest/model/metier/Question.kt new file mode 100644 index 0000000..d6c1550 --- /dev/null +++ b/android/app/src/main/java/fr/iut/sciencequest/model/metier/Question.kt @@ -0,0 +1,7 @@ +package fr.iut.sciencequest.model.metier +class Question( + val id: Int, + val question: String, + val reponses: List +) {} + diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/metier/Reponse.kt b/android/app/src/main/java/fr/iut/sciencequest/model/metier/Reponse.kt new file mode 100644 index 0000000..aaacc6d --- /dev/null +++ b/android/app/src/main/java/fr/iut/sciencequest/model/metier/Reponse.kt @@ -0,0 +1,9 @@ +package fr.iut.sciencequest.model.metier + +class Reponse ( + val id: Int, + val reponse: String, + val question: Question, + val scientifique: Scientifique +) {} +