update truncation logic, error handling.

bcgov · Dec 23, 2024 · 4981bca · 4981bca
1 parent ff6a6b5
commit 4981bca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/source/backend/api/Services/DocumentQueueService.cs b/source/backend/api/Services/DocumentQueueService.cs
@@ -252,7 +252,7 @@ public async Task<PimsDocumentQueue> Upload(PimsDocumentQueue documentQueue)
                         databaseDocumentQueue.DocumentQueueStatusTypeCode,
                         response.DocumentExternalResponse.Status);
 
-                    databaseDocumentQueue.MayanError = $"Failed to upload document, mayan error: {response.DocumentExternalResponse.Message}".Truncate(4000);
+                    databaseDocumentQueue.MayanError = $"Failed to upload document, mayan error: {response.DocumentExternalResponse.Message}";
                     UpdateDocumentQueueStatus(databaseDocumentQueue, DocumentQueueStatusTypes.MAYAN_ERROR);
                     return databaseDocumentQueue;
                 }
@@ -267,7 +267,7 @@ public async Task<PimsDocumentQueue> Upload(PimsDocumentQueue documentQueue)
             catch (Exception ex) when (ex is BadRequestException || ex is KeyNotFoundException || ex is InvalidDataException || ex is JsonException)
             {
                 this.Logger.LogError($"Error: {ex.Message}");
-                databaseDocumentQueue.MayanError = ex.Message.Truncate(4000);
+                databaseDocumentQueue.MayanError = ex.Message;
                 UpdateDocumentQueueStatus(databaseDocumentQueue, DocumentQueueStatusTypes.PIMS_ERROR);
             }
             return databaseDocumentQueue;

diff --git a/source/backend/api/Services/DocumentService.cs b/source/backend/api/Services/DocumentService.cs
@@ -211,7 +211,7 @@ public async Task<DocumentUploadResponse> UploadDocumentSync(DocumentUploadReque
 
         public async Task<DocumentUploadResponse> UploadDocumentAsync(DocumentUploadRequest uploadRequest, bool skipExtensionCheck = false)
         {
-            this.Logger.LogInformation("Uploading document, do not wait for mayan processing.");
+            this.Logger.LogInformation("Uploading document, do not wait for mayan processing. documentId: {documentId}", uploadRequest.DocumentId);
             this.User.ThrowIfNotAuthorized(Permissions.DocumentAdd);
 
             ExternalResponse<DocumentDetailModel> externalResponse = await UploadDocumentAsync(uploadRequest.DocumentTypeMayanId, uploadRequest.File, skipExtensionCheck);
@@ -232,7 +232,8 @@ public async Task<DocumentUploadResponse> UploadDocumentAsync(DocumentUploadRequ
             }
             else
             {
-                this.Logger.LogError("Failed to update associated PIMS document with uploaded Mayan Id.");
+                this.Logger.LogError("Failed to update associated PIMS document with uploaded Mayan Id. documentId: {documentId}", uploadRequest.DocumentId);
+                this.Logger.LogDebug("Mayan response: {response}", response.Serialize());
             }
 
             return response;

diff --git a/source/backend/apimodels/Models/Concepts/DocumentQueue/DocumentQueueModel.cs b/source/backend/apimodels/Models/Concepts/DocumentQueue/DocumentQueueModel.cs
@@ -56,11 +56,6 @@ public class DocumentQueueModel : BaseAuditModel
         /// </summary>
         public string MayanError { get; set; }
 
-        /// <summary>
-        /// get/set - The actual document, represented as a byte[].
-        /// </summary>
-        public byte[] Document { get; set; }
-
         /// <summary>
         /// get/set - The actual document, represented as a byte[].
         /// </summary>

diff --git a/source/backend/scheduler/Services/DocumentQueueService.cs b/source/backend/scheduler/Services/DocumentQueueService.cs
@@ -173,7 +173,7 @@ private DocumentQueueResponseModel HandleDocumentQueueResponse(string httpMethod
                     var currentDocumentQueue = currentDocumentResponse.Result.Payload;
                     _logger.LogError("Received error response from {httpMethodName} for queued document {documentQueueId} status {Status} message: {Message}", httpMethodName, currentDocumentQueue?.Id, response?.Result?.Status, response?.Result?.Message);
                     currentDocumentQueue.DocumentQueueStatusType.Id = DocumentQueueStatusTypes.PIMS_ERROR.ToString();
-                    currentDocumentQueue.MayanError = $"Document {httpMethodName} failed: {response?.Result?.Message}".Truncate(4000);
+                    currentDocumentQueue.MayanError = $"Document {httpMethodName} failed: {response?.Result?.Message}";
                     _ = _pimsDocumentQueueRepository.UpdateQueuedDocument(currentDocumentQueue.Id, currentDocumentQueue);
                 });
                 return new DocumentQueueResponseModel() { DocumentQueueStatus = DocumentQueueStatusTypes.PIMS_ERROR, Message = $"Received error response from {httpMethodName} for queued document {qd?.Id} status {response?.Result?.Status} message: {response?.Result?.Message}" };