changed to use LocalDateTime instead for calculating Today minus

a number of days for searching portlet ratings
phillips1021 · Dec 6, 2017 · 3ec0bb9 · 3ec0bb9
1 parent 2587721
commit 3ec0bb9
Showing 1 changed file with 66 additions and 36 deletions.
diff --git a/uPortal-web/src/main/java/org/apereo/portal/portlet/dao/jpa/JpaMarketplaceRatingDao.java b/uPortal-web/src/main/java/org/apereo/portal/portlet/dao/jpa/JpaMarketplaceRatingDao.java
@@ -36,6 +36,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;
@@ -119,7 +120,7 @@ public IMarketplaceRating createOrUpdateRating(
         temp.setMarketplaceRatingPK(tempPK);
         temp.setRating(rating);
         temp.setReview(review);
-        temp.setRatingDate( new Date() );
+        temp.setRatingDate(new Date());
         return this.createOrUpdateRating(temp);
     }
 
@@ -305,53 +306,82 @@ public void aggregateMarketplaceRating() {
             }
         }
     }
-    
+
     @Override
-    public Set<IMarketplaceRating> getAllRatingsForPortletInLastXDays(int numberOfDaysBack, final String fname) {
-
-        final Calendar queryDate = Calendar.getInstance();
-        queryDate.add(Calendar.DAY_OF_YEAR, 0-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"), queryDate.getTime());
-                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;
-            }
-        }));
+    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) {
 
         final Calendar queryDate = Calendar.getInstance();
-        queryDate.add(Calendar.DAY_OF_YEAR, 0-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"), queryDate.getTime());
-
-                criteriaQuery.select(definitionRoot).where(ratingDatePredicate);
-
-                return criteriaQuery;
-            }
-        }));
+        queryDate.add(Calendar.DAY_OF_YEAR, 0 - 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"),
+                                                        queryDate.getTime());
+
+                                        criteriaQuery
+                                                .select(definitionRoot)
+                                                .where(ratingDatePredicate);
+
+                                        return criteriaQuery;
+                                    }
+                                }));
 
         return new HashSet<IMarketplaceRating>(query.getResultList());
     }
-
-
 }