Merge remote-tracking branch 'democracy-server/master'

Author: roschaefer

democracy-server/.env.example

@@ -4,4 +4,6 @@ ENGINE_API_KEY=
 APPLE_TEAMID=
 APPLE_APN_KEY_ID=
 APPLE_APN_KEY=
-NOTIFICATION_ANDROID_SERVER_KEY=
+NOTIFICATION_ANDROID_SERVER_KEY=
+STAGE= # alpha | beta | production
+NODE_ENV= # development | production

democracy-server/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+### 0.1.5
+
+* pushNotifications
+  * Disabled pushNotifications due to non-functionality
+
+### 0.1.4
+
+* graphQL
+  * Procedure resolver: procedures
+    * Fix order ( first votedate and add by last update ) [#280](https://github.com/demokratie-live/democracy-client/issues/280)

democracy-server/package.json

@@ -1,13 +1,14 @@
 {
   "name": "democracy-server",
-  "version": "0.0.1",
+  "version": "0.1.4",
   "main": "src/index.js",
   "author": "Manuel Ruck",
   "license": "Apache2",
   "private": true,
   "scripts": {
     "start": "babel-node src/index.js",
-    "dev": "nodemon -L -e js,graphql src/index.js --exec \"node --require dotenv/config --require babel-register\"",
+    "dev":
+      "nodemon -L -e js,graphql src/index.js --exec \"node --require dotenv/config --require babel-register\"",
     "lint": "eslint .",
     "build": "babel src -d dist -s",
     "serve": "node dist/index.js"

democracy-server/src/config/constants.js

@@ -7,4 +7,18 @@ export default {
   GRAPHQL_PATH: '/graphql',
   BUNDESTAGIO_SERVER_URL: process.env.BUNDESTAGIO_SERVER_URL || 'http://localhost:3100/graphql',
   NOTIFICATION_ANDROID_SERVER_KEY: process.env.NOTIFICATION_ANDROID_SERVER_KEY || false,
+  APN_TOPIC: (() => {
+    switch (process.env.STAGE) {
+      case 'alpha':
+        return 'de.democracy-deutschland.clientapp.alpha';
+      case 'beta':
+        return 'de.democracy-deutschland.clientapp.beta';
+      case 'production':
+        return 'de.democracy-deutschland.clientapp';
+
+      default:
+        console.error('ERROR: no STAGE defined!');
+        return 'de.democracy-deutschland.clientapp';
+    }
+  })(),
 };

democracy-server/src/graphql/resolvers/Procedure.js

@@ -57,7 +57,7 @@ export default {
       }
 
       let period = { $gte: 19 };
-      let sort = { voteDate: -1 };
+      let sort = { voteDate: -1, lastUpdateDate: -1 };
       if (type === 'PREPARATION') {
         period = { $gte: 19 };
         sort = { lastUpdateDate: -1 };
@@ -198,9 +198,8 @@ export default {
       const voted = await VoteModel.findOne({ procedure, users: user });
       return !!voted;
     },
-    votedGoverment: procedure => (
+    votedGoverment: procedure =>
       procedure.voteResults &&
-        (procedure.voteResults.yes || procedure.voteResults.abstination || procedure.voteResults.no)
-    ),
+      (procedure.voteResults.yes || procedure.voteResults.abstination || procedure.voteResults.no),
   },
 };

democracy-server/src/services/notifications/apn.js

@@ -10,7 +10,7 @@ if (!apnProvider) {
       keyId: process.env.APPLE_APN_KEY_ID,
       teamId: process.env.APPLE_TEAMID,
     },
-    production: process.env.NODE_ENV === 'production', // TODO: handle APLPHA/BETA/PRODUCTION
+    production: process.env.NODE_ENV === 'production',
   };
 
   if (_.filter(options.token, option => !option).length > 0) {

democracy-server/src/services/notifications/index.js

@@ -1,16 +1,21 @@
 /* eslint no-underscore-dangle: ["error", { "allow": ["_id"] }] */
 
-import _ from 'lodash';
-import apn from 'apn';
-import gcm from 'node-gcm';
+// import _ from 'lodash';
+// import apn from 'apn';
+// import gcm from 'node-gcm';
+// import util from 'util';
 
-import apnProvider from './apn';
-import gcmProvider from './gcm';
+// import apnProvider from './apn';
+// import gcmProvider from './gcm';
 import UserModel from '../../models/User';
 import ProcedureModel from '../../models/Procedure';
+// import CONFIG from '../../config/constants';
 
-const sendNotifications = ({ tokenObjects, message }) => {
-  const androidNotificationTokens = [];
+// TODO: remove both eslint-disable-line
+const sendNotifications = ({ tokenObjects, message }) => { // eslint-disable-line
+  // Disable Push Notifications
+  return; // eslint-disable-line
+  /* const androidNotificationTokens = [];
   tokenObjects.forEach(({ token, os }) => {
     switch (os) {
       case 'ios':
@@ -19,7 +24,7 @@ const sendNotifications = ({ tokenObjects, message }) => {
 
           note.alert = message;
           // note.payload = { messageFrom: 'John Appleseed' };
-          note.topic = 'de.democracy-deutschland.clientapp';
+          note.topic = CONFIG.APN_TOPIC;
 
           apnProvider.send(note, token).then((result) => {
             console.log('apnProvider.send', result);
@@ -54,7 +59,7 @@ const sendNotifications = ({ tokenObjects, message }) => {
         else console.log('gcmProvider', response);
       },
     );
-  }
+  } */
 };
 
 const newVote = async ({ procedureId }) => {
@@ -104,8 +109,13 @@ const procedureUpdate = async ({ procedureId }) => {
 
 export { procedureUpdate, newVote, newPreperation };
 
-export default async ({ message, user }) => {
-  let userId;
+// TODO: remove both eslint-disable-line
+export default async ({ message, user }) => { // eslint-disable-line
+  // Disable Push Notifications
+  return; // eslint-disable-line
+  // This function seems to be (partly) a duplicate of the sendNotifications function
+  // refactor?
+  /* let userId;
   if (_.isObject(user)) {
     userId = user._id;
   }
@@ -120,10 +130,10 @@ export default async ({ message, user }) => {
 
             note.alert = message;
             // note.payload = { messageFrom: 'John Appleseed' };
-            note.topic = 'de.democracy-deutschland.clientapp';
+            note.topic = CONFIG.APN_TOPIC;
 
             apnProvider.send(note, token).then((result) => {
-              console.log('apnProvider.send', result);
+              console.log('apnProvider.send', util.inspect(result, false, null));
             });
           }
           break;
@@ -156,5 +166,5 @@ export default async ({ message, user }) => {
         },
       );
     }
-  }
+  } */
 };