From e69c036c8036da19d75981f54c7fb1c277128a00 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 24 Apr 2023 16:21:50 +0200
Subject: [PATCH] order events by event date, filter outdated events

---
 backend/src/graphql/posts.js                  |  1 +
 .../src/schema/resolvers/filter-posts.spec.js | 73 ++++++++++++++++++-
 backend/src/schema/types/type/Post.gql        |  3 +
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/posts.js b/backend/src/graphql/posts.js
index 7d57b8510..d1dc3ee45 100644
--- a/backend/src/graphql/posts.js
+++ b/backend/src/graphql/posts.js
@@ -72,6 +72,7 @@ export const filterPosts = () => {
         id
         title
         content
+        eventStart
       }
     }
   `
diff --git a/backend/src/schema/resolvers/filter-posts.spec.js b/backend/src/schema/resolvers/filter-posts.spec.js
index b3109dbe4..0b96e001f 100644
--- a/backend/src/schema/resolvers/filter-posts.spec.js
+++ b/backend/src/schema/resolvers/filter-posts.spec.js
@@ -138,7 +138,7 @@ describe('Filter Posts', () => {
   })
 
   describe('post type filter set to ["Article", "Event"]', () => {
-    it('finds the articles', async () => {
+    it('finds all posts', async () => {
       const {
         data: { Post: result },
       } = await query({
@@ -156,4 +156,75 @@ describe('Filter Posts', () => {
       )
     })
   })
+
+  describe('order events by event start descending', () => {
+    it('finds the events orderd accordingly', async () => {
+      const {
+        data: { Post: result },
+      } = await query({
+        query: filterPosts(),
+        variables: { filter: { postType_in: ['Event'] }, orderBy: ['eventStart_desc'] },
+      })
+      expect(result).toHaveLength(2)
+      expect(result).toEqual([
+        expect.objectContaining({
+          id: 'e1',
+          eventStart: new Date(now.getFullYear(), now.getMonth() + 1).toISOString(),
+        }),
+        expect.objectContaining({
+          id: 'e2',
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).toISOString(),
+        }),
+      ])
+    })
+  })
+
+  describe('order events by event start ascending', () => {
+    it('finds the events orderd accordingly', async () => {
+      const {
+        data: { Post: result },
+      } = await query({
+        query: filterPosts(),
+        variables: { filter: { postType_in: ['Event'] }, orderBy: ['eventStart_asc'] },
+      })
+      expect(result).toHaveLength(2)
+      expect(result).toEqual([
+        expect.objectContaining({
+          id: 'e2',
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).toISOString(),
+        }),
+        expect.objectContaining({
+          id: 'e1',
+          eventStart: new Date(now.getFullYear(), now.getMonth() + 1).toISOString(),
+        }),
+      ])
+    })
+  })
+
+  describe('filter events by event start date', () => {
+    it('finds only events after given date', async () => {
+      const {
+        data: { Post: result },
+      } = await query({
+        query: filterPosts(),
+        variables: {
+          filter: {
+            postType_in: ['Event'],
+            eventStart_gte: new Date(
+              now.getFullYear(),
+              now.getMonth(),
+              now.getDate() + 2,
+            ).toISOString(),
+          },
+        },
+      })
+      expect(result).toHaveLength(1)
+      expect(result).toEqual([
+        expect.objectContaining({
+          id: 'e1',
+          eventStart: new Date(now.getFullYear(), now.getMonth() + 1).toISOString(),
+        }),
+      ])
+    })
+  })
 })
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 988e2b81d..548f3d5aa 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -84,6 +84,7 @@ input _PostFilter {
   group: _GroupFilter
   postsInMyGroups: Boolean
   postType_in: [PostType]
+  eventStart_gte: String 
 }
 
 enum _PostOrdering {
@@ -105,6 +106,8 @@ enum _PostOrdering {
   language_desc
   pinned_asc
   pinned_desc
+  eventStart_asc
+  eventStart_desc
 }