back - ImpactInfo

Fix bug in feedback token update graphql schema
publicissapient-france · Apr 8, 2017 · f6b3cc6 · f6b3cc6
1 parent 8db5dc3
commit f6b3cc6
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 8 deletions.
diff --git a/back/queries/feedback_find.graphql b/back/queries/feedback_find.graphql
@@ -5,7 +5,12 @@
         badges
         created_at
         updated_at
-        impact
+        impact {
+            id
+            description
+            created_at
+            updated_at
+        }
         customer {
             id
             firstname

diff --git a/back/queries/feedback_find_by_token.graphql b/back/queries/feedback_find_by_token.graphql
@@ -5,7 +5,6 @@
         badges
         created_at
         updated_at
-        impact
         customer {
             id
             firstname
@@ -16,5 +15,11 @@
             firstname
             lastname
         }
+        impact {
+            id
+            description
+            created_at
+            updated_at
+        }
     }
 }
diff --git a/back/src/feedback/query.feedback.js b/back/src/feedback/query.feedback.js
@@ -39,7 +39,16 @@ const feedback_by_token = {
     },
   },
   resolve(obj, { token }) {
-    return FeedbackRepository.getFeedbackByToken(token);
+    let dbFeedback;
+    return FeedbackRepository.getFeedbackByToken(token)
+      .then(_feedback => dbFeedback = _feedback)
+      .then(() => ImpactRepository.getImpact(dbFeedback.impact_id))
+      .then(impact => dbFeedback.impact = impact)
+      .then(() => CustomerRepository.getCustomer(dbFeedback.customer_id))
+      .then(customer => dbFeedback.customer = customer)
+      .then(() => XebianRepository.getXebian(dbFeedback.xebian_id))
+      .then(xebian => dbFeedback.xebian = xebian)
+      .then(() => dbFeedback);
   },
 };
 

diff --git a/back/src/feedback/type.feedback.js b/back/src/feedback/type.feedback.js
@@ -1,4 +1,5 @@
 const Author = require('./type.author');
+const ImpactInfo = require('../impact/type.impact.info');
 const {
   GraphQLObjectType,
   GraphQLString,
@@ -14,7 +15,7 @@ const Feedback = new GraphQLObjectType({
       type: new GraphQLNonNull(GraphQLString),
     },
     impact: {
-      type: GraphQLJSON,
+      type: ImpactInfo,
     },
     comment: {
       type: GraphQLString,

diff --git a/back/src/impact/type.impact.info.js b/back/src/impact/type.impact.info.js
@@ -0,0 +1,26 @@
+const {
+  GraphQLObjectType,
+  GraphQLString,
+  GraphQLNonNull,
+} = require('graphql');
+const GraphQLDate = require('graphql-date');
+
+const ImpactInfo = new GraphQLObjectType({
+  name: 'ImpactInfo',
+  fields: {
+    id: {
+      type: new GraphQLNonNull(GraphQLString),
+    },
+    description: {
+      type: new GraphQLNonNull(GraphQLString),
+    },
+    created_at: {
+      type: GraphQLDate,
+    },
+    updated_at: {
+      type: GraphQLDate,
+    },
+  },
+});
+
+module.exports = ImpactInfo;
diff --git a/back/src/mail/templates/invitation-email/html.hbs b/back/src/mail/templates/invitation-email/html.hbs
@@ -8,7 +8,7 @@
     <pre>{{impact.description}}</pre>
 </p>
 <p>
-    Pourriez-vous vous rendre <a href="https://impact.xebia.fr/feedbacks/{{feedback.token}}">à cette adresse</a>.
+    Pourriez-vous vous rendre <a href="https://impact.xebia.fr/#/feedbacks/{{feedback.token}}">à cette adresse</a>.
 </p>
 <p>
     Pour en savoir plus sur X-Impact, n'hésite pas à consulter <a href="http://impact.xebia.fr">notre site</a>.

diff --git a/back/src/mail/templates/invitation-email/text.hbs b/back/src/mail/templates/invitation-email/text.hbs
@@ -4,7 +4,7 @@ Nous vous invitons à laisser un feedback à {{xebian.firstname}} {{xebian.lastn
 
 {{impact.description}}
 
-Pourriez-vous vous rendre à cette adresse : https://impact.xebia.fr/feedbacks/{{feedback.token}}
+Pourriez-vous vous rendre à cette adresse : https://impact.xebia.fr/#/feedbacks/{{feedback.token}}
 
 Pour en savoir plus sur X-Impact, n'hésite pas à consulter <a href="http://impact.xebia.fr">notre site</a>.
 

diff --git a/back/src/monthly-feedback/monthly-feedback.js b/back/src/monthly-feedback/monthly-feedback.js
@@ -8,12 +8,14 @@ const MailService = require('../mail/mail.service');
 const createAndSendFeedback = (impact) => {
   let customer;
   let xebian;
+  let feedback;
   return FeedbackRepository.createCustomerFeedback(impact.id, impact.customer_id)
+    .then(_feedback => feedback = _feedback)
     .then(() => CustomerRepository.getCustomer(impact.customer_id))
     .then(_customer => customer = _customer)
     .then(() => XebianRepository.getXebian(impact.xebian_id))
     .then(_xebian => xebian = _xebian)
-    .then((feedback) => {
+    .then(() => {
       feedback.token = FeedbackRepository.createToken(feedback);
       return MailService.send({ to: customer.email, feedback, customer, xebian, impact, template: 'invitation-email' });
     });

diff --git a/graphql.schema.json b/graphql.schema.json