Skip to content

Commit 310faad

Browse files
authored
Merge pull request #55 from demokratie-live/sprint#10/issue-fixes-demokratie-live#2
Sprint#10/issue fixes demokratie-live#2
2 parents ce20b80 + 5c8ef8d commit 310faad

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

src/graphql/resolvers/Procedure.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,13 @@ export default {
194194
active: !!active,
195195
};
196196
},
197+
voted: async (procedure, args, { VoteModel, user }) => {
198+
const voted = await VoteModel.findOne({ procedure, users: user });
199+
return !!voted;
200+
},
201+
votedGoverment: procedure => (
202+
procedure.voteResults &&
203+
(procedure.voteResults.yes || procedure.voteResults.abstination || procedure.voteResults.no)
204+
),
197205
},
198206
};

src/graphql/schemas/Procedure.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ type Procedure {
2020
activityIndex: ActivityIndex
2121
importantDocuments: [Document]
2222
voteResults: VoteResult
23+
voted: Boolean
24+
votedGoverment: Boolean
2325
notify: Boolean
2426
listType: ProcedureType
2527
}

src/services/notifications/apn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (!apnProvider) {
1010
keyId: process.env.APPLE_APN_KEY_ID,
1111
teamId: process.env.APPLE_TEAMID,
1212
},
13-
production: false, // TODO: handle APLPHA/BETA/PRODUCTION
13+
production: process.env.NODE_ENV === 'production', // TODO: handle APLPHA/BETA/PRODUCTION
1414
};
1515

1616
if (_.filter(options.token, option => !option).length > 0) {

0 commit comments

Comments
 (0)