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

 import org.springframework.web.bind.annotation.RequestParam;
 import com.google.gson.Gson;
 import com.mongodb.DBObject;
 import com.spice.profitmandi.common.enumuration.ContentType;
+import com.spice.profitmandi.common.enumuration.MessageType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.BrandStockPrice;
 import com.spice.profitmandi.common.model.Notification;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.dtr.UserCampaign;
 import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 import com.spice.profitmandi.dao.entity.fofo.PartnerDailyInvestment;
 import com.spice.profitmandi.dao.entity.fofo.PartnerTargetDetails;
 import com.spice.profitmandi.dao.entity.fofo.PartnerType;
 import com.spice.profitmandi.dao.model.SimpleCampaign;
 import com.spice.profitmandi.dao.model.SimpleCampaignParams;
 import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.Mongo;
 	@Autowired
 	private PartnerInvestmentService partnerInvestmentService;
 	@Autowired
 	DocumentRepository documentRepository;
 	@Autowired
 	InventoryService inventoryService;
 	@Autowired
 	private CurrentInventorySnapshotRepository currentInventorySnapshotRepository;
 		model.addAttribute("appContextPath", request.getContextPath());
 		return "contact-us";
+	}
 	@RequestMapping(value = "/notifications", method = RequestMethod.GET)
-	public String getNotificationsWithType(HttpServletRequest request, @RequestParam(value = "") String notifyType,
+	public String getNotificationsWithType(HttpServletRequest request,
+			@RequestParam(required = false) MessageType messageType,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "20") int limit, Model model) throws Exception {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		int userId = userAccountRepository.selectUserIdByRetailerId(loginDetails.getFofoId());
 		List<UserCampaign> userCampaigns = userCampaignRepository.selectByUserId(userId);
-		List<Notification> notifications = new ArrayList<>();
+		List<Notification> notifications = null;
-		Document document = null;
 		if (!userCampaigns.isEmpty()) {
 			List<Integer> campaignIds = new ArrayList<>();
 			for (UserCampaign userCampaign : userCampaigns) {
 				campaignIds.add(userCampaign.getCampaignId());
+			}
 			List<NotificationCampaign> notificationCampaigns = notificationCampaignRepository.selectbyCids(campaignIds);
-			if (notifyType.equals("annoucement")) {
-				for (NotificationCampaign notificationCampaign : notificationCampaigns) {
-					if (notificationCampaign.isAnnoucement() == true) {
-						Notification ns = new Notification();
-						SimpleCampaignParams scp = gson.fromJson(notificationCampaign.getImplementationParams(),
-								SimpleCampaignParams.class);
-						Campaign campaign = new SimpleCampaign(scp);
-						LocalDateTime expire = campaign.getExpireTimestamp();
-						ns.setCid(Integer.toString(notificationCampaign.getId()));
-						ns.setType(campaign.getType());
-						ns.setMessage(campaign.getMessage());
+			LOGGER.info("messageType" + messageType);
-						ns.setTitle(campaign.getTitle());
-						if (notificationCampaign.getDocumentId() != null) {
-							document = documentRepository.selectById(notificationCampaign.getDocumentId());
+			notifications = getNotifications(notificationCampaigns, messageType);
-							ns.setDocumentName(document.getDisplayName());
-						}
+		}
-						ns.setUrl(campaign.getUrl());
-						ns.setShowImage(campaign.getShowImage());
-						ns.setImageUrl(campaign.getImageUrl());
-						ns.setDocumentId(notificationCampaign.getDocumentId());
+		model.addAttribute("notifications", notifications);
-						ns.setAnnoucement(notificationCampaign.isAnnoucement());
+		LOGGER.info("notifications" + notifications);
-						ns.setCreated(notificationCampaign.getCreatedTimestamp()
-								.toEpochSecond(ZoneOffset.ofHoursMinutes(5, 30)) * 1000);
-						if (LocalDateTime.now().isAfter(expire)) {
-							ns.setExpired(true);
-						} else {
-							ns.setExpired(false);
-						}
-						notifications.add(ns);
+		return "notification-template";
-					}
+	}
-				}
-			} else if (notifyType.equals("notification")) {
-				for (NotificationCampaign notificationCampaign : notificationCampaigns) {
+	public List<Notification> getNotifications(List<NotificationCampaign> nc, MessageType messageType)
-					if (notificationCampaign.isAnnoucement() == false) {
+			throws ProfitMandiBusinessException {
-						Notification ns = new Notification();
+		List<Notification> notifications = new ArrayList<>();
-						SimpleCampaignParams scp = gson.fromJson(notificationCampaign.getImplementationParams(),
-								SimpleCampaignParams.class);
-						Campaign campaign = new SimpleCampaign(scp);
-						LocalDateTime expire = campaign.getExpireTimestamp();
-						ns.setCid(Integer.toString(notificationCampaign.getId()));
-						ns.setType(campaign.getType());
+		Document document = null;
-						ns.setMessage(campaign.getMessage());
+		if (messageType != null) {
-						ns.setTitle(campaign.getTitle());
-						ns.setUrl(campaign.getUrl());
-						if (notificationCampaign.getDocumentId() != null) {
+			for (NotificationCampaign notificationCampaign : nc) {
-							document = documentRepository.selectById(notificationCampaign.getDocumentId());
-							ns.setDocumentName(document.getDisplayName());
-						}
-						ns.setShowImage(campaign.getShowImage());
-						ns.setImageUrl(campaign.getImageUrl());
-						ns.setDocumentId(notificationCampaign.getDocumentId());
-						ns.setAnnoucement(notificationCampaign.isAnnoucement());
-						ns.setCreated(notificationCampaign.getCreatedTimestamp()
+				if (notificationCampaign.getMessageType() == messageType) {
-								.toEpochSecond(ZoneOffset.ofHoursMinutes(5, 30)) * 1000);
-						if (LocalDateTime.now().isAfter(expire)) {
-							ns.setExpired(true);
-						} else {
-							ns.setExpired(false);
-						}
-						notifications.add(ns);
-					}
-				}
-			} else {
-				for (NotificationCampaign notificationCampaign : notificationCampaigns) {
 					Notification ns = new Notification();
 					SimpleCampaignParams scp = gson.fromJson(notificationCampaign.getImplementationParams(),
 							SimpleCampaignParams.class);
 					Campaign campaign = new SimpleCampaign(scp);
 					LocalDateTime expire = campaign.getExpireTimestamp();
 					ns.setCid(Integer.toString(notificationCampaign.getId()));
 					ns.setType(campaign.getType());
 					ns.setMessage(campaign.getMessage());
 					ns.setTitle(campaign.getTitle());
-					ns.setUrl(campaign.getUrl());
 					if (notificationCampaign.getDocumentId() != null) {
 						document = documentRepository.selectById(notificationCampaign.getDocumentId());
 						ns.setDocumentName(document.getDisplayName());
+					}
-					ns.setDocumentId(notificationCampaign.getDocumentId());
+					ns.setUrl(campaign.getUrl());
 					ns.setShowImage(campaign.getShowImage());
 					ns.setImageUrl(campaign.getImageUrl());
-					ns.setAnnoucement(notificationCampaign.isAnnoucement());
+					ns.setDocumentId(notificationCampaign.getDocumentId());
+					ns.setMessageType(notificationCampaign.getMessageType());
 					ns.setCreated(
 							notificationCampaign.getCreatedTimestamp().toEpochSecond(ZoneOffset.ofHoursMinutes(5, 30))
 									* 1000);
 					if (LocalDateTime.now().isAfter(expire)) {
 						ns.setExpired(true);
 						ns.setExpired(false);
+					}
 					notifications.add(ns);
+				}
+			}
-		}
+		} else {
+			for (NotificationCampaign notificationCampaign : nc) {
-		model.addAttribute("notifications", notifications);
+				Notification ns = new Notification();
+				SimpleCampaignParams scp = gson.fromJson(notificationCampaign.getImplementationParams(),
+						SimpleCampaignParams.class);
+				Campaign campaign = new SimpleCampaign(scp);
+				LocalDateTime expire = campaign.getExpireTimestamp();
+				ns.setCid(Integer.toString(notificationCampaign.getId()));
+				ns.setType(campaign.getType());
+				ns.setMessage(campaign.getMessage());
+				ns.setTitle(campaign.getTitle());
+				if (notificationCampaign.getDocumentId() != null) {
+					document = documentRepository.selectById(notificationCampaign.getDocumentId());
+					ns.setDocumentName(document.getDisplayName());
+				}
+				ns.setUrl(campaign.getUrl());
+				ns.setShowImage(campaign.getShowImage());
+				ns.setImageUrl(campaign.getImageUrl());
+				ns.setDocumentId(notificationCampaign.getDocumentId());
+				ns.setMessageType(notificationCampaign.getMessageType());
+				ns.setCreated(notificationCampaign.getCreatedTimestamp().toEpochSecond(ZoneOffset.ofHoursMinutes(5, 30))
+						* 1000);
+				if (LocalDateTime.now().isAfter(expire)) {
+					ns.setExpired(true);
+				} else {
+					ns.setExpired(false);
+				}
+				notifications.add(ns);
+			}
+		}
+		return notifications;
-		LOGGER.info("notifications" + notifications);
-		return "notification-template";
+	}
 	@RequestMapping(value = "/notifyDocument/documentId", method = RequestMethod.GET)
 	public ResponseEntity<?> retailerDocumentById(HttpServletRequest request,
 			@RequestParam(name = ProfitMandiConstants.DOCUMENT_ID) int documentId, @RequestParam int cid)

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java – Rev 25677 → 25683