Added integration tests for timeactivity and created helpers.py

ej2 · ej2 · commit c373ba66c399 · 2016-07-22T11:07:36.000-04:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,6 +9,9 @@ Changelog
     * Fixed issues creating notes with Attachable.
     * Updated default values on Transfer.
     * Fixed issue with default values on Deposit.
+    * Fixed issue with default values on Emloyee.
+    * Fixed issue with default vaules on TimeActivity.
+    * Added date and datetime format helper functions.
 
 * 0.4.0 (June 15, 2016)
     * Added a way of disconnecting a Quickbooks Account to client.
diff --git a/README.rst b/README.rst
@@ -302,6 +302,18 @@ Loading JSON data into a quickbooks object:
    )
    account.save(qb=client)
 
+Date formatting
+----------------
+When setting date or datetime fields, Quickbooks requires a specific format.
+Formating helpers are available in helpers.py. Example usage:
+
+::
+
+   date_string = qb_date_format(date(2016, 7, 22))
+   date_time_string = qb_datetime_format(datetime(2016, 7, 22, 10, 35, 00))
+   date_time_with_utc_string = qb_datetime_utc_offset_format(datetime(2016, 7, 22, 10, 35, 00), '-06:00')
+
+
 **Note:** Objects and object property names match their Quickbooks
 counterparts and do not follow PEP8.
 
diff --git a/quickbooks/helpers.py b/quickbooks/helpers.py
@@ -0,0 +1,27 @@
+
+def qb_date_format(input_date):
+    """
+    Converts date to quickbooks date format
+    :param input_date:
+    :return:
+    """
+    return input_date.strftime("%Y-%m-%d")
+
+
+def qb_datetime_format(input_date):
+    """
+    Converts datetime to quickbooks datetime format
+    :param input_date:
+    :return:
+    """
+    return input_date.strftime("%Y-%m-%dT%H:%M:%S")
+
+
+def qb_datetime_utc_offset_format(input_date, utc_offset):
+    """
+    Converts datetime to quickbooks datetime format including UTC offset
+    :param input_date:
+    :param utc_offset: Formatted +/-HH:MM example: -08:00
+    :return:
+    """
+    return "{}{}".format(qb_datetime_format(input_date), utc_offset)
diff --git a/quickbooks/objects/timeactivity.py b/quickbooks/objects/timeactivity.py
@@ -21,19 +21,18 @@ class TimeActivity(QuickbooksManagedObject, QuickbooksTransactionEntity, LinkedT
 
     def __init__(self):
         super(TimeActivity, self).__init__()
-        self.NameOf = ""
-        self.TimeZone = ""
-        self.TxnDate = ""
-        self.BillableStatus = ""
+        self.NameOf = ""  # required
+        self.TxnDate = None
+        self.BillableStatus = None
         self.Taxable = False
-        self.HourlyRate = 0
-        self.Hours = 0
-        self.Minutes = 0
-        self.BreakHours = 0
-        self.BreakMinutes = 0
-        self.StartTime = ""
-        self.EndTime = ""
-        self.Description = ""
+        self.HourlyRate = None
+        self.Hours = None
+        self.Minutes = None
+        self.BreakHours = None
+        self.BreakMinutes = None
+        self.StartTime = None
+        self.EndTime = None
+        self.Description = None
 
         self.VendorRef = None
         self.CustomerRef = None
diff --git a/tests/integration/test_timeactivity.py b/tests/integration/test_timeactivity.py
@@ -0,0 +1,52 @@
+import os
+import unittest
+from datetime import datetime
+
+from quickbooks.client import QuickBooks
+from quickbooks.helpers import qb_datetime_utc_offset_format
+from quickbooks.objects.employee import Employee
+from quickbooks.objects.timeactivity import TimeActivity
+
+
+class TimeActivityTest(unittest.TestCase):
+    def setUp(self):
+        self.qb_client = QuickBooks(
+            sandbox=True,
+            consumer_key=os.environ.get('CONSUMER_KEY'),
+            consumer_secret=os.environ.get('CONSUMER_SECRET'),
+            access_token=os.environ.get('ACCESS_TOKEN'),
+            access_token_secret=os.environ.get('ACCESS_TOKEN_SECRET'),
+            company_id=os.environ.get('COMPANY_ID')
+        )
+
+        self.name = "Test {0}".format(datetime.now().strftime('%d%H%M'))
+
+    def test_create(self):
+        employee = Employee.all(max_results=1, qb=self.qb_client)[0]
+
+        time_activity = TimeActivity()
+        time_activity.NameOf = "Employee"
+
+        time_activity.EmployeeRef = employee.to_ref()
+        time_activity.Description = "Test description"
+        time_activity.StartTime = qb_datetime_utc_offset_format(datetime(2016, 7, 22, 10, 0),'-07:00')
+        time_activity.EndTime = qb_datetime_utc_offset_format(datetime(2016, 7, 22, 11, 0), '-07:00')
+        time_activity.save(qb=self.qb_client)
+
+        query_time_activity = TimeActivity.get(time_activity.Id, qb=self.qb_client)
+
+        self.assertEquals(query_time_activity.Id, time_activity.Id)
+        self.assertEquals(query_time_activity.NameOf, "Employee")
+        self.assertEquals(query_time_activity.Description, "Test description")
+        self.assertEquals(query_time_activity.EmployeeRef.value, employee.Id)
+        self.assertEquals(query_time_activity.StartTime, '2016-07-22T10:00:00-07:00')
+        self.assertEquals(query_time_activity.EndTime, '2016-07-22T11:00:00-07:00')
+
+    def test_update(self):
+        time_activity = TimeActivity.all(max_results=1, qb=self.qb_client)[0]
+        time_activity.Description = "Updated test description"
+        time_activity.save(qb=self.qb_client)
+
+        query_time_activity = TimeActivity.get(time_activity.Id, qb=self.qb_client)
+
+        self.assertEquals(query_time_activity.Description, "Updated test description")
diff --git a/tests/unit/test_helpers.py b/tests/unit/test_helpers.py
@@ -0,0 +1,17 @@
+import unittest
+from quickbooks.helpers import qb_date_format, qb_datetime_format, qb_datetime_utc_offset_format
+from datetime import datetime, date
+
+
+class HelpersTests(unittest.TestCase):
+    def test_qb_date_format(self):
+        result = qb_date_format(date(2016, 7, 22))
+        self.assertEquals(result, '2016-07-22')
+
+    def test_qb_datetime_format(self):
+        result = qb_datetime_format(datetime(2016, 7, 22, 10, 35, 00))
+        self.assertEquals(result, '2016-07-22T10:35:00')
+
+    def test_qb_datetime_utc_offset_format(self):
+        result = qb_datetime_utc_offset_format(datetime(2016, 7, 22, 10, 35, 00), '-06:00')
+        self.assertEquals(result, '2016-07-22T10:35:00-06:00')
