Merge pull request #190 from redbadger/rest-events

REST’arised events URL
redbadger · Jul 13, 2016 · 1f4a6bb · 1f4a6bb
2 parents 3c4f45e + 95d53db
commit 1f4a6bb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/server/api/controllers/events.js b/src/server/api/controllers/events.js
@@ -47,7 +47,7 @@ export default class EventsController {
   getEvent = (req, res) => {
     const body = `
       query {
-        event(id: "${req.query.id}") {
+        event(id: "${req.params.id}") {
           ${allEventFields}
         }
       }

diff --git a/src/server/api/index.js b/src/server/api/index.js
@@ -12,7 +12,7 @@ export default function createApi(workable) {
   api.use(bodyParser.urlencoded({ extended: true }));
 
   api.get('/jobs', jobsController.getJobs);
-  api.get('/event', eventsController.getEvent);
+  api.get('/event/:id', eventsController.getEvent);
   api.get('/events', eventsController.getEvents);
 
   return api;

diff --git a/src/shared/actions/events/event.js b/src/shared/actions/events/event.js
@@ -42,7 +42,7 @@ export const fetchEvent = (fetch) => (
     const { id, token } = location ? location.query : {};
 
     if (id && token) {
-      return fetch(`${apiEndpoint}/event?id=${id}&token=${token}`)
+      return fetch(`${apiEndpoint}/event/${id}?token=${token}`)
         // eslint-disable-next-line no-shadow
         .then((event) => dispatch(fetchSuccessful(event)))
         .catch((error) => dispatch(fetchFailure(error)));

diff --git a/src/shared/actions/events/event.spec.js b/src/shared/actions/events/event.spec.js
@@ -129,7 +129,7 @@ describe('event actions', () => {
           fetchFn(dispatch, getState, nextState)
             .then(() => {
               const { id, token } = nextState.location.query;
-              expect(fetch.firstCall.args[0]).to.equal(`${apiEndpoint}/event?id=${id}&token=${token}`);
+              expect(fetch.firstCall.args[0]).to.equal(`${apiEndpoint}/event/${id}?token=${token}`);
               done();
             })
             .catch(done);