Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions connect/models/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# This file is part of the Ingram Micro Cloud Blue Connect SDK.
# Copyright (c) 2019 Ingram Micro. All Rights Reserved.

import datetime

from .base import BaseModel
from .company import Company
from .hub import Hub
Expand Down Expand Up @@ -33,3 +35,11 @@ class Connection(BaseModel):

hub = None # type: Hub
""" (:py:class:`.Hub`) Hub Reference. """

# Undocumented fields (they appear in PHP SDK)

status = None # type: str
""" (str) Status. """

created_at = None # type: datetime.datetime
""" (datetime.datetime) Creation date. """
15 changes: 3 additions & 12 deletions connect/models/conversation.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,6 @@ def add_message(self, message, config=None):

from connect.resources.base import ApiClient

if self._is_different_to_last_message(message):
response, _ = ApiClient(config, base_path='conversations/' + self.id + '/messages')\
.post(json={'text': message})
return ConversationMessage.deserialize(response)
else:
return None

def _is_different_to_last_message(self, msg):
if len(self.messages) > 0 and self.messages[-1].text == msg:
return False
else:
return True
response, _ = ApiClient(config, base_path='conversations/' + self.id + '/messages')\
.post(json={'text': message})
return ConversationMessage.deserialize(response)
5 changes: 5 additions & 0 deletions connect/models/product.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ class Product(BaseModel):
stats = None # type: Optional[ProductStats]
""" (:py:class:``.ProductStats) Statistics of product use, depends on account of callee. """

# Undocumented fields (they appear in PHP SDK)

status = None # type: str
""" (str) Product status. """

def get_templates(self, config=None):
"""
:param Config config: Configuration to use, or None for environment config.
Expand Down
3 changes: 3 additions & 0 deletions connect/models/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ class ProductSchema(BaseSchema):
owner = fields.Nested(CompanySchema)
latest = fields.Bool()
stats = fields.Nested(ProductStatsSchema)
status = fields.Str()

@post_load
def make_object(self, data):
Expand Down Expand Up @@ -531,6 +532,8 @@ class ConnectionSchema(BaseSchema):
vendor = fields.Nested(CompanySchema, only=('id', 'name'))
product = fields.Nested(ProductSchema)
hub = fields.Nested(HubSchema)
status = fields.Str()
created_at = fields.DateTime()

@post_load
def make_object(self, data):
Expand Down
2 changes: 1 addition & 1 deletion connect/models/tier_config_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TierConfigRequest(BaseModel):
""" (str) TCR environment (test, prod or preview) """

assignee = None # type: Optional[User]
""" (:py:class:`.User` | None) TCR environment. One of: test, prod, preview. """
""" (:py:class:`.User` | None) User assigned to this TCR. """

template = None # type: Optional[Template]
""" (:py:class:`.Template` | None) Template Object. This is filled only if TCR is approved. """
Expand Down
2 changes: 1 addition & 1 deletion connect/resources/usage_automation.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def _create_spreadsheet(usage_records):
book = openpyxl.Workbook()
sheet = book.active
sheet.title = 'usage_records'
sheet['A1'] = 'usage_record_id'
sheet['A1'] = 'record_id'
sheet['B1'] = 'item_search_criteria'
sheet['C1'] = 'item_search_value'
sheet['D1'] = 'quantity'
Expand Down