fixed mirgation + back-end + front end filter, heart shaped button and special FavSongRow

back/prisma/migrations/20230822074959_liked_songs/migration.sql

@@ -1,8 +0,0 @@
-/*
-  Warnings:
-
-  - Added the required column `likedSongs` to the `User` table without a default value. This is not possible if the table is not empty.
-
-*/
--- AlterTable
-ALTER TABLE "User" ADD COLUMN     "likedSongs" JSONB NOT NULL DEFAULT '{}'::jsonb;

back/prisma/migrations/20230917180806_add_liked_songs/migration.sql

@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "LikedSongs" (
+    "id" SERIAL NOT NULL,
+    "userId" INTEGER NOT NULL,
+    "songId" INTEGER NOT NULL,
+    "addedDate" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "LikedSongs_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "LikedSongs" ADD CONSTRAINT "LikedSongs_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "LikedSongs" ADD CONSTRAINT "LikedSongs_songId_fkey" FOREIGN KEY ("songId") REFERENCES "Song"("id") ON DELETE CASCADE ON UPDATE CASCADE;

back/prisma/schema.prisma

@@ -21,7 +21,16 @@ model User {
     SongHistory   SongHistory[]
     searchHistory SearchHistory[]
     settings      UserSettings?
-    likedSongs    Json?
+    likedSongs    LikedSongs[]
+}
+
+model LikedSongs {
+    id                   Int        @id @default(autoincrement())
+    user                 User       @relation(fields: [userId], references: [id], onDelete: Cascade)
+    userId               Int
+    song                 Song       @relation(fields: [songId], references: [id], onDelete: Cascade)
+    songId               Int
+    addedDate            DateTime   @default(now())
 }
 
 model UserSettings {
@@ -61,6 +70,7 @@ model Song {
     genre            Genre?        @relation(fields: [genreId], references: [id])
     difficulties     Json
     SongHistory      SongHistory[]
+    likedByUsers     LikedSongs[]
 }
 
 model SongHistory {

back/src/auth/auth.controller.ts

@@ -205,15 +205,40 @@ export class AuthController {
 	@ApiBearerAuth()
 	@ApiOkResponse({ description: 'Successfully added liked song'})
 	@ApiUnauthorizedResponse({ description: 'Invalid token' })
-	@Post('me/likes:id')
+	@Post('me/likes/:id')
 	addLikedSong(
 		@Request() req: any,
-		@Body() data: any,
+		@Param('id') songId: number
 	) {
 		return this.usersService.addLikedSong(
-			req.user.id,
-			data.songId,
+			+req.user.id,
+			+songId,
 		);
 	}
 
+	@UseGuards(JwtAuthGuard)
+	@ApiBearerAuth()
+	@ApiOkResponse({ description: 'Successfully removed liked song'})
+	@ApiUnauthorizedResponse({ description: 'Invalid token' })
+	@Delete('me/likes/:id')
+	removeLikedSong(
+		@Request() req: any,
+		@Param('id') songId: number,
+	) {
+		return this.usersService.removeLikedSong(
+			+req.user.id,
+			+songId,
+		);
+	}
+
+	@UseGuards(JwtAuthGuard)
+	@ApiBearerAuth()
+	@ApiOkResponse({ description: 'Successfully retrieved liked song'})
+	@ApiUnauthorizedResponse({ description: 'Invalid token' })
+	@Get('me/likes')
+	getLikedSongs(
+		@Request() req: any,
+	) {
+		return this.usersService.getLikedSongs(+req.user.id)
+	}
 }

back/src/users/users.service.ts

@@ -101,19 +101,34 @@ export class UsersService {
 	}
 
 	async addLikedSong(
-		where: Prisma.UserWhereUniqueInput,
+		userId: number,
 		songId: number,
 	) {
-		return this.prisma.user.update({
-			where,
-			data: {
-				likedSongs: {
-					merde: {
-						songId: songId,
-						time: Date()
-					}
-				}
+		return this.prisma.likedSongs.create(
+			{
+				data: { songId: songId, userId: userId }
 			}
-		})
+		)
+	}
+
+	async getLikedSongs(
+		userId: number,
+	) {
+		return this.prisma.likedSongs.findMany(
+			{
+				where: { userId: userId },
+			}
+		)
+	}
+
+	async removeLikedSong(
+		userId: number,
+		songId: number,
+	) {
+		return this.prisma.likedSongs.deleteMany(
+			{
+				where: { userId: userId, songId: songId },
+			}
+		)
 	}
 }