Feat/adc/search view v2

back/Dockerfile.dev

@@ -1,3 +1,3 @@
-FROM node:17
+FROM node:18.10.0
 WORKDIR /app
 CMD npm i ; npx prisma generate ; npx prisma migrate dev ; npm run start:dev

back/src/scores/scores.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get } from "@nestjs/common";
+import { Controller, Get, Put } from "@nestjs/common";
 import { ApiOkResponse, ApiTags } from "@nestjs/swagger";
 import { ScoresService } from "./scores.service";
 import { User } from "@prisma/client";
@@ -13,4 +13,10 @@ export class ScoresController {
 	getTopTwenty(): Promise<User[]> {
 		return this.scoresService.topTwenty();
 	}
+
+	// @ApiOkResponse{{description: "Successfully updated the user's total score"}}
+	// @Put("/add")
+	// addScore(): Promise<void> {
+	// 	return this.ScoresService.add()
+	// }
 }

front/API.ts

@@ -1,5 +1,4 @@
 import Artist, { ArtistHandler } from './models/Artist';
-import Album from './models/Album';
 import Chapter from './models/Chapter';
 import Lesson from './models/Lesson';
 import Genre, { GenreHandler } from './models/Genre';
@@ -24,6 +23,7 @@ import * as yup from 'yup';
 import { base64ToBlob } from './utils/base64ToBlob';
 import { ImagePickerAsset } from 'expo-image-picker';
 import { SongCursorInfos, SongCursorInfosHandler } from './models/SongCursorInfos';
+import { searchProps } from './views/V2/SearchView';
 
 type AuthenticationInput = { username: string; password: string };
 type RegistrationInput = AuthenticationInput & { email: string };
@@ -497,84 +497,6 @@ export default class API {
 		};
 	}
 
-	/**
-	 * Search a song by its name
-	 * @param query the string used to find the songs
-	 */
-	public static searchSongs(query: string): Query<Song[]> {
-		return {
-			key: ['search', 'song', query],
-			exec: () =>
-				API.fetch(
-					{
-						route: `/search/songs/${query}`,
-					},
-					{ handler: ListHandler(SongHandler) }
-				),
-		};
-	}
-
-	/**
-	 * Search artists by name
-	 * @param query the string used to find the artists
-	 */
-	public static searchArtists(query: string): Query<Artist[]> {
-		return {
-			key: ['search', 'artist', query],
-			exec: () =>
-				API.fetch(
-					{
-						route: `/search/artists/${query}`,
-					},
-					{ handler: ListHandler(ArtistHandler) }
-				),
-		};
-	}
-
-	/**
-	 * Search Album by name
-	 * @param query the string used to find the album
-	 */
-	public static searchAlbum(query: string): Query<Album[]> {
-		return {
-			key: ['search', 'album', query],
-			exec: async () => [
-				{
-					id: 1,
-					name: 'Super Trooper',
-				},
-				{
-					id: 2,
-					name: 'Kingdom Heart 365/2 OST',
-				},
-				{
-					id: 3,
-					name: 'The Legend Of Zelda Ocarina Of Time OST',
-				},
-				{
-					id: 4,
-					name: 'Random Access Memories',
-				},
-			],
-		};
-	}
-
-	/**
-	 * Retrieve music genres
-	 */
-	public static searchGenres(query: string): Query<Genre[]> {
-		return {
-			key: ['search', 'genre', query],
-			exec: () =>
-				API.fetch(
-					{
-						route: `/search/genres/${query}`,
-					},
-					{ handler: ListHandler(GenreHandler) }
-				),
-		};
-	}
-
 	/**
 	 * Retrieve a lesson
 	 * @param lessonId the id to find the lesson
@@ -779,4 +701,25 @@ export default class API {
 	public static getPartitionSvgUrl(songId: number): string {
 		return `${API.baseUrl}/song/${songId}/assets/partition`;
 	}
+
+	public static searchSongs(query: searchProps): Query<Song[]> {
+		const queryParams: string[] = [];
+
+		if (query.artist) queryParams.push(`artistId=${query.artist}`);
+		if (query.genre) queryParams.push(`genreId=${query.genre}`);
+
+		const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
+
+		return {
+			key: ['search', query.query],
+			exec: () => {
+				return API.fetch(
+					{
+						route: `/search/songs/${query.query}${queryString}`,
+					},
+					{ handler: ListHandler(SongHandler) }
+				);
+			},
+		};
+	}
 }

front/components/ScoreGraph.tsx

@@ -121,7 +121,7 @@ const Graph = ({ songId, since }: GraphProps) => {
 
 const ScoreGraph = () => {
 	const layout = useWindowDimensions();
-	const songs = useQuery(API.getAllSongs);
+	const songs = useQuery(API.getAllSongs());
 	const rangeOptions = [
 		{ label: '3 derniers jours', value: '3days' },
 		{ label: 'Dernière semaine', value: 'week' },