Add attacktype and usespells. Optimise getting creatures one by one.

Author: benjaminkomen

src/main/kotlin/com/wikia/tibia/enums/AttackType.kt

@@ -0,0 +1,5 @@
+package com.wikia.tibia.enums
+
+enum class AttackType {
+  Melee, Distance, None
+}

src/main/kotlin/com/wikia/tibia/jackson/Parser.kt

@@ -94,4 +94,13 @@ object Parser {
       ""
     }
   }
+
+  fun <T> mapToType(type: Class<T>, json: Any, mapper: ObjectMapper = defaultObjectMapper): T? {
+    return try {
+      mapper.convertValue(json, type)
+    } catch (e: Exception) {
+      logger.error("Unable to construct object of type '$type' from the following json: '$json' because of error: $e")
+      null
+    }
+  }
 }

src/main/kotlin/com/wikia/tibia/objects/Creature.kt

@@ -2,6 +2,7 @@ package com.wikia.tibia.objects
 
 import com.fasterxml.jackson.annotation.JsonGetter
 import com.wikia.tibia.enums.Article
+import com.wikia.tibia.enums.AttackType
 import com.wikia.tibia.enums.BestiaryClass
 import com.wikia.tibia.enums.BestiaryLevel
 import com.wikia.tibia.enums.BestiaryOccurrence
@@ -33,6 +34,8 @@ data class Creature(
   val bestiaryclass: BestiaryClass? = null,
   val bestiarylevel: BestiaryLevel? = null,
   val occurrence: BestiaryOccurrence? = null,
+  val attacktype: AttackType? = null,
+  val usespells: YesNo? = null,
   val spawntype: List<Spawntype>? = emptyList(),
   val isboss: YesNo? = null,
   val isarenaboss: YesNo? = null,

src/main/kotlin/com/wikia/tibia/v2/adapters/creature/CreatureRepositoryImpl.kt

@@ -2,6 +2,7 @@ package com.wikia.tibia.v2.adapters.creature
 
 import com.github.benmanes.caffeine.cache.AsyncLoadingCache
 import com.github.benmanes.caffeine.cache.Caffeine
+import com.wikia.tibia.jackson.Parser
 import com.wikia.tibia.objects.Creature
 import com.wikia.tibia.v2.adapters.tibiawiki.TibiaWikiApiClientFactory
 import com.wikia.tibia.v2.domain.creature.CreatureRepository
@@ -70,7 +71,9 @@ class CreatureRepositoryImpl : CreatureRepository {
       logger.info("Getting all creatures")
       val response = client.getCreatures()
       if (response.isSuccessful) {
-        response.body() ?: emptyList()
+        response.body()
+          ?.mapNotNull { Parser.mapToType(type = Creature::class.java, json = it) }
+          ?: emptyList()
       } else {
         logger.error("Could not get list of creatures for key $key because: ${response.errorBody() ?: response.message()}")
         emptyList()

src/main/kotlin/com/wikia/tibia/v2/adapters/tibiawiki/TibiaWikiApiClient.kt

@@ -14,7 +14,7 @@ import retrofit2.http.Query
 interface TibiaWikiApiClient {
 
   @GET("/api/creatures")
-  suspend fun getCreatures(@Query("expand") expand: Boolean? = true): Response<List<Creature>>
+  suspend fun getCreatures(@Query("expand") expand: Boolean? = true): Response<List<Any>>
 
   @GET("/api/creatures")
   suspend fun getCreatureNames(@Query("expand") expand: Boolean? = false): Response<List<String>>