Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Fix relative date calculation

Blue Mouseffd0d0fa463b
diff --git a/backend/apps/cloud/src/project/gsc.service.ts b/backend/apps/cloud/src/project/gsc.service.ts
index e59449952..193e055f2 100644
--- a/backend/apps/cloud/src/project/gsc.service.ts
+++ b/backend/apps/cloud/src/project/gsc.service.ts
@@ -1126,15 +1126,28 @@ export class GSCService {
}
const organicPositions: OrganicPositionSeriesEntry[] = []
- let cursor = dayjs(from).startOf('day')
- const end = dayjs(to).startOf('day')
-
- while (cursor.isBefore(end) || cursor.isSame(end, 'day')) {
- const date = cursor.format('YYYY-MM-DD')
- organicPositions.push(
- organicPositionsByDate.get(date) || initialOrganicPositionEntry(date),
- )
- cursor = cursor.add(1, 'day')
+ const datesWithPositionData = Array.from(
+ organicPositionsByDate.keys(),
+ ).sort()
+
+ if (datesWithPositionData.length > 0) {
+ let cursor = dayjs(datesWithPositionData[0]).startOf('day')
+ const requestedEnd = dayjs(to).startOf('day')
+ const lastDataDate = dayjs(
+ datesWithPositionData[datesWithPositionData.length - 1],
+ ).startOf('day')
+ const end = lastDataDate.isBefore(requestedEnd)
+ ? lastDataDate
+ : requestedEnd
+
+ while (cursor.isBefore(end) || cursor.isSame(end, 'day')) {
+ const date = cursor.format('YYYY-MM-DD')
+ organicPositions.push(
+ organicPositionsByDate.get(date) ||
+ initialOrganicPositionEntry(date),
+ )
+ cursor = cursor.add(1, 'day')
+ }
}
return {
diff --git a/backend/apps/community/src/project/gsc.service.ts b/backend/apps/community/src/project/gsc.service.ts
index 4b535931f..ebd548d21 100644
--- a/backend/apps/community/src/project/gsc.service.ts
+++ b/backend/apps/community/src/project/gsc.service.ts
@@ -1187,15 +1187,28 @@ export class GSCService {
}
const organicPositions: OrganicPositionSeriesEntry[] = []
- let cursor = dayjs(from).startOf('day')
- const end = dayjs(to).startOf('day')
-
- while (cursor.isBefore(end) || cursor.isSame(end, 'day')) {
- const date = cursor.format('YYYY-MM-DD')
- organicPositions.push(
- organicPositionsByDate.get(date) || initialOrganicPositionEntry(date),
- )
- cursor = cursor.add(1, 'day')
+ const datesWithPositionData = Array.from(
+ organicPositionsByDate.keys(),
+ ).sort()
+
+ if (datesWithPositionData.length > 0) {
+ let cursor = dayjs(datesWithPositionData[0]).startOf('day')
+ const requestedEnd = dayjs(to).startOf('day')
+ const lastDataDate = dayjs(
+ datesWithPositionData[datesWithPositionData.length - 1],
+ ).startOf('day')
+ const end = lastDataDate.isBefore(requestedEnd)
+ ? lastDataDate
+ : requestedEnd
+
+ while (cursor.isBefore(end) || cursor.isSame(end, 'day')) {
+ const date = cursor.format('YYYY-MM-DD')
+ organicPositions.push(
+ organicPositionsByDate.get(date) ||
+ initialOrganicPositionEntry(date),
+ )
+ cursor = cursor.add(1, 'day')
+ }
}
return {