From 12293cc073131fad566c42ce3d94a00b023796bf Mon Sep 17 00:00:00 2001 From: Javier San Juan Cervera Date: Fri, 27 Mar 2020 13:04:45 +0100 Subject: [PATCH 1/2] Update schemas.py --- connect/models/schemas.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/connect/models/schemas.py b/connect/models/schemas.py index 3075a90..771b8cc 100644 --- a/connect/models/schemas.py +++ b/connect/models/schemas.py @@ -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 @@ -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() @@ -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 @@ -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): @@ -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() @@ -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) @@ -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 From 7c73efbe99b90fd99124da172fb2a22691c9791b Mon Sep 17 00:00:00 2001 From: Javier San Juan Cervera Date: Fri, 3 Apr 2020 11:58:44 +0200 Subject: [PATCH 2/2] Update CHANGES.md --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 48e1e12..58c4aff 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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.