Merge pull request #10 from mbaraa/feat/the-long-awaited-playlists

Feat: The long awaited playlists

Author: mbaraa

Makefile

@@ -21,6 +21,9 @@ init:
 	templ generate && \
     go run main.go migrate
 
+seed:
+	go run main.go seed
+
 # dev runs the development server where it builds the tailwind css sheet,
 # and compiles the project whenever a file is changed.
 dev:

cmd/migrator/migrator.go

@@ -11,10 +11,27 @@ func Migrate() error {
 		return err
 	}
 
-	return dbConn.Debug().AutoMigrate(
+	err = dbConn.Debug().AutoMigrate(
 		new(models.Account),
 		new(models.Profile),
 		new(models.EmailVerificationCode),
 		new(models.Song),
+		new(models.Playlist),
+		new(models.PlaylistSong),
+		new(models.PlaylistOwner),
 	)
+	if err != nil {
+		return err
+	}
+
+	for _, tableName := range []string{
+		"profiles", "songs", "playlists",
+	} {
+		err = dbConn.Exec("ALTER TABLE " + tableName + " CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci").Error
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }

cmd/seeder/seeder.go

@@ -0,0 +1,124 @@
+package seeder
+
+import (
+	"dankmuzikk/db"
+	"dankmuzikk/entities"
+	"dankmuzikk/log"
+	"dankmuzikk/models"
+	playlistspkg "dankmuzikk/services/playlists"
+	"dankmuzikk/tests"
+	"math/rand"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+var (
+	dbConn            *gorm.DB
+	accountRepo       db.UnsafeCRUDRepo[models.Account]
+	profileRepo       db.UnsafeCRUDRepo[models.Profile]
+	songRepo          db.UnsafeCRUDRepo[models.Song]
+	playlistRepo      db.UnsafeCRUDRepo[models.Playlist]
+	playlistSongsRepo db.UnsafeCRUDRepo[models.PlaylistSong]
+	playlistOwnerRepo db.UnsafeCRUDRepo[models.PlaylistOwner]
+
+	profiles  = tests.Profiles()
+	songs     = tests.Songs()
+	playlists = tests.Playlists()
+
+	random = rand.New(rand.NewSource(time.Now().UnixMicro()))
+)
+
+func SeedDb() error {
+	var err error
+
+	dbConn, err = db.Connector()
+	if err != nil {
+		return err
+	}
+
+	accountRepo = db.NewBaseDB[models.Account](dbConn)
+	profileRepo = db.NewBaseDB[models.Profile](dbConn)
+	songRepo = db.NewBaseDB[models.Song](dbConn)
+	playlistRepo = db.NewBaseDB[models.Playlist](dbConn)
+	playlistSongsRepo = db.NewBaseDB[models.PlaylistSong](dbConn)
+	playlistOwnerRepo = db.NewBaseDB[models.PlaylistOwner](dbConn)
+
+	playlistService := playlistspkg.New(playlistRepo, playlistOwnerRepo, nil)
+
+	pl, err := playlistService.GetAll(400)
+	if err != nil {
+		return err
+	}
+	log.Infof("%+v\n", pl)
+
+	err = playlistService.CreatePlaylist(entities.Playlist{
+		Title: "Danki Muzikki",
+	}, 400)
+	if err != nil {
+		return err
+	}
+
+	err = playlistService.DeletePlaylist("a1a4b25f6eac4fb08222d14cadcfc7cd", 400)
+	if err != nil {
+		return err
+	}
+
+	return nil
+
+	err = seedProfiles()
+	if err != nil {
+		return err
+	}
+
+	err = seedPlaylists()
+	if err != nil {
+		return err
+	}
+
+	err = addPlaylistsToProfiles()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func seedProfiles() error {
+	for i := range profiles {
+		err := profileRepo.Add(&profiles[i])
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func seedPlaylists() error {
+	for i := range playlists {
+		for _, song := range playlists[i].Songs {
+			err := songRepo.Add(song)
+			if err != nil {
+				return err
+			}
+		}
+		err := playlistRepo.Add(&playlists[i])
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func addPlaylistsToProfiles() error {
+	for i := 0; i < len(profiles)*3; i++ {
+		// ignore errors because there will be duplicates lol
+		_ = playlistOwnerRepo.Add(&models.PlaylistOwner{
+			ProfileId:   profiles[i%len(profiles)].Id,
+			PlaylistId:  playlists[random.Intn(len(playlists))].Id,
+			Permissions: models.WritePermission,
+		})
+		random.Seed(time.Now().UnixNano())
+	}
+	return nil
+}

cmd/server/server.go

@@ -3,12 +3,15 @@ package server
 import (
 	"dankmuzikk/config"
 	"dankmuzikk/db"
+	"dankmuzikk/handlers"
 	"dankmuzikk/handlers/apis"
 	"dankmuzikk/handlers/pages"
 	"dankmuzikk/log"
 	"dankmuzikk/models"
 	"dankmuzikk/services/jwt"
 	"dankmuzikk/services/login"
+	"dankmuzikk/services/playlists"
+	"dankmuzikk/services/playlists/songs"
 	"dankmuzikk/services/youtube/download"
 	"dankmuzikk/services/youtube/search"
 	"embed"
@@ -25,30 +28,40 @@ func StartServer(staticFS embed.FS) error {
 	profileRepo := db.NewBaseDB[models.Profile](dbConn)
 	otpRepo := db.NewBaseDB[models.EmailVerificationCode](dbConn)
 	songRepo := db.NewBaseDB[models.Song](dbConn)
-	// playlistRepo := db.NewBaseDB[models.Playlist](dbConn)
+	playlistRepo := db.NewBaseDB[models.Playlist](dbConn)
+	playlistOwnersRepo := db.NewBaseDB[models.PlaylistOwner](dbConn)
+	playlistSongssRepo := db.NewBaseDB[models.PlaylistSong](dbConn)
+
+	downloadService := download.New(songRepo)
+	playlistsService := playlists.New(playlistRepo, playlistOwnersRepo, downloadService)
+	songsService := songs.New(playlistSongssRepo, songRepo, playlistRepo)
 
 	jwtUtil := jwt.NewJWTImpl()
 
+	gHandler := handlers.NewHandler(profileRepo, jwtUtil)
+
 	///////////// Pages and files /////////////
 	pagesHandler := http.NewServeMux()
 	pagesHandler.Handle("/static/", http.FileServer(http.FS(staticFS)))
 	pagesHandler.Handle("/music/", http.StripPrefix("/music", http.FileServer(http.Dir(config.Env().YouTube.MusicDir))))
 
-	pagesRouter := pages.NewPagesHandler(profileRepo, jwtUtil)
-	pagesHandler.HandleFunc("/", pagesRouter.Handler(pagesRouter.HandleHomePage))
-	pagesHandler.HandleFunc("/signup", pagesRouter.AuthHandler(pagesRouter.HandleSignupPage))
-	pagesHandler.HandleFunc("/login", pagesRouter.AuthHandler(pagesRouter.HandleLoginPage))
-	pagesHandler.HandleFunc("/profile", pagesRouter.AuthHandler(pagesRouter.HandleProfilePage))
-	pagesHandler.HandleFunc("/about", pagesRouter.Handler(pagesRouter.HandleAboutPage))
-	pagesHandler.HandleFunc("/playlists", pagesRouter.AuthHandler(pagesRouter.HandlePlaylistsPage))
-	pagesHandler.HandleFunc("/privacy", pagesRouter.Handler(pagesRouter.HandlePrivacyPage))
-	pagesHandler.HandleFunc("/search", pagesRouter.Handler(pagesRouter.HandleSearchResultsPage(&search.ScraperSearch{})))
+	pagesRouter := pages.NewPagesHandler(profileRepo, playlistsService, jwtUtil)
+	pagesHandler.HandleFunc("/", gHandler.OptionalAuthPage(pagesRouter.HandleHomePage))
+	pagesHandler.HandleFunc("/signup", gHandler.AuthPage(pagesRouter.HandleSignupPage))
+	pagesHandler.HandleFunc("/login", gHandler.AuthPage(pagesRouter.HandleLoginPage))
+	pagesHandler.HandleFunc("/profile", gHandler.AuthPage(pagesRouter.HandleProfilePage))
+	pagesHandler.HandleFunc("/about", gHandler.NoAuthPage(pagesRouter.HandleAboutPage))
+	pagesHandler.HandleFunc("/playlists", gHandler.AuthPage(pagesRouter.HandlePlaylistsPage))
+	pagesHandler.HandleFunc("/playlist/{playlist_id}", gHandler.AuthPage(pagesRouter.HandleSinglePlaylistPage))
+	pagesHandler.HandleFunc("/privacy", gHandler.NoAuthPage(pagesRouter.HandlePrivacyPage))
+	pagesHandler.HandleFunc("/search", gHandler.OptionalAuthPage(pagesRouter.HandleSearchResultsPage(&search.ScraperSearch{})))
 
 	///////////// APIs /////////////
 
 	emailLoginApi := apis.NewEmailLoginApi(login.NewEmailLoginService(accountRepo, profileRepo, otpRepo, jwtUtil))
 	googleLoginApi := apis.NewGoogleLoginApi(login.NewGoogleLoginService(accountRepo, profileRepo, otpRepo, jwtUtil))
-	songDownloadApi := apis.NewDownloadHandler(*download.New(songRepo))
+	songDownloadApi := apis.NewDownloadHandler(downloadService)
+	playlistsApi := apis.NewPlaylistApi(playlistsService, songsService)
 
 	apisHandler := http.NewServeMux()
 	apisHandler.HandleFunc("POST /login/email", emailLoginApi.HandleEmailLogin)
@@ -60,6 +73,9 @@ func StartServer(staticFS embed.FS) error {
 	apisHandler.HandleFunc("GET /logout", apis.HandleLogout)
 	apisHandler.HandleFunc("GET /search-suggestion", apis.HandleSearchSuggestions)
 	apisHandler.HandleFunc("GET /song/download", songDownloadApi.HandleDownloadSong)
+	apisHandler.HandleFunc("GET /song/download/queue", songDownloadApi.HandleDownloadSongToQueue)
+	apisHandler.HandleFunc("POST /playlist", gHandler.AuthApi(playlistsApi.HandleCreatePlaylist))
+	apisHandler.HandleFunc("PUT /toggle-song-in-playlist", gHandler.AuthApi(playlistsApi.HandleToggleSongInPlaylist))
 
 	applicationHandler := http.NewServeMux()
 	applicationHandler.Handle("/", pagesHandler)

db/allowed_models.go

@@ -4,6 +4,6 @@ import "dankmuzikk/models"
 
 type AllowedModels interface {
 	models.Account | models.Profile | models.EmailVerificationCode |
-		models.Song
+		models.Song | models.Playlist | models.PlaylistSong | models.PlaylistOwner
 	GetId() uint
 }

db/base_db.go

@@ -28,7 +28,7 @@ func (b *BaseDB[T]) Add(obj *T) error {
 		Error
 
 	if err != nil {
-		return tryWrapMySqlError(err)
+		return TryWrapMySqlError(err)
 	}
 
 	return nil
@@ -46,19 +46,25 @@ func (b *BaseDB[T]) AddMany(objs []*T) error {
 		Error
 
 	if err != nil {
-		return tryWrapMySqlError(err)
+		return TryWrapMySqlError(err)
 	}
 
 	return nil
 }
 
 // Exists checks the existence of the given record's id
-func (b *BaseDB[T]) Exists(id uint) bool {
+func (b *BaseDB[T]) Exists(id uint) error {
 	if id == 0 { // better to check this before, fetching eh?
-		return false
+		return ErrRecordNotFound
 	}
-	_, err := b.Get(id)
-	return err == nil
+
+	var obj T
+	return b.
+		db.
+		Select("id").
+		Where("id = ?", id).
+		First(&obj).
+		Error
 }
 
 // Get retrieves the object which has the given id

db/crud_repo.go

@@ -15,7 +15,7 @@ type CreatorRepo[T any] interface {
 // GetterRepo is a safe wrapper for records retrieval for a certain repo
 type GetterRepo[T any] interface {
 	// Exists checks the existence of the given record's id
-	Exists(id uint) bool
+	Exists(id uint) error
 
 	// Get retrieves the object which has the given id
 	Get(id uint) (T, error)

db/db.go

@@ -29,7 +29,7 @@ func getDBConnector(dbName string) (*gorm.DB, error) {
 		return nil, err
 	}
 	instance, err := gorm.Open(mysql.Open(
-		fmt.Sprintf("%s:%s@tcp(%s)/%s?parseTime=True&loc=Local",
+		fmt.Sprintf("%s:%s@tcp(%s)/%s?parseTime=True&loc=Local&charset=utf8mb4",
 			config.Env().DB.Username,
 			config.Env().DB.Password,
 			config.Env().DB.Host,

db/errors.go

@@ -14,7 +14,7 @@ var (
 	ErrRecordExists           = errors.New("db: record exists in table")
 )
 
-func tryWrapMySqlError(err error) error {
+func TryWrapMySqlError(err error) error {
 	if mysqlErr, ok := err.(*mysql.MySQLError); ok {
 		switch mysqlErr.Number {
 		case 1062:

entities/playlist.go

@@ -0,0 +1,8 @@
+package entities
+
+type Playlist struct {
+	PublicId   string `json:"public_id"`
+	Title      string `json:"title"`
+	SongsCount int    `json:"songs_count"`
+	Songs      []Song `json:"songs"`
+}

entities/song.go

@@ -0,0 +1,9 @@
+package entities
+
+type Song struct {
+	YtId         string `json:"yt_id"`
+	Title        string `json:"title"`
+	Artist       string `json:"artist"`
+	ThumbnailUrl string `json:"thumbnail_url"`
+	Duration     string `json:"duration"`
+}