improved vote reset

teropa · teropa · commit 84c51e763c66 · 2015-09-10T16:42:16.000+03:00
diff --git a/src/components/Voting.jsx b/src/components/Voting.jsx
@@ -18,7 +18,7 @@ export const Voting = React.createClass({
 function mapStateToProps(state) {
   return {
     pair: state.getIn(['vote', 'pair']),
-    hasVoted: state.get('hasVoted'),
+    hasVoted: state.getIn(['myVote', 'entry']),
     winner: state.get('winner')
   };
 }
diff --git a/src/reducer.js b/src/reducer.js
@@ -5,19 +5,23 @@ function setState(state, newState) {
 }
 
 function vote(state, entry) {
+  const currentRound = state.getIn(['vote', 'round']);
   const currentPair = state.getIn(['vote', 'pair']);
   if (currentPair && currentPair.includes(entry)) {
-    return state.set('hasVoted', entry);
+    return state.set('myVote', Map({
+      round: currentRound,
+      entry
+    }));
   } else {
     return state;
   }
 }
 
 function resetVote(state) {
-  const hasVoted = state.get('hasVoted');
-  const currentPair = state.getIn(['vote', 'pair'], List());
-  if (hasVoted && !currentPair.includes(hasVoted)) {
-    return state.remove('hasVoted');
+  const votedForRound = state.getIn(['myVote', 'round']);
+  const currentRound = state.getIn(['vote', 'round']);
+  if (votedForRound !== currentRound) {
+    return state.remove('myVote');
   } else {
     return state;
   }
diff --git a/test/reducer_spec.js b/test/reducer_spec.js
@@ -67,9 +67,10 @@ describe('reducer', () => {
     }));
   });
 
-  it('handles VOTE by setting hasVoted', () => {
+  it('handles VOTE by setting myVote', () => {
     const state = fromJS({
       vote: {
+        round: 42,
         pair: ['Trainspotting', '28 Days Later'],
         tally: {Trainspotting: 1}
       }
@@ -79,16 +80,21 @@ describe('reducer', () => {
 
     expect(nextState).to.equal(fromJS({
       vote: {
+        round: 42,
         pair: ['Trainspotting', '28 Days Later'],
         tally: {Trainspotting: 1}
       },
-      hasVoted: 'Trainspotting'
+      myVote: {
+        round: 42,
+        entry: 'Trainspotting'
+      }
     }));
   });
 
-  it('does not set hasVoted for VOTE on invalid entry', () => {
+  it('does not set myVote for VOTE on invalid entry', () => {
     const state = fromJS({
       vote: {
+        round: 42,
         pair: ['Trainspotting', '28 Days Later'],
         tally: {Trainspotting: 1}
       }
@@ -98,33 +104,40 @@ describe('reducer', () => {
 
     expect(nextState).to.equal(fromJS({
       vote: {
+        round: 42,
         pair: ['Trainspotting', '28 Days Later'],
         tally: {Trainspotting: 1}
       }
     }));
   });
 
-  it('removes hasVoted on SET_STATE if pair changes', () => {
+  it('removes myVote on SET_STATE if round has changed', () => {
     const initialState = fromJS({
       vote: {
+        round: 42,
         pair: ['Trainspotting', '28 Days Later'],
         tally: {Trainspotting: 1}
       },
-      hasVoted: 'Trainspotting'
+      myVote: {
+        round: 42,
+        entry: 'Trainspotting'
+      }
     });
     const action = {
       type: 'SET_STATE',
       state: {
         vote: {
-          pair: ['Sunshine', 'Slumdog Millionaire']
+          round: 43,
+          pair: ['Sunshine', 'Trainspotting']
         }
       }
     };
     const nextState = reducer(initialState, action);
 
     expect(nextState).to.equal(fromJS({
       vote: {
-        pair: ['Sunshine', 'Slumdog Millionaire']
+        round: 43,
+        pair: ['Sunshine', 'Trainspotting']
       }
     }));
   });

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export const Voting = React.createClass({`
`18`	`18`	`function mapStateToProps(state) {`
`19`	`19`	`return {`
`20`	`20`	`pair: state.getIn(['vote', 'pair']),`
`21`		`- hasVoted: state.get('hasVoted'),`
	`21`	`+ hasVoted: state.getIn(['myVote', 'entry']),`
`22`	`22`	`winner: state.get('winner')`
`23`	`23`	`};`
`24`	`24`	`}`