WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java

 package com.spice.profitmandi.web.controller;
+import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
 			return responseSender.badRequest(profitMandiBusinessException);
+		}
+	}
-	@Transactional
 	private void createRetailer(CreateRetailerRequest createRetailerRequest)
 			throws ProfitMandiBusinessException{
 		Retailer retailer = new Retailer();
 		retailer.setName(createRetailerRequest.getName());
 		retailer.setNumber(createRetailerRequest.getNumber());
 		retailer.setOther1(createRetailerRequest.getLineOfBusiness().getOther1());
 		retailer.setOther2(createRetailerRequest.getLineOfBusiness().getOther2());
 		Document retailerDocument = documentRepository.selectById(createRetailerRequest.getDocumentId());
 		if(retailerRepository.isExistByDocumentId(retailerDocument.getId())){
 			LOGGER.error("documet is already mapped with another retailer");
-			throw new ProfitMandiBusinessException(ProfitMandiConstants.DOCUMENT_ID, retailerDocument.getId(), "");
+			throw new ProfitMandiBusinessException(ProfitMandiConstants.DOCUMENT_ID, retailerDocument.getId(), "DCMNT_1000");
+		}
 		retailer.setDocumentId(retailerDocument.getId());
 		final Document shopDocument = documentRepository.selectById(createRetailerRequest.getShop().getDocumentId());
 		if(shopRepository.isExistByDocumentId(shopDocument.getId())){
-			throw new ProfitMandiBusinessException(ProfitMandiConstants.DOCUMENT_ID, shopDocument.getId(), "");
+			throw new ProfitMandiBusinessException(ProfitMandiConstants.DOCUMENT_ID, shopDocument.getId(), "DCMNT_1000");
+		}
+		System.out.println(retailer.getNumber() + ", " + retailer.getType());
+		if(retailerRepository.isExistByNumberAndType(retailer.getNumber(), retailer.getType())){
+			throw new ProfitMandiBusinessException(ProfitMandiConstants.NUMBER + ", " + ProfitMandiConstants.TYPE, retailer.getNumber() + ", " + retailer.getType(), "RTLR_1001");
+		}
 		retailerRepository.persist(retailer);
 		Shop shop = new Shop();
 		shop.setName(createRetailerRequest.getShop().getName());
 		shop.setDocumentId(shopDocument.getId());
 		shop.setRetailerId(retailer.getId());
 		shopRepository.persist(shop);
-		for(Category category : createRetailerRequest.getCategories()){
+		this.addBrandWithRetailer(retailer.getId(), createRetailerRequest.getCategories());
-			for(com.spice.profitmandi.web.req.Brand brandModel : category.getBrands()){
-				Brand brand = brandRepository.selectByIdAndName(brandModel.getId(), brandModel.getName());
-				final RetailerBrand retailerBrand = new RetailerBrand();
-				retailerBrand.setRetailerId(retailer.getId());
-				retailerBrand.setBrandId(brand.getId());
-				retailerBrandRepository.persist(retailerBrand);
-			}
-		}
 		final Address addressRetailer = this.createAddress(createRetailerRequest.getAddress());
 		if(!addressRepository.isExist(addressRetailer)){
 			addressRepository.persist(addressRetailer);
+		}
 		shopAddress.setShopId(shop.getId());
 		shopAddress.setAddressId(addressShop.getId());
 		shopAddressRepository.persist(shopAddress);
+	}
+	private void addBrandWithRetailer(int retailerId, Set<Category> categories)
+		throws ProfitMandiBusinessException{
+		for(Category category : categories){
+			for(com.spice.profitmandi.web.req.Brand brandModel : category.getBrands()){
+				Brand brand = brandRepository.selectByIdAndName(brandModel.getId(), brandModel.getName());
+				final RetailerBrand retailerBrand = new RetailerBrand();
+				retailerBrand.setRetailerId(retailerId);
+				retailerBrand.setBrandId(brand.getId());
+				retailerBrandRepository.persist(retailerBrand);
+			}
+		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_RETAILER_ALL,method=RequestMethod.GET)
 	public ResponseEntity<?> getAll(HttpServletRequest request){
 		LOGGER.info("requested url : "+request.getRequestURL().toString());
 		return responseSender.ok(retailerRepository.selectAll());
+	}
 			LOGGER.error("ProfitMandi error: ",  profitMandiBusinessException);
 			return responseSender.badRequest(profitMandiBusinessException);
+		}
+	}
-	@Transactional
 	@RequestMapping(value = ProfitMandiConstants.URL_RETAILER_SHOP_ADD, method=RequestMethod.POST)
 	public ResponseEntity<?> addShop(HttpServletRequest request, @RequestBody com.spice.profitmandi.web.req.Shop createShop, @RequestParam(name = "retailerId") int retailerId){
 		LOGGER.info("requested url : "+request.getRequestURL().toString());
 		try {
 			Document document = documentRepository.selectById(createShop.getDocumentId());
 	@RequestMapping(value = ProfitMandiConstants.URL_RETAILER_BRAND_ADD, method=RequestMethod.POST)
 	public ResponseEntity<?> addBrand(HttpServletRequest request, @RequestBody RetailerAddBrandRequest retailerAddBrandRequest){
 		LOGGER.info("requested url : "+request.getRequestURL().toString());
 		try {
-			Retailer retailer = retailerRepository.selectById(retailerAddBrandRequest.getRetailerId());
+			retailerRepository.selectById(retailerAddBrandRequest.getRetailerId());
-			for(String brandName : retailerAddBrandRequest.getBrandNames()){
+			this.addBrandWithRetailer(retailerAddBrandRequest.getRetailerId(), retailerAddBrandRequest.getCategories());
-				Brand brand = brandRepository.selectByName(brandName);
-				RetailerBrand retailerBrand = new RetailerBrand();
-				retailerBrand.setBrandId(brand.getId());
-				retailerBrand.setRetailerId(retailer.getId());
-			}
 			return responseSender.ok(ResponseCodeHolder.getMessage("API_OK_1001"));
 		}catch (ProfitMandiBusinessException profitMandiBusinessException) {
 			LOGGER.error("ProfitMandi error: ",  profitMandiBusinessException);
 			return responseSender.badRequest(profitMandiBusinessException);
+		}
 	public ResponseEntity<?> removeBrand(HttpServletRequest request, @RequestParam(name = "brandId") int brandId, @RequestParam(name = "retailerId") int retailerId){
 		LOGGER.info("requested url : "+request.getRequestURL().toString());
 		try {
 			brandRepository.selectById(brandId);
 			retailerRepository.selectById(retailerId);
-			retailerBrandRepository.deleteByRetailerId(retailerId, brandId);
+			retailerBrandRepository.deleteByRetailerAndBrandId(retailerId, brandId);
 			return responseSender.ok(ResponseCodeHolder.getMessage("API_OK_1001"));
 		}catch (ProfitMandiBusinessException profitMandiBusinessException) {
 			LOGGER.error("ProfitMandi error: ",  profitMandiBusinessException);
 			return responseSender.badRequest(profitMandiBusinessException);
+		}
+	}
-	@RequestMapping(value = ProfitMandiConstants.URL_RETAILER_DOCUMENT_DOCUMENT_ID, method=RequestMethod.GET)
+	@RequestMapping(value = ProfitMandiConstants.URL_RETAILER_DOCUMENT, method=RequestMethod.GET)
-	public ResponseEntity<?> getDocumentById(HttpServletRequest request, @RequestParam(name = "document") int documentId){
+	public ResponseEntity<?> getDocumentById(HttpServletRequest request, @RequestParam(name = "retailerId") int retailerId){
+		LOGGER.info("requested url : "+request.getRequestURL().toString());
+		try {
+			return responseSender.ok(retailerRepository.selectDocumentById(retailerId));
+		}catch (ProfitMandiBusinessException profitMandiBusinessException) {
+			LOGGER.error("ProfitMandi error: ",  profitMandiBusinessException);
+			return responseSender.badRequest(profitMandiBusinessException);
+		}
+	}
+	@RequestMapping(value = ProfitMandiConstants.URL_RETAILER_REGISTERED_ADDRESS, method=RequestMethod.GET)
+	public ResponseEntity<?> getRegisteredAddressById(HttpServletRequest request, @RequestParam(name = "retailerId") int retailerId){
 		LOGGER.info("requested url : "+request.getRequestURL().toString());
 		try {
-			retailerRepository.selectByDocumentId(documentId);
-			return responseSender.ok(documentRepository.selectById(documentId));
+			return responseSender.ok(retailerRegisteredAddressRepository.selectByRetailerId(retailerId));
 		}catch (ProfitMandiBusinessException profitMandiBusinessException) {
 			LOGGER.error("ProfitMandi error: ",  profitMandiBusinessException);
 			return responseSender.badRequest(profitMandiBusinessException);
+		}
+	}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java – Rev 21440 → 21448