Skip to content

feat: change cache to use Map<String, Flag> instead of Set<Flag> #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: change cache to use Map<String, Flag> instead of Set<Flag> #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions lib/src/flagsmith_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import 'dart:async';
import 'dart:convert';

import 'package:collection/collection.dart' show IterableExtension;
import 'package:dio/dio.dart';
import 'package:flutter_client_sse/constants/sse_request_type_enum.dart';
import 'package:flutter_client_sse/flutter_client_sse.dart';
import 'package:rxdart/subjects.dart';
import 'package:dio/dio.dart';

import '../flagsmith.dart';

Expand Down Expand Up @@ -35,10 +36,10 @@ class FlagsmithClient {
late StorageProvider storageProvider;
CoreStorage? storage;
late Dio _api;
final Set<Flag> _flags = {};
final Map<String, Flag> _flags = {};
final List<Flag> seeds;

Set<Flag> get cachedFlags => _flags;
Map<String, Flag> get cachedFlags => _flags;

//A map of flag names to the amount of times they have been evaluated in the last 10 seconds
final Map<String, int> flagAnalytics = {};
Expand Down Expand Up @@ -290,9 +291,8 @@ class FlagsmithClient {
throw FlagsmithConfigException(Exception('caches are NOT enabled!'));
}

var feature = _flags.firstWhereOrNull((element) =>
element.feature.name == featureName && element.enabled == true);
return feature != null;
final feature = cachedFlags[featureName];
return feature?.enabled == true;
}

/// Check if Feature flag exist and is enabled
Expand Down Expand Up @@ -336,8 +336,7 @@ class FlagsmithClient {
log('Exception: caches are NOT enabled!');
throw FlagsmithConfigException(Exception('caches are NOT enabled!'));
}
var feature = cachedFlags
.firstWhereOrNull((element) => element.feature.name == featureId);
final feature = cachedFlags[featureId];
_incrementFlagAnalytics(feature);
return feature?.stateValue;
}
Expand All @@ -357,7 +356,7 @@ class FlagsmithClient {
Future<bool> removeFeatureFlag(String featureName) async {
var result = await storageProvider.delete(featureName);
if (config.caches) {
_flags.removeWhere((element) => element.feature.name == featureName);
_flags.removeWhere((key, _) => key == featureName);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_flags.removeWhere((key, _) => key == featureName);
_flags.remove(featureName);

}
return result;
}
Expand Down Expand Up @@ -539,11 +538,17 @@ class FlagsmithClient {

/// Internal updadte caches from list of featurs
void _updateCaches({List<Flag> list = const <Flag>[]}) {
if (config.caches) {
_flags
..clear()
..addAll(list.toSet());
if (!config.caches) {
return;
}
final newData = <String, Flag>{};
for (var element in list) {
newData[element.feature.name] = element;
}

_flags
..clear()
..addAll(newData);
Comment on lines +544 to +551
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
final newData = <String, Flag>{};
for (var element in list) {
newData[element.feature.name] = element;
}
_flags
..clear()
..addAll(newData);
_flags.clear();
list.forEach((element) => _flags[element.feature.name] = element);

We don't need the addAll after all. Feel free to keep the bare for syntax.

}

/// clear all data from storage
Expand Down Expand Up @@ -575,9 +580,9 @@ class FlagsmithClient {
final result = await storageProvider.togggleFeature(featureName);
final value = await storageProvider.read(featureName);
if (config.caches) {
_flags.removeWhere((element) => element.feature.name == featureName);
_flags.removeWhere((key, _) => key == featureName);
if (value != null) {
_flags.add(value);
_flags[value.feature.name] = value;
}
Comment on lines 582 to 586
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

if (config.caches && value != null) {
  _flags[featureName] = value;
}

}
return result;
Expand Down