Skip to content

Commit e593364

Browse files
fix: remove title from parameter list (#79)
* feat: initial implementation * test: correcting test and trackScreen with LoggableScreen * chore: removing title screen parameter * fix: removing title from parameters
1 parent 7ae7e70 commit e593364

9 files changed

Lines changed: 7 additions & 17 deletions

File tree

Sources/GAnalytics/GAnalytics.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ extension GAnalytics: AnalyticsService {
7373
lhs
7474
}
7575
return newCopy
76-
7776
}
7877

7978
/// Tracks screens adding screen tracking parameters in Firebase package.
@@ -92,8 +91,8 @@ extension GAnalytics: AnalyticsService {
9291
parameters params: [String: Any]) {
9392
var parameters = mergeAdditionalParameters(params)
9493

95-
parameters[AnalyticsParameterScreenClass] = screen.type.description
9694
parameters[AnalyticsParameterScreenName] = screen.name
95+
parameters[AnalyticsParameterScreenClass] = screen.type.description
9796

9897
analytics.logEvent(AnalyticsEventScreenView,
9998
parameters: parameters)

Sources/GDSAnalytics/Screens/ErrorScreenView.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public struct ErrorScreenView<Screen: ScreenType>: ScreenViewProtocol, LoggableE
1111

1212
public var parameters: [String: String] {
1313
[
14-
ScreenParameter.title.rawValue: title,
1514
ScreenParameter.id.rawValue: id,
1615
ScreenParameter.reason.rawValue: reason,
1716
ScreenParameter.endpoint.rawValue: endpoint,
@@ -43,7 +42,6 @@ public struct ErrorScreenView<Screen: ScreenType>: ScreenViewProtocol, LoggableE
4342
titleKey: String,
4443
error: LoggableError,
4544
bundle: Bundle = .main) {
46-
4745
self.id = id
4846
self.screen = screen
4947
title = titleKey.englishString(bundle: bundle).formattedAsParameter

Sources/GDSAnalytics/Screens/ScreenParameter.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ public enum ScreenParameter: String {
33
case endpoint
44
case status
55
case hash
6-
case title
76
case id = "screen_id"
87
}

Sources/GDSAnalytics/Screens/ScreenType.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ extension ScreenType {
1313

1414
extension ScreenType where Self: RawRepresentable,
1515
Self.RawValue == String {
16-
1716
/// Protocol method returning the string value from a Type's `name` property which conforms to this protocol.
1817
public var name: String {
1918
rawValue

Sources/GDSAnalytics/Screens/ScreenView.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public struct ScreenView<Screen: ScreenType>: ScreenViewProtocol {
1515

1616
public var parameters: [String: String] {
1717
[
18-
ScreenParameter.id.rawValue: id,
19-
ScreenParameter.title.rawValue: title
18+
ScreenParameter.id.rawValue: id
2019
].compactMapValues(\.?.formattedAsParameter)
2120
}
2221

Sources/Logging/LoggableEvent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public protocol LoggableEvent {
66
}
77

88
extension LoggableEvent where Self: RawRepresentable,
9-
Self.RawValue == String {
9+
Self.RawValue == String {
1010

1111
/// Protocol method returning the string value from a Type's `name` property which conforms to this protocol.
1212
public var name: String {

Tests/GAnalyticsTests/GAnalyticsTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ extension GAnalyticsTests {
170170
XCTAssertEqual(
171171
analyticsLogger.events,
172172
[.init(name: "screen_view", parameters: [
173-
"screen_class": "WELCOME_SCREEN",
174173
"screen_name": "WELCOME_SCREEN",
174+
"screen_class": "WELCOME_SCREEN",
175175
"additional_parameter": "testing"
176176
])]
177177
)
@@ -188,8 +188,8 @@ extension GAnalyticsTests {
188188
XCTAssertEqual(
189189
analyticsLogger.events,
190190
[.init(name: "screen_view", parameters: [
191-
"screen_class": "WELCOME_SCREEN",
192191
"screen_name": "WELCOME_SCREEN",
192+
"screen_class": "WELCOME_SCREEN",
193193
"additional_parameter": "testing",
194194
"journey": "id_verification"
195195
])]
@@ -208,8 +208,8 @@ extension GAnalyticsTests {
208208
XCTAssertEqual(
209209
analyticsLogger.events,
210210
[.init(name: "screen_view", parameters: [
211-
"screen_class": "WELCOME_SCREEN",
212211
"screen_name": "Welcome to GOV.UK One Login",
212+
"screen_class": "WELCOME_SCREEN",
213213
"additional_parameter": "testing"
214214
])]
215215
)

Tests/GDSAnalyticsTests/Screens/ErrorScreenViewTests.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ final class ErrorScreenViewTests: XCTestCase {
1818
titleKey: "Something went wrong")
1919

2020
XCTAssertEqual(view.parameters, [
21-
"title": "something went wrong",
2221
"screen_id": uuid
2322
])
2423
}
@@ -39,7 +38,6 @@ final class ErrorScreenViewTests: XCTestCase {
3938

4039
XCTAssertEqual(view.title, "something went wrong")
4140
XCTAssertEqual(view.parameters, [
42-
"title": "something went wrong",
4341
"screen_id": uuid,
4442
"hash": "83766358f64858b51afb745bbdde91bb",
4543
"reason": "server",
@@ -60,7 +58,6 @@ final class ErrorScreenViewTests: XCTestCase {
6058
)
6159

6260
XCTAssertEqual(view.parameters, [
63-
"title": "something went wrong",
6461
"screen_id": uuid,
6562
"reason": "network",
6663
"endpoint": "appinfo",

Tests/GDSAnalyticsTests/Screens/ScreenViewTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ final class ScreenViewTests: XCTestCase {
1818
titleKey: "welcome to this app")
1919

2020
XCTAssertEqual(view.parameters, [
21-
"title": "welcome to this app",
2221
"screen_id": uuid
2322
])
2423
}
@@ -30,6 +29,6 @@ final class ScreenViewTests: XCTestCase {
3029

3130
XCTAssertEqual(view.title, "welcome to this app with a really really really really really really really really really really lon")
3231

33-
XCTAssertEqual(view.parameters, [ "title": "welcome to this app with a really really really really really really really really really really lon"])
32+
XCTAssertEqual(view.parameters, [:])
3433
}
3534
}

0 commit comments

Comments
 (0)