Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/integrated insights #463

Merged
merged 11 commits into from
Oct 20, 2024
Merged

Feat/integrated insights #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9cff43c
:triangular_ruler: Refactored insights controller and service
Douglasj02 Oct 17, 2024
0ea6da5
:triangular_ruler: Added supabase as provider in insights module
Douglasj02 Oct 17, 2024
cabbbeb
:triangular_ruler: Changed frontend insights service to use updated i…
Douglasj02 Oct 17, 2024
e40b909
:tada: Integrated insights
Douglasj02 Oct 17, 2024
9ba481a
:tada: New endpoints for insights
Douglasj02 Oct 17, 2024
3d64afb
:triangular_ruler: Adjusted graph endpoints in insights controller an…
Douglasj02 Oct 20, 2024
086d820
:triangular_ruler: Refactored frontend insights service to match form…
Douglasj02 Oct 20, 2024
1fc40d4
:triangular_ruler: Updated graphs on insights page
Douglasj02 Oct 20, 2024
e9a2125
:tada: Cache service for frontend
Douglasj02 Oct 20, 2024
9989062
:triangular_ruler: Added caching for moods in frontend
Douglasj02 Oct 20, 2024
ff8e4ad
Merge branch 'develop' into feat/integratedInsights
Douglasj02 Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
183 changes: 102 additions & 81 deletions Backend/src/insights/controller/insights.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Controller, Get, Query, HttpException, HttpStatus } from "@nestjs/common";
import { Controller, Post, Body, HttpException, HttpStatus } from "@nestjs/common";
import { InsightsService } from "../services/insights.service";

@Controller("insights")
Expand All @@ -8,131 +8,152 @@ export class InsightsController
{
}

// Endpoint to get the top mood from recent tracks
@Get("top-mood")
async getTopMood(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("top-mood")
async getTopMood(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getTopMood(userId, accessToken, providerToken, providerName);
return this.insightsService.getTopMood(accessToken, refreshToken, providerName);
}

// Endpoint to get the total listening time
@Get("total-listening-time")
async getTotalListeningTime(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("total-listening-time")
async getTotalListeningTime(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getTotalListeningTime(userId, accessToken, providerToken, providerName);
return this.insightsService.getTotalListeningTime(accessToken, refreshToken, providerName);
}

// Endpoint to get the most listened artist
@Get("most-listened-artist")
async getMostListenedArtist(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("most-listened-artist")
async getMostListenedArtist(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getMostListenedArtist(userId, accessToken, providerToken, providerName);
return this.insightsService.getMostListenedArtist(accessToken, refreshToken, providerName);
}

// Endpoint to get the most played track
@Get("most-played-track")
async getMostPlayedTrack(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("most-played-track")
async getMostPlayedTrack(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getMostPlayedTrack(userId, accessToken, providerToken, providerName);
return this.insightsService.getMostPlayedTrack(accessToken, refreshToken, providerName);
}

// Endpoint to get the top genre from the user's listening history
@Get("top-genre")
async getTopGenre(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("top-genre")
async getTopGenre(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getTopGenre(userId, accessToken, providerToken, providerName);
return this.insightsService.getTopGenre(accessToken, refreshToken, providerName);
}

// Endpoint to get the average song duration
@Get("average-song-duration")
async getAverageSongDuration(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("average-song-duration")
async getAverageSongDuration(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getAverageSongDuration(userId, accessToken, providerToken, providerName);
return this.insightsService.getAverageSongDuration(accessToken, refreshToken, providerName);
}

// Endpoint to get the most active day of listening
@Get("most-active-day")
async getMostActiveDay(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("most-active-day")
async getMostActiveDay(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getMostActiveDay(userId, accessToken, providerToken, providerName);
return this.insightsService.getMostActiveDay(accessToken, refreshToken, providerName);
}

// Endpoint to get the number of unique artists listened to
@Get("unique-artists-listened")
async getUniqueArtistsListened(
@Query("userId") userId: string,
@Query("accessToken") accessToken: string,
@Query("providerToken") providerToken: string,
@Query("providerName") providerName: string
)
@Post("unique-artists-listened")
async getUniqueArtistsListened(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
if (!userId || !accessToken || !providerToken || !providerName)
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getUniqueArtistsListened(userId, accessToken, providerToken, providerName);
return this.insightsService.getUniqueArtistsListened(accessToken, refreshToken, providerName);
}

@Post("listening-trends")
async getListeningTrends(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getListeningTrends(accessToken, refreshToken, providerName);
}

@Post("weekly-playlist")
async getWeeklyPlaylist(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getWeeklyPlaylist(accessToken, refreshToken, providerName);
}

@Post("most-listened-day")
async getMostListenedDay(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return this.insightsService.getMostListenedDay(accessToken, refreshToken, providerName);
}

@Post("listening-over-time")
async getListeningOverTime(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
return this.validateAndCallService(body, this.insightsService.getListeningOverTime);
}

@Post("artists-vs-tracks")
async getArtistsVsTracks(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
return this.validateAndCallService(body, this.insightsService.getArtistsVsTracks);
}

@Post("recent-track-genres")
async getRecentTrackGenres(@Body() body: { accessToken: string; refreshToken: string; providerName: string })
{
return this.validateAndCallService(body, this.insightsService.getRecentTrackGenres);
}

private validateAndCallService(body: any, serviceMethod: Function)
{
const { accessToken, refreshToken, providerName } = body;
if (!accessToken || !refreshToken || !providerName)
{
throw new HttpException("Missing required parameters", HttpStatus.BAD_REQUEST);
}
return serviceMethod.call(this.insightsService, accessToken, refreshToken, providerName);
}
}
6 changes: 5 additions & 1 deletion Backend/src/insights/insights.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { Module } from '@nestjs/common';
import { InsightsService } from './services/insights.service';
import { InsightsController } from './controller/insights.controller';
import { HttpModule } from "@nestjs/axios";
import { SupabaseModule } from "../supabase/supabase.module";
import { SupabaseService } from "../supabase/services/supabase.service";

@Module({
imports: [HttpModule, SupabaseModule],
controllers: [InsightsController],
providers: [InsightsService],
providers: [InsightsService, SupabaseService],
})
export class InsightsModule {}
Loading
Loading