Up 4621 Add Date When Portlet Rating Was Made

uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/rest/MarketplaceRESTController.java

@@ -165,4 +165,72 @@ public ModelAndView saveUserRating(
         return new ModelAndView(
                 "json", "rating", new MarketplaceEntryRating(Integer.parseInt(rating), review));
     }
+
+    /**
+     * Get all ratings done on portlets since daysBack ago.
+     *
+     * @param request
+     * @param daysBack - number of days back to search for portlet ratings
+     * @return
+     */
+    @RequestMapping(value = "/marketplace/{daysBack}/getRatings", method = RequestMethod.GET)
+    public ModelAndView getPortletRatings(HttpServletRequest request, @PathVariable int daysBack) {
+
+        Set<IMarketplaceRating> portlets = marketplaceRatingDAO.getAllRatingsInLastXDays(daysBack);
+
+        List<MarketplaceEntryRating> ratings = new ArrayList<>();
+
+        for (IMarketplaceRating portlet : portlets) {
+
+            MarketplaceEntryRating portletRating =
+                    new MarketplaceEntryRating(
+                            portlet.getMarketplaceRatingPK().getUserName(),
+                            portlet.getMarketplaceRatingPK().getPortletDefinition().getName(),
+                            portlet.getMarketplaceRatingPK().getPortletDefinition().getFName(),
+                            portlet.getRating(),
+                            portlet.getReview(),
+                            portlet.getRatingDate());
+
+            ratings.add(portletRating);
+        }
+
+        return new ModelAndView("json", "ratings", ratings);
+    }
+
+    /**
+     * Get all ratings done on a specific portlet since daysBack ago.
+     *
+     * @param request
+     * @param fname - portlet fname
+     * @param daysBack - number of days back to search for portlet ratings
+     * @return
+     */
+    @RequestMapping(
+        value = "/marketplace/{fname}/{daysBack}/getRatings",
+        method = RequestMethod.GET
+    )
+    public ModelAndView getPortletRatings(
+            HttpServletRequest request, @PathVariable String fname, @PathVariable int daysBack) {
+
+        Set<IMarketplaceRating> portlets =
+                marketplaceRatingDAO.getAllRatingsForPortletInLastXDays(daysBack, fname);
+
+        List<MarketplaceEntryRating> ratings = new ArrayList<>();
+
+        for (IMarketplaceRating portlet : portlets) {
+
+            MarketplaceEntryRating portletRating =
+                    new MarketplaceEntryRating(
+                            portlet.getMarketplaceRatingPK().getUserName(),
+                            portlet.getMarketplaceRatingPK().getPortletDefinition().getName(),
+                            portlet.getMarketplaceRatingPK().getPortletDefinition().getFName(),
+                            portlet.getRating(),
+                            portlet.getReview(),
+                            portlet.getRatingDate());
+
+            ratings.add(portletRating);
+        }
+
+        return new ModelAndView("json", "ratings", ratings);
+    }
 }

uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/rest/layout/MarketplaceEntryRating.java

@@ -14,15 +14,56 @@
  */
 package org.apereo.portal.rest.layout;
 
+import java.util.Date;
+
 public class MarketplaceEntryRating {
 
+    public MarketplaceEntryRating() {}
+
     public MarketplaceEntryRating(int rating, String review) {
         this.rating = rating;
         this.review = review;
     }
 
     private int rating;
     private String review;
+    private String user;
+    private String portletName;
+    private Date ratingDate;
+    private String portletFName;
+
+    public MarketplaceEntryRating(
+            String user,
+            String portletName,
+            String portletFName,
+            int rating,
+            String review,
+            Date ratingDate) {
+        this.user = user;
+        this.portletName = portletName;
+        this.portletFName = portletFName;
+        this.rating = rating;
+        this.review = review;
+        this.ratingDate = ratingDate;
+    }
+
+    @Override
+    public String toString() {
+        return "MarketplaceEntryRating{"
+                + "rating="
+                + rating
+                + ", review="
+                + review
+                + ", user="
+                + user
+                + ", portletName="
+                + portletName
+                + ", ratingDate="
+                + ratingDate
+                + ", portletFName="
+                + portletFName
+                + '}';
+    }
 
     public int getRating() {
         return rating;
@@ -39,4 +80,36 @@ public String getReview() {
     public void setReview(String review) {
         this.review = review;
     }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getPortletName() {
+        return portletName;
+    }
+
+    public void setPortletName(String portletName) {
+        this.portletName = portletName;
+    }
+
+    public Date getRatingDate() {
+        return ratingDate;
+    }
+
+    public void setRatingDate(Date ratingDate) {
+        this.ratingDate = ratingDate;
+    }
+
+    public String getPortletFName() {
+        return portletFName;
+    }
+
+    public void setPortletFName(String portletFName) {
+        this.portletFName = portletFName;
+    }
 }

uPortal-api/uPortal-api-rest/src/test/java/org/apereo/portal/rest/MarketplaceRESTControllerTest.java

@@ -111,6 +111,28 @@ public void testGetUserRating() {
         Assert.assertNull(modelAndView.getModel().get("rating"));
     }
 
+    @Test
+    public void testAllPortletRatingDaysBack() {
+
+        String remoteUser = "jdoe";
+        Mockito.when(req.getRemoteUser()).thenReturn("jdoe");
+        IPortletType portletType =
+                new PortletTypeImpl("John Doe", "http://localhost:8080/uportal/test");
+        portletType.setDescription("Portlet Type");
+
+        PortletDefinitionImpl tempPortlet =
+                new PortletDefinitionImpl(
+                        portletType, "John", "Doe", "Course", "app-id", "Courses", true);
+
+        Mockito.when(
+                        marketplaceService.getOrCreateMarketplacePortletDefinitionIfTheFnameExists(
+                                remoteUser))
+                .thenReturn(null);
+
+        ModelAndView modelAndView = marketplaceRESTController.getPortletRatings(req, F_NAME, 30);
+        Assert.assertNull(modelAndView.getModel().get("rating"));
+    }
+
     @Test
     public void testSaveUserRating() {
         String rating = "3";

uPortal-content/uPortal-content-portlet/src/main/java/org/apereo/portal/portlet/dao/IMarketplaceRatingDao.java

@@ -62,4 +62,21 @@ IMarketplaceRating createOrUpdateRating(
 
     /** Aggregates the IMarketplaceRating into IPortletDefinition */
     void aggregateMarketplaceRating();
+
+    /**
+     * Get all the ratings done in the last X days.
+     *
+     * @param numberOfDaysBack - number of days to go back to find ratings
+     * @return collection of IMarketplaceRating - can be null
+     */
+    Set<IMarketplaceRating> getAllRatingsInLastXDays(int numberOfDaysBack);
+
+    /**
+     * Get all the ratings done for a specific portlet in the last X days.
+     *
+     * @param numberOfDaysBack - number of days to go back to find ratings
+     * @param fname - portlet fname
+     * @return collection of IMarketplaceRating - can be null
+     */
+    Set<IMarketplaceRating> getAllRatingsForPortletInLastXDays(int numberOfDaysBack, String fname);
 }

uPortal-content/uPortal-content-portlet/src/main/java/org/apereo/portal/portlet/marketplace/IMarketplaceRating.java

@@ -14,6 +14,7 @@
  */
 package org.apereo.portal.portlet.marketplace;
 
+import java.util.Date;
 import org.apereo.portal.portlet.dao.jpa.MarketplaceRatingPK;
 
 public interface IMarketplaceRating {
@@ -39,4 +40,8 @@ public interface IMarketplaceRating {
      * @param review a text review of the portlet
      */
     public void setReview(String review);
+
+    public void setRatingDate(Date ratingDate);
+
+    public Date getRatingDate();
 }

uPortal-web/src/main/java/org/apereo/portal/portlet/dao/jpa/JpaMarketplaceRatingDao.java

@@ -15,6 +15,7 @@
 package org.apereo.portal.portlet.dao.jpa;
 
 import com.google.common.base.Function;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -34,6 +35,7 @@
 import org.apereo.portal.portlet.dao.IPortletDefinitionDao;
 import org.apereo.portal.portlet.marketplace.IMarketplaceRating;
 import org.apereo.portal.portlet.om.IPortletDefinition;
+import org.joda.time.LocalDateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
@@ -117,6 +119,7 @@ public IMarketplaceRating createOrUpdateRating(
         temp.setMarketplaceRatingPK(tempPK);
         temp.setRating(rating);
         temp.setReview(review);
+        temp.setRatingDate(new Date());
         return this.createOrUpdateRating(temp);
     }
 
@@ -302,4 +305,82 @@ public void aggregateMarketplaceRating() {
             }
         }
     }
+
+    @Override
+    public Set<IMarketplaceRating> getAllRatingsForPortletInLastXDays(
+            int numberOfDaysBack, final String fname) {
+
+        LocalDateTime todayMinusNumberOfDaysBack = LocalDateTime.now().minusDays(numberOfDaysBack);
+
+        final TypedQuery<MarketplaceRatingImpl> query =
+                this.createQuery(
+                        this.createCriteriaQuery(
+                                new Function<
+                                        CriteriaBuilder, CriteriaQuery<MarketplaceRatingImpl>>() {
+                                    @Override
+                                    public CriteriaQuery<MarketplaceRatingImpl> apply(
+                                            CriteriaBuilder input) {
+                                        final CriteriaQuery<MarketplaceRatingImpl> criteriaQuery =
+                                                input.createQuery(MarketplaceRatingImpl.class);
+                                        final Root<MarketplaceRatingImpl> definitionRoot =
+                                                criteriaQuery.from(MarketplaceRatingImpl.class);
+                                        Predicate ratingDatePredicate =
+                                                input.greaterThanOrEqualTo(
+                                                        definitionRoot.<java.util.Date>get(
+                                                                "ratingDate"),
+                                                        todayMinusNumberOfDaysBack.toDate());
+                                        Predicate conditionPortlet =
+                                                input.equal(
+                                                        definitionRoot
+                                                                .get("marketplaceRatingPK")
+                                                                .get("portletDefinition"),
+                                                        portletDefinitionDao
+                                                                .getPortletDefinitionByFname(
+                                                                        fname));
+                                        Predicate allConditions =
+                                                input.and(conditionPortlet, ratingDatePredicate);
+                                        criteriaQuery.select(definitionRoot).where(allConditions);
+
+                                        return criteriaQuery;
+                                    }
+                                }));
+
+        return new HashSet<IMarketplaceRating>(query.getResultList());
+    }
+
+    @Override
+    @PortalTransactionalReadOnly
+    @OpenEntityManager(unitName = PERSISTENCE_UNIT_NAME)
+    public Set<IMarketplaceRating> getAllRatingsInLastXDays(int numberOfDaysBack) {
+
+        LocalDateTime todayMinusNumberOfDaysBack = LocalDateTime.now().minusDays(numberOfDaysBack);
+
+        final TypedQuery<MarketplaceRatingImpl> query =
+                this.createQuery(
+                        this.createCriteriaQuery(
+                                new Function<
+                                        CriteriaBuilder, CriteriaQuery<MarketplaceRatingImpl>>() {
+                                    @Override
+                                    public CriteriaQuery<MarketplaceRatingImpl> apply(
+                                            CriteriaBuilder input) {
+                                        final CriteriaQuery<MarketplaceRatingImpl> criteriaQuery =
+                                                input.createQuery(MarketplaceRatingImpl.class);
+                                        final Root<MarketplaceRatingImpl> definitionRoot =
+                                                criteriaQuery.from(MarketplaceRatingImpl.class);
+                                        Predicate ratingDatePredicate =
+                                                input.greaterThanOrEqualTo(
+                                                        definitionRoot.<java.util.Date>get(
+                                                                "ratingDate"),
+                                                        todayMinusNumberOfDaysBack.toDate());
+
+                                        criteriaQuery
+                                                .select(definitionRoot)
+                                                .where(ratingDatePredicate);
+
+                                        return criteriaQuery;
+                                    }
+                                }));
+
+        return new HashSet<IMarketplaceRating>(query.getResultList());
+    }
 }

uPortal-web/src/main/java/org/apereo/portal/portlet/dao/jpa/MarketplaceRatingImpl.java

@@ -14,6 +14,7 @@
  */
 package org.apereo.portal.portlet.dao.jpa;
 
+import java.util.Date;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
@@ -33,6 +34,9 @@ class MarketplaceRatingImpl implements IMarketplaceRating {
     @Column(name = "REVIEW", length = REVIEW_MAX_LENGTH)
     private String review;
 
+    @Column(name = "RATINGDATE")
+    private Date ratingDate;
+
     @Override
     public MarketplaceRatingPK getMarketplaceRatingPK() {
         return marketplaceRatingPK;
@@ -69,12 +73,21 @@ public void setRating(int rating) {
         this.rating = rating;
     }
 
+    public Date getRatingDate() {
+        return ratingDate;
+    }
+
+    public void setRatingDate(Date ratingDate) {
+        this.ratingDate = ratingDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this)
                 .append("RatingPK: ", this.marketplaceRatingPK)
                 .append("Rating: ", this.rating)
                 .append("Review: ", this.review)
+                .append("Date: ", this.ratingDate)
                 .toString();
     }
 }