s

app/trade/[base]/components/charts/tradingview/helpers.ts

@@ -61,7 +61,7 @@ export async function fetchBarsForPeriod(
   timeInterval: string,
   countBack: number,
 ): Promise<Bar[]> {
-  // Reduce startTimeMs by 10%
+  // Reduce startTimeMs by 10% to ensure we fetch enough bars
   const adjustedStartTimeMs = startTimeMs - (endTimeMs - startTimeMs) * 0.1
 
   const timeChunks = splitTimeRange(
@@ -88,14 +88,12 @@ export async function fetchBarsForPeriod(
     new Map(allBars.map((bar) => [bar.time, bar])).values(),
   ).sort((a, b) => a.time - b.time)
 
-  if (uniqueBars.length >= countBack) {
-    return uniqueBars
-  } else {
+  if (uniqueBars.length < countBack) {
     console.warn(
       `Not enough bars fetched: ${uniqueBars.length}, requested ${countBack}`,
     )
-    return uniqueBars // Return what we have instead of throwing an error
   }
+  return uniqueBars
 }
 
 /**
@@ -122,7 +120,6 @@ async function fetchBarsForTimeChunk(
       countBack,
     )
   } else {
-    // Split the time range into two equal parts
     const midTimeMs = startTimeMs + Math.floor(timeDiff / 2)
     const [firstHalf, secondHalf] = await Promise.all([
       fetchBarsForTimeChunk(
@@ -144,33 +141,6 @@ async function fetchBarsForTimeChunk(
   }
 }
 
-/**
- * Splits a time range into smaller chunks for parallel processing.
- * @param startTimeMs The start time in milliseconds.
- * @param endTimeMs The end time in milliseconds.
- * @param maxChunks The maximum number of chunks to create.
- * @returns An array of time chunks, each with a start and end time.
- */
-function splitTimeRange(
-  startTimeMs: number,
-  endTimeMs: number,
-  maxChunks: number,
-) {
-  const totalDuration = endTimeMs - startTimeMs
-  const chunkSize = Math.ceil(totalDuration / maxChunks)
-  const chunks = []
-
-  for (let i = 0; i < maxChunks; i++) {
-    const chunkStart = startTimeMs + i * chunkSize
-    const chunkEnd = Math.min(chunkStart + chunkSize, endTimeMs)
-    chunks.push({ start: chunkStart, end: chunkEnd })
-    if (chunkEnd === endTimeMs) break
-  }
-
-  return chunks
-}
-
-// TODO: Start time MS recursively decrements and gets stuck in loop. Need to figure out where it's being decremented and avoid.
 /**
  * Helper function to fetch trading bars for periods of 2 years or less.
  * @param ticker The ticker symbol for the asset pair.
@@ -215,3 +185,29 @@ async function fetchBarsForTwoYearsOrLess(
 
   return allBars
 }
+
+/**
+ * Splits a time range into smaller chunks for parallel processing.
+ * @param startTimeMs The start time in milliseconds.
+ * @param endTimeMs The end time in milliseconds.
+ * @param maxChunks The maximum number of chunks to create.
+ * @returns An array of time chunks, each with a start and end time.
+ */
+function splitTimeRange(
+  startTimeMs: number,
+  endTimeMs: number,
+  maxChunks: number,
+) {
+  const totalDuration = endTimeMs - startTimeMs
+  const chunkSize = Math.ceil(totalDuration / maxChunks)
+  const chunks = []
+
+  for (let i = 0; i < maxChunks; i++) {
+    const chunkStart = startTimeMs + i * chunkSize
+    const chunkEnd = Math.min(chunkStart + chunkSize, endTimeMs)
+    chunks.push({ start: chunkStart, end: chunkEnd })
+    if (chunkEnd === endTimeMs) break
+  }
+
+  return chunks
+}