Implement Observability

Tests/accounts-journey/unit-tests/AccountsJourneyObservabilityTests.swift

@@ -40,27 +40,24 @@ final class AccountsJourneyObservabilityTests: XCTestCase {
 
     func test_accountsScreenEventIsPublished_whenTheAccountsViewLoads() {
         screenViewEventsSpy = TrackerSpy<ScreenViewEvent>()
-        let event = AccountsJourney.Tracker.event(forScreen: .accounts_list)
 
-        expect(screenViewEventsSpy!, toReceive: [event], when: {
+        expect(screenViewEventsSpy!, toReceive: [ScreenViewEvent(.accounts_list)], when: {
             AccountsListViewModel().onEvent(.getAccounts)
         })
     }
 
     func test_refresh_accountsUserActionEvent_isPublished_whenTheRefreshEventIsEmitted() {
         userActionSpy = TrackerSpy<UserActionEvent>()
-        let event = AccountsJourney.Tracker.event(forUserAction: .refresh_accounts)
 
-        expect(userActionSpy!, toReceive: [event], when: {
+        expect(userActionSpy!, toReceive: [UserActionEvent(.refresh_accounts)], when: {
             AccountsListViewModel().onEvent(.refresh)
         })
     }
 
     func test_search_accountsUserActionEvent_isPublished_whenTheSearchEventIsEmitted() {
         userActionSpy = TrackerSpy<UserActionEvent>()
-        let event = AccountsJourney.Tracker.event(forUserAction: .search_accounts)
 
-        expect(userActionSpy!, toReceive: [event], when: {
+        expect(userActionSpy!, toReceive: [UserActionEvent(.search_accounts)], when: {
             AccountsListViewModel().onEvent(.search(""))
         })
     }
@@ -83,8 +80,8 @@ final class AccountsJourneyObservabilityTests: XCTestCase {
 
     func test_accountsDetailsScreenEventIsPublished_whenTheAccountsDetailsViewLoads() {
         screenViewEventsSpy = TrackerSpy<ScreenViewEvent>()
-        let event = AccountsJourney.Tracker.event(forScreen: .account_details)
-        expect(screenViewEventsSpy!, toReceive: [event], when: {
+
+        expect(screenViewEventsSpy!, toReceive: [ScreenViewEvent(.account_details)], when: {
             AccountDetailsViewModel().onEvent(.getAccountDetails(""))
         })
     }

accounts-journey/Extensions/O11YEvents.swift

@@ -0,0 +1,31 @@
+//
+//  O11YEvents.swift
+//  AccountsJourney
+//
+//  Created by George Nyakundi on 07/02/2024.
+//
+
+import Foundation
+import BackbaseObservability
+
+extension ScreenViewEvent {
+    enum ScreenName: String {
+        case accounts_list = "accounts-list"
+        case account_details = "account-details"
+    }
+
+    init(_ screenName: ScreenName, addition: String? = nil) {
+        self.init(name: screenName.rawValue, journey: "accounts-transactions", addition: addition)
+    }
+}
+
+extension UserActionEvent {
+
+    enum EventName: String {
+        case refresh_accounts = "refresh-accounts"
+        case search_accounts = "search-accounts"
+    }
+    convenience init(_ eventName: EventName, attributes: [String : BackbaseObservability.BasicEventData] = [:]) {
+        self.init(name: eventName.rawValue, journey: "accounts-transactions", attributes: attributes)
+    }
+}

accounts-journey/presentation/viewmodel/AccountDetailsViewModel.swift

@@ -23,14 +23,14 @@ final class AccountDetailsViewModel: NSObject {
         return useCase
     }()
 
-    private var observabilityTracker: BackbaseObservability.Tracker? = Resolver.optional()
+    private var tracker: BackbaseObservability.Tracker? = Resolver.optional()
 
     // MARK: - Methods
     func onEvent(_ event: AccountDetailsEvent) {
         switch event {
         case let .getAccountDetails(id):
 
-            observabilityTracker?.publish(event: AccountsJourney.Tracker.event(forScreen: .account_details))
+            tracker?.publish(event: ScreenViewEvent(.account_details))
 
             getAccountDetail(id: id)
         }

accounts-journey/presentation/viewmodel/AccountsListViewModel.swift

@@ -19,7 +19,7 @@ final class AccountsListViewModel: NSObject {
 
     var didSelectProduct: ((String) -> Void)?
 
-    private var observabilityTracker: BackbaseObservability.Tracker? = Resolver.optional()
+    private var tracker: BackbaseObservability.Tracker? = Resolver.optional()
 
     // MARK: - Private
 
@@ -48,11 +48,11 @@ final class AccountsListViewModel: NSObject {
     private func publishObservabilityEvents(for event: AccountListScreenEvent) {
         switch event {
         case .getAccounts:
-            observabilityTracker?.publish(event: AccountsJourney.Tracker.event(forScreen: .accounts_list))
+            tracker?.publish(event: ScreenViewEvent(.accounts_list))
         case .refresh:
-            observabilityTracker?.publish(event: AccountsJourney.Tracker.event(forUserAction: .refresh_accounts))
+            tracker?.publish(event: UserActionEvent(.refresh_accounts))
         case .search:
-            observabilityTracker?.publish(event: AccountsJourney.Tracker.event(forUserAction: .search_accounts))
+            tracker?.publish(event: UserActionEvent(.search_accounts))
         }
     }