dropping mapping id, using uri

fixes #41

Selector.CLI/ScrobbleMapper.cs

@@ -110,7 +110,24 @@ namespace Selector
                 SpotifyUri = a.Uri
             });
 
-            mappingRepo.AddRange(newMappings);
+            var existingUris = currentArtists.Select(a => a.SpotifyUri).ToArray();
+
+            foreach (var candidateMapping in newMappings)
+            {
+                if (existingUris.Contains(candidateMapping.SpotifyUri))
+                {
+                    var duplicates = currentArtists.Where(a => a.LastfmArtistName.Equals(candidateMapping.LastfmArtistName, StringComparison.OrdinalIgnoreCase));
+                    logger.LogWarning("Found duplicate Spotify uri ({}), [{}], {}", 
+                        candidateMapping.SpotifyUri, 
+                        candidateMapping.LastfmArtistName, 
+                        string.Join(", ", duplicates.Select(d => d.LastfmArtistName))
+                    );
+                }
+                else
+                {
+                    mappingRepo.Add(candidateMapping);
+                }
+            }
         }
 
         private async Task MapAlbums(CancellationToken token)
@@ -162,7 +179,26 @@ namespace Selector
                 SpotifyUri = a.Uri
             });
 
-            mappingRepo.AddRange(newMappings);
+            var existingUris = currentAlbums.Select(a => a.SpotifyUri).ToArray();
+
+            foreach(var candidateMapping in newMappings)
+            {
+                if(existingUris.Contains(candidateMapping.SpotifyUri))
+                {
+                    var duplicates = currentAlbums.Where(a => a.LastfmArtistName.Equals(candidateMapping.LastfmArtistName, StringComparison.OrdinalIgnoreCase)
+                                                                && a.LastfmAlbumName.Equals(candidateMapping.LastfmAlbumName, StringComparison.OrdinalIgnoreCase));
+                    logger.LogWarning("Found duplicate Spotify uri ({}), [{}, {}] {}", 
+                        candidateMapping.SpotifyUri, 
+                        candidateMapping.LastfmAlbumName, 
+                        candidateMapping.LastfmArtistName, 
+                        string.Join(", ", duplicates.Select(d => $"{d.LastfmAlbumName} {d.LastfmArtistName}"))
+                    );
+                }
+                else
+                {
+                    mappingRepo.Add(candidateMapping);
+                }
+            }
         }
 
         private async Task MapTracks(CancellationToken token)
@@ -214,7 +250,26 @@ namespace Selector
                 SpotifyUri = a.Uri
             });
 
-            mappingRepo.AddRange(newMappings);
+            var existingUris = currentTracks.Select(a => a.SpotifyUri).ToArray();
+
+            foreach (var candidateMapping in newMappings)
+            {
+                if (existingUris.Contains(candidateMapping.SpotifyUri))
+                {
+                    var duplicates = currentTracks.Where(a => a.LastfmArtistName.Equals(candidateMapping.LastfmArtistName, StringComparison.OrdinalIgnoreCase)
+                                                                && a.LastfmTrackName.Equals(candidateMapping.LastfmTrackName, StringComparison.OrdinalIgnoreCase));
+                    logger.LogWarning("Found duplicate Spotify uri ({}), [{}, {}] {}", 
+                        candidateMapping.SpotifyUri, 
+                        candidateMapping.LastfmTrackName, 
+                        candidateMapping.LastfmArtistName,
+                        string.Join(", ", duplicates.Select(d => $"{d.LastfmTrackName} {d.LastfmArtistName}"))
+                    );
+                }
+                else
+                {
+                    mappingRepo.Add(candidateMapping);
+                }
+            }
         }
     }
 }

Selector.Model/ApplicationDbContext.cs

@@ -69,7 +69,7 @@ namespace Selector.Model
                 .Property(s => s.ArtistName)
                 .UseCollation("case_insensitive");
 
-            modelBuilder.Entity<TrackLastfmSpotifyMapping>().HasKey(s => s.Id);
+            modelBuilder.Entity<TrackLastfmSpotifyMapping>().HasKey(s => s.SpotifyUri);
             modelBuilder.Entity<TrackLastfmSpotifyMapping>()
                 .Property(s => s.LastfmTrackName)
                 .UseCollation("case_insensitive");
@@ -77,7 +77,7 @@ namespace Selector.Model
                 .Property(s => s.LastfmArtistName)
                 .UseCollation("case_insensitive");
 
-            modelBuilder.Entity<AlbumLastfmSpotifyMapping>().HasKey(s => s.Id);
+            modelBuilder.Entity<AlbumLastfmSpotifyMapping>().HasKey(s => s.SpotifyUri);
             modelBuilder.Entity<AlbumLastfmSpotifyMapping>()
                 .Property(s => s.LastfmAlbumName)
                 .UseCollation("case_insensitive");
@@ -85,7 +85,7 @@ namespace Selector.Model
                 .Property(s => s.LastfmArtistName)
                 .UseCollation("case_insensitive");
 
-            modelBuilder.Entity<ArtistLastfmSpotifyMapping>().HasKey(s => s.Id);
+            modelBuilder.Entity<ArtistLastfmSpotifyMapping>().HasKey(s => s.SpotifyUri);
             modelBuilder.Entity<ArtistLastfmSpotifyMapping>()
                 .Property(s => s.LastfmArtistName)
                 .UseCollation("case_insensitive");

Selector.Model/Migrations/20220224221306_mapping_spotify_id_as_id.Designer.cs

@@ -0,0 +1,443 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Selector.Model;
+
+#nullable disable
+
+namespace Selector.Model.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20220224221306_mapping_spotify_id_as_id")]
+    partial class mapping_spotify_id_as_id
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:CollationDefinition:case_insensitive", "en-u-ks-primary,en-u-ks-primary,icu,False")
+                .HasAnnotation("ProductVersion", "6.0.2")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+
+                    b.HasData(
+                        new
+                        {
+                            Id = "00c64c0a-3387-4933-9575-83443fa9092b",
+                            ConcurrencyStamp = "ec454f56-2b26-4bd8-be8e-a7fd34981ac2",
+                            Name = "Admin",
+                            NormalizedName = "ADMIN"
+                        });
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Selector.Model.AlbumLastfmSpotifyMapping", b =>
+                {
+                    b.Property<string>("SpotifyUri")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LastfmAlbumName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.Property<string>("LastfmArtistName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.HasKey("SpotifyUri");
+
+                    b.ToTable("AlbumMapping");
+                });
+
+            modelBuilder.Entity("Selector.Model.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LastFmUsername")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("SaveScrobbles")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SpotifyAccessToken")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("SpotifyIsLinked")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("SpotifyLastRefresh")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("SpotifyRefreshToken")
+                        .HasColumnType("text");
+
+                    b.Property<int>("SpotifyTokenExpiry")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Selector.Model.ArtistLastfmSpotifyMapping", b =>
+                {
+                    b.Property<string>("SpotifyUri")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LastfmArtistName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.HasKey("SpotifyUri");
+
+                    b.ToTable("ArtistMapping");
+                });
+
+            modelBuilder.Entity("Selector.Model.TrackLastfmSpotifyMapping", b =>
+                {
+                    b.Property<string>("SpotifyUri")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LastfmArtistName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.Property<string>("LastfmTrackName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.HasKey("SpotifyUri");
+
+                    b.ToTable("TrackMapping");
+                });
+
+            modelBuilder.Entity("Selector.Model.UserScrobble", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AlbumArtistName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AlbumName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.Property<string>("ArtistName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("TrackName")
+                        .HasColumnType("text")
+                        .UseCollation("case_insensitive");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Scrobble");
+                });
+
+            modelBuilder.Entity("Selector.Model.Watcher", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Watcher");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Selector.Model.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Selector.Model.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Selector.Model.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Selector.Model.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Selector.Model.UserScrobble", b =>
+                {
+                    b.HasOne("Selector.Model.ApplicationUser", "User")
+                        .WithMany("Scrobbles")
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Selector.Model.Watcher", b =>
+                {
+                    b.HasOne("Selector.Model.ApplicationUser", "User")
+                        .WithMany("Watchers")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Selector.Model.ApplicationUser", b =>
+                {
+                    b.Navigation("Scrobbles");
+
+                    b.Navigation("Watchers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Selector.Model/Migrations/20220224221306_mapping_spotify_id_as_id.cs

@@ -0,0 +1,174 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Selector.Model.Migrations
+{
+    public partial class mapping_spotify_id_as_id : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_TrackMapping",
+                table: "TrackMapping");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_ArtistMapping",
+                table: "ArtistMapping");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_AlbumMapping",
+                table: "AlbumMapping");
+
+            migrationBuilder.DropColumn(
+                name: "Id",
+                table: "TrackMapping");
+
+            migrationBuilder.DropColumn(
+                name: "Id",
+                table: "ArtistMapping");
+
+            migrationBuilder.DropColumn(
+                name: "Id",
+                table: "AlbumMapping");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SpotifyUri",
+                table: "TrackMapping",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SpotifyUri",
+                table: "ArtistMapping",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SpotifyUri",
+                table: "AlbumMapping",
+                type: "text",
+                nullable: false,
+                defaultValue: "",
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_TrackMapping",
+                table: "TrackMapping",
+                column: "SpotifyUri");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_ArtistMapping",
+                table: "ArtistMapping",
+                column: "SpotifyUri");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_AlbumMapping",
+                table: "AlbumMapping",
+                column: "SpotifyUri");
+
+            migrationBuilder.UpdateData(
+                table: "AspNetRoles",
+                keyColumn: "Id",
+                keyValue: "00c64c0a-3387-4933-9575-83443fa9092b",
+                column: "ConcurrencyStamp",
+                value: "ec454f56-2b26-4bd8-be8e-a7fd34981ac2");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_TrackMapping",
+                table: "TrackMapping");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_ArtistMapping",
+                table: "ArtistMapping");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_AlbumMapping",
+                table: "AlbumMapping");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SpotifyUri",
+                table: "TrackMapping",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AddColumn<int>(
+                name: "Id",
+                table: "TrackMapping",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0)
+                .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SpotifyUri",
+                table: "ArtistMapping",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AddColumn<int>(
+                name: "Id",
+                table: "ArtistMapping",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0)
+                .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SpotifyUri",
+                table: "AlbumMapping",
+                type: "text",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "text");
+
+            migrationBuilder.AddColumn<int>(
+                name: "Id",
+                table: "AlbumMapping",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0)
+                .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_TrackMapping",
+                table: "TrackMapping",
+                column: "Id");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_ArtistMapping",
+                table: "ArtistMapping",
+                column: "Id");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_AlbumMapping",
+                table: "AlbumMapping",
+                column: "Id");
+
+            migrationBuilder.UpdateData(
+                table: "AspNetRoles",
+                keyColumn: "Id",
+                keyValue: "00c64c0a-3387-4933-9575-83443fa9092b",
+                column: "ConcurrencyStamp",
+                value: "765f8993-a743-496b-8c8a-e43f532ac862");
+        }
+    }
+}

Selector.Model/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -52,7 +52,7 @@ namespace Selector.Model.Migrations
                         new
                         {
                             Id = "00c64c0a-3387-4933-9575-83443fa9092b",
-                            ConcurrencyStamp = "765f8993-a743-496b-8c8a-e43f532ac862",
+                            ConcurrencyStamp = "ec454f56-2b26-4bd8-be8e-a7fd34981ac2",
                             Name = "Admin",
                             NormalizedName = "ADMIN"
                         });
@@ -166,11 +166,8 @@ namespace Selector.Model.Migrations
 
             modelBuilder.Entity("Selector.Model.AlbumLastfmSpotifyMapping", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<string>("SpotifyUri")
-                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<string>("LastfmAlbumName")
                         .HasColumnType("text")
@@ -180,12 +177,9 @@ namespace Selector.Model.Migrations
                         .HasColumnType("text")
                         .UseCollation("case_insensitive");
 
-                    b.Property<string>("SpotifyUri")
+                    b.HasKey("SpotifyUri");
-                        .HasColumnType("text");
 
-                    b.HasKey("Id");
+                    b.ToTable("AlbumMapping");
-
-                    b.ToTable("AlbumMapping", (string)null);
                 });
 
             modelBuilder.Entity("Selector.Model.ApplicationUser", b =>
@@ -276,31 +270,22 @@ namespace Selector.Model.Migrations
 
             modelBuilder.Entity("Selector.Model.ArtistLastfmSpotifyMapping", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<string>("SpotifyUri")
-                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<string>("LastfmArtistName")
                         .HasColumnType("text")
                         .UseCollation("case_insensitive");
 
-                    b.Property<string>("SpotifyUri")
+                    b.HasKey("SpotifyUri");
-                        .HasColumnType("text");
 
-                    b.HasKey("Id");
+                    b.ToTable("ArtistMapping");
-
-                    b.ToTable("ArtistMapping", (string)null);
                 });
 
             modelBuilder.Entity("Selector.Model.TrackLastfmSpotifyMapping", b =>
                 {
-                    b.Property<int>("Id")
+                    b.Property<string>("SpotifyUri")
-                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<string>("LastfmArtistName")
                         .HasColumnType("text")
@@ -310,12 +295,9 @@ namespace Selector.Model.Migrations
                         .HasColumnType("text")
                         .UseCollation("case_insensitive");
 
-                    b.Property<string>("SpotifyUri")
+                    b.HasKey("SpotifyUri");
-                        .HasColumnType("text");
 
-                    b.HasKey("Id");
+                    b.ToTable("TrackMapping");
-
-                    b.ToTable("TrackMapping", (string)null);
                 });
 
             modelBuilder.Entity("Selector.Model.UserScrobble", b =>
@@ -351,7 +333,7 @@ namespace Selector.Model.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("Scrobble", (string)null);
+                    b.ToTable("Scrobble");
                 });
 
             modelBuilder.Entity("Selector.Model.Watcher", b =>
@@ -373,7 +355,7 @@ namespace Selector.Model.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("Watcher", (string)null);
+                    b.ToTable("Watcher");
                 });
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>

Selector.Model/Scrobble/LastfmSpotifyMapping.cs

@@ -2,8 +2,6 @@
 {
     public abstract class LastfmSpotifyMapping
     {
-        public int Id { get; set; }
-
         public string SpotifyUri { get; set; }
     }