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

Jump to bottom

T214 add object attribute #33

Merged
merged 2 commits into from Apr 19, 2018
Merged

T214 add object attribute #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f325e9
Add object attribute where needed
Apr 18, 2018
98386de
Add account and avatar objects
Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions OmiseGO.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -47,6 +47,8 @@
034FA0441FA31C930033B8D1 /* LogoutFixtureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034FA0431FA31C930033B8D1 /* LogoutFixtureTests.swift */; };
0355969920453069000E38DA /* TransactionSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0355969820453069000E38DA /* TransactionSource.swift */; };
0355969B2045315F000E38DA /* TransactionExchange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0355969A2045315F000E38DA /* TransactionExchange.swift */; };
036128A020872E7D00E13514 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361289F20872E7D00E13514 /* Account.swift */; };
036128A22087315D00E13514 /* Avatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 036128A12087315D00E13514 /* Avatar.swift */; };
0365DE832028508900F7B42E /* TransactionRequestParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0365DE822028508900F7B42E /* TransactionRequestParams.swift */; };
0365DE8520285FE700F7B42E /* TransactionRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0365DE8420285FE700F7B42E /* TransactionRequest.swift */; };
0365F4F120565011000DA61A /* Listenable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0365F4F020565011000DA61A /* Listenable.swift */; };
Expand Down Expand Up @@ -173,6 +175,8 @@
034FA0431FA31C930033B8D1 /* LogoutFixtureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoutFixtureTests.swift; sourceTree = "<group>"; };
0355969820453069000E38DA /* TransactionSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionSource.swift; sourceTree = "<group>"; };
0355969A2045315F000E38DA /* TransactionExchange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionExchange.swift; sourceTree = "<group>"; };
0361289F20872E7D00E13514 /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
036128A12087315D00E13514 /* Avatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Avatar.swift; sourceTree = "<group>"; };
0365DE822028508900F7B42E /* TransactionRequestParams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionRequestParams.swift; sourceTree = "<group>"; };
0365DE8420285FE700F7B42E /* TransactionRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionRequest.swift; sourceTree = "<group>"; };
0365F4F020565011000DA61A /* Listenable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Listenable.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -414,6 +418,8 @@
039DA976203FAB0600CCC56A /* TransactionListParams.swift */,
039DA972203FA72800CCC56A /* Transaction.swift */,
039DA978203FB53F00CCC56A /* Pagination.swift */,
0361289F20872E7D00E13514 /* Account.swift */,
036128A12087315D00E13514 /* Avatar.swift */,
);
path = Models;
sourceTree = "<group>";
Expand Down Expand Up @@ -752,6 +758,7 @@
037032AC1FBBE6B100DBCDDD /* Reponse.swift in Sources */,
0377EBAF20564E7A0036A9D6 /* SocketMessage.swift in Sources */,
039DA975203FA94100CCC56A /* PaginationParams.swift in Sources */,
036128A22087315D00E13514 /* Avatar.swift in Sources */,
0365DE832028508900F7B42E /* TransactionRequestParams.swift in Sources */,
037BAA9B205F701F004A3952 /* RequestBuilder.swift in Sources */,
0313D6D820317696003E99BA /* QRScannerView.swift in Sources */,
Expand All @@ -761,6 +768,7 @@
037032AF1FBBE6B100DBCDDD /* Retrievable.swift in Sources */,
0313D6DC20317696003E99BA /* QRScannerViewController.swift in Sources */,
037032B11FBBE6B100DBCDDD /* ClientConfiguration.swift in Sources */,
036128A020872E7D00E13514 /* Account.swift in Sources */,
0355969B2045315F000E38DA /* TransactionExchange.swift in Sources */,
037032B01FBBE6B100DBCDDD /* Listable.swift in Sources */,
03E8E6732060C5320036CC9E /* SocketEvent.swift in Sources */,
Expand Down
44 changes: 40 additions & 4 deletions OmiseGOTests/CodingTests/DecodeTests.swift
View file
Open in desktop
Expand Up @@ -284,6 +284,9 @@ class DecodeTests: XCTestCase {
XCTAssertEqual(decodedData.mintedToken.id, "BTC:861020af-17b6-49ee-a0cb-661a4d2d1f95")
XCTAssertEqual(decodedData.amount, 1337)
XCTAssertEqual(decodedData.address, "3b7f1c68-e3bd-4f8f-9916-4af19be95d00")
let user = decodedData.user!
XCTAssertEqual(user.id, "6f56efa1-caf9-4348-8e0f-f5af283f17ee")
XCTAssertNil(decodedData.account)
XCTAssertEqual(decodedData.correlationId, "31009545-db10-4287-82f4-afb46d9741d8")
XCTAssertEqual(decodedData.status, .valid)
XCTAssertEqual(decodedData.socketTopic, "transaction_request:8eb0160e-1c96-481a-88e1-899399cc84dc")
Expand Down Expand Up @@ -314,10 +317,11 @@ class DecodeTests: XCTestCase {
XCTAssertEqual(mintedToken.subUnitToUnit, 100000)
XCTAssertEqual(decodedData.correlationId, "31009545-db10-4287-82f4-afb46d9741d8")
XCTAssertEqual(decodedData.idempotencyToken, "31009545-db10-4287-82f4-afb46d9741d8")
XCTAssertEqual(decodedData.transactionId, "6ca40f34-6eaa-43e1-b2e1-a94ff3660988")
XCTAssertEqual(decodedData.userId, "6f56efa1-caf9-4348-8e0f-f5af283f17ee")
XCTAssertNil(decodedData.accountId)
XCTAssertEqual(decodedData.transactionRequestId, "907056a4-fc2d-47cb-af19-5e73aade7ece")
let transaction = decodedData.transaction!
XCTAssertEqual(transaction.id, "6ca40f34-6eaa-43e1-b2e1-a94ff366098")
let user = decodedData.user!
XCTAssertEqual(user.id, "6f56efa1-caf9-4348-8e0f-f5af283f17ee")
XCTAssertNil(decodedData.account)
let transactionRequest = decodedData.transactionRequest
XCTAssertEqual(transactionRequest.id, "907056a4-fc2d-47cb-af19-5e73aade7ece")
XCTAssertEqual(decodedData.address, "3b7f1c68-e3bd-4f8f-9916-4af19be95d00")
Expand Down Expand Up @@ -458,4 +462,36 @@ class DecodeTests: XCTestCase {
}
}

func testAccountDecoding() {
do {
let jsonData = try self.jsonData(withFileName: "account")
let decodedData = try self.jsonDecoder.decode(Account.self, from: jsonData)
XCTAssertEqual(decodedData.id, "acc_01CA2P8JQANS5ATY5GJ5ETMJCF")
XCTAssertEqual(decodedData.parentId, "acc_01CA26PKGE49AABZD6K6MSHN0Y")
XCTAssertEqual(decodedData.name, "Account Name")
XCTAssertEqual(decodedData.description, "The account description")
XCTAssertEqual(decodedData.isMaster, false)
let avatar = decodedData.avatar
XCTAssertEqual(avatar.original, "original_url")
XCTAssertEqual(decodedData.metadata.count, 0)
XCTAssertEqual(decodedData.createdAt, "2018-01-01T00:00:00Z".toDate(withFormat: "yyyy-MM-dd'T'HH:mm:ssZ"))
XCTAssertEqual(decodedData.updatedAt, "2018-01-01T10:00:00Z".toDate(withFormat: "yyyy-MM-dd'T'HH:mm:ssZ"))
} catch let thrownError {
XCTFail(thrownError.localizedDescription)
}
}

func testAvatarDecoding() {
do {
let jsonData = try self.jsonData(withFileName: "avatar")
let decodedData = try self.jsonDecoder.decode(Avatar.self, from: jsonData)
XCTAssertEqual(decodedData.original, "original_url")
XCTAssertEqual(decodedData.large, "large_url")
XCTAssertEqual(decodedData.small, "small_url")
XCTAssertEqual(decodedData.thumb, "thumb_url")
} catch let thrownError {
XCTFail(thrownError.localizedDescription)
}
}

}
2 changes: 2 additions & 0 deletions OmiseGOTests/CodingTests/EncodeTests.swift
View file
Open in desktop
Expand Up @@ -243,6 +243,8 @@ class EncodeTests: XCTestCase {
mintedToken: StubGenerator.mintedToken(id: "BTC:5ee328ec-b9e2-46a5-88bb-c8b15ea6b3c1"),
amount: 1337,
address: "3bfe0ff7-f43e-4ac6-bdf9-c4a290c40d0d",
user: StubGenerator.user(),
account: nil,
correlationId: "31009545-db10-4287-82f4-afb46d9741d8",
status: .valid,
socketTopic: "transaction_request:0a8a4a98-794b-419e-b92d-514e83657e75",
Expand Down
51 changes: 46 additions & 5 deletions OmiseGOTests/FixtureTests/Fixtures/fixture/me.approve_transaction_consumption.json
View file
Open in desktop
Expand Up @@ -15,10 +15,42 @@
},
"correlation_id": "31009545-db10-4287-82f4-afb46d9741d8",
"idempotency_token": "31009545-db10-4287-82f4-afb46d9741d8",
"transaction_id": "6ca40f34-6eaa-43e1-b2e1-a94ff3660988",
"user_id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"account_id": null,
"transaction_request_id": "907056a4-fc2d-47cb-af19-5e73aade7ece",
"transaction": {
"object": "transaction",
"id": "6ca40f34-6eaa-43e1-b2e1-a94ff366098",
"from": {
"object": "transaction_source",
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"amount": 1337,
"minted_token": {
"object": "minted_token",
"id": "BTC:861020af-17b6-49ee-a0cb-661a4d2d1f95",
"symbol": "BTC",
"name": "Bitcoin",
"subunit_to_unit": 100000
}
},
"to": {
"object": "transaction_source",
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"amount": 1337,
"minted_token": {
"object": "minted_token",
"id": "BTC:861020af-17b6-49ee-a0cb-661a4d2d1f95",
"symbol": "BTC",
"name": "Bitcoin",
"subunit_to_unit": 100000
}
},
"exchange": {
"object": "exchange",
"rate": 1
},
"metadata": {},
"status": "confirmed",
"created_at": "2018-01-01T00:00:00Z",
"updated_at": "2018-01-01T10:00:00Z"
},
"transaction_request": {
"object": "transaction_request",
"type": "receive",
Expand All @@ -45,8 +77,16 @@
"metadata": {}
},
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"user": {
"object": "user",
"id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"provider_user_id": "a_provider_user_id",
"username": "john.doe@example.com",
"socket_topic": "user:6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"metadata": {}
},
"accountId": null,
"socket_topic": "transaction_consumption:8eb0160e-1c96-481a-88e1-899399cc84dc",
"finalized_at": "2018-01-01T00:00:00Z",
"expiration_date": "2019-01-01T00:00:00Z",
"approved_at": "2018-01-02T00:00:00Z",
"rejected_at": null,
Expand All @@ -56,4 +96,5 @@
"created_at": "2018-01-01T00:00:00Z",
"metadata": {}
}

}
49 changes: 45 additions & 4 deletions OmiseGOTests/FixtureTests/Fixtures/fixture/me.consume_transaction_request.json
View file
Open in desktop
Expand Up @@ -15,10 +15,42 @@
},
"correlation_id": "31009545-db10-4287-82f4-afb46d9741d8",
"idempotency_token": "31009545-db10-4287-82f4-afb46d9741d8",
"transaction_id": "6ca40f34-6eaa-43e1-b2e1-a94ff3660988",
"user_id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"account_id": null,
"transaction_request_id": "907056a4-fc2d-47cb-af19-5e73aade7ece",
"transaction": {
"object": "transaction",
"id": "6ca40f34-6eaa-43e1-b2e1-a94ff366098",
"from": {
"object": "transaction_source",
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"amount": 1337,
"minted_token": {
"object": "minted_token",
"id": "BTC:861020af-17b6-49ee-a0cb-661a4d2d1f95",
"symbol": "BTC",
"name": "Bitcoin",
"subunit_to_unit": 100000
}
},
"to": {
"object": "transaction_source",
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"amount": 1337,
"minted_token": {
"object": "minted_token",
"id": "BTC:861020af-17b6-49ee-a0cb-661a4d2d1f95",
"symbol": "BTC",
"name": "Bitcoin",
"subunit_to_unit": 100000
}
},
"exchange": {
"object": "exchange",
"rate": 1
},
"metadata": {},
"status": "confirmed",
"created_at": "2018-01-01T00:00:00Z",
"updated_at": "2018-01-01T10:00:00Z"
},
"transaction_request": {
"object": "transaction_request",
"type": "receive",
Expand All @@ -45,6 +77,15 @@
"metadata": {}
},
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"user": {
"object": "user",
"id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"provider_user_id": "a_provider_user_id",
"username": "john.doe@example.com",
"socket_topic": "user:6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"metadata": {}
},
"accountId": null,
"socket_topic": "transaction_consumption:8eb0160e-1c96-481a-88e1-899399cc84dc",
"expiration_date": "2019-01-01T00:00:00Z",
"approved_at": null,
Expand Down
10 changes: 10 additions & 0 deletions OmiseGOTests/FixtureTests/Fixtures/fixture/me.create_transaction_request.json
View file
Open in desktop
Expand Up @@ -14,6 +14,15 @@
},
"amount": 1337,
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"user": {
"object": "user",
"id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"provider_user_id": "a_provider_user_id",
"username": "john.doe@example.com",
"socket_topic": "user:6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"metadata": {}
},
"accountId": null,
"correlation_id": "31009545-db10-4287-82f4-afb46d9741d8",
"status": "valid",
"socket_topic": "transaction_request:8eb0160e-1c96-481a-88e1-899399cc84dc",
Expand All @@ -26,4 +35,5 @@
"allow_amount_override": true,
"metadata": {}
}

}
10 changes: 10 additions & 0 deletions OmiseGOTests/FixtureTests/Fixtures/fixture/me.get_transaction_request.json
View file
Open in desktop
Expand Up @@ -14,6 +14,15 @@
},
"amount": 1337,
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"user": {
"object": "user",
"id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"provider_user_id": "a_provider_user_id",
"username": "john.doe@example.com",
"socket_topic": "user:6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"metadata": {}
},
"accountId": null,
"correlation_id": "31009545-db10-4287-82f4-afb46d9741d8",
"status": "valid",
"socket_topic": "transaction_request:8eb0160e-1c96-481a-88e1-899399cc84dc",
Expand All @@ -26,4 +35,5 @@
"allow_amount_override": true,
"metadata": {}
}

}
49 changes: 45 additions & 4 deletions OmiseGOTests/FixtureTests/Fixtures/fixture/me.reject_transaction_consumption.json
View file
Open in desktop
Expand Up @@ -15,10 +15,42 @@
},
"correlation_id": "31009545-db10-4287-82f4-afb46d9741d8",
"idempotency_token": "31009545-db10-4287-82f4-afb46d9741d8",
"transaction_id": "6ca40f34-6eaa-43e1-b2e1-a94ff3660988",
"user_id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"account_id": null,
"transaction_request_id": "907056a4-fc2d-47cb-af19-5e73aade7ece",
"transaction": {
"object": "transaction",
"id": "6ca40f34-6eaa-43e1-b2e1-a94ff366098",
"from": {
"object": "transaction_source",
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"amount": 1337,
"minted_token": {
"object": "minted_token",
"id": "BTC:861020af-17b6-49ee-a0cb-661a4d2d1f95",
"symbol": "BTC",
"name": "Bitcoin",
"subunit_to_unit": 100000
}
},
"to": {
"object": "transaction_source",
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"amount": 1337,
"minted_token": {
"object": "minted_token",
"id": "BTC:861020af-17b6-49ee-a0cb-661a4d2d1f95",
"symbol": "BTC",
"name": "Bitcoin",
"subunit_to_unit": 100000
}
},
"exchange": {
"object": "exchange",
"rate": 1
},
"metadata": {},
"status": "confirmed",
"created_at": "2018-01-01T00:00:00Z",
"updated_at": "2018-01-01T10:00:00Z"
},
"transaction_request": {
"object": "transaction_request",
"type": "receive",
Expand All @@ -45,6 +77,15 @@
"metadata": {}
},
"address": "3b7f1c68-e3bd-4f8f-9916-4af19be95d00",
"user": {
"object": "user",
"id": "6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"provider_user_id": "a_provider_user_id",
"username": "john.doe@example.com",
"socket_topic": "user:6f56efa1-caf9-4348-8e0f-f5af283f17ee",
"metadata": {}
},
"accountId": null,
"socket_topic": "transaction_consumption:8eb0160e-1c96-481a-88e1-899399cc84dc",
"expiration_date": "2019-01-01T00:00:00Z",
"approved_at": null,
Expand Down
17 changes: 17 additions & 0 deletions OmiseGOTests/FixtureTests/Fixtures/objects/account.json
View file
Open in desktop
@@ -0,0 +1,17 @@
{
"object": "account",
"id": "acc_01CA2P8JQANS5ATY5GJ5ETMJCF",
"parent_id": "acc_01CA26PKGE49AABZD6K6MSHN0Y",
"name": "Account Name",
"description": "The account description",
"master": false,
"metadata": {},
"avatar": {
"original": "original_url",
"large": "large_url",
"small": "small_url",
"thumb": "thumb_url"
},
"created_at": "2018-01-01T00:00:00Z",
"updated_at": "2018-01-01T10:00:00Z"
}
6 changes: 6 additions & 0 deletions OmiseGOTests/FixtureTests/Fixtures/objects/avatar.json
View file
Open in desktop
@@ -0,0 +1,6 @@
{
"original": "original_url",
"large": "large_url",
"small": "small_url",
"thumb": "thumb_url"
}