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

 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.model.v1.catalog.BannerType;
 import in.shop2020.serving.services.ScpService;
 import in.shop2020.thrift.clients.CatalogClient;
 import java.io.File;
 import java.io.IOException;
 	private String id;
 	private String newsletterName;
 	private String imageName;
 	private String campaignId;
 	private String fileExtention;
+	private String bannerType;
+	private String actionType;
 	public String create() {
 		try {
 			filePath = servletRequest.getSession().getServletContext().getRealPath("/images/banners/");
 			setUrl("/user-image");
 			String imageName = null;
+			Banner antecedent = new Banner();
 			if (StringUtils.isNotEmpty(userImageFileName)) {
 				imageName = getImageName();
 				File fileToCreate = new File(filePath, imageName);
 				FileUtils.copyFile(this.userImage, fileToCreate);
 				try {
 					return "redirect";
+				}
+			}
 			else{
 				Client CatalogClient = new CatalogClient().getClient();
-				imageName =CatalogClient.getBannerDetails(action).getImageName();
+				imageName =CatalogClient.getBannerDetails(action,BannerType.valueOf(actionType)).getImageName();
+				antecedent.setBannerName(action);
+				antecedent.setBannerType(BannerType.valueOf(actionType));
+			}
 			if (StringUtils.isEmpty(link)) {
 				log.info("Empty Link Field");
 				this.link="#";
+			}
 			banner.setBannerName(bannerName);
 			banner.setImageName(imageName);
 			banner.setLink(link);
 			banner.setHasMap(Boolean.parseBoolean(hasMap));
 			banner.setPriority(Long.valueOf(priority));
-			banner.setOldBanner(action);
+			banner.setBannerType(BannerType.valueOf(bannerType));
 			List<BannerMap> bannerMaps = new ArrayList<BannerMap>();
 			if(banner.isHasMap()) {
 				for(int i=0;i<mapLink.length;i++){
 					if(mapLink[i].isEmpty()) {
 						continue;
+			}
 			BannerCongregate bannerCongregate = new BannerCongregate();
 			bannerCongregate.setBanner(banner);
 			bannerCongregate.setBannerMaps(bannerMaps);
 			bannerCongregate.setBannerUriMappings(bannerUriMappings);
+			bannerCongregate.setAntecedent(antecedent);
 			Client CatalogClient = new CatalogClient().getClient();
 			CatalogClient.addBanner(bannerCongregate);
 		} catch (Exception e) {
 			log.error("Error while uploading/changing map",e);
 			addActionError("Failed To Do Changes");
 	public String createNewsletter() throws IOException{
 		filePath = servletRequest.getSession().getServletContext().getRealPath("/images/campaignImages/");
 		setUrl("/user-image!editNewsletter?newsletterName="+this.newsletterName);
 		if (StringUtils.isNotEmpty(userImageFileName)) {
-			imageName = getTimeInMilliseconds()+"_"+imageName.replace(' ', '_');
+			imageName = getImageName();
 			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);
 		return banners;
+	}
 	public String destroy() throws TException {
 		Client CatalogClient = new CatalogClient().getClient();
-		CatalogClient.deleteBanner(bannerName);
+		CatalogClient.deleteBanner(bannerName,BannerType.valueOf(bannerType));
 		setUrl("/user-image");
 		return "redirect";
+	}
-	public Banner getUpdates() throws TException {
+	public Banner getUpdates(String bannerType) throws TException {
 		Client CatalogClient = null;
 		CatalogClient = new CatalogClient().getClient();
-		Banner banner = CatalogClient.getBannerDetails(bannerName);
+		Banner banner = CatalogClient.getBannerDetails(bannerName,BannerType.valueOf(bannerType));
 		try{
 			setFileExtention(banner.getImageName().split("[.]")[1]);
+		}
 		catch (Exception e){
 			log.error("Split image name error "+e);
+		}
 		return banner;
+	}
-	public Banner getUpdates(String name) throws TException {
+	public Banner getUpdates(String name,String bannerType) throws TException {
 		Client CatalogClient = null;
 		CatalogClient = new CatalogClient().getClient();
-		return CatalogClient.getBannerDetails(name);
+		return CatalogClient.getBannerDetails(name,BannerType.valueOf(bannerType));
+	}
-	public List<BannerMap> getbannermapdetails() throws TException {
+	public List<BannerMap> getbannermapdetail(String bannerType) throws TException {
 		Client CatalogClient = null;
 		CatalogClient = new CatalogClient().getClient();
-		return CatalogClient.getBannerMapDetails(bannerName);
+		return CatalogClient.getBannerMapDetails(bannerName,BannerType.valueOf(bannerType));
+	}
 	public String getImageName() {
 		Calendar cal=GregorianCalendar.getInstance();
 		return String.valueOf(cal.getTimeInMillis())+"."+fileExtention;
 	public String getTimeInMilliseconds(){
 		Calendar cal=GregorianCalendar.getInstance();
 		return String.valueOf(cal.getTimeInMillis());
+	}
-	public List<BannerUriMapping> getUriMapping(String bannerName) throws TException{
+	public List<BannerUriMapping> getUriMapping(String bannerName,BannerType bannerType) throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
-		return CatalogClient.getUriMapping(bannerName);
+		return CatalogClient.getUriMapping(bannerName,bannerType);
+	}
-	public List<BannerUriMapping> getUriMapping() throws TException{
+	public List<BannerUriMapping> getUriMapping(String bannerType) throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
-		return CatalogClient.getUriMapping(bannerName);
+		return CatalogClient.getUriMapping(bannerName,BannerType.valueOf(bannerType));
+	}
 	public List<Campaign> getCampaigns(String campaignName) throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
 		return CatalogClient.getCampaigns(campaignName);
+	}
 	public List<String> getAllCampaigns() throws TException{
 		Client CatalogClient = new CatalogClient().getClient();
-		log.info(CatalogClient.getAllCampaigns());
 		return CatalogClient.getAllCampaigns();
+	}
 	public String index() {
 		return "index";
 	public String getFileExtention() {
 		return fileExtention;
+	}
+	public void setBannerType(String bannerType) {
+		this.bannerType = bannerType;
+	}
+	public String getBannerType() {
+		return bannerType;
+	}
+	public void setActionType(String actionType) {
+		this.actionType = actionType;
+	}
+	public String getActionType() {
+		return actionType;
+	}
+}

Subversion Repositories SmartDukaan

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