Skip to content

Commit fa8124c

Browse files
yasirfolio3yasirfolio3
committed
fixes.
1 parent 8f902fb commit fa8124c

File tree

8 files changed

+80
-81
lines changed

8 files changed

+80
-81
lines changed

‎ios/Classes/HelperClasses/Constants.swift‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,23 @@ struct NotificationType {
3939
}
4040

4141
struct RequestParameterKey {
42-
static let sdkKey = "sdk_key"
43-
static let userId = "user_id"
42+
static let sdkKey = "sdkKey"
43+
static let userId = "userID"
4444
static let notificationId = "id"
4545
static let notificationType = "type"
4646
static let notificationPayload = "payload"
4747
static let attributes = "attributes"
4848
static let decideKeys = "keys"
49-
static let variationKey = "variation_key"
50-
static let flagKey = "flag_key"
51-
static let ruleKey = "rule_key"
52-
static let decideOptions = "optimizely_decide_option"
53-
static let eventKey = "event_key"
54-
static let eventTags = "event_tags"
49+
static let variationKey = "variationKey"
50+
static let flagKey = "flagKey"
51+
static let ruleKey = "ruleKey"
52+
static let enabled = "enabled"
53+
static let userContext = "userContext"
54+
static let variables = "variables"
55+
static let eventKey = "eventKey"
56+
static let eventTags = "eventTags"
57+
static let reasons = "reasons"
58+
static let decideOptions = "optimizelyDecideOption"
5559
}
5660

5761
struct ResponseKey {

‎ios/Classes/HelperClasses/Utils.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,17 @@ public class Utils: NSObject {
140140

141141
static func convertDecisionToDictionary(decision: OptimizelyDecision?) -> [String: Any?] {
142142
let userContext: [String: Any?] =
143-
["user_id" : decision?.userContext.userId,
144-
"attributes" : decision?.userContext.attributes]
143+
[RequestParameterKey.userId : decision?.userContext.userId,
144+
RequestParameterKey.attributes : decision?.userContext.attributes]
145145

146146
let decisionMap: [String: Any?] =
147-
["variation_key": decision?.variationKey,
148-
"rule_key": decision?.ruleKey,
149-
"enabled": decision?.enabled,
150-
"flag_key": decision?.flagKey,
151-
"user_context": userContext,
152-
"variables": decision?.variables.toMap(),
153-
"reasons": decision?.reasons]
147+
[RequestParameterKey.variationKey: decision?.variationKey,
148+
RequestParameterKey.ruleKey: decision?.ruleKey,
149+
RequestParameterKey.enabled: decision?.enabled,
150+
RequestParameterKey.flagKey: decision?.flagKey,
151+
RequestParameterKey.userContext: userContext,
152+
RequestParameterKey.variables: decision?.variables.toMap(),
153+
RequestParameterKey.reasons: decision?.reasons]
154154
return decisionMap
155155
}
156156
}

‎lib/src/constants.dart‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,26 @@ class Constants {
3737
"removeNotificationListener";
3838

3939
// Request parameter keys
40-
static const String requestID = "id";
41-
static const String requestSDKKey = "sdk_key";
42-
static const String requestUserID = "user_id";
43-
static const String requestAttributes = "attributes";
44-
static const String requestEventKey = "event_key";
45-
static const String requestEventTags = "event_tags";
46-
static const String requestKeys = "keys";
47-
static const String requestVariationKey = "variation_key";
48-
static const String requestFlagKey = "flag_key";
49-
static const String requestRuleKey = "rule_key";
50-
static const String requestOptimizelyDecideOption =
51-
"optimizely_decide_option";
52-
static const String requestPayload = "payload";
53-
static const String requestValue = "value";
54-
static const String requestType = "type";
55-
static const String requestCallBackListener = "callbackListener";
40+
static const String id = "id";
41+
static const String sdkKey = "sdkKey";
42+
static const String userID = "userID";
43+
static const String attributes = "attributes";
44+
static const String eventKey = "eventKey";
45+
static const String eventTags = "eventTags";
46+
static const String keys = "keys";
47+
static const String variationKey = "variationKey";
48+
static const String flagKey = "flagKey";
49+
static const String ruleKey = "ruleKey";
50+
static const String optimizelyDecideOption = "optimizelyDecideOption";
51+
static const String payload = "payload";
52+
static const String value = "value";
53+
static const String type = "type";
54+
static const String callBackListener = "callbackListener";
5655

5756
// Response keys
5857
static const String responseSuccess = "success";
5958
static const String responseResult = "result";
6059
static const String responseReason = "reason";
61-
static const String responseVariationKey = "variationKey";
6260

6361
// SuccessMessage from ios/Classes/SwiftOptimizelyFlutterSdkPlugin.swift
6462
// These are unique only to flutter SDK. This helps in testing if correct native code was called.

‎lib/src/optimizely_client_wrapper.dart‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ class OptimizelyClientWrapper {
3434
/// Starts Optimizely SDK (Synchronous) with provided sdkKey.
3535
static Future<Map<String, dynamic>> initializeClient(String sdkKey) async {
3636
_channel.setMethodCallHandler(methodCallHandler);
37-
return Map<String, dynamic>.from(await _channel.invokeMethod(
38-
Constants.initializeMethod, {Constants.requestSDKKey: sdkKey}));
37+
return Map<String, dynamic>.from(await _channel
38+
.invokeMethod(Constants.initializeMethod, {Constants.sdkKey: sdkKey}));
3939
}
4040

4141
/// Returns a snapshot of the current project configuration.
4242
static Future<Map<String, dynamic>> getOptimizelyConfig(String sdkKey) async {
4343
return Map<String, dynamic>.from(await _channel.invokeMethod(
44-
Constants.getOptimizelyConfigMethod,
45-
{Constants.requestSDKKey: sdkKey}));
44+
Constants.getOptimizelyConfigMethod, {Constants.sdkKey: sdkKey}));
4645
}
4746

4847
/// Creates a context of the user for which decision APIs will be called.
@@ -53,9 +52,9 @@ class OptimizelyClientWrapper {
5352
[Map<String, dynamic> attributes = const {}]) async {
5453
var result = Map<String, dynamic>.from(
5554
await _channel.invokeMethod(Constants.createUserContextMethod, {
56-
Constants.requestSDKKey: sdkKey,
57-
Constants.requestUserID: userId,
58-
Constants.requestAttributes: Utils.covertToTypedMap(attributes)
55+
Constants.sdkKey: sdkKey,
56+
Constants.userID: userId,
57+
Constants.attributes: Utils.covertToTypedMap(attributes)
5958
}));
6059
if (result[Constants.responseSuccess] == true) {
6160
return OptimizelyUserContext(sdkKey, _channel);
@@ -84,25 +83,23 @@ class OptimizelyClientWrapper {
8483
.toString()
8584
.substring(listenerType.toString().indexOf('.') + 1);
8685
await _channel.invokeMethod(Constants.addNotificationListenerMethod, {
87-
Constants.requestSDKKey: sdkKey,
88-
Constants.requestID: currentListenerId,
89-
Constants.requestType: listenerTypeStr
86+
Constants.sdkKey: sdkKey,
87+
Constants.id: currentListenerId,
88+
Constants.type: listenerTypeStr
9089
});
9190
// Returning a callback function that allows the user to remove the added notification listener
9291
return () {
93-
_channel.invokeMethod(Constants.removeNotificationListenerMethod, {
94-
Constants.requestSDKKey: sdkKey,
95-
Constants.requestID: currentListenerId
96-
});
92+
_channel.invokeMethod(Constants.removeNotificationListenerMethod,
93+
{Constants.sdkKey: sdkKey, Constants.id: currentListenerId});
9794
callbacksById.remove(currentListenerId);
9895
};
9996
}
10097

10198
static Future<void> methodCallHandler(MethodCall call) async {
10299
switch (call.method) {
103-
case Constants.requestCallBackListener:
104-
var id = call.arguments[Constants.requestID];
105-
var payload = call.arguments[Constants.requestPayload];
100+
case Constants.callBackListener:
101+
var id = call.arguments[Constants.id];
102+
var payload = call.arguments[Constants.payload];
106103
if (id is int && payload != null && callbacksById.containsKey(id)) {
107104
callbacksById[id]!(payload);
108105
}

‎lib/src/user_context/optimizely_user_context.dart‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class OptimizelyUserContext {
3333
Map<String, dynamic> attributes) async {
3434
return Map<String, dynamic>.from(
3535
await _channel.invokeMethod(Constants.setAttributesMethod, {
36-
Constants.requestSDKKey: _sdkKey,
37-
Constants.requestAttributes: Utils.covertToTypedMap(attributes)
36+
Constants.sdkKey: _sdkKey,
37+
Constants.attributes: Utils.covertToTypedMap(attributes)
3838
}));
3939
}
4040

@@ -43,9 +43,9 @@ class OptimizelyUserContext {
4343
[Map<String, dynamic> eventTags = const {}]) async {
4444
return Map<String, dynamic>.from(
4545
await _channel.invokeMethod(Constants.trackEventMethod, {
46-
Constants.requestSDKKey: _sdkKey,
47-
Constants.requestEventKey: eventKey,
48-
Constants.requestEventTags: Utils.covertToTypedMap(eventTags)
46+
Constants.sdkKey: _sdkKey,
47+
Constants.eventKey: eventKey,
48+
Constants.eventTags: Utils.covertToTypedMap(eventTags)
4949
}));
5050
}
5151

@@ -73,9 +73,9 @@ class OptimizelyUserContext {
7373
[List<String> keys = const [], List<String> options = const []]) async {
7474
return Map<String, dynamic>.from(
7575
await _channel.invokeMethod(Constants.decideMethod, {
76-
Constants.requestSDKKey: _sdkKey,
77-
Constants.requestKeys: keys,
78-
Constants.requestOptimizelyDecideOption: options
76+
Constants.sdkKey: _sdkKey,
77+
Constants.keys: keys,
78+
Constants.optimizelyDecideOption: options
7979
}));
8080
}
8181

@@ -84,12 +84,12 @@ class OptimizelyUserContext {
8484
OptimizelyDecisionContext context,
8585
OptimizelyForcedDecision decision) async {
8686
Map<String, dynamic> request = {
87-
Constants.requestSDKKey: _sdkKey,
88-
Constants.requestFlagKey: context.flagKey,
89-
Constants.requestVariationKey: decision.variationKey
87+
Constants.sdkKey: _sdkKey,
88+
Constants.flagKey: context.flagKey,
89+
Constants.variationKey: decision.variationKey
9090
};
9191
if (context.ruleKey != null) {
92-
request[Constants.requestRuleKey] = context.ruleKey;
92+
request[Constants.ruleKey] = context.ruleKey;
9393
}
9494
return Map<String, dynamic>.from(
9595
await _channel.invokeMethod(Constants.setForcedDecision, request));
@@ -99,19 +99,19 @@ class OptimizelyUserContext {
9999
Future<Map<String, dynamic>> getForcedDecision() async {
100100
return Map<String, dynamic>.from(
101101
await _channel.invokeMethod(Constants.getForcedDecision, {
102-
Constants.requestSDKKey: _sdkKey,
102+
Constants.sdkKey: _sdkKey,
103103
}));
104104
}
105105

106106
/// Removes the forced decision for a given decision context.
107107
Future<Map<String, dynamic>> removeForcedDecision(
108108
OptimizelyDecisionContext context) async {
109109
Map<String, dynamic> request = {
110-
Constants.requestSDKKey: _sdkKey,
111-
Constants.requestFlagKey: context.flagKey,
110+
Constants.sdkKey: _sdkKey,
111+
Constants.flagKey: context.flagKey,
112112
};
113113
if (context.ruleKey != null) {
114-
request[Constants.requestRuleKey] = context.ruleKey;
114+
request[Constants.ruleKey] = context.ruleKey;
115115
}
116116
return Map<String, dynamic>.from(
117117
await _channel.invokeMethod(Constants.removeForcedDecision, request));
@@ -121,7 +121,7 @@ class OptimizelyUserContext {
121121
Future<Map<String, dynamic>> removeAllForcedDecisions() async {
122122
return Map<String, dynamic>.from(
123123
await _channel.invokeMethod(Constants.removeAllForcedDecisions, {
124-
Constants.requestSDKKey: _sdkKey,
124+
Constants.sdkKey: _sdkKey,
125125
}));
126126
}
127127
}

‎lib/src/utils.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@ class Utils {
3030
for (MapEntry e in map.entries) {
3131
if (e.value is String) {
3232
typedMap[e.key] = {
33-
Constants.requestValue: e.value,
34-
Constants.requestType: Constants.stringType
33+
Constants.value: e.value,
34+
Constants.type: Constants.stringType
3535
};
3636
continue;
3737
}
3838
if (e.value is double) {
3939
typedMap[e.key] = {
40-
Constants.requestValue: e.value,
41-
Constants.requestType: Constants.doubleType
40+
Constants.value: e.value,
41+
Constants.type: Constants.doubleType
4242
};
4343
continue;
4444
}
4545
if (e.value is int) {
4646
typedMap[e.key] = {
47-
Constants.requestValue: e.value,
48-
Constants.requestType: Constants.intType
47+
Constants.value: e.value,
48+
Constants.type: Constants.intType
4949
};
5050
continue;
5151
}
5252
if (e.value is bool) {
5353
typedMap[e.key] = {
54-
Constants.requestValue: e.value,
55-
Constants.requestType: Constants.boolType
54+
Constants.value: e.value,
55+
Constants.type: Constants.boolType
5656
};
5757
continue;
5858
}

‎test/optimizely_flutter_sdk_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void main() {
8686
case Constants.getForcedDecision:
8787
return {
8888
Constants.responseSuccess: true,
89-
Constants.responseVariationKey: "123",
89+
Constants.variationKey: "123",
9090
};
9191
case Constants.removeForcedDecision:
9292
return {
@@ -260,7 +260,7 @@ void main() {
260260

261261
expect(result[Constants.responseSuccess], equals(true));
262262
expect(result[Constants.responseResult], isNull);
263-
expect(result[Constants.responseVariationKey], equals("123"));
263+
expect(result[Constants.variationKey], equals("123"));
264264
});
265265
});
266266
group("removeForcedDecision()", () {

‎test/test_utils.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class TestUtils {
2121
static sendTestNotifications(
2222
Function(MethodCall message) handler, int count) {
2323
for (var i = 0; i < count; i++) {
24-
handler(MethodCall(Constants.requestCallBackListener, {
25-
Constants.requestID: i,
26-
Constants.requestPayload: {"payload": i}
24+
handler(MethodCall(Constants.callBackListener, {
25+
Constants.id: i,
26+
Constants.payload: {"payload": i}
2727
}));
2828
}
2929
}

0 commit comments

Comments
 (0)