Merge pull request #37 from redbadger/multiday-events

Event end date sanitation

lib/fetch.js

@@ -30,7 +30,8 @@ export function sanitizeEventAndNews(item, type) {
     strapline: get(`${type}.strapline`),
     datetime: get(`${type}.timestamp`),
     startDateTime: get(`${type}.timestamp`),
-    endDateTime: get(`${type}.timestampEnd`),
+    endDateTime: pathOr(get(`${type}.timestamp`),
+      ['data', `${type}.timestampEnd`, 'value'], item),
     internalLinks: mapLinkList(get(`${type}.internalLinks`)),
     externalLinks: mapLinkList(get(`${type}.externalLinks`)),
     body: get(`${type}.body`) || [],

lib/fetch.spec.js

@@ -1,4 +1,6 @@
 import PrismicMock from '../test/mocks/prismic';
+import * as prismicEventResponse from
+  '../test/fixtures/event-prismic-response.json';
 
 import {
   sanitizeEventAndNews,
@@ -85,8 +87,17 @@ describe('Data sanitation', () => {
 
     expect(sanitizeEventAndNews(event)).to.deep.equal(emptyResponse);
   });
+
+
+  it('should copy start datetime to end datetime when end datetime is empty', () => {
+    const response = sanitizeEventAndNews(prismicEventResponse, 'event');
+
+    expect(response.startDateTime).to.deep.equal(response.endDateTime);
+    expect(response.endDateTime).to.equal('2016-07-27T23:00:00+0000');
+  });
 });
 
+
 describe('sanitizeCommunity', () => {
   it('converts the raw json provided by prismic to be readable by graphql', () => {
     const rawData = {

lib/resolvers.js

@@ -10,7 +10,7 @@ export const mapDateTime = fieldName => doc => {
     iso: timestamp,
     date: dateFns.format(d, 'DD'),
     month: dateFns.format(d, 'MM'),
-    monthSym: dateFns.format(d, 'MMM'),
+    monthSym: dateFns.format(d, 'MMMM'),
     year: dateFns.format(d, 'YYYY'),
   };
 };

lib/resolvers.spec.js

@@ -10,7 +10,7 @@ describe('Resolvers', () => {
         iso: data.datetime,
         date: '08',
         month: '06',
-        monthSym: 'Jun',
+        monthSym: 'June',
         year: '2016',
       });
     });

test/fixtures/event-prismic-response.json

@@ -0,0 +1,131 @@
+{
+  "id": "V3-PjyMAAF0n2y3Q",
+  "uid": "react-london-july-meetup",
+  "type": "event",
+  "href": "https://rb-website-stage.prismic.io/api/documents/search?ref=V4Y7ciMAAICj9eD-&q=%5B%5B%3Ad+%3D+at%28document.id%2C+%22V3-PjyMAAF0n2y3Q%22%29+%5D%5D",
+  "tags": [],
+  "slug": "react-london-july-meetup",
+  "slugs": [
+    "react-london-july-meetup"
+  ],
+  "data": {
+    "event.title": {
+      "type": "Text",
+      "value": "React London July Meetup"
+    },
+    "event.strapline": {
+      "type": "Text",
+      "value": "Awesome meetup"
+    },
+    "event.body": {
+      "type": "StructuredText",
+      "value": [
+        {
+          "type": "paragraph",
+          "text": "With description",
+          "spans": []
+        }
+      ]
+    },
+    "event.timestamp": {
+      "type": "Timestamp",
+      "value": "2016-07-27T23:00:00+0000"
+    },
+    "event.address": {
+      "type": "Text",
+      "value": "Skills Matter, CodeNode, 10 South Place, London EC2M 7EB"
+    },
+    "event.talks": {
+      "type": "Group",
+      "value": [
+        {
+          "data": {
+            "type": "Link.document",
+            "value": {
+              "document": {
+                "id": "V3-t-SMAALE426eq",
+                "type": "talk",
+                "tags": [],
+                "slug": "graphql-for-beginners",
+                "uid": "GraphQL for beginners"
+              },
+              "isBroken": false
+            }
+          }
+        }
+      ]
+    }
+  },
+  "fragments": {
+    "event.title": {
+      "value": "React London July Meetup"
+    },
+    "event.strapline": {
+      "value": "Awesome meetup"
+    },
+    "event.body": {
+      "blocks": [
+        {
+          "type": "paragraph",
+          "text": "With description",
+          "spans": []
+        }
+      ]
+    },
+    "event.timestamp": {
+      "value": "2016-07-27T23:00:00.000Z"
+    },
+    "event.address": {
+      "value": "Skills Matter, CodeNode, 10 South Place, London EC2M 7EB"
+    },
+    "event.talks": {
+      "value": [
+        {
+          "data": {
+            "data": {
+              "type": "Link.document",
+              "value": {
+                "document": {
+                  "id": "V3-t-SMAALE426eq",
+                  "type": "talk",
+                  "tags": [],
+                  "slug": "graphql-for-beginners",
+                  "uid": "GraphQL for beginners"
+                },
+                "isBroken": false
+              }
+            }
+          },
+          "fragments": {
+            "data": {
+              "value": {
+                "document": {
+                  "id": "V3-t-SMAALE426eq",
+                  "type": "talk",
+                  "tags": [],
+                  "slug": "graphql-for-beginners",
+                  "uid": "GraphQL for beginners"
+                },
+                "isBroken": false
+              },
+              "document": {
+                "id": "V3-t-SMAALE426eq",
+                "type": "talk",
+                "tags": [],
+                "slug": "graphql-for-beginners",
+                "uid": "GraphQL for beginners"
+              },
+              "id": "V3-t-SMAALE426eq",
+              "uid": "GraphQL for beginners",
+              "tags": [],
+              "slug": "graphql-for-beginners",
+              "type": "talk",
+              "fragments": {},
+              "isBroken": false
+            }
+          }
+        }
+      ]
+    }
+  }
+}

test/fixtures/news-resolve.json

@@ -8,7 +8,7 @@
         "iso": "2016-02-02T12:00:00+0000",
         "date": "02",
         "month": "02",
-        "monthSym": "Feb",
+        "monthSym": "February",
         "year": "2016"
       },
       "strapline": "Red Badger CEO Cain Ullah explains how he and the other Founders learned from their own experience to build incentives for Red Badger that go beyond the impersonal ‘reward’ of financial bonuses",