Merge pull request shopizer-ecommerce#388 from wtune/add_findAllStoreCodeNameEmail

shopizer-ecommerce · web-flow · commit 765f19c7f768 · 2020-01-10T13:03:49.000-05:00
Add a dedicated query to reduce the amount of unnecessary joined table for MerchantStore
diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/merchant/MerchantStore.java b/sm-core-model/src/main/java/com/salesmanager/core/model/merchant/MerchantStore.java
@@ -52,6 +52,13 @@ public MerchantStore(Integer id, String code, String name) {
 	  
   }
 
+  public MerchantStore(Integer id, String code, String name, String storeEmailAddress) {
+    this.id = id;
+    this.code = code;
+    this.storename = name;
+    this.storeEmailAddress = storeEmailAddress;
+  }
+
   @Id
   @Column(name = "MERCHANT_ID", unique = true, nullable = false)
   @TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME",
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java
@@ -28,4 +28,7 @@ public interface MerchantRepository extends JpaRepository<MerchantStore, Integer
 	
 	@Query("select new com.salesmanager.core.model.merchant.MerchantStore(m.id, m.code, m.storename) from MerchantStore m")
 	List<MerchantStore> findAllStoreNames();
+
+	@Query("select new com.salesmanager.core.model.merchant.MerchantStore(m.id, m.code, m.storename, m.storeEmailAddress) from MerchantStore m")
+	List<MerchantStore> findAllStoreCodeNameEmail();
 }
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreService.java b/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreService.java
@@ -22,6 +22,8 @@ MerchantStore getMerchantStore(String merchantStoreCode)
 	
 	List<MerchantStore> findAllStoreNames() throws ServiceException;
 
+	List<MerchantStore> findAllStoreCodeNameEmail() throws ServiceException;
+
 	Page<MerchantStore> listAll(Optional<String> storeName, int page, int count) throws ServiceException;
 	
 	Page<MerchantStore> listAllRetailers(Optional<String> storeName, int page, int count) throws ServiceException;
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java
@@ -110,8 +110,12 @@ public List<MerchantStore> findAllStoreNames() throws ServiceException {
 	return merchantRepository.findAllStoreNames();
 }
 
-	
-/*	@Override
+	@Override
+	public List<MerchantStore> findAllStoreCodeNameEmail() throws ServiceException {
+		return merchantRepository.findAllStoreCodeNameEmail();
+	}
+
+	/*	@Override
 	public void delete(MerchantStore merchant) throws ServiceException {
 		
 		merchant = this.getById(merchant.getId());
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
@@ -104,7 +104,7 @@ ResponseEntity<String> pageStores(HttpServletRequest request,
 
 		try {
 
-			List<MerchantStore> stores = merchantStoreService.list();
+			List<MerchantStore> stores = merchantStoreService.findAllStoreCodeNameEmail();
 
 			for (MerchantStore store : stores) {
 

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,7 @@ public interface MerchantRepository extends JpaRepository<MerchantStore, Integer`
`28`	`28`
`29`	`29`	`@Query("select new com.salesmanager.core.model.merchant.MerchantStore(m.id, m.code, m.storename) from MerchantStore m")`
`30`	`30`	`List<MerchantStore> findAllStoreNames();`
	`31`	`+`
	`32`	`+ @Query("select new com.salesmanager.core.model.merchant.MerchantStore(m.id, m.code, m.storename, m.storeEmailAddress) from MerchantStore m")`
	`33`	`+ List<MerchantStore> findAllStoreCodeNameEmail();`
`31`	`34`	`}`