Skip to content

Commit eb0dd0f

Browse files
JaviCerveraIngramJaviCerveraIngram
committed
Renamed all Scheme classes to Schema, to be consistent with Marshmallow's naming
1 parent 1b26abd commit eb0dd0f

File tree

14 files changed

+96
-96
lines changed

14 files changed

+96
-96
lines changed

‎connect/models/__init__.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
from .activation_response import ActivationTemplateResponse, ActivationTileResponse
2-
from .base import BaseScheme
3-
from .fulfillment import FulfillmentScheme
4-
from .parameters import Param, ParamScheme
5-
from .server_error import ServerErrorScheme
2+
from .base import BaseSchema
3+
from .fulfillment import FulfillmentSchema
4+
from .parameters import Param, ParamSchema
5+
from .server_error import ServerErrorSchema
66

77
__all__ = [
88
'ActivationTemplateResponse',
99
'ActivationTileResponse',
10-
'BaseScheme',
11-
'FulfillmentScheme',
12-
'ServerErrorScheme',
10+
'BaseSchema',
11+
'FulfillmentSchema',
12+
'ServerErrorSchema',
1313
'Param',
14-
'ParamScheme',
14+
'ParamSchema',
1515
]

‎connect/models/asset.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
from marshmallow import fields, post_load
22

3-
from .base import BaseObject, BaseScheme
4-
from .connection import ConnectionScheme
5-
from .parameters import ParamScheme
6-
from .product import ItemScheme, ProductScheme
7-
from .tiers import TiersSchemeMixin
3+
from .base import BaseModel, BaseSchema
4+
from .connection import ConnectionSchema
5+
from .parameters import ParamSchema
6+
from .product import ItemSchema, ProductSchema
7+
from .tiers import TiersSchemaMixin
88

99

10-
class Asset(BaseObject):
10+
class Asset(BaseModel):
1111
pass
1212

1313

14-
class AssetScheme(BaseScheme):
14+
class AssetSchema(BaseSchema):
1515
status = fields.Str()
1616
external_id = fields.Str()
1717
external_uid = fields.UUID()
18-
product = fields.Nested(ProductScheme, only=('id', 'name'))
18+
product = fields.Nested(ProductSchema, only=('id', 'name'))
1919
connection = fields.Nested(
20-
ConnectionScheme, only=('id', 'type', 'provider', 'vendor'),
20+
ConnectionSchema, only=('id', 'type', 'provider', 'vendor'),
2121
)
22-
items = fields.List(fields.Nested(ItemScheme))
23-
params = fields.List(fields.Nested(ParamScheme))
24-
tiers = fields.Nested(TiersSchemeMixin)
22+
items = fields.List(fields.Nested(ItemSchema))
23+
params = fields.List(fields.Nested(ParamSchema))
24+
tiers = fields.Nested(TiersSchemaMixin)
2525

2626
@post_load
2727
def make_object(self, data):

‎connect/models/base.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
from marshmallow import Schema, fields, post_load
22

33

4-
class BaseObject:
4+
class BaseModel:
55
def __init__(self, *args, **kwargs):
66
self.id = kwargs.get('id')
77
if kwargs:
88
for attr, val in kwargs.items():
99
setattr(self, attr, val)
1010

1111

12-
class BaseScheme(Schema):
12+
class BaseSchema(Schema):
1313
id = fields.Str()
1414

1515
@post_load
1616
def make_object(self, data):
17-
return BaseObject(**data)
17+
return BaseModel(**data)

‎connect/models/company.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from marshmallow import fields, post_load
22

3-
from .base import BaseObject, BaseScheme
3+
from .base import BaseModel, BaseSchema
44

55

6-
class Company(BaseObject):
6+
class Company(BaseModel):
77
pass
88

99

10-
class CompanyScheme(BaseScheme):
10+
class CompanySchema(BaseSchema):
1111
name = fields.Str()
1212

1313
@post_load

‎connect/models/connection.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
from marshmallow import fields, post_load
22

3-
from .base import BaseObject, BaseScheme
4-
from .company import CompanyScheme
5-
from .hub import HubScheme
6-
from .product import ProductScheme
3+
from .base import BaseModel, BaseSchema
4+
from .company import CompanySchema
5+
from .hub import HubSchema
6+
from .product import ProductSchema
77

88

9-
class Connection(BaseObject):
9+
class Connection(BaseModel):
1010
pass
1111

1212

13-
class ConnectionScheme(BaseScheme):
13+
class ConnectionSchema(BaseSchema):
1414
type = fields.Str()
15-
provider = fields.Nested(CompanyScheme, only=('id', 'name'))
16-
vendor = fields.Nested(CompanyScheme, only=('id', 'name'))
17-
product = fields.Nested(ProductScheme)
18-
hub = fields.Nested(HubScheme)
15+
provider = fields.Nested(CompanySchema, only=('id', 'name'))
16+
vendor = fields.Nested(CompanySchema, only=('id', 'name'))
17+
product = fields.Nested(ProductSchema)
18+
hub = fields.Nested(HubSchema)
1919

2020
@post_load
2121
def make_object(self, data):

‎connect/models/fulfillment.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
from marshmallow import fields, post_load
22

3-
from .asset import AssetScheme
4-
from .base import BaseObject, BaseScheme
5-
from .marketplace import ContractScheme, MarketplaceScheme
3+
from .asset import AssetSchema
4+
from .base import BaseModel, BaseSchema
5+
from .marketplace import ContractSchema, MarketplaceSchema
66

77

8-
class Fulfillment(BaseObject):
8+
class Fulfillment(BaseModel):
99
pass
1010

1111

12-
class FulfillmentScheme(BaseScheme):
12+
class FulfillmentSchema(BaseSchema):
1313
activation_key = fields.Str()
14-
asset = fields.Nested(AssetScheme)
14+
asset = fields.Nested(AssetSchema)
1515
status = fields.Str()
1616
type = fields.Str()
1717
updated = fields.DateTime()
1818
created = fields.DateTime()
1919
reason = fields.Str()
2020
params_form_url = fields.Str()
21-
contract = fields.Nested(ContractScheme, only=('id', 'name'))
22-
marketplace = fields.Nested(MarketplaceScheme, only=('id', 'name'))
21+
contract = fields.Nested(ContractSchema, only=('id', 'name'))
22+
marketplace = fields.Nested(MarketplaceSchema, only=('id', 'name'))
2323

2424
@post_load
2525
def make_object(self, data):

‎connect/models/hub.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
from marshmallow import Schema, fields, post_load
22

3-
from .base import BaseObject, BaseScheme
3+
from .base import BaseModel, BaseSchema
44

55

6-
class Hub(BaseObject):
6+
class Hub(BaseModel):
77
pass
88

99

10-
class HubScheme(BaseScheme):
10+
class HubSchema(BaseSchema):
1111
name = fields.Str()
1212

1313
@post_load
1414
def make_object(self, data):
1515
return Hub(**data)
1616

1717

18-
class HubsSchemeMixin(Schema):
19-
hub = fields.Nested(HubScheme, only=('id', 'name'))
18+
class HubsSchemaMixin(Schema):
19+
hub = fields.Nested(HubSchema, only=('id', 'name'))
2020
external_id = fields.Str()

‎connect/models/marketplace.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
from marshmallow import fields, post_load
22

3-
from .base import BaseObject, BaseScheme
4-
from .company import CompanyScheme
5-
from .hub import HubsSchemeMixin
3+
from .base import BaseModel, BaseSchema
4+
from .company import CompanySchema
5+
from .hub import HubsSchemaMixin
66

77

8-
class Marketplace(BaseObject):
8+
class Marketplace(BaseModel):
99
pass
1010

1111

12-
class MarketplaceScheme(BaseScheme):
12+
class MarketplaceSchema(BaseSchema):
1313
name = fields.Str()
1414
zone = fields.Str()
1515
description = fields.Str()
1616
active_contract = fields.Int()
1717
icon = fields.Str()
18-
owner = fields.Nested(CompanyScheme, only=('id', 'name'))
19-
hubs = fields.List(fields.Nested(HubsSchemeMixin, only=('id', 'name')))
18+
owner = fields.Nested(CompanySchema, only=('id', 'name'))
19+
hubs = fields.List(fields.Nested(HubsSchemaMixin, only=('id', 'name')))
2020

2121
@post_load
2222
def make_object(self, data):
2323
return Marketplace(**data)
2424

2525

26-
class Agreement(BaseObject):
26+
class Agreement(BaseModel):
2727
pass
2828

2929

30-
class AgreementScheme(BaseScheme):
30+
class AgreementSchema(BaseSchema):
3131
type = fields.Str()
3232
title = fields.Str()
3333
description = fields.Str()
3434
created = fields.DateTime()
3535
updated = fields.DateTime()
36-
owner = fields.Nested(CompanyScheme, only=('id', 'name'))
36+
owner = fields.Nested(CompanySchema, only=('id', 'name'))
3737
stats = fields.Dict()
3838
active = fields.Bool()
3939
version = fields.Int()
@@ -46,25 +46,25 @@ def make_object(self, data):
4646
return Agreement(**data)
4747

4848

49-
class Contract(BaseObject):
49+
class Contract(BaseModel):
5050
pass
5151

5252

53-
class ContractScheme(BaseScheme):
53+
class ContractSchema(BaseSchema):
5454
name = fields.Str()
5555
status = fields.Str()
5656
version = fields.Int()
5757
type = fields.Str()
58-
agreement = fields.Nested(AgreementScheme, only=('id', 'name'))
59-
marketplace = fields.Nested(MarketplaceScheme, only=('id', 'name'))
60-
owner = fields.Nested(CompanyScheme, only=('id', 'name'))
61-
creater = fields.Nested(CompanyScheme, only=('id', 'name'))
58+
agreement = fields.Nested(AgreementSchema, only=('id', 'name'))
59+
marketplace = fields.Nested(MarketplaceSchema, only=('id', 'name'))
60+
owner = fields.Nested(CompanySchema, only=('id', 'name'))
61+
creater = fields.Nested(CompanySchema, only=('id', 'name'))
6262
created = fields.DateTime()
6363
updated = fields.DateTime()
6464
enrolled = fields.Str()
6565
version_created = fields.DateTime()
6666
activation = fields.Dict()
67-
signee = fields.Nested(CompanyScheme, only=('id', 'name'))
67+
signee = fields.Nested(CompanySchema, only=('id', 'name'))
6868

6969
@post_load
7070
def make_object(self, data):

‎connect/models/parameters.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from marshmallow import Schema, fields, post_load
22

3-
from .base import BaseObject, BaseScheme
3+
from .base import BaseModel, BaseSchema
44

55

6-
class ValueChoice(BaseObject):
6+
class ValueChoice(BaseModel):
77
pass
88

99

10-
class ValueChoiceScheme(Schema):
10+
class ValueChoiceSchema(Schema):
1111
value = fields.Str()
1212
label = fields.Str()
1313

@@ -16,15 +16,15 @@ def make_object(self, data):
1616
return ValueChoice(**data)
1717

1818

19-
class Param(BaseObject):
19+
class Param(BaseModel):
2020
pass
2121

2222

23-
class ParamScheme(BaseScheme):
23+
class ParamSchema(BaseSchema):
2424
name = fields.Str()
2525
type = fields.Str()
2626
value = fields.Str()
27-
value_choices = fields.List(fields.Nested(ValueChoiceScheme))
27+
value_choices = fields.List(fields.Nested(ValueChoiceSchema))
2828
value_error = fields.Str()
2929

3030
@post_load

‎connect/models/product.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
from marshmallow import fields, post_load
22

3-
from .base import BaseObject, BaseScheme
3+
from .base import BaseModel, BaseSchema
44

55

6-
class Product(BaseObject):
6+
class Product(BaseModel):
77
pass
88

99

10-
class ProductScheme(BaseScheme):
10+
class ProductSchema(BaseSchema):
1111
name = fields.Str()
1212

1313
@post_load
1414
def make_object(self, data):
1515
return Product(**data)
1616

1717

18-
class Item(BaseObject):
18+
class Item(BaseModel):
1919
pass
2020

2121

22-
class ItemScheme(BaseScheme):
22+
class ItemSchema(BaseSchema):
2323
global_id = fields.Str()
2424
mpn = fields.Str()
2525
old_quantity = fields.Str()

0 commit comments

Comments
 (0)