From eb3c3fbe70a9d487a631ca79b7b3997d50ec6ce4 Mon Sep 17 00:00:00 2001 From: Renaud BEURET Date: Fri, 22 Mar 2024 08:54:14 +0100 Subject: [PATCH] =?UTF-8?q?[FIX]=20Cr=C3=A9ation=20module=20Scientifique?= =?UTF-8?q?=20dans=20dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/ScientifiqueDTOs/ScientifiqueDTO.kt | 4 +++- .../dto/ScientifiqueDTOs/ScientifiqueListDTO.kt | 14 ++++++++++++++ .../model/dto/extensions/ScientifiqueExtensions.kt | 2 +- .../sciencequest/model/dto/reponse/ReponseDTO.kt | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueListDTO.kt diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueDTO.kt index fd78068..f62c147 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueDTO.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueDTO.kt @@ -1,5 +1,7 @@ -package fr.iut.sciencequest.model.dto +package fr.iut.sciencequest.model.dto.ScientifiqueDTOs +import fr.iut.sciencequest.model.dto.DifficulteDTO +import fr.iut.sciencequest.model.dto.ThematiqueDTO import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueListDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueListDTO.kt new file mode 100644 index 0000000..8007d40 --- /dev/null +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTOs/ScientifiqueListDTO.kt @@ -0,0 +1,14 @@ +package fr.iut.sciencequest.model.dto.ScientifiqueDTOs + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +open class ScientifiqueListDTO { + @SerialName("_embedded") + val scientifiques: List + + constructor(scientifiques: List) { + this.scientifiques = scientifiques + } +} \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/extensions/ScientifiqueExtensions.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/extensions/ScientifiqueExtensions.kt index 636f77e..45bd9b3 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/extensions/ScientifiqueExtensions.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/extensions/ScientifiqueExtensions.kt @@ -1,6 +1,6 @@ package fr.iut.sciencequest.model.dto.extensions -import fr.iut.sciencequest.model.dto.ScientifiqueDTO +import fr.iut.sciencequest.model.dto.ScientifiqueDTOs.ScientifiqueDTO import fr.iut.sciencequest.model.metier.Scientifique fun ScientifiqueDTO.ToModel(): Scientifique { diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/reponse/ReponseDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/reponse/ReponseDTO.kt index e7233d6..970b3ea 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/reponse/ReponseDTO.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/reponse/ReponseDTO.kt @@ -1,7 +1,7 @@ package fr.iut.sciencequest.model.dto.reponse import fr.iut.sciencequest.model.dto.question.QuestionDTO -import fr.iut.sciencequest.model.dto.ScientifiqueDTO +import fr.iut.sciencequest.model.dto.ScientifiqueDTOs.ScientifiqueDTO import kotlinx.serialization.Serializable @Serializable