add named voting results

Author: ManAnRuck

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

@@ -25,6 +25,7 @@ const ProcedureSchema = new Schema(
       yes: { type: Number, required: true },
       no: { type: Number, required: true },
       abstination: { type: Number, required: true },
+      notVote: { type: Number, required: true },
     },
   },
   { timestamps: true },

src/scripts/import.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,7 +38,7 @@ export default async (procedureIds) => {
       } else if (newBIoProcedure.currentStatus === 'Zurückgezogen') {
         newBIoProcedure.voteDate = lastHistory.date;
       }
-      let voteResults = false;
+      let voteResults;
       procedures.history.some((h) => {
         if (h.decision) {
           return h.decision.some((decision) => {
@@ -31,6 +48,9 @@ export default async (procedureIds) => {
                 yes: vResults[0],
                 no: vResults[1],
                 abstination: vResults[2],
+                notVote:
+                  deputiesNumber[bIoProcedure.period] -
+                  vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0),
               };
               return true;
             }
@@ -47,7 +67,9 @@ export default async (procedureIds) => {
     }
     return Procedure.findOneAndUpdate(
       { procedureId: newBIoProcedure.procedureId },
-      newBIoProcedure,
+      _(newBIoProcedure)
+        .omitBy(x => _.isNull(x) || _.isUndefined(x))
+        .value(),
       {
         upsert: true,
       },

src/scripts/importAll.js

@@ -1,7 +1,24 @@
+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');
@@ -22,7 +39,7 @@ export default async () => {
       } else if (newBIoProcedure.currentStatus === 'Zurückgezogen') {
         newBIoProcedure.voteDate = lastHistory.date;
       }
-      let voteResults = false;
+      let voteResults;
       bIoProcedure.history.some((h) => {
         if (h.decision) {
           return h.decision.some((decision) => {
@@ -32,6 +49,9 @@ export default async () => {
                 yes: vResults[0],
                 no: vResults[1],
                 abstination: vResults[2],
+                notVote:
+                  deputiesNumber[bIoProcedure.period] -
+                  vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0),
               };
               return true;
             }
@@ -40,16 +60,19 @@ export default async () => {
         }
         return false;
       });
-      console.log(newBIoProcedure.procedureId, voteResults);
+
       newBIoProcedure.voteResults = voteResults;
 
       newBIoProcedure.lastUpdateDate = lastHistory.date;
 
       newBIoProcedure.submissionDate = newBIoProcedure.history[0].date;
     }
+
     await Procedure.findOneAndUpdate(
       { procedureId: newBIoProcedure.procedureId },
-      newBIoProcedure,
+      _(newBIoProcedure)
+        .omitBy(x => _.isNull(x) || _.isUndefined(x))
+        .value(),
       {
         upsert: true,
       },