svnno****@sourc*****
svnno****@sourc*****
2008年 3月 6日 (木) 07:21:50 JST
Revision: 831
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=831
Author: shinsuke
Date: 2008-03-06 07:21:49 +0900 (Thu, 06 Mar 2008)
Log Message:
-----------
updated customer service.
Modified Paths:
--------------
pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getAddressBookList_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomerList_Expected.xls
Added Paths:
-----------
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addAddressBook_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addBasket_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addCustomer_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_cleanupBasket_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteAddressBook_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteBasket_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteCustomer_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getBasketList_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomerByPortalId_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomer_Expected.xls
pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getDefaultAddressBook_Expected.xls
-------------- next part --------------
Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
===================================================================
--- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2008-02-29 04:26:52 UTC (rev 830)
+++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2008-03-05 22:21:49 UTC (rev 831)
@@ -30,11 +30,11 @@
private BasketBhv basketBhv;
public List<Customer> getCustomerList() {
- CustomerCB customerCB = new CustomerCB();
- customerCB.query().addOrderBy_LastnameDescription_Asc();
- customerCB.query().addOrderBy_Lastname_Asc();
+ CustomerCB cb = new CustomerCB();
+ cb.query().addOrderBy_LastnameDescription_Asc();
+ cb.query().addOrderBy_Lastname_Asc();
- return getCustomerBhv().selectList(customerCB);
+ return getCustomerBhv().selectList(cb);
}
public void addAddressBook(AddressBook addressBook) {
@@ -246,11 +246,11 @@
getAddressBookBhv().delete(addressBook);
}
- public void deleteBasket(Basket basket) {
- getBasketBhv().delete(basket);
+ // public void deleteBasket(Basket basket) {
+ // getBasketBhv().delete(basket);
+ //
+ // }
- }
-
public void deleteBasket(BigDecimal basketId) {
BasketCB cb = new BasketCB();
cb.query().setBasketId_Equal(basketId);
@@ -282,6 +282,7 @@
customerBhv.delete(customer);
}
+ //TODO test
public AddressBook getAddressBook(BigDecimal addressBookId) {
AddressBookCB cb = new AddressBookCB();
cb.setupSelect_Customer();
@@ -304,8 +305,8 @@
return getAddressBookBhv().selectList(cb);
}
+ //TODO test
public Basket getBasket(BigDecimal customerId, BigDecimal productId) {
- // TODO Auto-generated method stub
BasketCB cb = new BasketCB();
cb.setupSelect_Customer();
cb.setupSelect_Product();
@@ -315,8 +316,10 @@
}
public List<Basket> getBasketList(BigDecimal customerId) {
- // TODO Auto-generated method stub
- return null;
+ BasketCB cb = new BasketCB();
+ cb.setupSelect_Customer();
+ cb.query().setCustomerId_Equal(customerId);
+ return getBasketBhv().selectList(cb);
}
public Customer getCustomer(BigDecimal customersId) {
@@ -345,22 +348,19 @@
cb.setupSelect_Country();
// needed(for tax)
cb.setupSelect_DeliveryZone();
- //TODO needed?
cb.query().setCustomerId_Equal(customerId);
- for (AddressBook ab : getAddressBookBhv().selectList(cb)) {
- if (PompeiDBConstants.TRUE.equals(ab.getDefaultAddress())) {
- return ab;
- }
- }
- return null;
+ cb.query().setDefaultAddress_Equal(PompeiDBConstants.TRUE);
+ return getAddressBookBhv().selectEntity(cb);
}
+ //TODO test
public void updateBasket(Basket basket) {
getBasketBhv().update(basket);
}
+ //TODO test
public void updateCustomer(Customer customer, AddressBook addressBook) {
getCustomerBhv().update(customer);
Modified: pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java
===================================================================
--- pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java 2008-02-29 04:26:52 UTC (rev 830)
+++ pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java 2008-03-05 22:21:49 UTC (rev 831)
@@ -6,8 +6,10 @@
import java.util.List;
import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Basket;
import jp.sf.pal.pompei.exentity.Customer;
import jp.sf.pal.pompei.service.CustomerService;
+import junit.framework.Assert;
import org.junit.runner.RunWith;
import org.seasar.framework.unit.Seasar2;
@@ -24,9 +26,159 @@
assertEquals("1", ctx.getExpected(), customerList);
}
+ public void getCustomer() {
+ Customer customer = customerService.getCustomer(BigDecimal.valueOf(2));
+ assertEquals(ctx.getExpected(), customer);
+ }
+
+ public void getCustomerByPortalId() {
+ Customer customer = customerService.getCustomerByPortalId("testuser2");
+ assertEquals(ctx.getExpected(), customer);
+ }
+
public void getAddressBookList() throws Exception {
List<AddressBook> addressBookList = customerService
.getAddressBookList(BigDecimal.ONE);
assertEquals("1", ctx.getExpected(), addressBookList);
}
+
+ // public void getAddressBook1() {
+ // assertEquals(ctx.getExpected(), customerService.getAddressBook(BigDecimal.valueOf(1)));
+ // }
+ //
+ // public void getAddressBook2() {
+ // assertEquals(ctx.getExpected(), customerService.getAddressBook(BigDecimal.valueOf(2)));
+ // }
+
+ public void getDefaultAddressBook() {
+ AddressBook addressBook = customerService
+ .getDefaultAddressBook(BigDecimal.valueOf(2));
+ assertEquals(ctx.getExpected(), addressBook);
+ }
+
+ public void getBasketList() {
+ assertEquals(ctx.getExpected(), customerService
+ .getBasketList(BigDecimal.valueOf(2)));
+ }
+
+ // public void getBasket1() {
+ // assertEquals(ctx.getExpected(), customerService.getBasketList(BigDecimal.valueOf(2)));
+ // }
+ //
+ // public void getBasket2() {
+ // assertEquals(ctx.getExpected(), customerService.getBasket(BigDecimal.valueOf(2), BigDecimal.valueOf(2)));
+ // }
+
+ public void addBasket() {
+ Basket basket = new Basket();
+ basket.setCustomerId(BigDecimal.valueOf(2));
+ basket.setProductId(BigDecimal.valueOf(2));
+ basket.setQuantity(BigDecimal.valueOf(2));
+ basket.setFinalPrice(BigDecimal.valueOf(2000));
+ basket
+ .setUpdatedDate(java.sql.Timestamp
+ .valueOf("2006-05-04 12:34:00"));
+ customerService.addBasket(basket);
+
+ List<Basket> basketList = customerService.getBasketList(BigDecimal
+ .valueOf(2));
+ assertEquals("1", ctx.getExpected(), basketList);
+ }
+
+ public void addAddressBook() {
+ AddressBook addressBook = new AddressBook();
+ addressBook.setCustomerId(BigDecimal.valueOf(2));
+ addressBook.setCompany("company4");
+ addressBook.setDepartment("department4");
+ addressBook.setFirstname("Firstname2");
+ addressBook.setLastname("Lastname2");
+ addressBook.setFirstnameDescription("firstname2");
+ addressBook.setLastnameDescription("lastname2");
+ addressBook.setStreetAddress("Street4");
+ addressBook.setSuburb("Suburb4");
+ addressBook.setCity("City4");
+ addressBook.setState("state4");
+ addressBook.setPostcode("333-3333");
+ addressBook.setTelephone("333-333-3333");
+ addressBook.setFax("333-333-3333");
+ addressBook.setCellphone("333-3333-3333");
+ addressBook.setDefaultAddress(BigDecimal.valueOf(1));
+ addressBook.setCountryId(BigDecimal.valueOf(1));
+ addressBook.setDeliveryZoneId(BigDecimal.valueOf(1));
+ customerService.addAddressBook(addressBook);
+ assertEquals(ctx.getExpected(), customerService
+ .getAddressBookList(BigDecimal.valueOf(2)));
+ }
+
+ public void addCustomer() {
+ Customer customer = new Customer();
+ AddressBook addressBook = new AddressBook();
+ customer.setPortalId("portalId2");
+ customer.setGender("M");
+ customer.setFirstname("");
+ customer.setLastname("");
+ customer.setFirstnameDescription("");
+ customer.setLastnameDescription("");
+ customer.setNickname("");
+ customer.setDayOfBirth(java.sql.Timestamp
+ .valueOf("1985-04-06 12:34:56"));
+ customer.setEmailAddress("");
+ customer.setCreatedDate(java.sql.Timestamp
+ .valueOf("2007-06-05 12:34:00"));
+ customer.setUpdatedTime(java.sql.Timestamp
+ .valueOf("2007-08-09 12:34:00"));
+ addressBook.setCustomerId(BigDecimal.valueOf(2));
+ addressBook.setCompany("company2");
+ addressBook.setDepartment("department2");
+ addressBook.setFirstname("hoge");
+ addressBook.setLastname("hoge");
+ addressBook.setFirstnameDescription("");
+ addressBook.setLastnameDescription("");
+ addressBook.setStreetAddress("");
+ addressBook.setSuburb("");
+ addressBook.setCity("");
+ addressBook.setState("");
+ addressBook.setPostcode("");
+ addressBook.setTelephone("");
+ addressBook.setFax("");
+ addressBook.setCellphone("");
+ addressBook.setDefaultAddress(BigDecimal.valueOf(1));
+ addressBook.setCountryId(BigDecimal.valueOf(1));
+ addressBook.setDeliveryZoneId(BigDecimal.valueOf(1));
+ customerService.addCustomer(customer, addressBook);
+ assertEquals("1", ctx.getExpected(), customerService.getCustomerList());
+ }
+
+ public void deleteCustomer() {
+ customerService.deleteCustomer(BigDecimal.valueOf(1));
+ assertEquals(ctx.getExpected(), customerService.getCustomerList());
+ }
+
+ public void deleteAddressBook() {
+ AddressBook addressBook = customerService.getAddressBook(BigDecimal
+ .valueOf(2));
+ customerService.deleteAddressBook(addressBook);
+ assertEquals(ctx.getExpected(), customerService
+ .getAddressBookList(BigDecimal.valueOf(2)));
+ }
+
+ // public void deleteBasket1() {
+ // Basket basket = customerService.getBasket(BigDecimal.valueOf(2), BigDecimal.valueOf(1));
+ // customerService.deleteBasket(basket);
+ // assertEquals(ctx.getExpected(), customerService.getBasketList(BigDecimal.valueOf(2)));
+ // }
+
+ public void deleteBasket() {
+ customerService.deleteBasket(BigDecimal.valueOf(2));
+ assertEquals(ctx.getExpected(), customerService
+ .getBasketList(BigDecimal.valueOf(2)));
+ }
+
+ public void cleanupBasket() {
+ customerService.cleanupBasket(BigDecimal.valueOf(2));
+ List<Basket> basketList = customerService.getBasketList(BigDecimal
+ .valueOf(2));
+
+ Assert.assertTrue(basketList.isEmpty());
+ }
}
Modified: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.xls
===================================================================
(Binary files differ)
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addAddressBook_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addAddressBook_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addBasket_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addBasket_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addCustomer_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_addCustomer_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_cleanupBasket_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_cleanupBasket_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteAddressBook_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteAddressBook_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteBasket_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteBasket_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteCustomer_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_deleteCustomer_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getAddressBookList_Expected.xls
===================================================================
(Binary files differ)
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getBasketList_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getBasketList_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomerByPortalId_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomerByPortalId_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomerList_Expected.xls
===================================================================
(Binary files differ)
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomer_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomer_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getDefaultAddressBook_Expected.xls
===================================================================
(Binary files differ)
Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getDefaultAddressBook_Expected.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream