Merge pull request #27 from opsgenie/fix-alert-responders

mhamzak008 · web-flow · commit 74dd84c26e51 · 2019-11-06T10:16:02.000+03:00
Fix alert &amp; incident responders
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 2.0.0
-- Package version: 2.0.1
+- Package version: 2.0.2
 - Build package: com.atlassian.opsgenie.codegen.geniepy.GeniepyGenerator
 
 For more information, please visit [https://www.opsgenie.com/contact-us](https://www.opsgenie.com/contact-us)
diff --git a/docs/Alert.md b/docs/Alert.md
@@ -20,7 +20,7 @@ Name | Type | Description | Notes
 **source** | **str** |  | [optional] 
 **owner** | **str** |  | [optional] 
 **priority** | **str** |  | [optional] 
-**responders** | [**list[Recipient]**](Recipient.md) |  | [optional] 
+**responders** | [**list[Responder]**](Responder.md) |  | [optional] 
 **integration** | [**AlertIntegration**](AlertIntegration.md) |  | [optional] 
 **report** | [**AlertReport**](AlertReport.md) |  | [optional] 
 **actions** | **list[str]** |  | [optional] 
diff --git a/docs/BaseAlert.md b/docs/BaseAlert.md
@@ -20,7 +20,7 @@ Name | Type | Description | Notes
 **source** | **str** |  | [optional] 
 **owner** | **str** |  | [optional] 
 **priority** | **str** |  | [optional] 
-**responders** | [**list[Recipient]**](Recipient.md) |  | [optional] 
+**responders** | [**list[Responder]**](Responder.md) |  | [optional] 
 **integration** | [**AlertIntegration**](AlertIntegration.md) |  | [optional] 
 **report** | [**AlertReport**](AlertReport.md) |  | [optional] 
 
diff --git a/docs/BaseIncident.md b/docs/BaseIncident.md
@@ -14,7 +14,7 @@ Name | Type | Description | Notes
 **source** | **str** |  | [optional] 
 **owner** | **str** |  | [optional] 
 **priority** | **str** |  | [optional] 
-**responders** | [**list[Recipient]**](Recipient.md) |  | [optional] 
+**responders** | [**list[Responder]**](Responder.md) |  | [optional] 
 **team_id** | **str** |  | [optional] 
 **details** | **dict(str, str)** | Map of key-value pairs to use as custom properties of the incident | [optional] 
 
diff --git a/docs/Incident.md b/docs/Incident.md
@@ -14,7 +14,7 @@ Name | Type | Description | Notes
 **source** | **str** |  | [optional] 
 **owner** | **str** |  | [optional] 
 **priority** | **str** |  | [optional] 
-**responders** | [**list[Recipient]**](Recipient.md) |  | [optional] 
+**responders** | [**list[Responder]**](Responder.md) |  | [optional] 
 **team_id** | **str** |  | [optional] 
 **details** | **dict(str, str)** | Map of key-value pairs to use as custom properties of the incident | [optional] 
 **request_id** | **str** |  | [optional] 
diff --git a/docs/TeamResponder.md b/docs/TeamResponder.md
@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**type** | **str** |  | 
+**id** | **str** |  | 
 **name** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/UserResponder.md b/docs/UserResponder.md
@@ -3,7 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** |  | [optional] 
+**type** | **str** |  | 
+**id** | **str** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/opsgenie-oas.json b/opsgenie-oas.json
@@ -4518,7 +4518,6 @@
     "Responder": {
       "x-opsgenie-domain": "common",
       "type": "object",
-      "discriminator": "type",
       "required": [
         "type",
         "id"
@@ -4538,7 +4537,6 @@
     },
     "UserResponder": {
       "x-opsgenie-domain": "common",
-      "x-discriminator-value": "user",
       "description": "User responder",
       "allOf": [
         {
@@ -4556,7 +4554,6 @@
     },
     "TeamResponder": {
       "x-opsgenie-domain": "common",
-      "x-discriminator-value": "team",
       "description": "Team responder",
       "allOf": [
         {
@@ -5294,7 +5291,7 @@
         "responders": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Recipient"
+            "$ref": "#/definitions/Responder"
           }
         },
         "integration": {
@@ -6127,7 +6124,7 @@
         "responders": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Recipient"
+            "$ref": "#/definitions/Responder"
           }
         },
         "teamId": {
diff --git a/opsgenie-oas.yml b/opsgenie-oas.yml
@@ -9105,7 +9105,7 @@ components:
         responders:
           type: array
           items:
-            $ref: '#/components/schemas/Recipient'
+            $ref: '#/components/schemas/Responder'
         integration:
           $ref: '#/components/schemas/AlertIntegration'
         report:
@@ -9217,8 +9217,6 @@ components:
           - team
         id:
           type: string
-      discriminator:
-        propertyName: type
       x-opsgenie-domain: common
     AssignAlertPayload:
       allOf:
@@ -9239,7 +9237,6 @@ components:
           id:
             type: string
       x-opsgenie-domain: common
-      x-discriminator-value: user
     AddTagsToAlertPayload:
       allOf:
       - $ref: '#/components/schemas/AlertActionPayload'
@@ -9315,7 +9312,7 @@ components:
         responders:
           type: array
           items:
-            $ref: '#/components/schemas/Recipient'
+            $ref: '#/components/schemas/Responder'
         teamId:
           type: string
         details:
@@ -9337,7 +9334,6 @@ components:
           name:
             type: string
       x-opsgenie-domain: common
-      x-discriminator-value: team
     WeekdayTimeRestrictionInterval:
       description: Weekday time restriction interval
       allOf:
diff --git a/opsgenie_sdk/__init__.py b/opsgenie_sdk/__init__.py
@@ -168,7 +168,7 @@
 from opsgenie_sdk.models.weekday_time_restriction_interval import WeekdayTimeRestrictionInterval
 from opsgenie_sdk.models.weekday_time_restriction_interval_all_of import WeekdayTimeRestrictionIntervalAllOf
 
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 
 # import apis into sdk package
 
diff --git a/opsgenie_sdk/api/alert/alert.py b/opsgenie_sdk/api/alert/alert.py
@@ -49,7 +49,7 @@ class Alert(object):
         'source': 'str',
         'owner': 'str',
         'priority': 'str',
-        'responders': 'list[Recipient]',
+        'responders': 'list[Responder]',
         'integration': 'AlertIntegration',
         'report': 'AlertReport',
         'actions': 'list[str]',
@@ -527,7 +527,7 @@ def responders(self):
 
 
         :return: The responders of this Alert.  # noqa: E501
-        :rtype: list[Recipient]
+        :rtype: list[Responder]
         """
         return self._responders
 
@@ -537,7 +537,7 @@ def responders(self, responders):
 
 
         :param responders: The responders of this Alert.  # noqa: E501
-        :type: list[Recipient]
+        :type: list[Responder]
         """
 
         self._responders = responders
diff --git a/opsgenie_sdk/api/alert/base_alert.py b/opsgenie_sdk/api/alert/base_alert.py
@@ -49,7 +49,7 @@ class BaseAlert(object):
         'source': 'str',
         'owner': 'str',
         'priority': 'str',
-        'responders': 'list[Recipient]',
+        'responders': 'list[Responder]',
         'integration': 'AlertIntegration',
         'report': 'AlertReport'
     }
@@ -507,7 +507,7 @@ def responders(self):
 
 
         :return: The responders of this BaseAlert.  # noqa: E501
-        :rtype: list[Recipient]
+        :rtype: list[Responder]
         """
         return self._responders
 
@@ -517,7 +517,7 @@ def responders(self, responders):
 
 
         :param responders: The responders of this BaseAlert.  # noqa: E501
-        :type: list[Recipient]
+        :type: list[Responder]
         """
 
         self._responders = responders
diff --git a/opsgenie_sdk/api/incident/base_incident.py b/opsgenie_sdk/api/incident/base_incident.py
@@ -43,7 +43,7 @@ class BaseIncident(object):
         'source': 'str',
         'owner': 'str',
         'priority': 'str',
-        'responders': 'list[Recipient]',
+        'responders': 'list[Responder]',
         'team_id': 'str',
         'details': 'dict(str, str)'
     }
@@ -351,7 +351,7 @@ def responders(self):
 
 
         :return: The responders of this BaseIncident.  # noqa: E501
-        :rtype: list[Recipient]
+        :rtype: list[Responder]
         """
         return self._responders
 
@@ -361,7 +361,7 @@ def responders(self, responders):
 
 
         :param responders: The responders of this BaseIncident.  # noqa: E501
-        :type: list[Recipient]
+        :type: list[Responder]
         """
 
         self._responders = responders
diff --git a/opsgenie_sdk/api/incident/incident.py b/opsgenie_sdk/api/incident/incident.py
@@ -43,7 +43,7 @@ class Incident(object):
         'source': 'str',
         'owner': 'str',
         'priority': 'str',
-        'responders': 'list[Recipient]',
+        'responders': 'list[Responder]',
         'team_id': 'str',
         'details': 'dict(str, str)',
         'request_id': 'str'
@@ -356,7 +356,7 @@ def responders(self):
 
 
         :return: The responders of this Incident.  # noqa: E501
-        :rtype: list[Recipient]
+        :rtype: list[Responder]
         """
         return self._responders
 
@@ -366,7 +366,7 @@ def responders(self, responders):
 
 
         :param responders: The responders of this Incident.  # noqa: E501
-        :type: list[Recipient]
+        :type: list[Responder]
         """
 
         self._responders = responders
diff --git a/opsgenie_sdk/api_client.py b/opsgenie_sdk/api_client.py
@@ -91,7 +91,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'opsgenie-sdk-python-2.0.1'
+        self.user_agent = 'opsgenie-sdk-python-2.0.2'
 
         # init metric publishers
         self.http_metric_publisher = self.rest_client.http_metric
diff --git a/opsgenie_sdk/configuration.py b/opsgenie_sdk/configuration.py
@@ -254,7 +254,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2.0.0\n"\
-               "SDK Package Version: 2.0.1".\
+               "SDK Package Version: 2.0.2".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):
diff --git a/opsgenie_sdk/models/responder.py b/opsgenie_sdk/models/responder.py
@@ -41,17 +41,12 @@ class Responder(object):
         'id': 'id'
     }
 
-    discriminator_value_class_map = {
-        'user': 'UserResponder',
-        'team': 'TeamResponder'
-    }
-
     def __init__(self, type=None, id=None):  # noqa: E501
         """Responder - a model defined in OpenAPI"""  # noqa: E501
 
         self._type = None
         self._id = None
-        self.discriminator = 'type'
+        self.discriminator = None
 
         self.type = type
         self.id = id
@@ -108,12 +103,6 @@ def id(self, id):
 
         self._id = id
 
-    def get_real_child_model(self, data):
-        """Returns the real base class specified by the discriminator"""
-        discriminator_key = self.attribute_map[self.discriminator]
-        discriminator_value = data[discriminator_key]
-        return self.discriminator_value_class_map.get(discriminator_value)
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/opsgenie_sdk/models/team_responder.py b/opsgenie_sdk/models/team_responder.py
@@ -32,22 +32,82 @@ class TeamResponder(object):
                             and the value is json key in definition.
     """
     openapi_types = {
+        'type': 'str',
+        'id': 'str',
         'name': 'str'
     }
 
     attribute_map = {
+        'type': 'type',
+        'id': 'id',
         'name': 'name'
     }
 
-    def __init__(self, name=None):  # noqa: E501
+    def __init__(self, type=None, id=None, name=None):  # noqa: E501
         """TeamResponder - a model defined in OpenAPI"""  # noqa: E501
 
+        self._type = None
+        self._id = None
         self._name = None
         self.discriminator = None
 
+        self.type = type
+        self.id = id
         if name is not None:
             self.name = name
 
+    @property
+    def type(self):
+        """Gets the type of this TeamResponder.  # noqa: E501
+
+
+        :return: The type of this TeamResponder.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this TeamResponder.
+
+
+        :param type: The type of this TeamResponder.  # noqa: E501
+        :type: str
+        """
+        if type is None:
+            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
+        allowed_values = ["user", "team"]  # noqa: E501
+        if type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
+
+        self._type = type
+
+    @property
+    def id(self):
+        """Gets the id of this TeamResponder.  # noqa: E501
+
+
+        :return: The id of this TeamResponder.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this TeamResponder.
+
+
+        :param id: The id of this TeamResponder.  # noqa: E501
+        :type: str
+        """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
     @property
     def name(self):
         """Gets the name of this TeamResponder.  # noqa: E501
diff --git a/opsgenie_sdk/models/user_responder.py b/opsgenie_sdk/models/user_responder.py
diff --git a/scripts/sdk/config.json b/scripts/sdk/config.json
diff --git a/setup.py b/setup.py
