- add import voteResults

- add import all webhook (commented)

Author: ManAnRuck

src/graphql/queries/getAllProcedures.js

@@ -1,8 +1,8 @@
 import gql from 'graphql-tag';
 
 export default gql`
-  query allProcedures() {
-    allProcedures() {
+  query allProcedures {
+    allProcedures {
       title
       procedureId
       type
@@ -16,6 +16,8 @@ export default gql`
         initiator
         decision {
           tenor
+          type
+          comment
         }
         date
       }

src/index.js

@@ -13,6 +13,7 @@ import typeDefs from './graphql/schemas';
 import resolvers from './graphql/resolvers';
 
 import webhook from './scripts/webhook';
+import importAll from './scripts/importAll';
 
 import auth from './express/auth';
 
@@ -83,6 +84,9 @@ app.post('/webhooks/bundestagio/update', async (req, res) => {
   }
 });
 
+// Darf in Production nicht ausführbar sein!
+// app.get('/webhooks/bundestagio/import-all', importAll);
+
 const graphqlServer = createServer(app);
 
 graphqlServer.listen(constants.PORT, (err) => {

src/scripts/import.js

@@ -22,19 +22,24 @@ export default async (procedureIds) => {
         newBIoProcedure.voteDate = lastHistory.date;
       }
       let voteResults = false;
-      procedures.history.forEach((h) => {
+      procedures.history.some((h) => {
         if (h.decision) {
-          return h.decision.forEach((decision) => {
+          return h.decision.some((decision) => {
             if (decision.type === 'Namentliche Abstimmung') {
-              return (voteResults = {
-                yes: decision.comment,
-                no: decision.comment,
-                abstination: decision.comment,
-              });
+              const vResults = decision.comment.split(':');
+              voteResults = {
+                yes: vResults[0],
+                no: vResults[1],
+                abstination: vResults[2],
+              };
+              return true;
             }
+            return false;
           });
         }
+        return false;
       });
+      newBIoProcedure.voteResults = voteResults;
 
       newBIoProcedure.lastUpdateDate = lastHistory.date;
 

scripts/importAll.js renamed to src/scripts/importAll.js

@@ -1,17 +1,17 @@
-import client from '../src/graphql/client';
-import Procedure from '../src/models/Procedure';
-import getAllProcedures from '../src/graphql/queries/getAllProcedures';
+import createClient from '../graphql/client';
+import Procedure from '../models/Procedure';
+import getAllProcedures from '../graphql/queries/getAllProcedures';
 
-require('../src/config/db');
-
-(async () => {
+export default async () => {
+  const client = createClient();
   console.log('Start Importing');
   const { data: { allProcedures } } = await client.query({
     query: getAllProcedures,
     // variables: {},
   });
   console.log(allProcedures.map(({ procedureId }) => procedureId));
   console.log('Start Inserting');
+  // Start Inserting
   await allProcedures.forEach(async (bIoProcedure) => {
     const newBIoProcedure = { ...bIoProcedure };
     if (bIoProcedure && bIoProcedure.history) {
@@ -22,6 +22,26 @@ require('../src/config/db');
       } else if (newBIoProcedure.currentStatus === 'Zurückgezogen') {
         newBIoProcedure.voteDate = lastHistory.date;
       }
+      let voteResults = false;
+      bIoProcedure.history.some((h) => {
+        if (h.decision) {
+          return h.decision.some((decision) => {
+            if (decision.type === 'Namentliche Abstimmung') {
+              const vResults = decision.comment.split(':');
+              voteResults = {
+                yes: vResults[0],
+                no: vResults[1],
+                abstination: vResults[2],
+              };
+              return true;
+            }
+            return false;
+          });
+        }
+        return false;
+      });
+      console.log(newBIoProcedure.procedureId, voteResults);
+      newBIoProcedure.voteResults = voteResults;
 
       newBIoProcedure.lastUpdateDate = lastHistory.date;
 
@@ -36,4 +56,4 @@ require('../src/config/db');
     );
   });
   console.log('Imported everything!'); // eslint-disable-line
-})();
+};