refactor prioritize #244

EthanJStark · 2017-04-14T00:56:00Z

No description provided.

jrob8577

Love the file organization.

Didn't go through the tests too closely...

jrob8577 · 2017-04-14T16:24:43Z

public/frontend/prioritization/active.js

+const active = ( requests, coachId ) =>
+  requests.map( request => Object.assign( {}, request, { active: isActive( request, coachId ) }))
+
+//TODO throw error if not given 2nd arg coachId


I'm not a fan of throwing an error - the function should be invoked correctly.

jrob8577 · 2017-04-14T16:26:27Z

tests/fixtures/requests/index.js

+  goal: { coach_id: coach_id || DEFAULT_COACH_ID }
+})
+
+const REQUESTS = [


Do we still need these? If so, we should generate entries using the request function, for consistency.

jrob8577 · 2017-04-14T16:30:31Z

tests/frontend/prioritization/active.js

+describe( 'active', () => {
+  describe( 'when no requests are active', () => {
+    it( 'returns array with no active requests', () => {
+      const input = [{}].map( item => request( item ))


I'm regretting the use of a function like this now in order to generate a valid request object... it makes it unclear in the test that we are generating a request. Maybe we could refactor our request function to be a member of an object that makes it clear that we are generating test mocks:

const Factory = { request } Factory.request() Factory.request({ created_at: `whatever` }) Factory.request({ coach_id: `1234-5678` })

EthanJStark · 2017-04-14T19:06:02Z

For your review!

All tests are passing, but can't run them unless you move frontend to root directory and uncomment require statements.

jrob8577 · 2017-04-14T18:58:37Z

public/frontend/prioritization/active.js

+const active = ( requests, coachId ) =>
+  requests.map( request => Object.assign( {}, request, { active: isActive( request, coachId ) }))
+
+const isActive = ( request, coachId ) => request.events.some( ({ data }) => data.claimed_by === coachId )


Can't active also mean escalated by me at some point?

It is the case that an escalated-by-me request has also been previously claimed-by-me, so isActive will catch all relevant requests.

jrob8577 · 2017-04-14T18:59:46Z

public/frontend/prioritization/prioritize.js

+
+const prioritize = requests =>
+  requests.map( request =>
+    Object.assign( {}, request, { priority: calculatePriority( request ) }))


Formatting off... I suggest closing the map on a new line, and applying sort on that line, with proper alignment (sort is at the same level as requests.map)

jrob8577 · 2017-04-14T19:00:51Z

public/javascripts/coach.js

+    const visibleRequests = decoratedSortedRequests.filter( request => request.visible )
+    const activeRequests = decoratedSortedRequests.filter( request => request.active )
+      .map( request => Object.assign( {}, request, { escalatable:
+        !request.events.some( ({ data }) => data.escalated_by === userId )} ))


Isn't this notEscalatedByMe?

jrob8577 · 2017-04-14T19:01:43Z

public/javascripts/coach.js

@@ -149,6 +126,7 @@ const escalationClick = event => {
  const { request_id } = event.target.dataset

  fetch( '/events', params( 'post', { request_id, name: 'escalate' }))
+    .then( _ => window.location.reload( true ) )


This was intentionally removed - refresh should happen on event publication...

@jrob8577 It's not refreshing without this . . . Do you have any insights on where we could look to see why it's not?

jrob8577 · 2017-04-14T19:01:46Z

public/javascripts/coach.js

@@ -157,6 +135,7 @@ const claimClick = event => {
  const { request_id } = event.target.dataset

  fetch( '/events', params( 'post', { request_id, name: 'claim' }))
+    .then( _ => window.location.reload( true ) )


This was intentionally removed - refresh should happen on event publication...

jrob8577 · 2017-04-14T19:06:23Z

tests/frontend/prioritization/visible.js

+describe( 'notEscalatedByMe', () => {
+
+  describe( 'when the request was escalated by me', () => {
+


Remove extraneous whitespace between describe and first it

jrob8577 · 2017-04-14T19:06:26Z

tests/frontend/prioritization/visible.js

+  })
+
+  describe( 'when the request was escalated by another coach', () => {
+


Remove extraneous whitespace between describe and first it

jrob8577 · 2017-04-14T19:06:30Z

tests/frontend/prioritization/visible.js

+  })
+
+  describe( 'when the request has not been escalated', () => {
+


Remove extraneous whitespace between describe and first it

jrob8577 · 2017-04-14T19:07:23Z

tests/frontend/prioritization/prioritize.js

+
+
+describe( 'calculatePriority', () => {
+


Remove extraneous whitespace between describe and first describe

jrob8577 · 2017-04-14T19:07:31Z

tests/frontend/prioritization/prioritize.js

+
+  describe( 'comparing one older and one newer request', () => {
+
+    const newerRequest = Factory.request( {


Move test cases into it

jrob8577 · 2017-04-14T21:32:20Z

public/javascripts/coach/templates.js

@@ -33,7 +33,7 @@ const queueTemplate = ({ id, goal, created_at, events, players, claimable, escal
  }[ events[ events.length - 1 ].name ]

  return `
-    <div class="panel panel-${type}" data-created-at="${created_at}">
+    <div class="panel panel-${type}" data-created_at="${created_at}">


This should be created-at...

jrob8577 · 2017-04-14T21:32:30Z

public/javascripts/coach.js

@@ -126,7 +99,7 @@ load()
 const buttons = className => {
  const elements = document.querySelectorAll( className )

-  if( elements !== null ) {
+  if ( elements !== null ) {


There should not be a space here.

jrob8577 · 2017-04-14T21:33:03Z

public/javascripts/coach.js

+    const visibleRequests = decoratedSortedRequests.filter( request => request.visible )
+    const activeRequests = decoratedSortedRequests.filter( request => request.active )
+      .map( request => Object.assign( {}, request, { escalatable:
+        !request.events.some( ({ data }) => data.escalated_by === userId )} ))


Formatting is hard to understand. Close map ) should align with map

jrob8577 · 2017-04-14T21:33:43Z

tests/fixtures/requests/index.js

+    goal: { coach_id: coach_id || DEFAULT_COACH_ID }
+  })
+}
+


remove extra space

jrob8577 · 2017-04-14T21:34:02Z

tests/frontend/prioritization/prioritize.js

+      const sortedRequests = prioritize(testRequests)
+
+      expect( sortedRequests.map( request => request.events[ request.events.length - 1 ].created_at ))
+        .to.deep.equal([ priorityOneEvent.events[ priorityOneEvent.events.length - 1 ].created_at,


Formatting hard to read.

* Complete refactor of how we sort, filter, and decorate requests * Wrote and tested small helper functions that serve active, visible, and prioritize

EthanJStark changed the title ~~240 refactor prioritize~~ WIP refactor prioritize Apr 14, 2017

jrob8577 reviewed Apr 14, 2017

View reviewed changes

EthanJStark force-pushed the 240-refactor-prioritize branch from 7ebe6e6 to d2bd79a Compare April 14, 2017 19:04

jrob8577 suggested changes Apr 14, 2017

View reviewed changes

EthanJStark force-pushed the 240-refactor-prioritize branch 3 times, most recently from 354b80c to 83a3514 Compare April 14, 2017 21:27

jrob8577 suggested changes Apr 14, 2017

View reviewed changes

[Fixes #240] Claimable bug, refactor prioritize()

0927bf8

* Complete refactor of how we sort, filter, and decorate requests * Wrote and tested small helper functions that serve active, visible, and prioritize

EthanJStark force-pushed the 240-refactor-prioritize branch from 83a3514 to 0927bf8 Compare April 14, 2017 21:48

EthanJStark changed the title ~~WIP refactor prioritize~~ refactor prioritize Apr 14, 2017

EthanJStark merged commit cdfc2c7 into GuildCrafts:master Apr 14, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor prioritize #244

refactor prioritize #244

EthanJStark commented Apr 14, 2017

jrob8577 left a comment

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

EthanJStark commented Apr 14, 2017

jrob8577 Apr 14, 2017

EthanJStark Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

EthanJStark Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

jrob8577 Apr 14, 2017

		describe( 'notEscalatedByMe', () => {

		describe( 'when the request was escalated by me', () => {

		})

		describe( 'when the request has not been escalated', () => {


		describe( 'comparing one older and one newer request', () => {

		const newerRequest = Factory.request( {

refactor prioritize #244

refactor prioritize #244

Conversation

EthanJStark commented Apr 14, 2017

jrob8577 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EthanJStark commented Apr 14, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment