shopizer-developers
Changes
sm-core/pom.xml 13(+10 -3)
sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java 21(+14 -7)
sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java 3(+2 -1)
sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java 6(+4 -2)
sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java 10(+9 -1)
sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java 3(+2 -1)
sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java 3(+2 -1)
Details
sm-core/pom.xml 13(+10 -3)
diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 9e97a00..f45f29b 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.shopizer</groupId>
<artifactId>sm-core</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>sm-core</name>
@@ -30,11 +30,11 @@
<sm-core.hibernate-entitymanager-version>4.1.2</sm-core.hibernate-entitymanager-version>
<sm-core.hibernate-jpamodelgen.version>1.1.1.Final</sm-core.hibernate-jpamodelgen.version>
<sm-core.aspectj.version>1.5.4</sm-core.aspectj.version>
- <sm-core.mysql-connector-java>5.1.19</sm-core.mysql-connector-java>
+ <sm-core.mysql-connector-java>5.1.31</sm-core.mysql-connector-java>
<sm-core.junit.version>4.9</sm-core.junit.version>
<sm-core.org.springframework.version>3.1.0.RELEASE</sm-core.org.springframework.version>
<sm-core.c3p0.version>0.9.1.2</sm-core.c3p0.version>
- <sm-core.querydsl.version>2.3.3</sm-core.querydsl.version>
+ <sm-core.querydsl.version>3.4.2</sm-core.querydsl.version>
<sm-core.jodatime.version>2.0</sm-core.jodatime.version>
<sm-core.jodatime-hibernate.version>1.3</sm-core.jodatime-hibernate.version>
<sm-core.javassist.version>3.3</sm-core.javassist.version>
@@ -63,6 +63,13 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j-version}</version>
</dependency>
+
+ <!-- required for query dsl 3 -->
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
+ </dependency>
<!-- Hibernate -->
<dependency>
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java
index 99cb5cd..a5f86a7 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java
@@ -195,7 +195,8 @@ public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> i
.and(qCategory.merchantStore.id.eq(store.getId())))
.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
- return query.listDistinct(qCategory);
+ return query.distinct().list(qCategory);
+ //.listDistinct(qCategory);
}
@Override
@@ -212,7 +213,8 @@ public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> i
.and(qCategory.merchantStore.code.eq(merchantStoreCode)))
.orderBy(qCategory.sortOrder.asc(),qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
- return query.listDistinct(qCategory);
+ return query.distinct().list(qCategory);
+ //.listDistinct(qCategory);
}
@Override
@@ -229,7 +231,8 @@ public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> i
.and(qCategory.merchantStore.id.eq(store.getId())))
.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
- return query.listDistinct(qCategory);
+ return query.distinct().list(qCategory);
+ //.listDistinct(qCategory);
}
@Override
@@ -247,7 +250,8 @@ public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> i
.and(qDescription.language.id.eq(language.getId())))
.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
- return query.listDistinct(qCategory);
+ return query.distinct().list(qCategory);
+ //.listDistinct(qCategory);
}
@Override
@@ -266,7 +270,8 @@ public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> i
.and(qCategory.merchantStore.id.eq(category.getMerchantStore().getId())))
.orderBy(qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
- return query.listDistinct(qCategory);
+ return query.distinct().list(qCategory);
+ //listDistinct(qCategory);
}
@@ -320,7 +325,8 @@ public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> i
.where(qCategory.merchantStore.id.eq(store.getId()))
.orderBy(qCategory.sortOrder.asc(),qCategory.id.asc());
- return query.listDistinct(qCategory);
+ return query.distinct().list(qCategory);
+ //listDistinct(qCategory);
}
@Override
@@ -365,6 +371,7 @@ public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> i
.and(qDescription.language.id.eq(language.getId())))
.orderBy(qCategory.sortOrder.asc(),qCategory.id.asc());
- return query.listDistinct(qCategory);
+ return query.distinct().list(qCategory);
+ //listDistinct(qCategory);
}
}
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java
index da21fd3..345f3c1 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java
@@ -33,7 +33,8 @@ public class ProductOptionDaoImpl extends SalesManagerEntityDaoImpl<Long, Produc
.and(qDescription.language.id.eq(language.getId())))
.orderBy(qProductOption.id.asc());
- return query.listDistinct(qProductOption);
+ return query.distinct().list(qProductOption);
+ //listDistinct(qProductOption);
}
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java
index 3c547b0..bddd805 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java
@@ -35,7 +35,8 @@ public class ProductOptionValueDaoImpl extends SalesManagerEntityDaoImpl<Long, P
- return query.listDistinct(qProductOption);
+ return query.distinct().list(qProductOption);
+ //listDistinct(qProductOption);
}
@@ -57,7 +58,8 @@ public class ProductOptionValueDaoImpl extends SalesManagerEntityDaoImpl<Long, P
- return query.listDistinct(qProductOption);
+ return query.distinct().list(qProductOption);
+ //listDistinct(qProductOption);
}
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java
index a987585..9e7510d 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java
@@ -30,6 +30,7 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
qs.append("left join fetch rp.descriptions rpd ");
qs.append("where pr.code=:code ");
+ qs.append("and pr.store.id=:storeId ");
qs.append("and p.id=:id ");
qs.append("and rpd.language.id=:langId");
@@ -40,6 +41,7 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
q.setParameter("code", type);
q.setParameter("id", product.getId());
+ qs.append("and pr.store.id=:storeId ");
q.setParameter("langId", language.getId());
@@ -74,6 +76,7 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
qs.append("left join fetch pap.descriptions papd ");
qs.append("where pr.code=:code ");
+ qs.append("and pr.store.id=:storeId ");
qs.append("and rpd.language.id=:langId");
@@ -83,6 +86,7 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
q.setParameter("code", type);
q.setParameter("langId", language.getId());
+ q.setParameter("storeId", store.getId());
@@ -117,6 +121,7 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
qs.append("left join fetch rp.type type ");
qs.append("where pr.code=:code ");
+ qs.append("and pr.store.id=:storeId ");
@@ -125,6 +130,7 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
Query q = super.getEntityManager().createQuery(hql);
q.setParameter("code", group);
+ q.setParameter("storeId", store.getId());
@@ -185,7 +191,8 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
qs.append("join fetch pr.relatedProduct rp ");
qs.append("left join fetch rp.descriptions rpd ");
- qs.append("where pr.code=:code");
+ qs.append("where pr.code=:code ");
+ qs.append("and pr.store.id=:storeId ");
@@ -194,6 +201,7 @@ public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long,
Query q = super.getEntityManager().createQuery(hql);
q.setParameter("code", type);
+ q.setParameter("storeId", store.getId());
@SuppressWarnings("unchecked")
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDaoImpl.java
index a413671..6bead43 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDaoImpl.java
@@ -16,6 +16,7 @@ import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
import com.salesmanager.core.business.generic.exception.ServiceException;
import com.salesmanager.core.business.merchant.model.MerchantStore;
import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
@Repository("contentDao")
public class ContentDaoImpl extends SalesManagerEntityDaoImpl<Long, Content> implements ContentDao {
@@ -214,6 +215,8 @@ public class ContentDaoImpl extends SalesManagerEntityDaoImpl<Long, Content> imp
QContent qContent = QContent.content;
QContentDescription qContentDescription = QContentDescription.contentDescription;
+ System.out.println("In");
+
JPQLQuery query = new JPAQuery (getEntityManager());
@@ -225,9 +228,13 @@ public class ContentDaoImpl extends SalesManagerEntityDaoImpl<Long, Content> imp
.and(qContent.code.eq(code)))
);
- Content content = query.singleResult(qContent);
-
- return content;
+
+ List<Content> results = query.list(qContent);
+ if (results.isEmpty()) return null;
+
+ else if (results.size() >= 1) return results.get(0);
+ return null;
+
}
@Override
@@ -257,6 +264,18 @@ public class ContentDaoImpl extends SalesManagerEntityDaoImpl<Long, Content> imp
return content.getDescription();
}
+ List<Content> results = query.list(qContent);
+ if (results.isEmpty()) {
+ return null;
+ } else if (results.size() >= 1) {
+ content = results.get(0);
+ }
+
+ if(content!=null) {
+ return content.getDescription();
+ }
+
+
return null;
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java
index dea06d2..07d6d60 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java
@@ -86,7 +86,8 @@ public class CustomerAttributeDaoImpl extends SalesManagerEntityDaoImpl<Long, Cu
System.out.println("done");
- return query.listDistinct(qCustomerAttribute);
+ return query.distinct().list(qCustomerAttribute);
+ //listDistinct(qCustomerAttribute);
}
@Override
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java
index 312613a..7f11d02 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java
@@ -36,7 +36,8 @@ public class CustomerOptionDaoImpl extends SalesManagerEntityDaoImpl<Long, Custo
.and(qCustomerOptionDescription.language.id.eq(language.getId())))
.orderBy(qCustomerOption.sortOrder.asc());
- return query.listDistinct(qCustomerOption);
+ return query.distinct().list(qCustomerOption);
+ //listDistinct(qCustomerOption);
}
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDaoImpl.java
index 88c1bbe..e2fb781 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDaoImpl.java
@@ -35,7 +35,8 @@ public class CustomerOptionValueDaoImpl extends SalesManagerEntityDaoImpl<Long,
.and(qCustomerOptionValueDescription.language.id.eq(language.getId())))
.orderBy(qCustomerOptionValue.sortOrder.asc());
- return query.listDistinct(qCustomerOptionValue);
+ return query.distinct().list(qCustomerOptionValue);
+ //listDistinct(qCustomerOptionValue);
}
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDaoImpl.java
index 4f7582e..b7f2d3d 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDaoImpl.java
@@ -71,7 +71,8 @@ public class GroupDaoImpl extends SalesManagerEntityDaoImpl<Integer, Group> impl
.where(qGroup.groupType.eq(groupType))
.orderBy(qGroup.id.asc());
- return query.listDistinct(qGroup);
+ return query.distinct().list(qGroup);
+ //listDistinct(qGroup);
}
}
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDaoImpl.java
index 115d119..70dd851 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDaoImpl.java
@@ -1,18 +1,14 @@
package com.salesmanager.core.business.user.dao;
-import java.util.Date;
import java.util.List;
import java.util.Set;
import javax.persistence.Query;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import com.mysema.query.jpa.JPQLQuery;
import com.mysema.query.jpa.impl.JPAQuery;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.ProductList;
import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
import com.salesmanager.core.business.user.model.Permission;
import com.salesmanager.core.business.user.model.PermissionCriteria;
@@ -31,7 +27,8 @@ public class PermissionDaoImpl extends SalesManagerEntityDaoImpl<Integer, Permis
query.from(qPermission)
.orderBy(qPermission.id.asc());
- return query.listDistinct(qPermission);
+ return query.distinct().list(qPermission);
+ //listDistinct(qPermission);
}
@Override
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDaoImpl.java
index 0aad078..8f6c7b8 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDaoImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDaoImpl.java
@@ -69,7 +69,8 @@ public class UserDaoImpl extends SalesManagerEntityDaoImpl<Long, User> implement
.leftJoin(qUser.defaultLanguage).fetch()
.orderBy(qUser.id.asc());
- return query.listDistinct(qUser);
+ return query.distinct().list(qUser);
+ //listDistinct(qUser);
}
@Override
@@ -84,7 +85,8 @@ public class UserDaoImpl extends SalesManagerEntityDaoImpl<Long, User> implement
.orderBy(qUser.id.asc())
.where(qUser.merchantStore.id.eq(store.getId()));
- return query.listDistinct(qUser);
+ return query.distinct().list(qUser);
+ //listDistinct(qUser);
}
}
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionServiceImpl.java
index d8acfcf..d855efb 100755
--- a/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionServiceImpl.java
@@ -1,7 +1,5 @@
package com.salesmanager.core.business.user.service;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -9,9 +7,6 @@ import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
import com.salesmanager.core.business.generic.exception.ServiceException;
import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
import com.salesmanager.core.business.merchant.service.MerchantStoreService;
@@ -93,8 +88,7 @@ public class PermissionServiceImpl extends
permission.getGroups().remove(group);
-
-// this.delete(permission);
+
}
@Override