daniel/deepdrft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Merge branch 'p6-w1-t2-data-model': ReleaseType + TrackNumber data model

Browse Source
This commit is contained in:
daniel-c-harvey
2026-06-10 21:36:28 -04:00
parent 754dc311a6 d47a5e00af
commit 480c961a09
15 changed files with 292 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DeepDrftAPI/Controllers/TrackController.cs
+31
View File
@@ -7,6 +7,7 @@ using DeepDrftContent.FileDatabase.Models;
using DeepDrftContent.Processors;
using DeepDrftData;
using DeepDrftModels.DTOs;
using DeepDrftModels.Enums;
using Microsoft.AspNetCore.Mvc;
namespace DeepDrftAPI.Controllers;
@@ -187,6 +188,8 @@ public class TrackController : ControllerBase
[FromForm] string? releaseDate,
[FromForm] string? originalFileName,
[FromForm] long createdByUserId,
[FromForm] string? releaseType,
[FromForm] int? trackNumber,
CancellationToken cancellationToken)
{
_logger.LogInformation("UploadTrack called: trackName={TrackName}, artist={Artist}, fileName={FileName}, size={Size}",
@@ -222,6 +225,22 @@ public class TrackController : ControllerBase
parsedReleaseDate = parsed;
}
// Default to Single for null/unparseable release type; default track number to a valid 1-based value.
ReleaseType parsedReleaseType;
if (!string.IsNullOrWhiteSpace(releaseType)
&& Enum.TryParse<ReleaseType>(releaseType, ignoreCase: true, out var rt)
&& Enum.IsDefined(rt))
{
parsedReleaseType = rt;
}
else
{
parsedReleaseType = ReleaseType.Single;
if (!string.IsNullOrWhiteSpace(releaseType))
_logger.LogWarning("UploadTrack: unrecognised releaseType value '{Value}', defaulting to Single", releaseType);
}
var resolvedTrackNumber = trackNumber is > 0 ? trackNumber.Value : 1;
// AudioProcessor.ProcessWavFileAsync requires a path ending in .wav and reads from disk.
// Path.GetTempFileName() yields .tmp, which fails that check — generate our own .wav path.
var tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N") + ".wav");
@@ -245,6 +264,8 @@ public class TrackController : ControllerBase
parsedReleaseDate,
createdByUserId,
string.IsNullOrWhiteSpace(originalFileName) ? null : originalFileName,
parsedReleaseType,
resolvedTrackNumber,
cancellationToken);
if (!result.Success || result.Value is null)
@@ -339,6 +360,9 @@ public class TrackController : ControllerBase
return NotFound();
}
if (request.TrackNumber is <= 0)
return BadRequest("trackNumber must be a positive integer when provided.");
var track = lookup.Value;
track.TrackName = request.TrackName;
track.Artist = request.Artist;
@@ -350,6 +374,13 @@ public class TrackController : ControllerBase
if (request.ImagePath is not null)
track.ImagePath = string.IsNullOrEmpty(request.ImagePath) ? null : request.ImagePath;
// ReleaseType / TrackNumber are non-null on the entity; null in the request means "no change".
if (request.ReleaseType is not null)
track.ReleaseType = request.ReleaseType.Value;
if (request.TrackNumber is > 0)
track.TrackNumber = request.TrackNumber.Value;
var update = await _sqlTrackService.Update(track);
if (!update.Success)
{
DeepDrftAPI/Models/UpdateTrackMetadataRequest.cs
+5 -1
View File
@@ -1,3 +1,5 @@
using DeepDrftModels.Enums;
namespace DeepDrftAPI.Models;
/// <summary>
@@ -15,4 +17,6 @@ public record UpdateTrackMetadataRequest(
string? Album,
string? Genre,
DateOnly? ReleaseDate,
string? ImagePath = null);
string? ImagePath = null,
ReleaseType? ReleaseType = null,
int? TrackNumber = null);
DeepDrftAPI/Services/UnifiedTrackService.cs
+5
View File
@@ -3,6 +3,7 @@ using DeepDrftContent.Constants;
using DeepDrftContent.Processors;
using DeepDrftData;
using DeepDrftModels.DTOs;
using DeepDrftModels.Enums;
using NetBlocks.Models;
using FileDb = DeepDrftContent.FileDatabase.Services.FileDatabase;
@@ -50,6 +51,8 @@ public class UnifiedTrackService
DateOnly? releaseDate,
long createdByUserId,
string? originalFileName,
ReleaseType releaseType,
int trackNumber,
CancellationToken ct)
{
var unpersisted = await _contentTrackContentService.AddTrackFromWavAsync(
@@ -62,6 +65,8 @@ public class UnifiedTrackService
}
unpersisted.CreatedByUserId = createdByUserId;
unpersisted.ReleaseType = releaseType;
unpersisted.TrackNumber = trackNumber;
var saveResult = await _sqlTrackService.Create(TrackConverter.Convert(unpersisted));
if (!saveResult.Success || saveResult.Value is null)
DeepDrftData/Data/Configurations/TrackConfiguration.cs
+13
View File
@@ -1,5 +1,6 @@
using Data.Data.Configurations;
using DeepDrftModels.Entities;
using DeepDrftModels.Enums;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -57,6 +58,18 @@ public class TrackConfiguration : BaseEntityConfiguration<TrackEntity>
.HasMaxLength(500)
.HasColumnName("original_file_name");
builder.Property(e => e.ReleaseType)
.IsRequired()
.HasConversion<string>() // Store as readable string, not int ordinal
.HasMaxLength(20)
.HasColumnName("release_type")
.HasDefaultValue(ReleaseType.Single);
builder.Property(e => e.TrackNumber)
.IsRequired()
.HasColumnName("track_number")
.HasDefaultValue(1);
// Names the is_deleted index explicitly. BaseEntityConfiguration.Configure already
// calls HasIndex(e => e.IsDeleted); this adds HasDatabaseName so EF always uses
// "IX_track_is_deleted" regardless of auto-naming conventions.
DeepDrftData/Migrations/20260611005700_AddReleaseTypeAndTrackNumber.Designer.cs
Generated
+121
View File
@@ -0,0 +1,121 @@
// <auto-generated />
using System;
using DeepDrftData.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace DeepDrftData.Migrations
{
[DbContext(typeof(DeepDrftContext))]
[Migration("20260611005700_AddReleaseTypeAndTrackNumber")]
partial class AddReleaseTypeAndTrackNumber
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "10.0.7")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("DeepDrftModels.Entities.TrackEntity", b =>
{
b.Property<long>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("bigint")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
b.Property<string>("Album")
.HasMaxLength(200)
.HasColumnType("character varying(200)")
.HasColumnName("album");
b.Property<string>("Artist")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("character varying(200)")
.HasColumnName("artist");
b.Property<DateTime>("CreatedAt")
.HasColumnType("timestamp with time zone")
.HasColumnName("created_at");
b.Property<long?>("CreatedByUserId")
.HasColumnType("bigint")
.HasColumnName("created_by_user_id");
b.Property<string>("EntryKey")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("character varying(100)")
.HasColumnName("entry_key");
b.Property<string>("Genre")
.HasMaxLength(100)
.HasColumnType("character varying(100)")
.HasColumnName("genre");
b.Property<string>("ImagePath")
.HasMaxLength(500)
.HasColumnType("character varying(500)")
.HasColumnName("image_path");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("is_deleted");
b.Property<string>("OriginalFileName")
.HasMaxLength(500)
.HasColumnType("character varying(500)")
.HasColumnName("original_file_name");
b.Property<DateOnly?>("ReleaseDate")
.HasColumnType("date")
.HasColumnName("release_date");
b.Property<string>("ReleaseType")
.IsRequired()
.ValueGeneratedOnAdd()
.HasMaxLength(20)
.HasColumnType("character varying(20)")
.HasDefaultValue("Single")
.HasColumnName("release_type");
b.Property<string>("TrackName")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("character varying(200)")
.HasColumnName("track_name");
b.Property<int>("TrackNumber")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(1)
.HasColumnName("track_number");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("timestamp with time zone")
.HasColumnName("updated_at");
b.HasKey("Id");
b.HasIndex("IsDeleted")
.HasDatabaseName("IX_track_is_deleted");
b.ToTable("track", (string)null);
});
#pragma warning restore 612, 618
}
}
}
DeepDrftData/Migrations/20260611005700_AddReleaseTypeAndTrackNumber.cs
+41
View File
@@ -0,0 +1,41 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace DeepDrftData.Migrations
{
/// <inheritdoc />
public partial class AddReleaseTypeAndTrackNumber : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "release_type",
table: "track",
type: "character varying(20)",
maxLength: 20,
nullable: false,
defaultValue: "Single");
migrationBuilder.AddColumn<int>(
name: "track_number",
table: "track",
type: "integer",
nullable: false,
defaultValue: 1);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "release_type",
table: "track");
migrationBuilder.DropColumn(
name: "track_number",
table: "track");
}
}
}
DeepDrftData/Migrations/DeepDrftContextModelSnapshot.cs
+14
View File
@@ -81,12 +81,26 @@ namespace DeepDrftData.Migrations
.HasColumnType("date")
.HasColumnName("release_date");
b.Property<string>("ReleaseType")
.IsRequired()
.ValueGeneratedOnAdd()
.HasMaxLength(20)
.HasColumnType("character varying(20)")
.HasDefaultValue("Single")
.HasColumnName("release_type");
b.Property<string>("TrackName")
.IsRequired()
.HasMaxLength(200)
.HasColumnType("character varying(200)")
.HasColumnName("track_name");
b.Property<int>("TrackNumber")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(1)
.HasColumnName("track_number");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("timestamp with time zone")
.HasColumnName("updated_at");
DeepDrftData/TrackConverter.cs
+6 -2
View File
@@ -25,7 +25,9 @@ public class TrackConverter : IEntityToModelConverter<TrackEntity, TrackDto>
ReleaseDate = entity.ReleaseDate,
ImagePath = entity.ImagePath,
CreatedByUserId = entity.CreatedByUserId,
OriginalFileName = entity.OriginalFileName
OriginalFileName = entity.OriginalFileName,
ReleaseType = entity.ReleaseType,
TrackNumber = entity.TrackNumber
};
public static TrackEntity Convert(TrackDto model) => new()
@@ -41,6 +43,8 @@ public class TrackConverter : IEntityToModelConverter<TrackEntity, TrackDto>
ReleaseDate = model.ReleaseDate,
ImagePath = model.ImagePath,
CreatedByUserId = model.CreatedByUserId,
OriginalFileName = model.OriginalFileName
OriginalFileName = model.OriginalFileName,
ReleaseType = model.ReleaseType,
TrackNumber = model.TrackNumber
};
}
DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
+23 -2
View File
@@ -1,5 +1,6 @@
@page "/tracks/{Id:long}"
@using DeepDrftManager.Services
@using DeepDrftModels.Enums
@using Microsoft.AspNetCore.Components.Forms
@attribute [Authorize]
@inject ICmsTrackService CmsTrackService
@@ -62,6 +63,20 @@
Label="Genre"
Variant="Variant.Outlined" />
<MudSelect @bind-Value="_form.ReleaseType"
Label="Release Type"
Variant="Variant.Outlined">
@foreach (var releaseType in Enum.GetValues<ReleaseType>())
{
<MudSelectItem Value="releaseType">@releaseType</MudSelectItem>
}
</MudSelect>
<MudNumericField @bind-Value="_form.TrackNumber"
Label="Track Number"
Min="1"
Variant="Variant.Outlined" />
<MudField Label="Cover Art" Variant="Variant.Outlined" InnerPadding="false">
<MudStack Spacing="3">
@if (ImagePreviewUrl is { } previewUrl)
@@ -207,7 +222,9 @@
string.IsNullOrWhiteSpace(_form.Album) ? null : _form.Album,
string.IsNullOrWhiteSpace(_form.Genre) ? null : _form.Genre,
releaseDate,
string.IsNullOrEmpty(_form.ImagePath) ? "" : _form.ImagePath);
string.IsNullOrEmpty(_form.ImagePath) ? "" : _form.ImagePath,
_form.ReleaseType,
_form.TrackNumber);
if (updated.Success)
{
Snackbar.Add("Track updated.", Severity.Success);
@@ -287,6 +304,8 @@
public string? Genre { get; set; }
public string? ImagePath { get; set; }
public DateTime? ReleaseDate { get; set; }
public ReleaseType ReleaseType { get; set; } = ReleaseType.Single;
public int TrackNumber { get; set; } = 1;
public static TrackEditForm From(TrackDto track) => new()
{
@@ -297,7 +316,9 @@
ImagePath = track.ImagePath,
ReleaseDate = track.ReleaseDate is { } d
? d.ToDateTime(TimeOnly.MinValue)
: null
: null,
ReleaseType = track.ReleaseType,
TrackNumber = track.TrackNumber
};
}
}
DeepDrftManager/Components/Pages/Tracks/TrackNew.razor
+4 -1
View File
@@ -1,6 +1,7 @@
@page "/tracks/new"
@using System.Security.Claims
@using DeepDrftManager.Services
@using DeepDrftModels.Enums
@attribute [Authorize]
@inject ICmsTrackService CmsTrackService
@@ -202,7 +203,9 @@
string.IsNullOrWhiteSpace(_genre) ? null : _genre,
string.IsNullOrWhiteSpace(_releaseDate) ? null : _releaseDate,
_selectedFile.Name,
createdByUserId);
createdByUserId,
releaseType: ReleaseType.Single,
trackNumber: 1);
if (result.Success)
{
DeepDrftManager/Services/CmsTrackService.cs
+9
View File
@@ -2,6 +2,7 @@ using System.Net;
using System.Net.Http.Headers;
using System.Net.Http.Json;
using DeepDrftModels.DTOs;
using DeepDrftModels.Enums;
using Models.Common;
using NetBlocks.Models;
@@ -41,6 +42,8 @@ public class CmsTrackService : ICmsTrackService
string? releaseDate,
string? originalFileName,
long createdByUserId,
ReleaseType releaseType,
int trackNumber,
CancellationToken ct = default)
{
// Rebuild the multipart container so the boundary is owned by HttpClient and the
@@ -58,6 +61,8 @@ public class CmsTrackService : ICmsTrackService
// Explicit field — decouples the admin-visible display name from the WAV part's content-disposition filename.
if (!string.IsNullOrWhiteSpace(originalFileName)) multipart.Add(new StringContent(originalFileName), "originalFileName");
multipart.Add(new StringContent(createdByUserId.ToString()), "createdByUserId");
multipart.Add(new StringContent(releaseType.ToString()), "releaseType");
multipart.Add(new StringContent(trackNumber.ToString()), "trackNumber");
var client = _httpClientFactory.CreateClient(ContentCmsClientName);
using var request = new HttpRequestMessage(HttpMethod.Post, UploadPath) { Content = multipart };
@@ -322,6 +327,8 @@ public class CmsTrackService : ICmsTrackService
long id, string trackName, string artist,
string? album, string? genre, DateOnly? releaseDate,
string? imagePath = null,
ReleaseType? releaseType = null,
int? trackNumber = null,
CancellationToken ct = default)
{
var client = _httpClientFactory.CreateClient(ContentCmsClientName);
@@ -333,6 +340,8 @@ public class CmsTrackService : ICmsTrackService
genre,
releaseDate,
imagePath,
releaseType = releaseType?.ToString(),
trackNumber,
};
HttpResponseMessage response;
DeepDrftManager/Services/ICmsTrackService.cs
+5
View File
@@ -1,4 +1,5 @@
using DeepDrftModels.DTOs;
using DeepDrftModels.Enums;
using Models.Common;
using NetBlocks.Models;
@@ -29,6 +30,8 @@ public interface ICmsTrackService
string? releaseDate,
string? originalFileName,
long createdByUserId,
ReleaseType releaseType,
int trackNumber,
CancellationToken ct = default);
/// <summary>
@@ -69,6 +72,8 @@ public interface ICmsTrackService
long id, string trackName, string artist,
string? album, string? genre, DateOnly? releaseDate,
string? imagePath = null,
ReleaseType? releaseType = null,
int? trackNumber = null,
CancellationToken ct = default);
/// <summary>
DeepDrftModels/DTOs/TrackDto.cs
+3
View File
@@ -1,3 +1,4 @@
using DeepDrftModels.Enums;
using Models.Models;
namespace DeepDrftModels.DTOs;
@@ -19,4 +20,6 @@ public class TrackDto : BaseModel
public string? ImagePath { get; set; }
public long? CreatedByUserId { get; set; }
public string? OriginalFileName { get; set; }
public ReleaseType ReleaseType { get; set; } = ReleaseType.Single;
public int TrackNumber { get; set; } = 1;
}
DeepDrftModels/Entities/TrackEntity.cs
+3
View File
@@ -1,3 +1,4 @@
using DeepDrftModels.Enums;
using Models.Entities;
namespace DeepDrftModels.Entities;
@@ -16,4 +17,6 @@ public class TrackEntity : BaseEntity, IEntity
public string? ImagePath { get; set; }
public long? CreatedByUserId { get; set; }
public string? OriginalFileName { get; set; }
public ReleaseType ReleaseType { get; set; } = ReleaseType.Single;
public int TrackNumber { get; set; } = 1;
}
DeepDrftModels/Enums/ReleaseType.cs
+9
View File
@@ -0,0 +1,9 @@
namespace DeepDrftModels.Enums;
/// <summary>The commercial release format of a track's parent release.</summary>
public enum ReleaseType
{
Single,
EP,
Album
}