From 2b3b68761abcfdef9363fe4460b1702fad72e89f Mon Sep 17 00:00:00 2001
From: Renaud BEURET <renaud.beuret@etu.uca.fr>
Date: Fri, 22 Mar 2024 09:09:13 +0100
Subject: [PATCH] =?UTF-8?q?[MOVE]=20Choses=20utilis=C3=A9s=20par=20tout=20?=
 =?UTF-8?q?les=20services=20dans=20un=20fichier=20pour=20=C3=A9viter=20red?=
 =?UTF-8?q?ondance?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buisness/ScientifiqueRequestService.kt     | 14 +-------------
 .../model/buisness/ServiceUtils.kt             | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 android/app/src/main/java/fr/iut/sciencequest/model/buisness/ServiceUtils.kt

diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ScientifiqueRequestService.kt b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ScientifiqueRequestService.kt
index 7b5e9f0..8247667 100644
--- a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ScientifiqueRequestService.kt
+++ b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ScientifiqueRequestService.kt
@@ -12,22 +12,10 @@ import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query
 
-// a remplir
-private const val API_BASE_URL = "https://sae-java.alix-jdlm.fr/api/v1/"
-
-val httpClient = OkHttpClient()
-
 interface ScientifiqueRequestService {
     @GET("scientifiques?page")
     fun getScientifiques(@Query("page") index: Int): Call<ScientifiqueListDTO>
 
     @GET("scientifiques/{id}")
     fun getScientifique(@Path("id") id: Int): Call<ScientifiqueDTO>
-}
-
-fun createRequestService(): Retrofit =
-    Retrofit.Builder()
-        .baseUrl(API_BASE_URL)
-        .addConverterFactory(Json {  ignoreUnknownKeys = true }.asConverterFactory(MediaType.get("application/json")))
-        .client(httpClient)
-        .build()
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ServiceUtils.kt b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ServiceUtils.kt
new file mode 100644
index 0000000..9029826
--- /dev/null
+++ b/android/app/src/main/java/fr/iut/sciencequest/model/buisness/ServiceUtils.kt
@@ -0,0 +1,18 @@
+package fr.iut.sciencequest.model.buisness
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+
+const val API_BASE_URL = "https://sae-java.alix-jdlm.fr/api/v1/"
+
+val httpClient = OkHttpClient()
+
+fun createRequestService(): Retrofit =
+    Retrofit.Builder()
+        .baseUrl(API_BASE_URL)
+        .addConverterFactory(Json {  ignoreUnknownKeys = true }.asConverterFactory(MediaType.get("application/json")))
+        .client(httpClient)
+        .build()
\ No newline at end of file