Skip to content
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

feat: add hash code to request query parameter #35

Merged
merged 5 commits into from
Sep 20, 2023
Merged

feat: add hash code to request query parameter #35

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9eca31
feat: remove hash code in event attribute, add hash code in request q…
Sep 18, 2023
28a3a45
feat: change test case
Sep 18, 2023
db05a56
fix: add test case wait time
Sep 18, 2023
3129004
fix: add wait time for test case
Sep 18, 2023
d343ee0
feat: add test case for verify hashCode in requst query parameter
Sep 19, 2023
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
3 changes: 0 additions & 3 deletions Sources/Clickstream/Dependency/Clickstream/Event/ClickstreamEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class ClickstreamEvent: AnalyticsPropertiesModel {

func toJson() -> String {
var event = JsonObject()
event["hashCode"] = ""
event["unique_id"] = uniqueId
event["event_type"] = eventType
event["event_id"] = eventId
Expand Down Expand Up @@ -94,8 +93,6 @@ class ClickstreamEvent: AnalyticsPropertiesModel {
event["app_title"] = systemInfo.appTitle
event["user"] = userAttributes
event["attributes"] = getAttributeObject(from: attributes)
let eventJson = getJsonStringFromObject(jsonObject: event)
event["hashCode"] = eventJson.hashCode()
return getJsonStringFromObject(jsonObject: event)
}

Expand Down
3 changes: 2 additions & 1 deletion Sources/Clickstream/Network/NetRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ enum NetRequest {
URLQueryItem(name: "platform", value: "iOS"),
URLQueryItem(name: "appId", value: configuration.appId),
URLQueryItem(name: "compression", value: compression),
URLQueryItem(name: "event_bundle_sequence_id", value: String(describing: bundleSequenceId))
URLQueryItem(name: "event_bundle_sequence_id", value: String(describing: bundleSequenceId)),
URLQueryItem(name: "hashCode", value: requestData.hashCode())
zhu-xiaowei marked this conversation as resolved.
Show resolved Hide resolved
]

var request = URLRequest(url: urlComponts.url!, timeoutInterval: 15.0)
Expand Down
2 changes: 1 addition & 1 deletion Tests/ClickstreamTests/Clickstream/AnalyticsClientTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class AnalyticsClientTest: XCTestCase {
for i in 0 ..< 501 {
analyticsClient.addGlobalAttribute("value", forKey: "name\(i)")
}
Thread.sleep(forTimeInterval: 0.1)
Thread.sleep(forTimeInterval: 0.2)
XCTAssertEqual(Event.PresetEvent.CLICKSTREAM_ERROR, eventRecorder.lastSavedEvent?.eventType)
XCTAssertEqual(Event.ErrorCode.ATTRIBUTE_SIZE_EXCEED, eventRecorder.lastSavedEvent?.attribute(forKey: Event.ReservedAttribute.ERROR_CODE) as! Int)
let errorValue = eventRecorder.lastSavedEvent?.attribute(forKey: Event.ReservedAttribute.ERROR_MESSAGE) as! String
Expand Down
2 changes: 1 addition & 1 deletion Tests/ClickstreamTests/Clickstream/AutoRecordEventClientTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class AutoRecordEventClientTest: XCTestCase {
window.makeKeyAndVisible()

autoRecordEventClient.updateLastScreenStartTimestamp(Date().millisecondsSince1970 - 1_100)

Thread.sleep(forTimeInterval: 0.02)
window.rootViewController = viewControllerB
window.makeKeyAndVisible()
XCTAssertTrue(viewControllerA.viewDidAppearCalled)
Expand Down
32 changes: 1 addition & 31 deletions Tests/ClickstreamTests/Clickstream/EventRecorderTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class EventRecorderTest: XCTestCase {
func testGetEventWithAllAttribute() throws {
try eventRecorder.save(clickstreamEvent)
let event = try eventRecorder.getBatchEvent().eventsJson.jsonArray()[0]
XCTAssertNotNil(event["hashCode"])
XCTAssertNil(event["hashCode"])
XCTAssertEqual(clickstream.userUniqueId, event["unique_id"] as! String)
XCTAssertEqual("testEvent", event["event_type"] as! String)
XCTAssertNotNil(event["event_id"])
Expand Down Expand Up @@ -412,36 +412,6 @@ class EventRecorderTest: XCTestCase {
activityTracker.callback?(.runningInBackground)
XCTAssertTrue(eventRecorder.queue.operationCount > 0)
}

func testGetEventHashCodeTwice() {
let eventJson = clickstreamEvent.toJson()
let hashCode1 = eventJson.hashCode()
let hashCode2 = eventJson.hashCode()
XCTAssertEqual(hashCode1, hashCode2)
}

func testEventModified() throws {
let originJson = clickstreamEvent.toJson()
let originJsonData = originJson.data(using: .utf8)!
var jsonObject = try JSONSerialization.jsonObject(with: originJsonData, options: []) as! [String: Any]
let originHashCode = jsonObject["hashCode"] as! String
jsonObject["hashCode"] = ""
jsonObject["event_type"] = "testEvent1"
let jsonWithoutHashCode = clickstreamEvent.getJsonStringFromObject(jsonObject: jsonObject)
let computedHashCode = jsonWithoutHashCode.hashCode()
XCTAssertNotEqual(originHashCode, computedHashCode)
}

func testEventNotModified() throws {
let originJson = clickstreamEvent.toJson()
let originJsonData = originJson.data(using: .utf8)!
var jsonObject = try JSONSerialization.jsonObject(with: originJsonData, options: []) as! [String: Any]
let originHashCode = jsonObject["hashCode"] as! String
jsonObject["hashCode"] = ""
let jsonWithoutHashCode = clickstreamEvent.getJsonStringFromObject(jsonObject: jsonObject)
let computedHashCode = jsonWithoutHashCode.hashCode()
XCTAssertEqual(originHashCode, computedHashCode)
}
}

extension String {
Expand Down