Merge pull request #39 from demokratie-live/sprint#7/fix_import_0

Sprint#7/fix import 0

Author: ulfgebhardt

src/graphql/resolvers/Procedure.js

@@ -128,7 +128,16 @@ export default {
 
     searchProcedures: (parent, { term }, { ProcedureModel }) =>
       ProcedureModel.find(
-        { $text: { $search: term }, period: 19 },
+        {
+          $or: [
+            { procedureId: { $regex: term, $options: 'i' } },
+            { title: { $regex: term, $options: 'i' } },
+            { abstract: { $regex: term, $options: 'i' } },
+            { tags: { $regex: term, $options: 'i' } },
+            { subjectGroups: { $regex: term, $options: 'i' } },
+          ],
+          period: 19,
+        },
         { score: { $meta: 'textScore' } },
       ).sort({ score: { $meta: 'textScore' } }),
   },

src/scripts/import.js

@@ -44,14 +44,15 @@ export default async (procedureIds) => {
           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(':');
+              const voteResultsProto = decision.comment.match(voteResultsRegEx);
+              const vResults = voteResultsProto ? voteResultsProto[0].split(':') : null;
               voteResults = {
-                yes: vResults[0],
-                no: vResults[1],
-                abstination: vResults[2],
+                yes: vResults ? vResults[0] : null,
+                no: vResults ? vResults[1] : null,
+                abstination: vResults ? vResults[2] : null,
                 notVote:
                   deputiesNumber[bIoProcedure.period] -
-                  vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0),
+                  (vResults ? vResults.reduce((pv, cv) => pv + parseInt(cv, 10), 0) : 0),
               };
               return true;
             }