User management

Author: shopizer-ecommerce

sm-core-model/src/main/java/com/salesmanager/core/model/merchant/MerchantStore.java

@@ -44,6 +44,13 @@ public class MerchantStore extends SalesManagerEntity<Integer, MerchantStore> im
 
 
   public final static String DEFAULT_STORE = "DEFAULT";
+  
+  public MerchantStore(Integer id, String code, String name) {
+	  this.id = id;
+	  this.code = code;
+	  this.storename = name;
+	  
+  }
 
   @Id
   @Column(name = "MERCHANT_ID", unique = true, nullable = false)

sm-core/files/store/StoreRepository.dat

@@ -25,4 +25,7 @@ public interface MerchantRepository extends JpaRepository<MerchantStore, Integer
 
 	@Query("SELECT COUNT(m) > 0 FROM MerchantStore m WHERE m.code = :code")
 	boolean existsByCode(String code);
+	
+	@Query("select new com.salesmanager.core.model.merchant.MerchantStore(m.id, m.code, m.storename) from MerchantStore m")
+	List<MerchantStore> findAllStoreNames();
 }

sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java

@@ -1,5 +1,6 @@
 package com.salesmanager.core.business.services.merchant;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.domain.Page;
@@ -17,7 +18,9 @@ public interface MerchantStoreService extends SalesManagerEntityService<Integer,
 	MerchantStore getMerchantStore(String merchantStoreCode)
 			throws ServiceException;
 
-	MerchantStore getByCode(String code) throws ServiceException ;
+	MerchantStore getByCode(String code) throws ServiceException;
+	
+	List<MerchantStore> findAllStoreNames() throws ServiceException;
 
 	Page<MerchantStore> listAll(Optional<String> storeName, int page, int count) throws ServiceException;
 

sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreService.java

@@ -1,5 +1,6 @@
 package com.salesmanager.core.business.services.merchant;
 
+import java.util.List;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -102,6 +103,13 @@ public Page<MerchantStore> listAllRetailers(Optional<String> storeName, int page
 	return pageableMerchantRepository.listAllRetailers(store, pageRequest);
 }
 
+
+@Override
+public List<MerchantStore> findAllStoreNames() throws ServiceException {
+
+	return merchantRepository.findAllStoreNames();
+}
+
 
 /*	@Override
 	public void delete(MerchantStore merchant) throws ServiceException {

sm-core/src/main/java/com/salesmanager/core/business/services/merchant/MerchantStoreServiceImpl.java

@@ -33,7 +33,7 @@ public class MerchantStoreEntity implements Serializable {
 	private boolean retailer;
 	private MeasureUnit dimension;
 	private MeasureUnit weight;
-	private List<String> supportedLanguages;
+	
 
 	public int getId() {
 		return id;
@@ -139,13 +139,6 @@ public void setWeight(MeasureUnit weight) {
 		this.weight = weight;
 	}
 
-	public List<String> getSupportedLanguages() {
-		return supportedLanguages;
-	}
-
-	public void setSupportedLanguages(List<String> supportedLanguages) {
-		this.supportedLanguages = supportedLanguages;
-	}
 
   public boolean isRetailer() {
     return retailer;

sm-shop-model/src/main/java/com/salesmanager/shop/model/store/MerchantStoreEntity.java

@@ -1,5 +1,7 @@
 package com.salesmanager.shop.model.store;
 
+import java.util.List;
+
 import com.salesmanager.shop.model.references.PersistableAddress;
 
 public class PersistableMerchantStore extends MerchantStoreEntity {
@@ -11,6 +13,15 @@ public class PersistableMerchantStore extends MerchantStoreEntity {
 	private PersistableAddress address;
 	//code of parent store (can be null if retailer)
 	private String retailerStore;
+	private List<String> supportedLanguages;
+
+	public List<String> getSupportedLanguages() {
+		return supportedLanguages;
+	}
+
+	public void setSupportedLanguages(List<String> supportedLanguages) {
+		this.supportedLanguages = supportedLanguages;
+	}
 
 	public PersistableAddress getAddress() {
 		return address;

sm-shop-model/src/main/java/com/salesmanager/shop/model/store/PersistableMerchantStore.java

@@ -1,7 +1,9 @@
 package com.salesmanager.shop.model.store;
 
 import java.io.Serializable;
+import java.util.List;
 
+import com.salesmanager.core.model.reference.language.Language;
 import com.salesmanager.shop.model.content.ReadableImage;
 import com.salesmanager.shop.model.entity.ReadableAudit;
 import com.salesmanager.shop.model.entity.ReadableAuditable;
@@ -19,6 +21,7 @@ public class ReadableMerchantStore extends MerchantStoreEntity implements Readab
 	private ReadableImage logo;
 	private ReadableAudit audit;
 	private ReadableMerchantStore parent;
+	private List<Language> supportedLanguages;
 
 
 
@@ -63,6 +66,14 @@ public void setParent(ReadableMerchantStore parent) {
     this.parent = parent;
   }
 
+public List<Language> getSupportedLanguages() {
+	return supportedLanguages;
+}
+
+public void setSupportedLanguages(List<Language> supportedLanguages) {
+	this.supportedLanguages = supportedLanguages;
+}
+
 
 
 }

sm-shop-model/src/main/java/com/salesmanager/shop/model/store/ReadableMerchantStore.java

@@ -120,15 +120,23 @@ public ReadableMerchantStore populate(MerchantStore source,
 		target.setUseCache(source.isUseCache());
 
 
-		List<Language> languages = source.getLanguages();
+/*		List<Language> languages = source.getLanguages();
 		if(!CollectionUtils.isEmpty(languages)) {
 			
 			List<String> langs = new ArrayList<String>();
 			for(Language lang : languages) {
 				langs.add(lang.getCode());
 			}
 			
-			target.setSupportedLanguages(langs);
+			//target.setSupportedLanguages(langs);
+		}*/
+		
+		if(!CollectionUtils.isEmpty(source.getLanguages())) {
+			List<Language> supported = new ArrayList<Language>();
+			for(Language lang : source.getLanguages()) {
+				supported.add(lang);
+			}
+			target.setSupportedLanguages(supported);
 		}
 
 		if(source.getAuditSection()!=null) {

sm-shop/SALESMANAGER-TEST.h2.db

@@ -6,15 +6,13 @@
 import java.security.Principal;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -33,14 +31,12 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import com.google.common.collect.ImmutableMap;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
 import com.salesmanager.core.model.common.Criteria;
 import com.salesmanager.core.model.content.FileContentType;
 import com.salesmanager.core.model.content.InputContentFile;
 import com.salesmanager.core.model.merchant.MerchantStoreCriteria;
 import com.salesmanager.core.model.reference.language.Language;
 import com.salesmanager.shop.model.entity.EntityExists;
-import com.salesmanager.shop.model.entity.ListCriteria;
 import com.salesmanager.shop.model.store.PersistableBrand;
 import com.salesmanager.shop.model.store.PersistableMerchantStore;
 import com.salesmanager.shop.model.store.ReadableBrand;
@@ -138,6 +134,16 @@ public ReadableMerchantStoreList get(
 	  return storeFacade.findAll(criteria, language, page, count);
   }
 
+  @ResponseStatus(HttpStatus.OK)
+  @GetMapping(value = {"/stores"}, produces = MediaType.APPLICATION_JSON_VALUE)
+  @ApiOperation(httpMethod = "GET", value = "Get list of store names. Returns all retailers and stores", notes = "",
+      response = ReadableMerchantStore.class)
+  public List<ReadableMerchantStore> get(
+		  HttpServletRequest request) {
+
+	  return storeFacade.getMerchantStoreNames();
+  }
+  
 
 
   @ResponseStatus(HttpStatus.OK)