Merge pull request #34 from demokratie-live/sprint#7/abstimmung

add named voting results

Author: ManAnRuck

scripts/importAll.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/graphql/queries/getAllProcedures.js

@@ -16,6 +16,8 @@ export default gql`
         initiator
         decision {
           tenor
+          type
+          comment
         }
         date
       }

src/graphql/queries/getProcedures.js

@@ -5,6 +5,13 @@ enum ProcedureType {
   HOT
 }
 
+type VoteResult {
+  yes: Int
+  no: Int
+  abstination: Int
+  notVote: Int
+}
+
 type Procedure {
   _id: ID!
   title: String!
@@ -19,6 +26,7 @@ type Procedure {
   submissionDate: Date
   activityIndex: ActivityIndex
   importantDocuments: [Document]
+  voteResults: VoteResult
 }
 
 type Query {

src/graphql/schemas/Procedure.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/index.js

@@ -21,6 +21,12 @@ const ProcedureSchema = new Schema(
     lastUpdateDate: Date,
     subjectGroups: [String],
     importantDocuments: [Document],
+    voteResults: {
+      yes: { type: Number, required: true },
+      no: { type: Number, required: true },
+      abstination: { type: Number, required: true },
+      notVote: { type: Number, required: true },
+    },
   },
   { timestamps: true },
 );

src/models/Procedure.js

@@ -1,7 +1,24 @@
+import _ from 'lodash';
+
 import createClient from '../graphql/client';
 import Procedure from '../models/Procedure';
 import getProcedures from '../graphql/queries/getProcedures';
 
+const deputiesNumber = {
+  8: 518,
+  9: 519,
+  10: 520,
+  11: 663,
+  12: 662,
+  13: 672,
+  14: 665,
+  15: 601,
+  16: 611,
+  17: 620,
+  18: 630,
+  19: 709,
+};
+
 export default async (procedureIds) => {
   const client = createClient();
   // Start Importing
@@ -21,14 +38,39 @@ export default async (procedureIds) => {
       } else if (newBIoProcedure.currentStatus === 'Zurückgezogen') {
         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;
+      });
+      newBIoProcedure.voteResults = voteResults;
 
       newBIoProcedure.lastUpdateDate = lastHistory.date;
 
       newBIoProcedure.submissionDate = newBIoProcedure.history[0].date;
     }
     return Procedure.findOneAndUpdate(
       { procedureId: newBIoProcedure.procedureId },
-      newBIoProcedure,
+      _(newBIoProcedure)
+        .omitBy(x => _.isNull(x) || _.isUndefined(x))
+        .value(),
       {
         upsert: true,
       },

src/scripts/import.js

@@ -0,0 +1,83 @@
+import _ from 'lodash';
+
+import createClient from '../graphql/client';
+import Procedure from '../models/Procedure';
+import getAllProcedures from '../graphql/queries/getAllProcedures';
+
+const deputiesNumber = {
+  8: 518,
+  9: 519,
+  10: 520,
+  11: 663,
+  12: 662,
+  13: 672,
+  14: 665,
+  15: 601,
+  16: 611,
+  17: 620,
+  18: 630,
+  19: 709,
+};
+
+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) {
+      const [lastHistory] = newBIoProcedure.history.slice(-1);
+      const btWithDecisions = bIoProcedure.history.filter(({ assignment, initiator }) => assignment === 'BT' && initiator === '2. Beratung');
+      if (btWithDecisions.length > 0) {
+        newBIoProcedure.voteDate = new Date(btWithDecisions.pop().date);
+      } else if (newBIoProcedure.currentStatus === 'Zurückgezogen') {
+        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;
+      });
+
+      newBIoProcedure.voteResults = voteResults;
+
+      newBIoProcedure.lastUpdateDate = lastHistory.date;
+
+      newBIoProcedure.submissionDate = newBIoProcedure.history[0].date;
+    }
+
+    await Procedure.findOneAndUpdate(
+      { procedureId: newBIoProcedure.procedureId },
+      _(newBIoProcedure)
+        .omitBy(x => _.isNull(x) || _.isUndefined(x))
+        .value(),
+      {
+        upsert: true,
+      },
+    );
+  });
+  console.log('Imported everything!'); // eslint-disable-line
+};