Fixed function to find enum value

jonathanarodr · May 2, 2024 · c8188ba · c8188ba
1 parent a6ca847
commit c8188ba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/common/src/main/kotlin/br/com/stonks/common/utils/KotlinUtils.kt b/common/src/main/kotlin/br/com/stonks/common/utils/KotlinUtils.kt
diff --git a/feature/home/src/main/kotlin/br/com/stonks/feature/home/domain/types/PortfolioType.kt b/feature/home/src/main/kotlin/br/com/stonks/feature/home/domain/types/PortfolioType.kt
@@ -1,6 +1,6 @@
 package br.com.stonks.feature.home.domain.types
 
-import br.com.stonks.common.utils.safeEnumValueOf
+import timber.log.Timber
 
 enum class PortfolioType(val id: String) {
     UNKNOWN("unknown"),
@@ -12,7 +12,12 @@ enum class PortfolioType(val id: String) {
     companion object {
 
         fun fromString(id: String): PortfolioType {
-            return safeEnumValueOf<PortfolioType>(id) ?: UNKNOWN
+            return try {
+                enumValues<PortfolioType>().find { it.id == id } ?: UNKNOWN
+            } catch (exception: IllegalArgumentException) {
+                Timber.e(exception, "Failure to find the enum value with ID '$id'")
+                UNKNOWN
+            }
         }
     }
 }
diff --git a/feature/home/src/main/kotlin/br/com/stonks/feature/home/domain/types/TransactionType.kt b/feature/home/src/main/kotlin/br/com/stonks/feature/home/domain/types/TransactionType.kt
@@ -1,6 +1,6 @@
 package br.com.stonks.feature.home.domain.types
 
-import br.com.stonks.common.utils.safeEnumValueOf
+import timber.log.Timber
 
 enum class TransactionType(val id: String) {
     UNKNOWN("unknown"),
@@ -10,7 +10,12 @@ enum class TransactionType(val id: String) {
     companion object {
 
         fun fromString(id: String): TransactionType {
-            return safeEnumValueOf<TransactionType>(id) ?: UNKNOWN
+            return try {
+                enumValues<TransactionType>().find { it.id == id } ?: UNKNOWN
+            } catch (exception: IllegalArgumentException) {
+                Timber.e(exception, "Failure to find the enum value with ID '$id'")
+                UNKNOWN
+            }
         }
     }
 }