[jboss-cvs] JBossAS SVN: r100448 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-02-04 21:12:22 -0500 (Thu, 04 Feb 2010)
New Revision: 100448

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Invoice.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
Log:
fix invoice generation code.

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Invoice.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Invoice.java	2010-02-05 00:35:43 UTC (rev 100447)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Invoice.java	2010-02-05 02:12:22 UTC (rev 100448)
@@ -1,6 +1,7 @@
 package org.jboss.snowdrop.samples.sportsclub.domain.entity;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import java.math.BigDecimal;
@@ -13,8 +14,8 @@
 public class Invoice
 {
 
-   @Id
-   private long id;
+   @Id @GeneratedValue
+   private Long id;
 
    @ManyToOne
    private Account account;

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java	2010-02-05 00:35:43 UTC (rev 100447)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-jpa-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/jpa/JpaAccountRepository.java	2010-02-05 02:12:22 UTC (rev 100448)
@@ -50,11 +50,13 @@
       {
          q += " AND a.closed = :active";
       }
-      if (criteria.getPersonSearchCriteria() != null && criteria.getPersonSearchCriteria().getName() != null)
+      if (criteria.getPersonSearchCriteria() != null
+            && criteria.getPersonSearchCriteria().getName() != null
+            && criteria.getPersonSearchCriteria().getName().trim().length() != 0)
       {
-         q += " AND a.subscriber.name.firstName like :name" +
+         q += " AND (a.subscriber.name.firstName like :name" +
               " OR a.subscriber.name.lastName like :name" +
-              " OR a.subscriber.name.middleName like :name";
+              " OR a.subscriber.name.middleName like :name)";
       }
       if (criteria.getPersonSearchCriteria() != null && criteria.getPersonSearchCriteria().getCity() != null)
       {
@@ -73,7 +75,9 @@
       {
          query.setParameter("active", false);
       }
-      if (criteria.getPersonSearchCriteria() != null && criteria.getPersonSearchCriteria().getName() != null)
+      if (criteria.getPersonSearchCriteria() != null
+            && criteria.getPersonSearchCriteria().getName() != null
+            && criteria.getPersonSearchCriteria().getName().trim().length() != 0)
       {
          query.setParameter("name", "%" + criteria.getPersonSearchCriteria().getName() + "%");
       }