split read and write in prod

alecgorge · alecgorge · commit bad97722e6c4 · 2025-04-17T11:34:40.000-07:00
diff --git a/RelistenApi/Services/Data/ArtistService.cs b/RelistenApi/Services/Data/ArtistService.cs
@@ -88,7 +88,7 @@ ORDER BY
 
         public Task<int> RemoveAllContentForArtist(Artist art)
         {
-            return db.WithConnection(con => con.ExecuteAsync(@"
+            return db.WithWriteConnection(con => con.ExecuteAsync(@"
 				delete from setlist_songs where artist_id = @ArtistId;
 				delete from setlist_shows where artist_id = @ArtistId;
 				delete from shows where artist_id = @ArtistId;
@@ -364,7 +364,7 @@ public async Task<SlimArtistWithFeatures> Save(SlimArtistWithFeatures artist)
         {
             if (artist.id != 0)
             {
-                var art = await db.WithConnection(async con =>
+                var art = await db.WithWriteConnection(async con =>
                 {
                     var innerArt = await con.QuerySingleAsync<SlimArtistWithFeatures>(@"
 	                    UPDATE
@@ -409,7 +409,7 @@ await con.ExecuteAsync(@"
             }
             else
             {
-                var art = await db.WithConnection(async con =>
+                var art = await db.WithWriteConnection(async con =>
                 {
                     var innerArt = await con.QuerySingleAsync<SlimArtistWithFeatures>(@"
 	                    INSERT INTO
diff --git a/RelistenApi/Services/Data/EraService.cs b/RelistenApi/Services/Data/EraService.cs
@@ -54,7 +54,7 @@ public async Task<Era> Save(Era era)
 
             if (era.id != 0)
             {
-                return await db.WithConnection(con => con.QuerySingleAsync<Era>(@"
+                return await db.WithWriteConnection(con => con.QuerySingleAsync<Era>(@"
                     UPDATE
                         eras
                     SET
@@ -68,7 +68,7 @@ public async Task<Era> Save(Era era)
                 ", p));
             }
 
-            return await db.WithConnection(con => con.QuerySingleAsync<Era>(@"
+            return await db.WithWriteConnection(con => con.QuerySingleAsync<Era>(@"
                     INSERT INTO
                         eras
 
diff --git a/RelistenApi/Services/Data/LinkService.cs b/RelistenApi/Services/Data/LinkService.cs
@@ -13,7 +13,7 @@ public LinkService(DbService db) : base(db)
 
         public async Task<IEnumerable<Link>> AddLinksForSource(Source src, IEnumerable<Link> links)
         {
-            return await db.WithConnection(async con =>
+            return await db.WithWriteConnection(async con =>
             {
                 var inserted = new List<Link>();
 
diff --git a/RelistenApi/Services/Data/SetlistShowService.cs b/RelistenApi/Services/Data/SetlistShowService.cs
@@ -91,7 +91,7 @@ public async Task<SetlistShow> Save(SetlistShow show)
 
             if (show.id != 0)
             {
-                return await db.WithConnection(con => con.QuerySingleAsync<SetlistShow>(@"
+                return await db.WithWriteConnection(con => con.QuerySingleAsync<SetlistShow>(@"
                     UPDATE
                         setlist_shows
                     SET
@@ -108,7 +108,7 @@ public async Task<SetlistShow> Save(SetlistShow show)
                 ", p));
             }
 
-            return await db.WithConnection(con => con.QuerySingleAsync<SetlistShow>(@"
+            return await db.WithWriteConnection(con => con.QuerySingleAsync<SetlistShow>(@"
                     INSERT INTO
                         setlist_shows
 
diff --git a/RelistenApi/Services/Data/SetlistSongService.cs b/RelistenApi/Services/Data/SetlistSongService.cs
@@ -169,7 +169,7 @@ public async Task<IEnumerable<SetlistSong>> InsertAll(Artist artist, IEnumerable
                     RETURNING *
                 ", song));
             }*/
-            return await db.WithConnection(async con =>
+            return await db.WithWriteConnection(async con =>
             {
                 var inserted = new List<SetlistSong>();
 
diff --git a/RelistenApi/Services/Data/SourceReviewService.cs b/RelistenApi/Services/Data/SourceReviewService.cs
@@ -29,7 +29,7 @@ public async Task<IEnumerable<SourceReview>> UpdateAll(Source source, IEnumerabl
         {
             const string guidSnippet =
                 @"md5(@source_id || '::review::' || COALESCE('' || @rating, 'NULL') || COALESCE('' || @title, 'NULL') || COALESCE('' || @author, 'NULL') || @updated_at)::uuid";
-            return await db.WithConnection(async con =>
+            return await db.WithWriteConnection(async con =>
             {
                 var inserted = new List<SourceReview>();
 
@@ -73,7 +73,7 @@ ON CONFLICT ON CONSTRAINT source_reviews_uuid
                     DO
                         UPDATE SET
                             review = EXCLUDED.review
-                    
+
                     RETURNING *
                     ", p));
                 }
diff --git a/RelistenApi/Services/Data/SourceService.cs b/RelistenApi/Services/Data/SourceService.cs
@@ -246,7 +246,7 @@ sources s
 
         public async Task<int> RemoveSourcesWithUpstreamIdentifiers(IEnumerable<string> upstreamIdentifiers)
         {
-            return await db.WithConnection(con => con.ExecuteAsync(@"
+            return await db.WithWriteConnection(con => con.ExecuteAsync(@"
                 DELETE FROM
                     sources
                 WHERE
@@ -280,7 +280,7 @@ public async Task<Source> Save(Source source)
                 source.flac_type
             };
 
-            return await db.WithConnection(con => con.QuerySingleAsync<Source>(@"
+            return await db.WithWriteConnection(con => con.QuerySingleAsync<Source>(@"
                 INSERT INTO
                     sources
                     (
diff --git a/RelistenApi/Services/Data/SourceSetService.cs b/RelistenApi/Services/Data/SourceSetService.cs
@@ -32,7 +32,7 @@ public async Task<SourceSet> Update(Source source, SourceSet set)
 
         public async Task<IEnumerable<SourceSet>> UpdateAll(Source source, IEnumerable<SourceSet> sets)
         {
-            return await db.WithConnection(async con =>
+            return await db.WithWriteConnection(async con =>
             {
                 var inserted = new List<SourceSet>();
 
diff --git a/RelistenApi/Services/Data/SourceTrackPlayService.cs b/RelistenApi/Services/Data/SourceTrackPlayService.cs
@@ -14,7 +14,7 @@ public SourceTrackPlaysService(DbService db) : base(db)
 
         public async Task<SourceTrackPlay> RecordPlayedTrack(SourceTrackPlay track)
         {
-            return await db.WithConnection(con => con.QuerySingleAsync<SourceTrackPlay>(@"
+            return await db.WithWriteConnection(con => con.QuerySingleAsync<SourceTrackPlay>(@"
 				INSERT INTO
 					source_track_plays
 
diff --git a/RelistenApi/Services/Data/SourceTrackService.cs b/RelistenApi/Services/Data/SourceTrackService.cs
@@ -47,7 +47,7 @@ source_tracks t
 
         public async Task<IEnumerable<SourceTrack>> InsertAll(Source source, IEnumerable<SourceTrack> tracks)
         {
-            return await db.WithConnection(async con =>
+            return await db.WithWriteConnection(async con =>
             {
                 var inserted = new List<SourceTrack>();
 
diff --git a/RelistenApi/Services/Data/TourService.cs b/RelistenApi/Services/Data/TourService.cs
@@ -100,7 +100,7 @@ public async Task<Tour> Save(Tour tour)
 
             if (tour.id != 0)
             {
-                return await db.WithConnection(con => con.QuerySingleAsync<Tour>(@"
+                return await db.WithWriteConnection(con => con.QuerySingleAsync<Tour>(@"
                     UPDATE
                         tours
                     SET
@@ -118,7 +118,7 @@ public async Task<Tour> Save(Tour tour)
                 ", p));
             }
 
-            return await db.WithConnection(con => con.QuerySingleAsync<Tour>(@"
+            return await db.WithWriteConnection(con => con.QuerySingleAsync<Tour>(@"
                     INSERT INTO
                         tours
 
diff --git a/RelistenApi/Services/Data/VenueService.cs b/RelistenApi/Services/Data/VenueService.cs
@@ -244,7 +244,7 @@ public async Task<Venue> Save(Venue venue)
 
             if (venue.id != 0)
             {
-                return await db.WithConnection(con => con.QuerySingleAsync<Venue>(@"
+                return await db.WithWriteConnection(con => con.QuerySingleAsync<Venue>(@"
                     UPDATE
                         venues
                     SET
@@ -264,7 +264,7 @@ public async Task<Venue> Save(Venue venue)
                 ", p));
             }
 
-            return await db.WithConnection(con => con.QuerySingleAsync<Venue>(@"
+            return await db.WithWriteConnection(con => con.QuerySingleAsync<Venue>(@"
                     INSERT INTO
                         venues
 
diff --git a/RelistenApi/Services/DbService.cs b/RelistenApi/Services/DbService.cs
@@ -16,8 +16,12 @@ public DbService(string url, IHostEnvironment hostEnvironment)
             ConnStr =
                 $"Host={uri.Host};Port={uri.Port.ToString()};Username={parts[0]};Password={parts[1]};Database={uri.AbsolutePath.Substring(1)};Include Error Detail=true";
 
+            // A bit of a hack, but it'll work well enough in prod and locally we don't need multiple dbs
+            ReadOnlyConnStr = ConnStr.Replace("relisten-db-rw.default", "relisten-db-ro.default");
+
             Console.WriteLine("Attempting to connect to {0}", url.Replace(parts[1], "********"));
-            Console.WriteLine($"DB Connection String: {ConnStr.Replace(parts[1], "********")}");
+            Console.WriteLine($"DB Connection: {ConnStr.Replace(parts[1], "********")}");
+            Console.WriteLine($"DB Connection (read-only): {ReadOnlyConnStr.Replace(parts[1], "********")}");
 
             if (hostEnvironment.IsDevelopment())
             {
@@ -28,17 +32,30 @@ public DbService(string url, IHostEnvironment hostEnvironment)
         }
 
         public static string ConnStr { get; set; }
+        public static string ReadOnlyConnStr { get; set; }
+
+        public NpgsqlConnection CreateConnection(bool longTimeout, bool readOnly)
+        {
+            var connectionSuffix = (longTimeout ? ";CommandTimeout=300" : "");
+
+            if (readOnly)
+            {
+                return new NpgsqlConnection(ReadOnlyConnStr + connectionSuffix);
+            }
+
+            return new NpgsqlConnection(ConnStr + connectionSuffix);
+        }
 
-        public NpgsqlConnection CreateConnection(bool longTimeout)
+        public Task<T> WithWriteConnection<T>(Func<IDbConnection, Task<T>> getData, bool longTimeout = false)
         {
-            return new NpgsqlConnection(ConnStr + (longTimeout ? ";CommandTimeout=300" : ""));
+            return WithConnection(getData, longTimeout, readOnly: false);
         }
 
-        public async Task<T> WithConnection<T>(Func<IDbConnection, Task<T>> getData, bool longTimeout = false)
+        public async Task<T> WithConnection<T>(Func<IDbConnection, Task<T>> getData, bool longTimeout = false, bool readOnly = true)
         {
             try
             {
-                using (var connection = CreateConnection(longTimeout))
+                using (var connection = CreateConnection(longTimeout, readOnly))
                 {
                     await connection.OpenAsync();
                     return await getData(connection);
@@ -58,11 +75,11 @@ public async Task<T> WithConnection<T>(Func<IDbConnection, Task<T>> getData, boo
         }
 
         // use for buffered queries that do not return a type
-        public async Task WithConnection(Func<IDbConnection, Task> getData, bool longTimeout = false)
+        public async Task WithConnection(Func<IDbConnection, Task> getData, bool longTimeout = false, bool readOnly = false)
         {
             try
             {
-                using (var connection = CreateConnection(longTimeout))
+                using (var connection = CreateConnection(longTimeout, readOnly))
                 {
                     await connection.OpenAsync();
                     await getData(connection);
@@ -83,11 +100,11 @@ public async Task WithConnection(Func<IDbConnection, Task> getData, bool longTim
 
         // use for non-buffered queries that return a type
         public async Task<TResult> WithConnection<TRead, TResult>(Func<IDbConnection, Task<TRead>> getData,
-            Func<TRead, Task<TResult>> process, bool longTimeout = false)
+            Func<TRead, Task<TResult>> process, bool longTimeout = false, bool readOnly = false)
         {
             try
             {
-                using (var connection = CreateConnection(longTimeout))
+                using (var connection = CreateConnection(longTimeout, readOnly))
                 {
                     await connection.OpenAsync();
                     var data = await getData(connection);
diff --git a/RelistenApi/Services/Importers/ImporterBase.cs b/RelistenApi/Services/Importers/ImporterBase.cs
@@ -225,7 +225,7 @@ public string SlugifyTrack(string full)
 
         public async Task<ImportStats> RebuildYears(Artist artist)
         {
-            await db.WithConnection(con => con.ExecuteAsync(@"
+            await db.WithWriteConnection(con => con.ExecuteAsync(@"
 BEGIN TRANSACTION;
 
 -- Build Years
@@ -601,7 +601,7 @@ USING shows_with_zero_sources
 
             ";
 
-            await db.WithConnection(con => con.ExecuteAsync(sql, new {artist.id}));
+            await db.WithWriteConnection(con => con.ExecuteAsync(sql, new {artist.id}));
             return ImportStats.None;
         }
     }
diff --git a/RelistenApi/Services/Importers/JerryGarciaComImporter.cs b/RelistenApi/Services/Importers/JerryGarciaComImporter.cs
@@ -304,7 +304,7 @@ private async Task ProcessPage(ImportStats stats, Artist artist, FileMetaObject
 
         private async Task UpdateTourStartEndDates(Artist artist)
         {
-            await db.WithConnection(con => con.ExecuteAsync(@"
+            await db.WithWriteConnection(con => con.ExecuteAsync(@"
                 UPDATE
                     tours
                 SET
diff --git a/RelistenApi/Services/Importers/PhantasyTourImporter.cs b/RelistenApi/Services/Importers/PhantasyTourImporter.cs
@@ -339,7 +339,7 @@ private async Task _ImportSingle(Artist artist, ImportStats stats, PerformContex
 
         private async Task UpdateTourStartEndDates(Artist artist)
         {
-            await db.WithConnection(con => con.ExecuteAsync(@"
+            await db.WithWriteConnection(con => con.ExecuteAsync(@"
                 UPDATE
                     tours
                 SET
diff --git a/RelistenApi/Services/Importers/SetlistFmImporter.cs b/RelistenApi/Services/Importers/SetlistFmImporter.cs
@@ -370,7 +370,7 @@ private async Task<Tuple<bool, ImportStats>> ProcessSetlistPage(Artist artist, H
 
         private async Task UpdateTourStartEndDates(Artist artist)
         {
-            await db.WithConnection(con => con.ExecuteAsync(@"
+            await db.WithWriteConnection(con => con.ExecuteAsync(@"
                 UPDATE
                     tours
                 SET
diff --git a/RelistenApi/Startup.cs b/RelistenApi/Startup.cs
@@ -280,7 +280,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
         public void RunMigrations(DbService db)
         {
             var migrationsAssembly = typeof(Startup).Assembly;
-            using (var pg = db.CreateConnection(true))
+            using (var pg = db.CreateConnection(longTimeout: true, readOnly: false))
             {
                 var databaseProvider = new PostgresqlDatabaseProvider(pg);
                 var migrator = new SimpleMigrator(migrationsAssembly, databaseProvider);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ ORDER BY`
`88`	`88`
`89`	`89`	`public Task<int> RemoveAllContentForArtist(Artist art)`
`90`	`90`	`{`
`91`		`- return db.WithConnection(con => con.ExecuteAsync(@"`
	`91`	`+ return db.WithWriteConnection(con => con.ExecuteAsync(@"`
`92`	`92`	`delete from setlist_songs where artist_id = @ArtistId;`
`93`	`93`	`delete from setlist_shows where artist_id = @ArtistId;`
`94`	`94`	`delete from shows where artist_id = @ArtistId;`
`@@ -364,7 +364,7 @@ public async Task<SlimArtistWithFeatures> Save(SlimArtistWithFeatures artist)`
`364`	`364`	`{`
`365`	`365`	`if (artist.id != 0)`
`366`	`366`	`{`
`367`		`- var art = await db.WithConnection(async con =>`
	`367`	`+ var art = await db.WithWriteConnection(async con =>`
`368`	`368`	`{`
`369`	`369`	`var innerArt = await con.QuerySingleAsync<SlimArtistWithFeatures>(@"`
`370`	`370`	`UPDATE`
`@@ -409,7 +409,7 @@ await con.ExecuteAsync(@"`
`409`	`409`	`}`
`410`	`410`	`else`
`411`	`411`	`{`
`412`		`- var art = await db.WithConnection(async con =>`
	`412`	`+ var art = await db.WithWriteConnection(async con =>`
`413`	`413`	`{`
`414`	`414`	`var innerArt = await con.QuerySingleAsync<SlimArtistWithFeatures>(@"`
`415`	`415`	`INSERT INTO`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public async Task<Era> Save(Era era)`
`54`	`54`
`55`	`55`	`if (era.id != 0)`
`56`	`56`	`{`
`57`		`- return await db.WithConnection(con => con.QuerySingleAsync<Era>(@"`
	`57`	`+ return await db.WithWriteConnection(con => con.QuerySingleAsync<Era>(@"`
`58`	`58`	`UPDATE`
`59`	`59`	`eras`
`60`	`60`	`SET`
`@@ -68,7 +68,7 @@ public async Task<Era> Save(Era era)`
`68`	`68`	`", p));`
`69`	`69`	`}`
`70`	`70`
`71`		`- return await db.WithConnection(con => con.QuerySingleAsync<Era>(@"`
	`71`	`+ return await db.WithWriteConnection(con => con.QuerySingleAsync<Era>(@"`
`72`	`72`	`INSERT INTO`
`73`	`73`	`eras`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public LinkService(DbService db) : base(db)`
`13`	`13`
`14`	`14`	`public async Task<IEnumerable<Link>> AddLinksForSource(Source src, IEnumerable<Link> links)`
`15`	`15`	`{`
`16`		`- return await db.WithConnection(async con =>`
	`16`	`+ return await db.WithWriteConnection(async con =>`
`17`	`17`	`{`
`18`	`18`	`var inserted = new List<Link>();`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public async Task<SetlistShow> Save(SetlistShow show)`
`91`	`91`
`92`	`92`	`if (show.id != 0)`
`93`	`93`	`{`
`94`		`- return await db.WithConnection(con => con.QuerySingleAsync<SetlistShow>(@"`
	`94`	`+ return await db.WithWriteConnection(con => con.QuerySingleAsync<SetlistShow>(@"`
`95`	`95`	`UPDATE`
`96`	`96`	`setlist_shows`
`97`	`97`	`SET`
`@@ -108,7 +108,7 @@ public async Task<SetlistShow> Save(SetlistShow show)`
`108`	`108`	`", p));`
`109`	`109`	`}`
`110`	`110`
`111`		`- return await db.WithConnection(con => con.QuerySingleAsync<SetlistShow>(@"`
	`111`	`+ return await db.WithWriteConnection(con => con.QuerySingleAsync<SetlistShow>(@"`
`112`	`112`	`INSERT INTO`
`113`	`113`	`setlist_shows`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public async Task<IEnumerable<SetlistSong>> InsertAll(Artist artist, IEnumerable`
`169`	`169`	`RETURNING *`
`170`	`170`	`", song));`
`171`	`171`	`}*/`
`172`		`- return await db.WithConnection(async con =>`
	`172`	`+ return await db.WithWriteConnection(async con =>`
`173`	`173`	`{`
`174`	`174`	`var inserted = new List<SetlistSong>();`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public async Task<IEnumerable<SourceReview>> UpdateAll(Source source, IEnumerabl`
`29`	`29`	`{`
`30`	`30`	`const string guidSnippet =`
`31`	`31`	`@"md5(@source_id \|\| '::review::' \|\| COALESCE('' \|\| @rating, 'NULL') \|\| COALESCE('' \|\| @title, 'NULL') \|\| COALESCE('' \|\| @author, 'NULL') \|\| @updated_at)::uuid";`
`32`		`- return await db.WithConnection(async con =>`
	`32`	`+ return await db.WithWriteConnection(async con =>`
`33`	`33`	`{`
`34`	`34`	`var inserted = new List<SourceReview>();`
`35`	`35`
`@@ -73,7 +73,7 @@ ON CONFLICT ON CONSTRAINT source_reviews_uuid`
`73`	`73`	`DO`
`74`	`74`	`UPDATE SET`
`75`	`75`	`review = EXCLUDED.review`
`76`		`-`
	`76`	`+`
`77`	`77`	`RETURNING *`
`78`	`78`	`", p));`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task<SourceSet> Update(Source source, SourceSet set)`
`32`	`32`
`33`	`33`	`public async Task<IEnumerable<SourceSet>> UpdateAll(Source source, IEnumerable<SourceSet> sets)`
`34`	`34`	`{`
`35`		`- return await db.WithConnection(async con =>`
	`35`	`+ return await db.WithWriteConnection(async con =>`
`36`	`36`	`{`
`37`	`37`	`var inserted = new List<SourceSet>();`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public SourceTrackPlaysService(DbService db) : base(db)`
`14`	`14`
`15`	`15`	`public async Task<SourceTrackPlay> RecordPlayedTrack(SourceTrackPlay track)`
`16`	`16`	`{`
`17`		`- return await db.WithConnection(con => con.QuerySingleAsync<SourceTrackPlay>(@"`
	`17`	`+ return await db.WithWriteConnection(con => con.QuerySingleAsync<SourceTrackPlay>(@"`
`18`	`18`	`INSERT INTO`
`19`	`19`	`source_track_plays`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ source_tracks t`
`47`	`47`
`48`	`48`	`public async Task<IEnumerable<SourceTrack>> InsertAll(Source source, IEnumerable<SourceTrack> tracks)`
`49`	`49`	`{`
`50`		`- return await db.WithConnection(async con =>`
	`50`	`+ return await db.WithWriteConnection(async con =>`
`51`	`51`	`{`
`52`	`52`	`var inserted = new List<SourceTrack>();`
`53`	`53`