Skip to content

CPS-77 Parse all fields #92

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

Merged
marcserrat merged 2 commits into from
Apr 3, 2020
Merged

CPS-77 Parse all fields #92

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
12293cc
Update schemas.py
JaviCerveraIngram Mar 27, 2020
7c73efb
Update CHANGES.md
JaviCerveraIngram Apr 3, 2020
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
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Connect SDK Changes History

## v18.2

* Fix: Accept rql.Query in resources list method.
* Fix: Bug causing some schemas not parsing all the fields.

## v18.1

* Feature: Allow masking of specified log fields.
Expand Down
32 changes: 15 additions & 17 deletions connect/models/schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def _deserialize(self, value, attr, obj, **kwargs):


class ExtIdHubSchema(BaseSchema):
hub = fields.Nested(HubSchema, only=('id', 'name'))
hub = fields.Nested(HubSchema)
external_id = ExternalIdField()

@post_load
Expand Down Expand Up @@ -262,7 +262,7 @@ class MarketplaceSchema(BaseSchema):
description = fields.Str()
active_contracts = fields.Int()
icon = fields.Str()
owner = fields.Nested(CompanySchema, only=('id', 'name'))
owner = fields.Nested(CompanySchema)
hubs = fields.Nested(ExtIdHubSchema, many=True)
zone = fields.Str()

Expand Down Expand Up @@ -341,8 +341,8 @@ class AgreementSchema(BaseSchema):
version_created = fields.DateTime()
version_contracts = fields.Int()
agreements = fields.Nested('AgreementSchema', many=True)
parent = fields.Nested('AgreementSchema', only=('id', 'name'))
marketplace = fields.Nested(MarketplaceSchema, only=('id', 'name'))
parent = fields.Nested('AgreementSchema')
marketplace = fields.Nested(MarketplaceSchema)
name = fields.Str()

@post_load
Expand All @@ -356,16 +356,16 @@ class ContractSchema(BaseSchema):
version = fields.Int()
type = fields.Str()
status = fields.Str()
agreement = fields.Nested(AgreementSchema, only=('id', 'name'))
marketplace = fields.Nested(MarketplaceSchema, only=('id', 'name'))
owner = fields.Nested(CompanySchema, only=('id', 'name'))
creator = fields.Nested(UserSchema, only=('id', 'name'))
agreement = fields.Nested(AgreementSchema)
marketplace = fields.Nested(MarketplaceSchema)
owner = fields.Nested(CompanySchema)
creator = fields.Nested(UserSchema)
created = fields.DateTime()
updated = fields.DateTime()
enrolled = fields.DateTime()
version_created = fields.DateTime()
activation = fields.Nested(ActivationSchema)
signee = fields.Nested(UserSchema, only=('id', 'name'))
signee = fields.Nested(UserSchema)

@post_load
def make_object(self, data):
Expand Down Expand Up @@ -528,8 +528,8 @@ def make_object(self, data):

class ConnectionSchema(BaseSchema):
type = fields.Str()
provider = fields.Nested(CompanySchema, only=('id', 'name'))
vendor = fields.Nested(CompanySchema, only=('id', 'name'))
provider = fields.Nested(CompanySchema)
vendor = fields.Nested(CompanySchema)
product = fields.Nested(ProductSchema)
hub = fields.Nested(HubSchema)
status = fields.Str()
Expand All @@ -547,10 +547,8 @@ class AssetSchema(BaseSchema):
events = fields.Nested(EventsSchema)
external_uid = fields.Str()
external_name = fields.Str()
product = fields.Nested(ProductSchema, only=('id', 'name'))
connection = fields.Nested(
ConnectionSchema, only=('id', 'type', 'provider', 'vendor')
)
product = fields.Nested(ProductSchema)
connection = fields.Nested(ConnectionSchema)
contract = fields.Nested(ContractSchema)
marketplace = fields.Nested(MarketplaceSchema)
params = fields.Nested(ParamSchema, many=True)
Expand Down Expand Up @@ -583,8 +581,8 @@ class FulfillmentSchema(BaseSchema):
reason = fields.Str()
note = fields.Str()
asset = fields.Nested(AssetSchema)
contract = fields.Nested(ContractSchema, only=('id', 'name'))
marketplace = fields.Nested(MarketplaceSchema, only=('id', 'name'))
contract = fields.Nested(ContractSchema)
marketplace = fields.Nested(MarketplaceSchema)
assignee = AssigneeField()

@post_load
Expand Down