Clean up domain entities: shared picture value object, lifecycle and ownership interfaces, explicit tables

backend/Core/Musify.Domain/Abstractions/IHasLifeCycle.cs

@@ -0,0 +1,10 @@
+using Musify.Domain.ValueObjects;
+
+namespace Musify.Domain.Abstractions;
+
+public interface IHasLifeCycle
+{
+    public Guid Id { get; }
+
+    public LifeCycleStatus LifeCycleStatus { get; set; }
+}

backend/Core/Musify.Domain/Abstractions/IOwnedEntity.cs

@@ -0,0 +1,8 @@
+namespace Musify.Domain.Abstractions;
+
+public interface IOwnedEntity
+{
+    public Guid Id { get; }
+
+    public long OwnerUserId { get; }
+}

backend/Core/Musify.Domain/Entities/Album.cs

@@ -5,17 +5,15 @@ using Musify.Domain.ValueObjects;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
-public class Album : IAuditable
+[Table("Albums")]
+public class Album : IAuditable, IHasLifeCycle, IOwnedEntity
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     [MaxLength(200)]
     public required string Title { get; set; }
 
-    [Required]
     [MaxLength(200)]
     public required string NormalizedTitle { get; set; }
 
@@ -24,21 +22,17 @@ public class Album : IAuditable
 
     public int? ReleaseYear { get; set; }
 
-    public AlbumPictures? Pictures { get; set; }
+    public EntityPictures? Pictures { get; set; }
 
-    [Required]
     public required long OwnerUserId { get; set; }
 
     [ForeignKey(nameof(OwnerUserId))]
-    public User Owner { get; set; }
+    public User Owner { get; set; } = null!;
 
-    [Required]
     public LifeCycleStatus LifeCycleStatus { get; set; } = LifeCycleStatus.Active;
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
-    [Required]
     public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
 
     public ICollection<AlbumHasTrack> AlbumTracks { get; set; } = new List<AlbumHasTrack>();

backend/Core/Musify.Domain/Entities/AlbumHasTrack.cs

@@ -1,29 +1,23 @@
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("AlbumHasTrack")]
 public class AlbumHasTrack
 {
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required Guid AlbumId { get; set; }
 
-    [Required]
     public required Guid TrackId { get; set; }
 
-    [Required]
     public int TrackNumber { get; set; } = 1;
 
-    [Required]
     public DateTime AddedAt { get; set; } = DateTime.UtcNow;
 
     [ForeignKey(nameof(AlbumId))]
-    public Album Album { get; set; }
+    public Album Album { get; set; } = null!;
 
     [ForeignKey(nameof(TrackId))]
-    public Track Track { get; set; }
+    public Track Track { get; set; } = null!;
 }

backend/Core/Musify.Domain/Entities/ListeningHistory.cs

@@ -3,20 +3,16 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("ListeningHistory")]
 public class ListeningHistory
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required long UserId { get; set; }
 
-    [Required]
     public required Guid TrackId { get; set; }
 
-    [Required]
     public DateTime ListenedAt { get; set; } = DateTime.UtcNow;
 
     public double? PlayedSeconds { get; set; }
@@ -26,8 +22,8 @@ public class ListeningHistory
     public bool IsCounted { get; set; }
 
     [ForeignKey(nameof(UserId))]
-    public User User { get; set; }
+    public User User { get; set; } = null!;
 
     [ForeignKey(nameof(TrackId))]
-    public Track Track { get; set; }
+    public Track Track { get; set; } = null!;
 }

backend/Core/Musify.Domain/Entities/Mix.cs

@@ -5,34 +5,28 @@ using Musify.Domain.Abstractions;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("Mixes")]
 public class Mix : IAuditable
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required long UserId { get; set; }
 
-    [Required]
     [MaxLength(100)]
     public required string Title { get; set; }
 
     [MaxLength(256)]
     public string? Subtitle { get; set; }
 
-    [Required]
-    public int Position { get; set; } = 0;
+    public int Position { get; set; }
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
-    [Required]
     public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
 
     [ForeignKey(nameof(UserId))]
-    public User User { get; set; }
+    public User User { get; set; } = null!;
 
     public ICollection<MixItem> Items { get; set; } = new List<MixItem>();
 }

backend/Core/Musify.Domain/Entities/MixItem.cs

@@ -3,25 +3,21 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("MixItems")]
 public class MixItem
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required Guid MixId { get; set; }
 
-    [Required]
-    public int Position { get; set; } = 0;
+    public int Position { get; set; }
 
-    [Required]
     public required Guid TrackId { get; set; }
 
     [ForeignKey(nameof(MixId))]
-    public Mix Mix { get; set; }
+    public Mix Mix { get; set; } = null!;
 
     [ForeignKey(nameof(TrackId))]
-    public Track Track { get; set; }
+    public Track Track { get; set; } = null!;
 }

backend/Core/Musify.Domain/Entities/PlayList.cs

@@ -6,43 +6,36 @@ using Musify.Domain.ValueObjects;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("PlayLists")]
-public class PlayList : IAuditable
+public class PlayList : IAuditable, IHasLifeCycle, IOwnedEntity
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
-    public required long UserId { get; set; }
+    [Column("UserId")]
+    public required long OwnerUserId { get; set; }
 
-    [Required]
     [MaxLength(50)]
     public required string Name { get; set; }
 
-    [Required]
     [MaxLength(50)]
     public required string NormalizedName { get; set; }
 
     [MaxLength(256)]
     public string? Description { get; set; }
 
-    public PlayListPictures? Pictures { get; set; }
+    public EntityPictures? Pictures { get; set; }
 
-    [Required]
     public LifeCycleStatus LifeCycleStatus { get; set; } = LifeCycleStatus.Active;
 
-    [Required]
-    public PlaylistVisibility Visibility { get; set; } = PlaylistVisibility.Private;
+    public PlayListVisibility Visibility { get; set; } = PlayListVisibility.Private;
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
-    [Required]
     public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
 
-    [ForeignKey(nameof(UserId))]
-    public User User { get; set; }
+    [ForeignKey(nameof(OwnerUserId))]
+    public User Owner { get; set; } = null!;
 
     public ICollection<PlayListHasTrack> PlayListTracks { get; set; } = new List<PlayListHasTrack>();
 }

backend/Core/Musify.Domain/Entities/PlayListHasTrack.cs

@@ -1,29 +1,23 @@
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("PlayListHasTrack")]
 public class PlayListHasTrack
 {
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required Guid PlayListId { get; set; }
 
-    [Required]
     public required Guid TrackId { get; set; }
 
-    [Required]
-    public int Position { get; set; } = 0;
+    public int Position { get; set; }
 
-    [Required]
     public DateTime AddedAt { get; set; } = DateTime.UtcNow;
 
     [ForeignKey(nameof(PlayListId))]
-    public PlayList PlayList { get; set; }
+    public PlayList PlayList { get; set; } = null!;
 
     [ForeignKey(nameof(TrackId))]
-    public Track Track { get; set; }
+    public Track Track { get; set; } = null!;
 }

backend/Core/Musify.Domain/Entities/Track.cs

@@ -5,39 +5,31 @@ using Musify.Domain.ValueObjects;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
-public class Track : IAuditable
+[Table("Tracks")]
+public class Track : IAuditable, IHasLifeCycle, IOwnedEntity
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     [MaxLength(200)]
     public required string Title { get; set; }
 
-    [Required]
     [MaxLength(200)]
     public required string NormalizedTitle { get; set; }
 
-    [Required]
     public double DurationSeconds { get; set; }
 
-    [Required]
     public required long OwnerUserId { get; set; }
 
     [ForeignKey(nameof(OwnerUserId))]
-    public required User Owner { get; set; }
+    public User Owner { get; set; } = null!;
 
-    [Required]
     public LifeCycleStatus LifeCycleStatus { get; set; } = LifeCycleStatus.Active;
 
-    [Required]
     public bool IsExplicit { get; set; }
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
-    [Required]
     public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
 
     public TrackPictures Pictures { get; set; } = new();

backend/Core/Musify.Domain/Entities/TrackLike.cs

@@ -3,25 +3,21 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("TrackLikes")]
 public class TrackLike
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required long UserId { get; set; }
 
-    [Required]
     public required Guid TrackId { get; set; }
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
     [ForeignKey(nameof(UserId))]
-    public User User { get; set; }
+    public User User { get; set; } = null!;
 
     [ForeignKey(nameof(TrackId))]
-    public Track Track { get; set; }
+    public Track Track { get; set; } = null!;
 }

backend/Core/Musify.Domain/Entities/TrackTag.cs

@@ -4,18 +4,16 @@ using Musify.Domain.ValueObjects;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
+[Table("TrackTags")]
 public class TrackTag
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required Guid TrackId { get; set; }
 
-    [Required]
     public required Genre Tag { get; set; }
 
     [ForeignKey(nameof(TrackId))]
-    public Track Track { get; set; }
+    public Track Track { get; set; } = null!;
 }

backend/Core/Musify.Domain/Entities/UploadIntent.cs

@@ -11,40 +11,34 @@ public class UploadIntent
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required long UserId { get; set; }
 
-    [Required, MaxLength(128)]
+    [MaxLength(128)]
     public required string Bucket { get; set; }
 
-    [Required, MaxLength(512)]
+    [MaxLength(512)]
     public required string Key { get; set; }
 
-    [Required, MaxLength(128)]
+    [MaxLength(128)]
     public required string ObjectName { get; set; }
 
-    [Required, MaxLength(128)]
+    [MaxLength(128)]
     public required string ContentType { get; set; }
 
     public long? ExpectedSizeBytes { get; set; }
 
-    [Required]
     public UploadIntentPurpose Purpose { get; set; }
 
-    [Required]
     public UploadIntentStatus Status { get; set; } = UploadIntentStatus.Issued;
 
-    [Required]
     public DateTime ExpiresAt { get; set; }
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
     [NotMapped]
     public bool IsConsumed => Status == UploadIntentStatus.Consumed;
 
-    [NotMapped]
-    public bool IsExpired => Status == UploadIntentStatus.Expired || ExpiresAt < DateTime.UtcNow;
+    public bool IsExpiredAt(DateTime now) => Status == UploadIntentStatus.Expired || ExpiresAt < now;
 
     [ForeignKey(nameof(UserId))]
     public User User { get; set; } = null!;

backend/Core/Musify.Domain/Entities/User.cs

@@ -11,11 +11,9 @@ public class User : IAuditable
     [DatabaseGenerated(DatabaseGeneratedOption.None)]
     public required long Id { get; set; }
 
-    [Required]
     [MaxLength(48)]
     public required string Name { get; set; }
 
-    [Required]
     [MaxLength(48)]
     public required string NormalizedName { get; set; }
 
@@ -28,10 +26,8 @@ public class User : IAuditable
     [MaxLength(2048)]
     public string? ProfilePictureUrl { get; set; }
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
-    [Required]
     public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
 
     public ICollection<UserHasTrack> UserTracks { get; set; } = new List<UserHasTrack>();

backend/Core/Musify.Domain/Entities/UserFollow.cs

@@ -3,25 +3,21 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("UserFollows")]
 public class UserFollow
 {
     [Key]
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required long FollowerId { get; set; }
 
-    [Required]
     public required long FollowedId { get; set; }
 
-    [Required]
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
     [ForeignKey(nameof(FollowerId))]
-    public User Follower { get; set; }
+    public User Follower { get; set; } = null!;
 
     [ForeignKey(nameof(FollowedId))]
-    public User Followed { get; set; }
+    public User Followed { get; set; } = null!;
 }

backend/Core/Musify.Domain/Entities/UserHasTrack.cs

@@ -1,23 +1,19 @@
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Musify.Domain.Entities;
 
-#pragma warning disable CS8618
 [Table("UserHasTrack")]
 public class UserHasTrack
 {
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    [Required]
     public required long UserId { get; set; }
 
-    [Required]
     public required Guid TrackId { get; set; }
 
     [ForeignKey(nameof(UserId))]
-    public User User { get; set; }
+    public User User { get; set; } = null!;
 
     [ForeignKey(nameof(TrackId))]
-    public Track Track { get; set; }
+    public Track Track { get; set; } = null!;
 }

backend/Core/Musify.Domain/ValueObjects/EntityPictures.cs

@@ -2,7 +2,8 @@ using System.ComponentModel.DataAnnotations;
 
 namespace Musify.Domain.ValueObjects;
 
-public class AlbumPictures
+/// <summary>The picture file names of an album or playlist. Resized names stay null until processing finishes.</summary>
+public class EntityPictures
 {
     [Required]
     public required string OriginalName { get; set; }
@@ -13,5 +14,5 @@ public class AlbumPictures
 
     public string? LargeName { get; set; }
 
-    public static AlbumPictures Pending(string originalName) => new() { OriginalName = originalName };
+    public static EntityPictures Pending(string objectName) => new() { OriginalName = objectName };
 }

backend/Core/Musify.Domain/ValueObjects/PlayListPictures.cs

@@ -1,17 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Musify.Domain.ValueObjects;
-
-public class PlayListPictures
-{
-    [Required]
-    public required string OriginalName { get; set; }
-
-    public string? SmallName { get; set; }
-
-    public string? MediumName { get; set; }
-
-    public string? LargeName { get; set; }
-
-    public static PlayListPictures Pending(string originalName) => new() { OriginalName = originalName };
-}

backend/Core/Musify.Domain/ValueObjects/PlaylistVisibility.cs

@@ -1,6 +1,6 @@
 namespace Musify.Domain.ValueObjects;
 
-public enum PlaylistVisibility
+public enum PlayListVisibility
 {
     Private = 0,
     Public = 1