Merge pull request #43 from demokratie-live/sprint#9/Antrag

add proceduretype "Antrag"

Author: ulfgebhardt

src/scripts/importAll.js

@@ -19,7 +19,9 @@ const deputiesNumber = {
   19: 709,
 };
 
-export default async () => {
+const pastStatus = ['Zurückgezogen', 'Abgelehnt', 'Angenommen'];
+
+export default async (req, res) => {
   const client = createClient();
   console.log('Start Importing');
   const { data: { allProcedures } } = await client.query({
@@ -36,7 +38,7 @@ export default async () => {
       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') {
+      } else if (pastStatus.some(status => status === newBIoProcedure.currentStatus)) {
         newBIoProcedure.voteDate = lastHistory.date;
       }
       let voteResults;
@@ -80,4 +82,5 @@ export default async () => {
     );
   });
   console.log('Imported everything!'); // eslint-disable-line
+  res.send('Imported everything!');
 };

src/scripts/webhook.js

@@ -31,9 +31,10 @@ export default async (data) => {
   const update = [];
   await Promise.all(data.map(async (d) => {
     const period = parseInt(d.period, 10);
-    const { type, countBefore, changedIds } = d.types.find(t => t.type === 'Gesetzgebung');
+    const { type, countBefore, changedIds } = d.types.find(t => t.type === 'Gesetzgebung' || t.type === 'Antrag');
     const group = groups.find(c => c.period === period);
-    const localCount = group ? group.types.find(ct => ct.type === type).count : 0;
+    const localGroup = group ? group.types.find(ct => ct.type === type) : null;
+    const localCount = localGroup ? localGroup.count : 0;
     // Append Changed IDs
     update.concat(changedIds);
     // Compare Counts Remote & Local
@@ -43,18 +44,18 @@ export default async (data) => {
         query: getProcedureUpdates,
         variables: { period, type },
       });
-        // Find local Procedure Updates
+      // Find local Procedure Updates
       const localProcedureUpdates = await ProcedureModel.find(
         { period, type },
         { procedureId: 1, bioUpdateAt: 1 },
       );
-        // Compare
+      // Compare
       procedureUpdates.forEach((pu) => {
         const localData = localProcedureUpdates.find(ld => ld.procedureId === pu.procedureId);
         if (
           !localData ||
-            (pu.bioUpdateAt &&
-              new Date(localData.bioUpdateAt).getTime() !== new Date(pu.bioUpdateAt).getTime())
+          (pu.bioUpdateAt &&
+            new Date(localData.bioUpdateAt).getTime() !== new Date(pu.bioUpdateAt).getTime())
         ) {
           update.push(pu.procedureId);
         }