Finished cosmetic endpoints

Author: thoo0224

build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
     kotlin("jvm") version "1.4.10"
+    id("com.github.johnrengelman.shadow") version "6.1.0"
+    id("maven")
 }
 
 group = "com.thoo.api"
@@ -14,4 +16,4 @@ dependencies {
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
-}
+}

src/main/kotlin/com/thoo/api/FortniteAPI.kt

@@ -12,7 +12,7 @@ import retrofit2.converter.gson.GsonConverterFactory
 class FortniteAPI private constructor(
     private val apiKey: String?,
     language: Language,
-    httpClient: OkHttpClient
+    private val httpClient: OkHttpClient
 ) {
 
     // The `/v2/` is a bug fix but won't actually get applied
@@ -27,7 +27,7 @@ class FortniteAPI private constructor(
     @JvmField val playlist = PlaylistEndpoints(retrofit, PlaylistService::class.java, language)
     @JvmField val banner = BannerEndpoints(retrofit, BannerService::class.java, language)
     @JvmField val creator = CreatorEndpoints(retrofit, CreatorService::class.java)
-    @JvmField val cosmetic = CosmeticEndpoints(retrofit, CosmeticService::class.java, language)
+    @JvmField val cosmetic = CosmeticEndpoints(retrofit, CosmeticService::class.java, language, httpClient)
 
     companion object {
 

src/main/kotlin/com/thoo/api/endpoints/CosmeticEndpoints.kt

@@ -1,16 +1,25 @@
 package com.thoo.api.endpoints
 
+import com.google.gson.Gson
+import com.thoo.api.FortniteAPI
 import com.thoo.api.enums.Language
+import com.thoo.api.models.BaseModel
+import com.thoo.api.models.Cosmetic
 import com.thoo.api.models.CosmeticSearchProperties
 import com.thoo.api.services.CosmeticService
 import com.thoo.api.utils.send
+import com.thoo.api.utils.sendOkHttp
+import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import retrofit2.Retrofit
 
 @SuppressWarnings("unused")
 class CosmeticEndpoints(
         retrofit: Retrofit,
         clazz: Class<out CosmeticService>,
-        private val language: Language
+        private val language: Language,
+        private val httpClient: OkHttpClient
 ): EndpointBase<CosmeticService>(retrofit, clazz) {
 
     @JvmOverloads fun getCosmetics(language: Language = this.language) =
@@ -20,15 +29,53 @@ class CosmeticEndpoints(
             service.getNewCosmetics(language.code).send()
 
     @JvmOverloads
-    fun searchCosmetic(language: Language = this.language, propertiesReceiver: CosmeticSearchProperties.() -> Unit) {
+    fun searchCosmetic(language: Language = this.language, propertiesReceiver: CosmeticSearchProperties.() -> Unit): BaseModel<Cosmetic> {
         val properties = CosmeticSearchProperties()
         propertiesReceiver.invoke(properties)
         val clazz = properties.javaClass
+        val queries = hashMapOf<String, Any>()
         clazz.declaredFields.forEach {
             it.isAccessible = true
             val value = it.get(properties) ?: return@forEach
-            println(it.name + " : " + value)
+            queries[it.name] = value
         }
+        val urlBuilder = HttpUrl.Builder()
+                .scheme("https")
+                .host("fortnite-api.com")
+                .addPathSegments("v2/cosmetics/br/search")
+                .addEncodedQueryParameter("language", language.code)
+        queries.forEach { (k, v) ->
+            urlBuilder.addEncodedQueryParameter(k, v.toString())
+        }
+        val request = Request.Builder()
+                .url(urlBuilder.build())
+                .build()
+        return request.sendOkHttp(httpClient)
+    }
+
+    @JvmOverloads
+    fun searchCosmetics(language: Language = this.language, propertiesReceiver: CosmeticSearchProperties.() -> Unit): BaseModel<List<Cosmetic>> {
+        val properties = CosmeticSearchProperties()
+        propertiesReceiver.invoke(properties)
+        val clazz = properties.javaClass
+        val queries = hashMapOf<String, Any>()
+        clazz.declaredFields.forEach {
+            it.isAccessible = true
+            val value = it.get(properties) ?: return@forEach
+            queries[it.name] = value
+        }
+        val urlBuilder = HttpUrl.Builder()
+                .scheme("https")
+                .host("fortnite-api.com")
+                .addPathSegments("v2/cosmetics/br/search/all")
+                .addEncodedQueryParameter("language", language.code)
+        queries.forEach { (k, v) ->
+            urlBuilder.addEncodedQueryParameter(k, v.toString())
+        }
+        val request = Request.Builder()
+                .url(urlBuilder.build())
+                .build()
+        return request.sendOkHttp(httpClient)
     }
 
 }

src/main/kotlin/com/thoo/api/models/BaseModel.kt

@@ -1,6 +1,6 @@
 package com.thoo.api.models
 
 data class BaseModel<T>(
-        val code: Int,
+        val status: Int,
         val data: T
 )

src/main/kotlin/com/thoo/api/services/CosmeticService.kt

@@ -17,4 +17,36 @@ interface CosmeticService: EndpointService {
             @Query("language") language: String
     ): FCall<List<Cosmetic>>
 
+    @GET("/v2/cosmetics/br/search/all")
+    fun searchCosmetic(
+            @Query("language") language: String,
+            @Query("searchLanguage") searchLanguage: String,
+            @Query("matchMethod") matchMethod: String,
+            @Query("id") id: String?,
+            @Query("name") name: String?,
+            @Query("description") description: String?,
+            @Query("type") type: String?,
+            @Query("displayType") displayType: String?,
+            @Query("backendType") backendType: String?,
+            @Query("rarity") rarity: String?,
+            @Query("displayRarity") displayRarity: String?,
+            @Query("backendRarity") backendRarity: String?,
+            @Query("hasSeries") hasSeries: Boolean?,
+            @Query("hasSet") hasSet: Boolean?,
+            @Query("set") set: String?,
+            @Query("setText") setText: String?,
+            @Query("backendSet") backendSet: String?,
+            @Query("hasIntroduction") hasIntroduction: Boolean?,
+            @Query("introductionChapter") introductionChapter: String?,
+            @Query("introductionSeason") introductionSeason: String?,
+            @Query("hasFeaturedImage") hasFeaturedImage: Boolean?,
+            @Query("hasVariants") hasVariants: Boolean?,
+            @Query("hasGameplayTags") hasGameplayTags: Boolean?,
+            @Query("gameplayTag") gameplayTag: String?,
+            @Query("added") added: Long?,
+            @Query("addedSince") addedSince: Long?,
+            @Query("unseenFor") unseenFor: Long?,
+            @Query("lastAppearance") lastAppearance: Long?,
+    ): FCall<Cosmetic>
+
 }

src/main/kotlin/com/thoo/api/utils/Utils.kt

@@ -3,6 +3,8 @@ package com.thoo.api.utils
 import com.google.gson.Gson
 import com.thoo.api.exceptions.FortniteApiException
 import com.thoo.api.models.BaseModel
+import okhttp3.OkHttpClient
+import okhttp3.Request
 import retrofit2.Call
 import retrofit2.Response
 import java.io.File
@@ -15,18 +17,25 @@ typealias FCall<T> = Call<BaseModel<T>>
 val gson = Gson()
 
 @Throws(FortniteApiException::class)
-inline fun <reified T> Call<BaseModel<T>>.send(): BaseModel<T> {
+internal inline fun <reified T> Call<BaseModel<T>>.send(): BaseModel<T> {
     val response = this.execute()
     if(!response.isSuccessful) throw response.parseApiError()
     return response.body()!!
 }
 
-fun Response<*>.parseApiError(): FortniteApiException {
+@Throws(FortniteApiException::class)
+internal inline fun <reified T> Request.sendOkHttp(client: OkHttpClient): BaseModel<T> {
+    val response = client.newCall(this).execute()
+    if(!response.isSuccessful) throw gson.fromJson(response.body()?.string() ?: "{}", FortniteApiException::class.java)
+    return gson.fromJson<BaseModel<T>>(response.body()?.string() ?: "{}", BaseModel::class.java)
+}
+
+internal fun Response<*>.parseApiError(): FortniteApiException {
     val json = this.errorBody()?.string() ?: "{}"
     return gson.fromJson(json, FortniteApiException::class.java)
 }
 
-fun download(byteStream: InputStream, file: File): Int {
+internal fun download(byteStream: InputStream, file: File): Int {
     val reader = ByteArray(4096)
     var fileSizeDownloaded = 0
     val output = FileOutputStream(file)

src/test/java/TestJava.java

@@ -5,10 +5,6 @@ public final class TestJava {
 
     public static void main(String[] args) {
         FortniteAPI api = FortniteAPI.create();
-        api.cosmetic.searchCosmetic(cosmetic  -> {
-            cosmetic.name = "Test";
-            return Unit.INSTANCE;
-        });
     }
 
 }

src/test/kotlin/TestKotlin.kt

@@ -8,9 +8,10 @@ object TestKotlin {
         val api = FortniteAPI.create(
                 language = Language.DE
         )
-        api.cosmetic.searchCosmetic {
-            name = "Test"
+        val cosmetic = api.cosmetic.searchCosmetic {
+            name = "aura"
         }
+        println(cosmetic.data.id)
     }
 
 }