WebSVN – SmartDukaan – Diff – /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java

 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.xwork.StringUtils;
 import in.shop2020.config.ConfigException;
 import in.shop2020.model.v1.catalog.Banner;
+import in.shop2020.model.v1.catalog.BannerCongregate;
 import in.shop2020.model.v1.catalog.BannerMap;
 import in.shop2020.model.v1.catalog.BannerUriMapping;
 import in.shop2020.model.v1.catalog.Campaign;
 import in.shop2020.model.v1.catalog.CatalogService.Client;
 import in.shop2020.serving.services.ScpService;
 			banner.setBannerName(bannerName);
 			banner.setImageName(imageName);
 			banner.setLink(link);
 			banner.setPriority(Long.parseLong(priority));
 			banner.setHasMap(Boolean.parseBoolean(hasMap));
-			if (StringUtils.isNotEmpty(action)) {
-				deleteBannerAndMap(action);
-			}
 			List<BannerMap> bannerMaps = new ArrayList<BannerMap>();
 			if(banner.isHasMap()) {
 				for(int i=0;i<mapLink.length;i++){
-					log.info("maplink"+mapLink[i]);
-					log.info("maplink"+mapCoordinates[i]);
 					if(mapLink[i].isEmpty()) {
 						continue;
+					}
 					BannerMap bannerMap = new BannerMap();
 					bannerMap.setBannerName(bannerName);
 					bannerMap.setCoordinates(mapCoordinates[i]);
 					bannerMap.setMapLink(mapLink[i]);
 					bannerMaps.add(bannerMap);
+				}
+			}
-			Client CatalogClient = new CatalogClient().getClient();
-			CatalogClient.addBanner(banner);
-			if(bannerMaps.size()>0){
-				addBannerMap(bannerMaps);
-			}
 			List<BannerUriMapping> bannerUriMappings = new ArrayList<BannerUriMapping>();
 			for (int i=0;i<uri.length;i++){
 				if(uri[i].isEmpty()) {
 					continue;
+				}
 				bannerUriMapping.setBannerName(bannerName);
 				bannerUriMapping.setUri(uri[i]);
 				bannerUriMapping.setIsActive(Boolean.valueOf(status[i]));
 				bannerUriMappings.add(bannerUriMapping);
+			}
+			BannerCongregate bannerCongregate = new BannerCongregate();
+			bannerCongregate.setBanner(banner);
+			bannerCongregate.setBannerMaps(bannerMaps);
-			addBannerUriMapping(bannerUriMappings);
+			bannerCongregate.setBannerUriMappings(bannerUriMappings);
+			Client CatalogClient = new CatalogClient().getClient();
+			CatalogClient.addBanner(bannerCongregate);
 		} catch (Exception e) {
 			log.error("Error while uploading/changing map",e);
 			addActionError("Failed To Do Changes");
 			return "redirect";
+		}
 		return "index";
+	}
 	public String createNewsletter() throws IOException{
 		filePath = servletRequest.getSession().getServletContext().getRealPath("/images/campaignImages/");
+		setUrl("/user-image!editNewsletter?newsletterName="+this.newsletterName);
 		if (StringUtils.isNotEmpty(userImageFileName)) {
 			File fileToCreate = new File(filePath, imageName);
 			FileUtils.copyFile(this.userImage, fileToCreate);
 			ScpService scp = new ScpService();
 			try {
 				scp.scpFile("/var/lib/tomcat6/webapps/ROOT/images/campaignImages/"+imageName, filePath+"/"+imageName);
 			} catch (ConfigException e) {
 				log.info("Unable to do scp "+e);
-				addActionError("Failed To Do Changes");
+				addActionError("Image Failed To Upload");
-				return "campaign-editNew";
+				return "redirect";
+			}
 			Campaign campaign = new Campaign();
 			campaign.setCampaignName(this.newsletterName);
 			campaign.setImageName(imageName);
 			Client CatalogClient;
 				CatalogClient = new CatalogClient().getClient();
 				CatalogClient.addCampaign(campaign);
 			} catch (Exception e) {
 				log.info("Unable to add campaign "+e);
 				addActionError("Failed To Do Changes");
-				return "campaign-editNew";
+				return "redirect";
+			}
+			addActionMessage("Changes Applied Successfully");
+			return "redirect";
+		}
+		else{
-		addActionMessage("Changes Applied Successfully");
+			addActionError("Image Missing");
-		return "campaign-editNew";
+			return "redirect";
+		}
+	}
+	public String deleteCampaign() {
+		setUrl("/user-image!editNewsletter?newsletterName="+this.newsletterName);
+		try {
+			Client CatalogClient = new CatalogClient().getClient();
+			CatalogClient.deleteCampaign(Long.valueOf(campaignId));
+			addActionMessage("Image deleted");
+			return "redirect";
+		}
+		catch (Exception e) {
+			log.info("Unable to delete campaign "+e);
+			addActionError("Unable to delete image");
+			return "redirect";
+		}
+	}
 	public void addBannerUriMapping(List<BannerUriMapping> bannerUriMappings) throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
 		CatalogClient.addBannerUri(bannerUriMappings);
+	}
 	public List<BannerUriMapping> getUriMapping(String bannerName) throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
 		return CatalogClient.getUriMapping(bannerName);
+	}
-	public void deleteBannerAndMap(String bannerName) throws TException{
-		Client CatalogClient = new CatalogClient().getClient();
-		CatalogClient.deleteBanner(bannerName);
-	}
 	public List<BannerUriMapping> getUriMapping() throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
 		return CatalogClient.getUriMapping(bannerName);
+	}
 	public List<Campaign> getCampaigns(String campaignName) throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
 		return CatalogClient.getCampaigns(campaignName);
+	}
-	public void deleteCampaign() throws NumberFormatException, TException{
-		Client CatalogClient = new CatalogClient().getClient();
-		CatalogClient.deleteCampaign(Long.valueOf(campaignId));
-	}
 	public List<String> getAllCampaigns() throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
 		log.info(CatalogClient.getAllCampaigns());
 		return CatalogClient.getAllCampaigns();
+	}
 	public void setImageName(String imageName) {
 		this.imageName = imageName;
+	}
-}
+}

Subversion Repositories SmartDukaan

(root)/trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java – Rev 8582 → 8590