diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/Question/QuestionRequestService.kt b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/QuestionRequestService.kt similarity index 83% rename from android/app/src/main/java/fr/iut/sciencequest/model/buisness/Question/QuestionRequestService.kt rename to android/app/src/main/java/fr/iut/sciencequest/model/buisness/QuestionRequestService.kt index 06cb39f..e3f4c24 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/Question/QuestionRequestService.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/QuestionRequestService.kt @@ -1,4 +1,4 @@ -package fr.iut.sciencequest.model.buisness.Question +package fr.iut.sciencequest.model.buisness import fr.iut.sciencequest.model.dto.question.QuestionListDTO import retrofit2.Call diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/Scientifique/ScientifiquesRequestor.kt b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/Scientifique/ScientifiquesRequestor.kt deleted file mode 100644 index 8269e18..0000000 --- a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/Scientifique/ScientifiquesRequestor.kt +++ /dev/null @@ -1,36 +0,0 @@ -package fr.iut.sciencequest.model.buisness.Scientifique - -import android.util.Log -import fr.iut.sciencequest.model.buisness.createRequestService -import kotlinx.coroutines.flow.flow -import retrofit2.create - -suspend fun fetchScientifiqueById(id: Int) = flow { - val serviceClient = createRequestService().create() - try { - val response = serviceClient.getScientifique(id) - emit(response) - } catch (e: Exception) { - Log.e("Requete API",e.message.toString()) - } -} - -fun fetchScientifiques(index: Int) = flow { - val serviceClient = createRequestService().create() - try { - val response = serviceClient.getScientifiques(index) - emit(response) - } catch (e: Exception) { - Log.e("Requete API",e.message.toString()) - } -} - -fun fetchScientifiquesInfos() = flow { - val serviceClient = createRequestService().create() - try { - val response = serviceClient.getScientifiquesListInfos().page - emit(response) - } catch (e: Exception) { - Log.e("Requete API",e.message.toString()) - } -} \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/Scientifique/ScientifiqueRequestService.kt b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ScientifiqueRequestService.kt similarity index 92% rename from android/app/src/main/java/fr/iut/sciencequest/model/buisness/Scientifique/ScientifiqueRequestService.kt rename to android/app/src/main/java/fr/iut/sciencequest/model/buisness/ScientifiqueRequestService.kt index 396ae00..3937a0b 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/Scientifique/ScientifiqueRequestService.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ScientifiqueRequestService.kt @@ -1,4 +1,4 @@ -package fr.iut.sciencequest.model.buisness.Scientifique +package fr.iut.sciencequest.model.buisness import fr.iut.sciencequest.model.dto.ScientifiqueDTOs.ScientifiqueDTO import fr.iut.sciencequest.model.dto.ScientifiqueDTOs.ScientifiqueListDTO diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionAPIRepository.kt b/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionAPIRepository.kt index 45b69c5..0f9bf3b 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionAPIRepository.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionAPIRepository.kt @@ -1,17 +1,13 @@ package fr.iut.sciencequest.model.repositories.question import android.util.Log -import fr.iut.sciencequest.model.buisness.Question.QuestionRequestService +import fr.iut.sciencequest.model.buisness.QuestionRequestService import fr.iut.sciencequest.model.buisness.createRequestService import fr.iut.sciencequest.model.dto.extensions.ToModel -import fr.iut.sciencequest.model.metier.question.Question import fr.iut.sciencequest.model.metier.question.QuestionWithSimpleReponse -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.update import retrofit2.create class QuestionAPIRepository : IQuestionRepository { diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionStubRepository.kt b/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionStubRepository.kt index c4fdce2..b943b3d 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionStubRepository.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/repositories/question/QuestionStubRepository.kt @@ -1,15 +1,9 @@ package fr.iut.sciencequest.model.repositories.question -import android.util.Log -import fr.iut.sciencequest.model.buisness.Question.QuestionRequestService -import fr.iut.sciencequest.model.buisness.createRequestService -import fr.iut.sciencequest.model.dto.extensions.ToModel -import fr.iut.sciencequest.model.metier.question.Question import fr.iut.sciencequest.model.metier.question.QuestionWithSimpleReponse import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -import retrofit2.create class QuestionStubRepository: IQuestionRepository { diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/repositories/scientifique/ScientifiqueAPIRepository.kt b/android/app/src/main/java/fr/iut/sciencequest/model/repositories/scientifique/ScientifiqueAPIRepository.kt index 52e9a65..5d592b3 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/repositories/scientifique/ScientifiqueAPIRepository.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/repositories/scientifique/ScientifiqueAPIRepository.kt @@ -1,17 +1,14 @@ package fr.iut.sciencequest.model.repositories.scientifique import android.util.Log -import fr.iut.sciencequest.model.buisness.Question.QuestionRequestService -import fr.iut.sciencequest.model.buisness.Scientifique.ScientifiqueRequestService +import fr.iut.sciencequest.model.buisness.ScientifiqueRequestService import fr.iut.sciencequest.model.buisness.createRequestService import fr.iut.sciencequest.model.dto.extensions.ToModel import fr.iut.sciencequest.model.metier.Scientifique import fr.iut.sciencequest.stub.StubScientifique1 -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.flow.flow import retrofit2.create class ScientifiqueAPIRepository: IScientifiqueRepository {