MMI-3346 Fix Notification Service (#2492)

Author: Fosol

db/postgres/README.md

@@ -74,15 +74,21 @@ DB_VOLUME=/var/lib/pgsql/data
 ## Backup Commands
 
 ```bash
+# RSH into database backup pod
+oc -n 9b301c-test rsh db-backup-855b845cc7-zrk7t
+
+# Test connection
+psql -h postgres -U admin -d tno
+
 # Backup and zip
-pg_dump -h postgres -U admin -C -Fc -v -d tno | gzip > /mnt/data/dev.tar.gz
+pg_dump -h postgres -U admin -C -Fc -v -d tno | gzip > /backups/dev.tar.gz
+
+# Copy file to local
+oc -n 9b301c-dev rsync db-backup-855b845cc7-zrk7t:/backups/dev.tar.gz /D/db
 
 # Unzip
 gzip -dk dev.tar.gz
 
-# Copy file to local
-oc -n 9b301c-dev rsync psql-4-zdbv6:/mnt/data/dev.tar.gz /D/db
-
 # Copy file to database server
 scp -v /D/db/dev.tar.gz jerfos_a@142.34.249.231:/u02/data/postgres
 ```

libs/net/ches/ChesService.cs

@@ -173,12 +173,16 @@ private async Task<string> SendAsync(string endpoint, HttpMethod method)
             }
             catch (HttpClientRequestException ex)
             {
-                if (ex.Response != null)
+                if (ex.Response != null && ex.Response.Content.Headers.ContentType?.MediaType?.Contains("json", StringComparison.InvariantCultureIgnoreCase) == true)
                 {
-                    var response = await this.Client.DeserializeAsync<Ches.Models.ErrorResponseModel>(ex.Response);
-                    var error = String.Join(Environment.NewLine, response?.Errors.Select(e => e.Message) ?? []);
-                    _logger.LogError(ex, "Failed to send/receive request: {code} {url}.  Error: {error}", ex.StatusCode, url, error);
-                    throw new ChesException(ex, this.Client, response);
+                    var stream = await ex.Response.Content.ReadAsStreamAsync();
+                    if (stream.CanSeek && stream.Position == stream.Length && stream.Length > 0)
+                    {
+                        var response = await this.Client.DeserializeAsync<Ches.Models.ErrorResponseModel>(ex.Response);
+                        var error = String.Join(Environment.NewLine, response?.Errors.Select(e => e.Message) ?? []);
+                        _logger.LogError(ex, "Failed to send/receive request: {code} {url}.  Error: {error}", ex.StatusCode, url, error);
+                        throw new ChesException(ex, this.Client, response);
+                    }
                 }
                 _logger.LogError(ex, "Failed to send/receive request: {code} {url}.  Error: {error}", ex.StatusCode, url, ex.GetAllMessages());
                 throw new ChesException("Failed to send message to CHES", ex);

libs/net/core/Http/HttpRequestClient.cs

@@ -97,11 +97,8 @@ public void Dispose()
                 throw;
             }
 
-            // Throw exception because the response failed and cannot be deserialized.
-            var errorEx = new HttpClientRequestException($"Response must contain JSON but was '{contentType?.MediaType}'.", response.StatusCode);
-            var responseBytes = responseStream.ReadAllBytes();
-            errorEx.Data["body"] = Encoding.Default.GetString(responseBytes);
-            throw errorEx;
+            // The request response was a failure, wrap exception.
+            throw new HttpClientRequestException(response);
         }
 
         #region HttpResponseMessage Methods

services/net/transcription/appsettings.json

@@ -53,9 +53,9 @@
       "GroupId": "Transcription",
       "BootstrapServers": "kafka-broker-0.kafka-headless:9092,kafka-broker-1.kafka-headless:9092,kafka-broker-2.kafka-headless:9092",
       "AutoOffsetReset": "Earliest",
-      "MaxInFlight": 5,
       "EnableAutoCommit": false,
-      "MaxThreads": 10
+      "MaxThreads": 10,
+      "MaxPollIntervalMs": 600000
     },
     "Producer": {
       "ClientId": "Transcription",