Utils refactor

src/hooks/useRandomNumbers.js

@@ -1,18 +1,15 @@
 import { useCallback, useState } from 'react'
 
 import { BOUNDS, MAX_QUANTITY, MIN_QUANTITY } from '@constants/numbers'
-import { numberGenerator } from '@utils/numberGenerator'
-import { randomNumber } from '@utils/randomNumber'
+import { getRandomNumbersFactory } from '@utils/randomNumbers'
 
-const generator = numberGenerator(...BOUNDS)
-const quantity = { min: MIN_QUANTITY, max: MAX_QUANTITY }
-const getNextNumbers = () => [...Array(randomNumber(quantity))].map(() => generator.next().value)
+const getRandomNumbers = getRandomNumbersFactory(MIN_QUANTITY, MAX_QUANTITY, BOUNDS)
 
 const useRandomNumbers = () => {
-  const [numbers, setNumbers] = useState(getNextNumbers)
+  const [numbers, setNumbers] = useState(getRandomNumbers)
 
   const nextNumbers = useCallback(() => {
-    setNumbers(getNextNumbers())
+    setNumbers(getRandomNumbers())
   }, [])
 
   return [numbers, nextNumbers]

src/services/storage.js

@@ -1,8 +1,32 @@
 import { firestore } from '@utils/firebase'
-import { normalizeAttempts } from '@utils/normalizeAttempts'
+import { twoDigits } from '@utils/twoDigits'
 
 const attemptsRef = firestore.collection('attempts')
 
+const parseDate = (fetchedDate) => {
+  const date = fetchedDate.toDate()
+  const year = date.getFullYear()
+  const month = twoDigits(date.getMonth() + 1)
+  const day = twoDigits(date.getDate())
+  return `${year}-${month}-${day}`
+}
+
+const normalizeAttempts = (snapshot) => {
+  const attempts = {}
+  snapshot.forEach(document => {
+    const data = document.data()
+    if (!data.end) return
+
+    const date = parseDate(data.end)
+    if (!attempts[date]) attempts[date] = [0, 0]
+
+    attempts[date][0]++
+    if (data.success === true) attempts[date][1]++
+  })
+
+  return attempts
+}
+
 export const fetchAttempts = async (uid, initDate, finishDate) => {
   const snapshot = await attemptsRef
     .where('uid', '==', uid)

src/utils/randomNumbers.js

@@ -0,0 +1,16 @@
+const getRandomNumber = (min, max) =>
+  min + Math.floor(Math.random() * (max - min + 1))
+
+const runOneOf = (callbacks) => {
+  const index = getRandomNumber(0, callbacks.length - 1)
+  return callbacks[index]()
+}
+
+export const getRandomNumbersFactory = (minQuantity, maxQuantity, bounds) => {
+  const callbacks = bounds.map(([min, max]) => () => getRandomNumber(min, max))
+
+  return () => {
+    const quantity = getRandomNumber(minQuantity, maxQuantity)
+    return [...Array(quantity)].map(() => runOneOf(callbacks))
+  }
+}