Implemented start and after date filters

adriantoine · Sep 16, 2015 · a925fc2 · a925fc2
1 parent 8addc83
commit a925fc2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bloql",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Blog engine powered by blog engine powered by React using Relay and GraphQL to interact with data",
   "scripts": {
     "clean": "rm -rf dist/",

diff --git a/src/client/PostList.js b/src/client/PostList.js
@@ -39,8 +39,8 @@ function createBlog(RelayPostList, PostList) {
     initialVariables: {
       count: PostList.postCount || 10,
 
-      beforeDate: PostList.beforeDate || null,
-      afterDate: PostList.afterDate || null,
+      startDate: PostList.startDate || null,
+      endDate: PostList.endDate || null,
       date: PostList.date || null,
       categories: PostList.categories || null,
       tags: PostList.tags || null,
@@ -50,7 +50,7 @@ function createBlog(RelayPostList, PostList) {
       blog: () => {
         return Relay.QL`
           fragment on Blog {
-            posts(first: $count beforeDate:$beforeDate afterDate:$afterDate date:$date categories:$categories tags:$tags) {
+            posts(first: $count startDate:$startDate endDate:$endDate date:$date categories:$categories tags:$tags) {
               ${RelayPostList.getFragment('posts')}
             }
           }

diff --git a/src/server/schema/database.js b/src/server/schema/database.js
@@ -31,14 +31,16 @@ export function getBlog() {
 
 // Function to call by filter
 var filterFunctions = {
+  startDate: startDateFilter,
+  endDate: endDateFilter,
   date: dateFilter,
   title: stringFilter,
   slug: stringFilter,
   categories: arrayFilterAnd,
   tags: arrayFilterAnd,
 };
 
-// Filter by date equality field
+// Filter by string equality field
 function stringFilter(a, b) {
   return a === b;
 }
@@ -60,6 +62,16 @@ function dateFilter(a, b) {
   return moment(a).format('YYYYMMDD') === moment(b).format('YYYYMMDD');
 }
 
+// Filter by date equality field
+function startDateFilter(a, b, meta) {
+  return moment(meta.date).isAfter(moment(b));
+}
+
+// Filter by date equality field
+function endDateFilter(a, b, meta) {
+  return moment(meta.date).isBefore(moment(b));
+}
+
 function isNullOrUndefined(a) {
   return _.isNull(a) || _.isUndefined(a);
 }
@@ -86,7 +98,7 @@ function checkFilters(filtersParam, meta) {
 
   // Check that every filter pass
   return _.every(filters, function (value, filter) {
-    return filterFunctions[filter](meta[filter], value);
+    return filterFunctions[filter](meta[filter], value, meta);
   });
 
 }

diff --git a/src/server/schema/types.js b/src/server/schema/types.js
@@ -87,10 +87,10 @@ export const blogType = new GraphQLObjectType({
       type: connection.connectionType,
       description: 'Blog posts',
       args: _.extend(connectionArgs, {
-        beforeDate: {
+        startDate: {
           type: GraphQLString
         },
-        afterDate: {
+        endDate: {
           type: GraphQLString
         },
         date: {
@@ -104,8 +104,8 @@ export const blogType = new GraphQLObjectType({
         }
       }),
       resolve: (blog, args) => connectionFromArray(getPostList({
-        beforeDate: args.beforeDate,
-        afterDate: args.afterDate,
+        startDate: args.startDate,
+        endDate: args.endDate,
         date: args.date,
         categories: args.categories,
         tags: args.tags