Merge pull request #59 from demokratie-live/sprint#11/list-order

Sortierreihenfolge von Alpha und Beta unterscheiden sich (Abstimmung)

Author: ManAnRuck

CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+### 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)

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"

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),
   },
 };