Merge branch 'main' into B-21583-gbloc-AK-moves

transcom · Jan 22, 2025 · 2b268f9 · 2b268f9
2 parents 5c9313c + 5d18ae2
commit 2b268f9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/services/paperwork/prime_download_user_upload_to_pdf_converter.go b/pkg/services/paperwork/prime_download_user_upload_to_pdf_converter.go
@@ -117,11 +117,14 @@ func (g *moveUserUploadToPDFDownloader) GenerateDownloadMoveUserUploadPDF(appCtx
 
 // Build orderUploadDocType for document
 func (g *moveUserUploadToPDFDownloader) buildPdfBatchInfo(appCtx appcontext.AppContext, uploadDocType services.MoveOrderUploadType, documentID uuid.UUID) (*pdfBatchInfo, error) {
-	document, err := models.FetchDocumentWithNoRestrictions(appCtx.DB(), appCtx.Session(), documentID, false)
+	document, err := models.FetchDocumentWithNoRestrictions(appCtx.DB(), appCtx.Session(), documentID, true)
 	if err != nil {
 		return nil, errors.Wrap(err, fmt.Sprintf("error fetching document domain by id: %s", documentID))
 	}
 
+	// filter out deleted uploads from userUploads
+	document.UserUploads = document.UserUploads.FilterDeleted()
+
 	var pdfFileNames []string
 	var pageCounts []int
 	// Document has one or more uploads. Create PDF file for each.