diff --git a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheReadKeyValueRepo.kt b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheReadKeyValueRepo.kt index 0bc040bef7b..1a46426d5e1 100644 --- a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheReadKeyValueRepo.kt +++ b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalue/AutoRecacheReadKeyValueRepo.kt @@ -61,7 +61,7 @@ open class AutoRecacheReadKeyValueRepo( override suspend fun get(k: Id): RegisteredObject? = actionWrapper.wrap { originalRepo.get(k) }.getOrNull() ?.also { - kvCache.set(idGetter(it), it) + kvCache.set(k, it) } ?: kvCache.get(k) override suspend fun values( diff --git a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt index 8527e89ecf5..c51f852932c 100644 --- a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt +++ b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheKeyValueRepo.kt @@ -12,15 +12,13 @@ open class AutoRecacheKeyValuesRepo( scope: CoroutineScope, kvCache: FullKVCache> = FullKVCache(), recacheDelay: Long = 60.seconds.inWholeMilliseconds, - actionWrapper: ActionWrapper = ActionWrapper.Direct, - idGetter: (RegisteredObject) -> Id + actionWrapper: ActionWrapper = ActionWrapper.Direct ) : AutoRecacheReadKeyValuesRepo ( originalRepo, scope, kvCache, recacheDelay, - actionWrapper, - idGetter + actionWrapper ), WriteKeyValuesRepo by AutoRecacheWriteKeyValuesRepo(originalRepo, scope, kvCache), KeyValuesRepo { @@ -30,9 +28,8 @@ open class AutoRecacheKeyValuesRepo( scope: CoroutineScope, originalCallTimeoutMillis: Long, kvCache: FullKVCache> = FullKVCache(), - recacheDelay: Long = 60.seconds.inWholeMilliseconds, - idGetter: (RegisteredObject) -> Id - ) : this(originalRepo, scope, kvCache, recacheDelay, ActionWrapper.Timeouted(originalCallTimeoutMillis), idGetter) + recacheDelay: Long = 60.seconds.inWholeMilliseconds + ) : this(originalRepo, scope, kvCache, recacheDelay, ActionWrapper.Timeouted(originalCallTimeoutMillis)) override suspend fun clearWithValue(v: RegisteredObject) { super.clearWithValue(v) diff --git a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheReadKeyValuesRepo.kt b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheReadKeyValuesRepo.kt index 252e20872a7..9eec30e41c5 100644 --- a/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheReadKeyValuesRepo.kt +++ b/repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/fallback/keyvalues/AutoRecacheReadKeyValuesRepo.kt @@ -27,8 +27,7 @@ open class AutoRecacheReadKeyValuesRepo( protected val scope: CoroutineScope, protected val kvCache: FullKVCache> = FullKVCache(), protected val recacheDelay: Long = 60.seconds.inWholeMilliseconds, - protected val actionWrapper: ActionWrapper = ActionWrapper.Direct, - protected val idGetter: (RegisteredObject) -> Id + protected val actionWrapper: ActionWrapper = ActionWrapper.Direct ) : ReadKeyValuesRepo, FallbackCacheRepo { val autoUpdateJob = scope.launch { while (isActive) { @@ -43,9 +42,8 @@ open class AutoRecacheReadKeyValuesRepo( scope: CoroutineScope, originalCallTimeoutMillis: Long, kvCache: FullKVCache> = FullKVCache(), - recacheDelay: Long = 60.seconds.inWholeMilliseconds, - idGetter: (RegisteredObject) -> Id - ) : this(originalRepo, scope, kvCache, recacheDelay, ActionWrapper.Timeouted(originalCallTimeoutMillis), idGetter) + recacheDelay: Long = 60.seconds.inWholeMilliseconds + ) : this(originalRepo, scope, kvCache, recacheDelay, ActionWrapper.Timeouted(originalCallTimeoutMillis)) protected suspend fun actualizeAll(): Result { return runCatchingSafely {