E2-1605 implement counters SDK (#226)

* added some counters

* add more counters

* bring back verify and add some stopMocking calls

* revert to previous successful build

* dependency in LPRequest

* add sendallcounts test, remove count aggregator from leanplumtest

* dependency in LPInbox

* dependency in LPActionContext

* bring back countaggregator test

Author: gg4race

Example/Tests/Classes/LPCountAggregatorTest.m

@@ -24,8 +24,10 @@
 
 
 #import <XCTest/XCTest.h>
+#import <OCMock/OCMock.h>
 #import "LPCountAggregator.h"
 #import "Constants.h"
+#import "LeanplumRequest.h"
 
 /**
  * Expose private class methods
@@ -128,4 +130,19 @@ - (void)test_makeParams {
     XCTAssert([params[LP_PARAM_COUNT] intValue] == 2);
 }
 
+- (void)test_sendAllCounts {
+    LPCountAggregator *countAggregator = [[LPCountAggregator alloc] init];
+    NSString *testString = @"test";
+    countAggregator.enabledCounters = [NSSet setWithObjects:testString, nil];
+    [countAggregator incrementCount:testString];
+    
+    id leanplumRequestMock = OCMClassMock([LeanplumRequest class]);
+    
+    OCMStub([leanplumRequestMock post:LP_METHOD_LOG params:[OCMArg any]]).andReturn(leanplumRequestMock);
+    
+    [countAggregator sendAllCounts];
+    
+    OCMVerify([leanplumRequestMock sendEventually]);
+}
+
 @end

Example/Tests/Classes/LPRequestSenderTest.m

@@ -87,6 +87,8 @@ - (void)testSendEventually {
     [requestSender sendEventually:request];
 
     OCMVerify([eventDataManagerMock addEvent:[OCMArg isNotNil]]);
+
+    [eventDataManagerMock stopMocking];
 }
 
 - (void)testSendIfConnected {
@@ -99,6 +101,8 @@ - (void)testSendIfConnected {
     [requestSender sendIfConnected:request];
 
     OCMVerify([requestSenderMock sendNow:request]);
+    
+    [requestSenderMock stopMocking];
 }
 
 - (void)testSendIfNotConnected {
@@ -126,6 +130,8 @@ - (void)testSendNowWithData {
     [requestSender sendNow:request withData:data[@"key"] forKey:@"key"];
 
     OCMVerify([requestSenderMock sendNow:request withDatas:data]);
+    
+    [requestSenderMock stopMocking];
 }
 
 - (void)testSendNowWithDatas {
@@ -170,7 +176,10 @@ - (void) testSendRequestsSync {
     OCMVerify([requestSender.engine operationWithPath:[OCMArg any] params:[OCMArg any] httpMethod:[OCMArg any] ssl:[OCMArg any] timeoutSeconds:timeout]);
     OCMVerify([opMock addCompletionHandler:[OCMArg any] errorHandler:[OCMArg any]]);
     OCMVerify([requestSender.engine enqueueOperation:opMock]);
+
+    [requestOperationMock stopMocking];
     [countAggregatorMock stopMocking];
+    [eventDataManagerMock stopMocking];
 }
 
 - (void) testSendRequestsAsync {
@@ -183,5 +192,8 @@ - (void) testSendRequestsAsync {
 
     OCMVerify([requestOperationMock addExecutionBlock:[OCMArg any]]);
     OCMVerify([mockQueue addOperation:requestOperationMock]);
+    
+    [requestOperationMock stopMocking];
+    [mockQueue stopMocking];
 }
 @end

Leanplum-SDK/Classes/Features/Actions/LPActionArg.m

@@ -8,6 +8,7 @@
 #import "LeanplumInternal.h"
 #import "Utils.h"
 #import "LPVarCache.h"
+#import "LPCountAggregator.h"
 
 @interface LPActionArg (PrivateProperties)
 
@@ -35,6 +36,8 @@ + (LPActionArg *)argNamed:(NSString *)name with:(NSObject *)defaultValue kind:(N
                 withDefaultValue:(NSString *) defaultValue];
     }
     LP_END_TRY
+    
+    [[LPCountAggregator sharedAggregator] incrementCount:@"arg_named"];
     return arg;
 }
 

Leanplum-SDK/Classes/Features/Actions/LPActionContext.m

@@ -9,6 +9,7 @@
 #import "LPVarCache.h"
 #import "LPFileManager.h"
 #import "Utils.h"
+#import "LPCountAggregator.h"
 
 typedef void (^LPFileCallback)(NSString* value, NSString *defaultValue);
 
@@ -26,6 +27,13 @@ @interface LPActionContext (PrivateProperties)
 
 @end
 
+@interface LPActionContext()
+
+@property (nonatomic, strong) LPCountAggregator *countAggregator;
+
+@end
+
+
 @implementation LPActionContext
 
 @synthesize name=_name;
@@ -38,6 +46,7 @@ @implementation LPActionContext
 @synthesize key=_key;
 @synthesize preventRealtimeUpdating=_preventRealtimeUpdating;
 @synthesize contextualValues=_contextualValues;
+@synthesize countAggregator=_countAggregator;
 
 + (LPActionContext *)actionContextWithName:(NSString *)name
                                       args:(NSDictionary *)args
@@ -67,6 +76,7 @@ + (LPActionContext *)actionContextWithName:(NSString *)name
     context->_isRooted = YES;
     context->_isPreview = NO;
     context->_priority = priority;
+    context->_countAggregator = [LPCountAggregator sharedAggregator];
     return context;
 }
 
@@ -511,6 +521,8 @@ - (void)runActionNamed:(NSString *)name
         [Leanplum triggerAction:childContext];
     });
     LP_END_TRY
+    
+    [self.countAggregator incrementCount:@"run_action_named"];
 }
 
 - (void)runTrackedActionNamed:(NSString *)name
@@ -524,6 +536,8 @@ - (void)runTrackedActionNamed:(NSString *)name
         [self trackMessageEvent:name withValue:0.0 andInfo:nil andParameters:nil];
     }
     [self runActionNamed:name];
+    
+    [self.countAggregator incrementCount:@"run_tracked_action_named"];
 }
 
 - (void)trackMessageEvent:(NSString *)event withValue:(double)value andInfo:(NSString *)info

Leanplum-SDK/Classes/Features/Actions/LPActionManager.m

@@ -35,6 +35,7 @@
 #import "LPRequestFactory.h"
 #import "LPRequestSender.h"
 #import "LPAPIConfig.h"
+#import "LPCountAggregator.h"
 
 #import <objc/runtime.h>
 #import <objc/message.h>
@@ -270,6 +271,7 @@ @interface LPActionManager()
 @property (nonatomic, strong) LeanplumShouldHandleNotificationBlock shouldHandleNotification;
 @property (nonatomic, strong) NSString *displayedTracked;
 @property (nonatomic, strong) NSDate *displayedTrackedTime;
+@property (nonatomic, strong) LPCountAggregator *countAggregator;
 
 @end
 
@@ -303,6 +305,7 @@ - (id)init
         _sessionOccurrences = [NSMutableDictionary dictionary];
         _messageImpressionOccurrences = [NSMutableDictionary dictionary];
         _messageTriggerOccurrences = [NSMutableDictionary dictionary];
+        _countAggregator = [LPCountAggregator sharedAggregator];
     }
     return self;
 }
@@ -590,6 +593,8 @@ - (void)didReceiveRemoteNotification:(NSDictionary *)userInfo
                           withAction:(NSString *)action
               fetchCompletionHandler:(LeanplumFetchCompletionBlock)completionHandler
 {
+    [self.countAggregator incrementCount:@"did_receive_remote_notification"];
+    
     // If app was inactive, then handle notification because the user tapped it.
     if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateActive) {
         [self handleNotification:userInfo
@@ -1217,6 +1222,8 @@ - (BOOL)matchesLimitTimes:(int)amount
 - (void)recordMessageTrigger:(NSString *)messageId
 {
     [self incrementMessageTriggerOccurrences:messageId];
+    
+    [self.countAggregator incrementCount:@"record_message_trigger"];
 }
 
 /**

Leanplum-SDK/Classes/Features/Actions/LPUIAlert.m

@@ -25,6 +25,7 @@
 
 #import "LPUIAlert.h"
 #import "Constants.h"
+#import "LPCountAggregator.h"
 
 @implementation LPUIAlert
 
@@ -84,6 +85,7 @@ + (void)showWithTitle:(NSString *)title
         [alertView show];
 #endif
     }
+    [[LPCountAggregator sharedAggregator] incrementCount:@"show_With_title"];
 }
 
 @end

Leanplum-SDK/Classes/Features/Events/LPEventCallback.m

@@ -25,6 +25,13 @@
 #import "LPEventCallback.h"
 #import "LeanplumRequest.h"
 #import "LPResponse.h"
+#import "LPCountAggregator.h"
+
+@interface LPEventCallback()
+
+@property (strong, nonatomic) LPCountAggregator *countAggregator;
+
+@end
 
 @implementation LPEventCallback
 
@@ -34,6 +41,7 @@ - (id)initWithResponseBlock:(LPNetworkResponseBlock)responseBlock
     if (self = [super init]) {
         self.responseBlock = [responseBlock copy];
         self.errorBlock = [errorBlock copy];
+        _countAggregator = [LPCountAggregator sharedAggregator];
     }
     return self;
 }
@@ -45,6 +53,8 @@ - (void)invokeResponseWithOperation:(id<LPNetworkOperationProtocol>)operation
         return;
     }
 
+    [self.countAggregator incrementCount:@"invoke_response_with_operation"];
+    
     // Ensure all callbacks are on main thread.
     if (![NSThread isMainThread]) {
         dispatch_async(dispatch_get_main_queue(), ^{

Leanplum-SDK/Classes/Features/Events/LPEventCallbackManager.m

@@ -26,6 +26,7 @@
 #import "LeanplumRequest.h"
 #import "LPEventCallback.h"
 #import "LPResponse.h"
+#import "LPCountAggregator.h"
 
 @implementation LPEventCallbackManager
 
@@ -55,6 +56,7 @@ + (void)addEventCallbackAt:(NSInteger)index
     if (callbackMap && callback && atIndex) {
         callbackMap[atIndex] = callback;
     }
+    [[LPCountAggregator sharedAggregator] incrementCount:@"add_event_callback_at"];
 }
 
 + (void)invokeSuccessCallbacksOnResponses:(id)responses
@@ -90,6 +92,7 @@ + (void)invokeSuccessCallbacksOnResponses:(id)responses
         id response = [LPResponse getResponseAt:index fromDictionary:responses];
         responseBlock(operation, response);
     }];
+    [[LPCountAggregator sharedAggregator] incrementCount:@"invoke_success_callbacks_on_responses"];
 }
 
 + (void)invokeErrorCallbacksOnResponses:(id)responses
@@ -117,6 +120,7 @@ + (void)invokeErrorCallbacksOnResponses:(id)responses
             [callback invokeError:error];
         }
     }
+    [[LPCountAggregator sharedAggregator] incrementCount:@"invoke_error_callbacks_on_responses"];
 }
 
 + (void)invokeErrorCallbacksWithError:(NSError *)error

Leanplum-SDK/Classes/Features/Events/LPEventDataManager.m

@@ -25,6 +25,7 @@
 #import "LPEventDataManager.h"
 #import "LPDatabase.h"
 #import "LPJSON.h"
+#import "LPCountAggregator.h"
 
 @implementation LPEventDataManager
 
@@ -33,6 +34,8 @@ + (void)addEvent:(NSDictionary *)event
     NSString *query = @"INSERT INTO event (data) VALUES (?);";
     NSArray *objectsToBind = @[[LPJSON stringFromJSON:event]];
     [[LPDatabase sharedDatabase] runQuery:query bindObjects:objectsToBind];
+    
+    [[LPCountAggregator sharedAggregator] incrementCount:@"add_event"];
 }
 
 + (void)addEvents:(NSArray *)events
@@ -52,6 +55,8 @@ + (void)addEvents:(NSArray *)events
         [objectsToBind addObject:dataString];
     }];
     [[LPDatabase sharedDatabase] runQuery:query bindObjects:objectsToBind];
+    
+    [[LPCountAggregator sharedAggregator] incrementCount:@"add_events"];
 }
 
 + (NSArray *)eventsWithLimit:(NSInteger)limit
@@ -70,6 +75,8 @@ + (NSArray *)eventsWithLimit:(NSInteger)limit
         [events addObject:[event mutableCopy]];
     }
 
+    [[LPCountAggregator sharedAggregator] incrementCount:@"events_with_limit"];
+    
     return events;
 }
 
@@ -82,6 +89,8 @@ + (void)deleteEventsWithLimit:(NSInteger)limit
                                                   "(SELECT rowid FROM event ORDER BY rowid "
                                                   "LIMIT %ld);", (long)limit];
     [[LPDatabase sharedDatabase] runQuery:query];
+    
+    [[LPCountAggregator sharedAggregator] incrementCount:@"delete_events_with_limit"];
 }
 
 + (NSInteger)count

Leanplum-SDK/Classes/Features/Inbox/LPInbox.m

@@ -34,6 +34,7 @@
 #import "Utils.h"
 #import "LPRequestFactory.h"
 #import "LPRequestSender.h"
+#import "LPCountAggregator.h"
 
 static NSObject *updatingLock;
 
@@ -260,6 +261,7 @@ + (LPInbox *)sharedState {
 - (id)init {
     if (self = [super init]) {
         [self reset];
+        _countAggregator = [LPCountAggregator sharedAggregator];
     }
     return self;
 }
@@ -508,6 +510,9 @@ - (NSArray *)allMessages
         [messages addObject:[self messageForId:messageId]];
     }
     LP_END_TRY
+    
+    [self.countAggregator incrementCount:@"all_messages_inbox"];
+    
     return messages;
 }