Merge branch 'B-22779' of github.com:transcom/mymove into B-22779-exp

transcom · Feb 28, 2025 · 4920e78 · 4920e78
2 parents 96a0165 + 680491e
commit 4920e78
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/pkg/paperwork/generator.go b/pkg/paperwork/generator.go
@@ -380,6 +380,7 @@ func (g *Generator) ConvertUploadToPDF(appCtx appcontext.AppContext, upload mode
 
 	images := make([]inputFile, 0)
 	images = append(images, inputFile{Path: path, ContentType: upload.ContentType})
+	g.fs.Remove(outputFile.Name())
 	return g.PDFFromImages(appCtx, images)
 }
 
@@ -470,6 +471,7 @@ func (g *Generator) PDFFromImages(appCtx appcontext.AppContext, images []inputFi
 		if closeErr := outputFile.Close(); closeErr != nil {
 			appCtx.Logger().Debug("Failed to close file", zap.Error(closeErr))
 		}
+		g.fs.Remove(outputFile.Name())
 	}()
 
 	var opt gofpdf.ImageOptions
@@ -498,6 +500,7 @@ func (g *Generator) PDFFromImages(appCtx appcontext.AppContext, images []inputFi
 				if closeErr := newFile.Close(); closeErr != nil {
 					appCtx.Logger().Debug("Failed to close file", zap.Error(closeErr))
 				}
+				g.fs.Remove(newFile.Name())
 			}()
 
 			convertTo8BitPNGErr := convertTo8BitPNG(file, newFile)
@@ -590,6 +593,7 @@ func (g *Generator) PDFFromImagesNoRotation(appCtx appcontext.AppContext, images
 		if closeErr := outputFile.Close(); closeErr != nil {
 			appCtx.Logger().Debug("Failed to close file", zap.Error(closeErr))
 		}
+		g.fs.Remove(outputFile.Name())
 	}()
 
 	var opt gofpdf.ImageOptions
@@ -618,6 +622,7 @@ func (g *Generator) PDFFromImagesNoRotation(appCtx appcontext.AppContext, images
 				if closeErr := newFile.Close(); closeErr != nil {
 					appCtx.Logger().Debug("Failed to close file", zap.Error(closeErr))
 				}
+				g.fs.Remove(newFile.Name())
 			}()
 
 			convertTo8BitPNGErr := convertTo8BitPNG(file, newFile)

diff --git a/pkg/services/ppmshipment/aoa_packet_creator.go b/pkg/services/ppmshipment/aoa_packet_creator.go
@@ -155,7 +155,8 @@ func (a *aoaPacketCreator) CleanupAOAPacketFile(packetFile afero.File, closeFile
 		}
 	}
 
-	return a.pdfGenerator.FileSystem().Remove(packetFile.Name())
+	a.pdfGenerator.FileSystem().Remove(packetFile.Name())
+	return nil
 }
 
 // saveAOAPacket uploads the AOA packet to S3 and saves the document data to the database, associating it with the PPM

diff --git a/pkg/services/ppmshipment/payment_packet_creator.go b/pkg/services/ppmshipment/payment_packet_creator.go
@@ -103,6 +103,9 @@ func (p *paymentPacketCreator) Generate(appCtx appcontext.AppContext, ppmShipmen
 
 	// Start building individual PDFs for each expense/receipt docs. These files will then be merged as one PDF.
 	var pdfFileNamesToMerge []string
+	var pdfFileNamesToMergePdf afero.File
+	var perr error
+
 	sortedPaymentPacketItemsMap := buildPaymentPacketItemsMap(ppmShipment)
 
 	for i := 0; i < len(sortedPaymentPacketItemsMap); i++ {
@@ -116,7 +119,7 @@ func (p *paymentPacketCreator) Generate(appCtx appcontext.AppContext, ppmShipmen
 	}
 
 	if len(pdfFileNamesToMerge) > 0 {
-		pdfFileNamesToMergePdf, perr := p.pdfGenerator.MergePDFFiles(appCtx, pdfFileNamesToMerge)
+		pdfFileNamesToMergePdf, perr = p.pdfGenerator.MergePDFFiles(appCtx, pdfFileNamesToMerge)
 		if perr != nil {
 			errMsgPrefix = fmt.Sprintf("%s: %s", errMsgPrefix, "failed pdfGenerator.MergePDFFiles")
 			appCtx.Logger().Error(errMsgPrefix, zap.Error(err))
@@ -149,6 +152,14 @@ func (p *paymentPacketCreator) Generate(appCtx appcontext.AppContext, ppmShipmen
 		return p.pdfGenerator.AddPdfBookmarks(finalMergePdf, bookmarks)
 	}
 
+	// cleanup files
+	if err = p.CleanupPaymentPacketFile(aoaPacketFile, true); err != nil {
+		return nil, fmt.Errorf("%s: %w", errMsgPrefix, err)
+	}
+	if err = p.CleanupPaymentPacketFile(pdfFileNamesToMergePdf, true); err != nil {
+		return nil, fmt.Errorf("%s: %w", errMsgPrefix, err)
+	}
+
 	// bookmark and watermark both disabled
 	return finalMergePdf, nil
 }