fix(profile/pages): getting time range

Author: Mnigos

app/profile/[id]/@top/@albums/page.tsx

@@ -44,7 +44,11 @@ export default async function ProfileTopAlbumsSubPage({
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )
-  const timeRange = validateTimeRange(searchParams[TIME_RANGE], statsProvider)
+  const timeRange = validateTimeRange(
+    searchParams[TIME_RANGE],
+    statsProvider,
+    createdAt
+  )
   const view = validateView(searchParams[VIEW])
 
   if (statsProvider === StatsProvider.SPOTIFY) return null

app/profile/[id]/@top/@artists/page.tsx

@@ -50,7 +50,11 @@ export default async function ProfileTopArtistsSubPage({
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )
-  const timeRange = validateTimeRange(searchParams[TIME_RANGE], statsProvider)
+  const timeRange = validateTimeRange(
+    searchParams[TIME_RANGE],
+    statsProvider,
+    createdAt
+  )
   const view = validateView(searchParams[VIEW])
 
   let items: ArtistEntity[] | RigtchStatsResponse<ArtistEntity>

app/profile/[id]/@top/@genres/page.tsx

@@ -48,7 +48,11 @@ export default async function ProfileTopGenresSubPage({
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )
-  const timeRange = validateTimeRange(searchParams[TIME_RANGE], statsProvider)
+  const timeRange = validateTimeRange(
+    searchParams[TIME_RANGE],
+    statsProvider,
+    createdAt
+  )
 
   let items: string[] | RigtchStatsResponse<string>
 

app/profile/[id]/@top/@tracks/page.tsx

@@ -47,7 +47,11 @@ export default async function ProfileTopTracksSubPage({
     searchParams[STATS_PROVIDER],
     createdAt
   )
-  const timeRange = validateTimeRange(searchParams[TIME_RANGE], statsProvider)
+  const timeRange = validateTimeRange(
+    searchParams[TIME_RANGE],
+    statsProvider,
+    createdAt
+  )
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )

app/profile/[id]/top/albums/page.tsx

@@ -13,6 +13,7 @@ import {
 } from '@app/profile/utils/validators'
 import { afterParamFactory } from '@app/profile/utils/factories'
 import { StatsProvider, type RigtchTimeRange } from '@app/profile/enums'
+import { getUser } from '@app/api/fetchers'
 
 export const runtime = 'edge'
 
@@ -21,19 +22,24 @@ export default async function ProfileTopAlbumsPage({
   params,
 }: ProfilePageProps) {
   const userId = validateId(params.id)
+  const token = await getServerToken()
+
+  if (!token) redirect('/')
+
+  const { createdAt } = await getUser(token, {
+    userId,
+  })
+
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )
   const timeRange = validateTimeRange(
     searchParams[TIME_RANGE],
-    StatsProvider.RIGTCH
+    StatsProvider.RIGTCH,
+    createdAt
   )
   const view = validateView(searchParams[VIEW])
 
-  const token = await getServerToken()
-
-  if (!token) redirect('/')
-
   const items = await getRigtchTopAlbums(token, {
     after: afterParamFactory(timeRange as RigtchTimeRange),
     userId,

app/profile/[id]/top/artists/page.tsx

@@ -49,7 +49,11 @@ export default async function ProfileTopArtistsPage({
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )
-  const timeRange = validateTimeRange(searchParams[TIME_RANGE], statsProvider)
+  const timeRange = validateTimeRange(
+    searchParams[TIME_RANGE],
+    statsProvider,
+    createdAt
+  )
   const view = validateView(searchParams[VIEW])
 
   let items: ArtistEntity[] | RigtchStatsResponse<ArtistEntity>

app/profile/[id]/top/genres/page.tsx

@@ -47,7 +47,11 @@ export default async function ProfileTopGenresPage({
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )
-  const timeRange = validateTimeRange(searchParams[TIME_RANGE], statsProvider)
+  const timeRange = validateTimeRange(
+    searchParams[TIME_RANGE],
+    statsProvider,
+    createdAt
+  )
 
   let items: string[] | RigtchStatsResponse<string>
 

app/profile/[id]/top/tracks/page.tsx

@@ -49,7 +49,11 @@ export default async function ProfileTopTracksPage({
   const statsMeasurement = validateStatsMeasurement(
     searchParams[STATS_MEASUREMENT]
   )
-  const timeRange = validateTimeRange(searchParams[TIME_RANGE], statsProvider)
+  const timeRange = validateTimeRange(
+    searchParams[TIME_RANGE],
+    statsProvider,
+    createdAt
+  )
   const view = validateView(searchParams[VIEW])
 
   let items: TrackEntity[] | RigtchStatsResponse<TrackEntity>

app/profile/components/common/stats-options.tsx

@@ -35,7 +35,8 @@ export function StatsOptions() {
   const view = validateView(searchParams.get(VIEW))
   const timeRange = validateTimeRange(
     searchParams.get(TIME_RANGE),
-    statsProvider
+    statsProvider,
+    user?.createdAt
   )
 
   const route = pathname.split('/').at(-1)

app/profile/utils/validators/validate-time-range.ts

@@ -1,3 +1,5 @@
+import { isTimeRangeDisabled } from '../helpers'
+
 import {
   DEFAULT_RIGTCH_TIME_RANCE,
   DEFAULT_SPOTIFY_TIME_RANCE,
@@ -18,7 +20,8 @@ function isRigtchTimeRange(value: string): value is RigtchTimeRange {
 
 export function validateTimeRange(
   timeRange: string | string[] | null | undefined,
-  provider: StatsProvider
+  provider: StatsProvider,
+  userCreatedAt?: Date
 ) {
   if (typeof timeRange === 'string') {
     if (provider === StatsProvider.SPOTIFY && isSpotifyTimeRange(timeRange))
@@ -30,5 +33,7 @@ export function validateTimeRange(
 
   return provider === StatsProvider.SPOTIFY
     ? DEFAULT_SPOTIFY_TIME_RANCE
-    : DEFAULT_RIGTCH_TIME_RANCE
+    : isTimeRangeDisabled(DEFAULT_RIGTCH_TIME_RANCE, userCreatedAt)
+      ? RigtchTimeRange.WEEK
+      : DEFAULT_RIGTCH_TIME_RANCE
 }