Merge branch 'master' into sprint#10/issue-fixes-demokratie-live#2

ManAnRuck · ManAnRuck · commit 5c8ef8dec88d · 2018-04-23T17:18:38.000+02:00
diff --git a/src/express/auth/jsonWebToken.js b/src/express/auth/jsonWebToken.js
@@ -29,7 +29,6 @@ export default (app) => {
 
   app.use((req, res, next) => {
     passport.authenticate('jwt', { session: true }, (err, user) => {
-      // console.log(info);
       if (user) {
         req.user = user;
       }
diff --git a/src/graphql/queries/getAllProcedures.js b/src/graphql/queries/getAllProcedures.js
@@ -28,6 +28,13 @@ export default gql`
         url
         number
       }
+      customData {
+        voteResults {
+          yes
+          no
+          abstination
+        }
+      }
     }
   }
 `;
diff --git a/src/graphql/queries/getProcedures.js b/src/graphql/queries/getProcedures.js
@@ -28,6 +28,13 @@ export default gql`
         url
         number
       }
+      customData {
+        voteResults {
+          yes
+          no
+          abstination
+        }
+      }
     }
   }
 `;
diff --git a/src/scripts/import.js b/src/scripts/import.js
@@ -40,29 +40,45 @@ export default async (procedureIds) => {
       } else if (newBIoProcedure.currentStatus === 'Zurückgezogen') {
         newBIoProcedure.voteDate = lastHistory.date;
       }
+
+      // check vote results
       let voteResults;
-      bIoProcedure.history.some((h) => {
-        if (h.decision) {
-          return h.decision.some((decision) => {
-            if (decision.type === 'Namentliche Abstimmung') {
-              const voteResultsRegEx = /(\d{1,3}:\d{1,3}:\d{1,3})/;
-              const voteResultsProto = decision.comment.match(voteResultsRegEx);
-              const vResults = voteResultsProto ? voteResultsProto[0].split(':') : null;
-              voteResults = {
-                yes: vResults ? vResults[0] : null,
-                no: vResults ? vResults[1] : null,
-                abstination: vResults ? vResults[2] : null,
-                notVote:
-                  deputiesNumber[bIoProcedure.period] -
-                  (vResults ? vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0) : 0),
-              };
-              return true;
-            }
-            return false;
-          });
-        }
-        return false;
-      });
+      if (
+        bIoProcedure.customData &&
+        bIoProcedure.customData.voteResults &&
+        (bIoProcedure.customData.voteResults.yes ||
+          bIoProcedure.customData.voteResults.abstination ||
+          bIoProcedure.customData.voteResults.no)
+      ) {
+        voteResults = {
+          yes: bIoProcedure.customData.voteResults.yes,
+          abstination: bIoProcedure.customData.voteResults.abstination,
+          no: bIoProcedure.customData.voteResults.no,
+        };
+      } else {
+        bIoProcedure.history.some((h) => {
+          if (h.decision) {
+            return h.decision.some((decision) => {
+              if (decision.type === 'Namentliche Abstimmung') {
+                const voteResultsRegEx = /(\d{1,3}:\d{1,3}:\d{1,3})/;
+                const voteResultsProto = decision.comment.match(voteResultsRegEx);
+                const vResults = voteResultsProto ? voteResultsProto[0].split(':') : null;
+                voteResults = {
+                  yes: vResults ? vResults[0] : null,
+                  no: vResults ? vResults[1] : null,
+                  abstination: vResults ? vResults[2] : null,
+                  notVote:
+                    deputiesNumber[bIoProcedure.period] -
+                    (vResults ? vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0) : 0),
+                };
+                return true;
+              }
+              return false;
+            });
+          }
+          return false;
+        });
+      }
       newBIoProcedure.voteResults = voteResults;
 
       newBIoProcedure.lastUpdateDate = lastHistory.date;
diff --git a/src/scripts/importAll.js b/src/scripts/importAll.js
@@ -41,29 +41,45 @@ export default async (req, res) => {
       } else if (pastStatus.some(status => status === newBIoProcedure.currentStatus)) {
         newBIoProcedure.voteDate = lastHistory.date;
       }
-      let voteResults;
-      bIoProcedure.history.some((h) => {
-        if (h.decision) {
-          return h.decision.some((decision) => {
-            if (decision.type === 'Namentliche Abstimmung') {
-              const voteResultsRegEx = /(\d{1,3}:\d{1,3}:\d{1,3})/;
-              const vResults = decision.comment.match(voteResultsRegEx)[0].split(':');
-              voteResults = {
-                yes: vResults[0],
-                no: vResults[1],
-                abstination: vResults[2],
-                notVote:
-                  deputiesNumber[bIoProcedure.period] -
-                  vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0),
-              };
-              return true;
-            }
-            return false;
-          });
-        }
-        return false;
-      });
 
+      // check vote results
+      let voteResults;
+      if (
+        bIoProcedure.customData &&
+        bIoProcedure.customData.voteResults &&
+        (bIoProcedure.customData.voteResults.yes ||
+          bIoProcedure.customData.voteResults.abstination ||
+          bIoProcedure.customData.voteResults.no)
+      ) {
+        voteResults = {
+          yes: bIoProcedure.customData.voteResults.yes,
+          abstination: bIoProcedure.customData.voteResults.abstination,
+          no: bIoProcedure.customData.voteResults.no,
+        };
+      } else {
+        bIoProcedure.history.some((h) => {
+          if (h.decision) {
+            return h.decision.some((decision) => {
+              if (decision.type === 'Namentliche Abstimmung') {
+                const voteResultsRegEx = /(\d{1,3}:\d{1,3}:\d{1,3})/;
+                const voteResultsProto = decision.comment.match(voteResultsRegEx);
+                const vResults = voteResultsProto ? voteResultsProto[0].split(':') : null;
+                voteResults = {
+                  yes: vResults ? vResults[0] : null,
+                  no: vResults ? vResults[1] : null,
+                  abstination: vResults ? vResults[2] : null,
+                  notVote:
+                    deputiesNumber[bIoProcedure.period] -
+                    (vResults ? vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0) : 0),
+                };
+                return true;
+              }
+              return false;
+            });
+          }
+          return false;
+        });
+      }
       newBIoProcedure.voteResults = voteResults;
 
       newBIoProcedure.lastUpdateDate = lastHistory.date;
diff --git a/src/scripts/webhook.js b/src/scripts/webhook.js
@@ -28,7 +28,7 @@ export default async (data) => {
     },
   ]);
 
-  const update = [];
+  let update = [];
   await Promise.all(data.map(async (d) => {
     const period = parseInt(d.period, 10);
     const types = d.types.filter(t => t.type === 'Gesetzgebung' || t.type === 'Antrag');
@@ -38,9 +38,9 @@ export default async (data) => {
       const localGroup = group ? group.types.find(ct => ct.type === type) : null;
       const localCount = localGroup ? localGroup.count : 0;
       // Append Changed IDs
-      update.concat(changedIds);
+      update = update.concat(changedIds);
       // Compare Counts Remote & Local
-      if (countBefore > localCount) {
+      if (countBefore > localCount && countBefore >= 0) {
         // Find remote Procedure Updates
         const { data: { procedureUpdates } } = await client.query({
           query: getProcedureUpdates,

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ export default (app) => {`
`29`	`29`
`30`	`30`	`app.use((req, res, next) => {`
`31`	`31`	`passport.authenticate('jwt', { session: true }, (err, user) => {`
`32`		`- // console.log(info);`
`33`	`32`	`if (user) {`
`34`	`33`	`req.user = user;`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
@@ -28,6 +28,13 @@ export default gql`
`28`	`28`	`url`
`29`	`29`	`number`
`30`	`30`	`}`
	`31`	`+ customData {`
	`32`	`+ voteResults {`
	`33`	`+ yes`
	`34`	`+ no`
	`35`	`+ abstination`
	`36`	`+ }`
	`37`	`+ }`
`31`	`38`	`}`
`32`	`39`	`}`
`33`	`40`	`;