Fixed missed path validation for update_line_item. Fixed merge conflicts.

Author: RidleyLarsen

dynatademand/api.py

@@ -241,7 +241,11 @@ def update_line_item(self, project_id, line_item_id, line_item_data):
             Updates the specified line item by setting the values of the parameters passed.
             Any parameters not provided will be left unchanged.
         '''
-        # self._validate_object('request_path','update_line_item', {'extProjectId': project_id, 'extLineItemId': line_item_id})
+        # Validate path and request body.
+        self._validate_object('request_path', 'update_line_item', {
+            'extProjectId': '{}'.format(project_id),
+            'extLineItemId': '{}'.format(line_item_id),
+        })
         self._validate_object('request_body', 'update_line_item', line_item_data)
         response_data = self._api_post('/projects/{}/lineItems/{}'.format(project_id, line_item_id), line_item_data)
         if response_data.get('status').get('message') != 'success':

dynatademand/schemas/request/path/update_line_item.json

@@ -2,12 +2,10 @@
   "type": "object",
   "properties": {
     "extProjectId": {
-      "type": "string",
-      "required": true
+      "type": "string"
     },
     "extLineItemId": {
-      "type": "string",
-      "required": true
+      "type": "string"
     }
   },
   "required": [