[POS-commit] r5336 - in stoqlib/trunk/stoqlib/domain: test

[Johan Dahlin]

Author: jdahlin
Date: Sat Nov 11 16:56:18 2006
New Revision: 5336

Modified:
   stoqlib/trunk/stoqlib/domain/person.py
   stoqlib/trunk/stoqlib/domain/test/test_person.py

Log:
Fix datetime in person test

Modified: stoqlib/trunk/stoqlib/domain/person.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/person.py	(original)
+++ stoqlib/trunk/stoqlib/domain/person.py	Sat Nov 11 16:56:18 2006
@@ -418,11 +418,18 @@
                                orderBy=SaleView.q.open_date)
 
     def get_last_purchase_date(self):
+        """
+        Fetch the date of the last purchased item by this client.
+        None is returned if there are no sales yet made by the client
+
+        @returns: the date of the last purchased item
+        @rtype: datetime.date or None
+        """
         sales = self.get_client_sales()
         if sales:
             # The get_client_sales method already returns a sorted list of
             # sales by open_date column
-            return sales[-1].open_date
+            return sales[-1].open_date.date()
 
 
 Person.registerFacet(PersonAdaptToClient, IClient)

Modified: stoqlib/trunk/stoqlib/domain/test/test_person.py
==============================================================================
--- stoqlib/trunk/stoqlib/domain/test/test_person.py	(original)
+++ stoqlib/trunk/stoqlib/domain/test/test_person.py	Sat Nov 11 16:56:18 2006
@@ -25,7 +25,8 @@
 ##
 """ Test case for stoq/domain/person.py module.  """
 
-from datetime import datetime
+import datetime
+
 from kiwi.datatypes import currency
 from sqlobject.main import SQLObjectMoreThanOneResultError
 
@@ -200,7 +201,7 @@
     def test_facet_ICreditProvider_add(self):
         person = get_person(self.trans)
         short_name = 'Credicard'
-        date = datetime(2006,06,01)
+        date = datetime.date(2006, 06, 01)
         assert self._check_create_facet_fails(person, ICreditProvider,
                                               short_name=short_name,
                                               open_contract_date=date)
@@ -389,7 +390,7 @@
         assert people
         salesperson = people[0]
         count_sales = client.get_client_sales().count()
-        date=datetime(2006,11,11)
+        date = datetime.date(2006, 11, 11)
         new_sale = Sale(coupon_id=123, client=client, cfop=cfop,
                         till=till, salesperson=salesperson,
                         connection=self.trans,
@@ -619,7 +620,7 @@
         return  person.addFacet(ICreditProvider,
                                 connection=self.trans,
                                 short_name='Velec',
-                                open_contract_date=datetime(2006,01,01))
+                                open_contract_date=datetime.date(2006, 01, 01))
 
 
     def test_get_card_providers(self):
@@ -628,7 +629,7 @@
         count = PersonAdaptToCreditProvider.get_card_providers(self.trans).count()
         credit_provider = person.addFacet(ICreditProvider, connection=self.trans,
                                           short_name='Plus',
-                                          open_contract_date=datetime(2006,02,02),
+                                          open_contract_date=datetime.date(2006, 02, 02),
                                           provider_type=0)
         assert credit_provider.get_card_providers(self.trans).count() == count + 1
 
@@ -638,7 +639,7 @@
         count = PersonAdaptToCreditProvider.get_finance_companies(self.trans).count()
         credit_provider = person.addFacet(ICreditProvider, connection=self.trans,
                                           short_name='Cards',
-                                          open_contract_date=datetime(2006,02,02),
+                                          open_contract_date=datetime.date(2006, 02, 02),
                                           provider_type=1)
         assert credit_provider.get_finance_companies(self.trans).count() == count + 1