Merge branch 'feature/delete-songs' of https://github.com/DutchJavaDev/MyMusicBox into feature/delete-songs

Author: DutchJavaDev

MyMusicBoxApi/database/db.go

@@ -45,7 +45,7 @@ func CreateDatabasConnectionPool() error {
 	// Should create test for these?
 	var _ ISongTable = (*SongTable)(nil)
 	var _ IPlaylistTable = (*PlaylistTable)(nil)
-	var _ IPlaylistsongTable = (*PlaylistsongTable)(nil)
+	var _ IPlaylistSongTable = (*PlaylistsongTable)(nil)
 	var _ ITasklogTable = (*TasklogTable)(nil)
 	var _ IMigrationTable = (*MigrationTable)(nil)
 

MyMusicBoxApi/database/playlistsongtable.go

@@ -7,7 +7,7 @@ import (
 	"musicboxapi/models"
 )
 
-type IPlaylistsongTable interface {
+type IPlaylistSongTable interface {
 	FetchPlaylistSongs(ctx context.Context, playlistId int, lastKnowPosition int) (songs []models.Song, error error)
 	InsertPlaylistSong(playlistId int, songId int) (lastInsertedId int, error error)
 	DeleteAllPlaylistSongs(playlistId int) (error error)
@@ -18,7 +18,7 @@ type PlaylistsongTable struct {
 	BaseTable
 }
 
-func NewPlaylistsongTableInstance() IPlaylistsongTable {
+func NewPlaylistsongTableInstance() IPlaylistSongTable {
 	return &PlaylistsongTable{
 		BaseTable: NewBaseTableInstance(),
 	}

MyMusicBoxApi/database/playlisttable.go

@@ -24,7 +24,7 @@ func NewPlaylistTableInstance() IPlaylistTable {
 }
 
 func (table *PlaylistTable) FetchPlaylists(ctx context.Context, lastKnowPlaylistId int) (playlists []models.Playlist, error error) {
-	query := "SELECT Id, Name, ThumbnailPath, Description, CreationDate FROM Playlist WHERE Id > $1 ORDER BY Id" // order by?
+	query := "SELECT Id, Name, ThumbnailPath, Description, CreationDate, IsPublic FROM Playlist WHERE Id > $1 ORDER BY Id" // order by?
 
 	rows, err := table.QueryRowsContex(ctx, query, lastKnowPlaylistId)
 
@@ -41,7 +41,7 @@ func (table *PlaylistTable) FetchPlaylists(ctx context.Context, lastKnowPlaylist
 	playlists = make([]models.Playlist, 0)
 
 	for rows.Next() {
-		scanError := rows.Scan(&playlist.Id, &playlist.Name, &playlist.ThumbnailPath, &playlist.Description, &playlist.CreationDate)
+		scanError := rows.Scan(&playlist.Id, &playlist.Name, &playlist.ThumbnailPath, &playlist.Description, &playlist.CreationDate, &playlist.IsPublic)
 
 		if scanError != nil {
 			logging.Error(fmt.Sprintf("Scan error: %s", scanError.Error()))
@@ -68,9 +68,9 @@ func (table *PlaylistTable) InsertPlaylist(playlist models.Playlist) (lastInsert
 }
 
 func (table *PlaylistTable) DeletePlaylist(playlistId int) (error error) {
-	query := `DELETE FROM Playlist WHERE Id = $1`
+	query := `DELETE FROM Playlist WHERE Id = $1 AND IsPublic = $2` // Prevemts private playlists (like the default one) from being deleted for real
 
-	err := table.NonScalarQuery(query, playlistId)
+	err := table.NonScalarQuery(query, playlistId, true)
 
 	if err != nil {
 		logging.Error(fmt.Sprintf("Failed to delete playlist: %s", err.Error()))

MyMusicBoxApi/http/playlist.go

@@ -110,6 +110,11 @@ func (handler *PlaylistHandler) DeletePlaylist(ctx *gin.Context) {
 		return
 	}
 
+	if DefaultPlaylistId == id {
+		ctx.JSON(http.StatusInternalServerError, models.ErrorResponse("Funky music... "))
+		return
+	}
+
 	err = handler.PlaylistTable.DeletePlaylist(id)
 
 	// TODO delete background image if its not the default image for it

MyMusicBoxApi/http/playlistsong.go

@@ -15,7 +15,7 @@ import (
 )
 
 type PlaylistSongHandler struct {
-	PlaylistsongTable database.IPlaylistsongTable
+	PlaylistsongTable database.IPlaylistSongTable
 }
 
 const DefaultPlaylistId = 1
@@ -106,6 +106,7 @@ func (handler *PlaylistSongHandler) DeletePlaylistSong(ctx *gin.Context) {
 		return
 	}
 
+	// Thumbnail and .opus file will be deleted only if you delete a song via the main playlist containing all the songs
 	if playlistId == DefaultPlaylistId {
 
 		songTable := database.NewSongTableInstance()

MyMusicBoxApi/http/playlistsong_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 type mockPlaylistSongTable struct {
-	database.IPlaylistsongTable
+	database.IPlaylistSongTable
 	fetchPlaylistSongs     func(ctx context.Context, playlistId int, lastKnowPosition int) (songs []models.Song, error error)
 	insertPlaylistSong     func(playlistId int, songId int) (lastInsertedId int, error error)
 	deleteAllPlaylistSongs func(playlistId int) (error error) // TODO

MyMusicBoxApi/models/http.go

@@ -19,6 +19,7 @@ type ApiResponseModel struct {
 }
 
 func ErrorResponse(data any) ApiResponseModel {
+
 	return ApiResponseModel{
 		Data:    data,
 		Message: "An error occurred",