Refactor

icodejs · Feb 14, 2020 · 094c356 · 094c356
1 parent 93e1c10
commit 094c356
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/pages/Lessons/Lessons.jsx b/src/pages/Lessons/Lessons.jsx
@@ -68,9 +68,8 @@ const getChordsInKey = ({ tonic, chordLength = CHORD_LENGTH }) => {
     })
     .map((name, index) => {
       return {
-        name,
         scaleDegree: index + 1,
-        chord: R.compose(R.take(chordLength), R.prop('notes'), chord)(name),
+        ...chord(name),
       };
     });
 };
@@ -85,8 +84,8 @@ const findChordMatch = ({
     return;
   }
 
-  return chordsInKey.find(({ chord }) => {
-    return chord.every(key => {
+  return chordsInKey.find(({ notes }) => {
+    return notes.every(key => {
       return noteNames.includes(key);
     });
   });
@@ -155,7 +154,7 @@ class Lessons extends Component {
       return;
     }
 
-    return `Chord match: ${JSON.stringify(matchedChord.name)}`;
+    return `Chord match: ${matchedChord.name} - ${matchedChord.notes}`;
   }
 
   render() {