Expand GetArtists with album details, download info, and generic MonitorState enum

internal/service.go

@@ -96,6 +96,11 @@ func (service *MusicAgregatorService) GetArtists(ctx context.Context, _ *pb.GetA
 
 	artists := make([]*pb.ArtistSummary, 0, len(dbArtists))
 	for _, a := range dbArtists {
+		albums, err := service.buildAlbumsForArtist(ctx, a)
+		if err != nil {
+			log.Warn().Err(err).Str("artist", a.Name).Msg("failed to build album details, returning artist without albums")
+		}
+
 		artists = append(artists, &pb.ArtistSummary{
 			Id:           a.ID,
 			ExternalId:   a.ExternalID,
@@ -105,12 +110,73 @@ func (service *MusicAgregatorService) GetArtists(ctx context.Context, _ *pb.GetA
 			Genres:       a.Genres,
 			ImageUrl:     a.ImageURL,
 			MonitorState: toProtoMonitorState(a.MonitorState),
+			Albums:       albums,
 		})
 	}
 
 	return &pb.GetArtistsResponse{Artists: artists}, nil
 }
 
+func (service *MusicAgregatorService) buildAlbumsForArtist(ctx context.Context, artist *database.Artist) ([]*pb.AlbumDetail, error) {
+	metadataAlbums, err := service.metadata.GetArtistAlbums(ctx, artist.ExternalID)
+	if err != nil {
+		return nil, fmt.Errorf("fetching metadata albums: %w", err)
+	}
+
+	dbAlbums, err := service.metadata.GetAlbumsByArtistID(ctx, artist.ID)
+	if err != nil {
+		log.Warn().Err(err).Str("artist_id", artist.ID).Msg("failed to get local albums")
+		dbAlbums = nil
+	}
+
+	dbAlbumsByExternalID := make(map[string]*database.Album, len(dbAlbums))
+	for _, a := range dbAlbums {
+		dbAlbumsByExternalID[a.ExternalID] = a
+	}
+
+	albums := make([]*pb.AlbumDetail, 0, len(metadataAlbums))
+	for _, ma := range metadataAlbums {
+		detail := &pb.AlbumDetail{
+			ExternalId:  ma.GetId(),
+			Title:       ma.GetTitle(),
+			AlbumType:   ma.GetAlbumType(),
+			ReleaseDate: ma.GetReleaseDate(),
+			TotalTracks: ma.GetTotalTracks(),
+			TotalDiscs:  ma.GetTotalDiscs(),
+			CoverUrl:    ma.GetCoverUrl(),
+		}
+
+		if ma.GetLabel() != nil {
+			detail.Label = ma.GetLabel().GetName()
+		}
+		for _, g := range ma.GetGenres() {
+			detail.Genres = append(detail.Genres, g.GetName())
+		}
+
+		if dbAlbum, ok := dbAlbumsByExternalID[ma.GetId()]; ok {
+			detail.Id = dbAlbum.ID
+			detail.MonitorState = toProtoMonitorState(dbAlbum.MonitorState)
+
+			downloads, err := service.downloads.GetByAlbumID(ctx, dbAlbum.ID)
+			if err == nil && len(downloads) > 0 {
+				best := downloads[0]
+				detail.Download = &pb.DownloadInfo{
+					State:    best.State,
+					Format:   best.Format,
+					Quality:  best.Quality,
+					SavePath: best.SavePath,
+				}
+			}
+		} else {
+			detail.MonitorState = pb.MonitorState_MONITOR_STATE_UNMONITORED
+		}
+
+		albums = append(albums, detail)
+	}
+
+	return albums, nil
+}
+
 func (service *MusicAgregatorService) MonitorAlbum(ctx context.Context, req *pb.MonitorAlbumRequest) (*pb.MonitorAlbumResponse, error) {
 	album, err := service.metadata.GetAlbum(ctx, req.GetAlbumId())
 	if err != nil {
@@ -404,16 +470,16 @@ func buildMonitoredRelease(p parsedItem) *pb.MonitoredRelease {
 	}
 }
 
-func toProtoMonitorState(state database.ArtistMonitorState) pb.ArtistMonitorState {
+func toProtoMonitorState(state database.MonitorState) pb.MonitorState {
 	switch state {
-	case database.ArtistMonitored:
-		return pb.ArtistMonitorState_ARTIST_MONITOR_STATE_MONITORED
-	case database.ArtistUnmonitored:
-		return pb.ArtistMonitorState_ARTIST_MONITOR_STATE_UNMONITORED
-	case database.ArtistExcluded:
-		return pb.ArtistMonitorState_ARTIST_MONITOR_STATE_EXCLUDED
+	case database.Monitored:
+		return pb.MonitorState_MONITOR_STATE_MONITORED
+	case database.Unmonitored:
+		return pb.MonitorState_MONITOR_STATE_UNMONITORED
+	case database.Excluded:
+		return pb.MonitorState_MONITOR_STATE_EXCLUDED
 	default:
-		return pb.ArtistMonitorState_ARTIST_MONITOR_STATE_UNSPECIFIED
+		return pb.MonitorState_MONITOR_STATE_UNSPECIFIED
 	}
 }