B 18428 int

cmd/generate-shipment-summary/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
 	"log"
 	"net/http"
@@ -16,7 +15,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/transcom/mymove/pkg/appcontext"
-	"github.com/transcom/mymove/pkg/assets"
 	"github.com/transcom/mymove/pkg/auth"
 	"github.com/transcom/mymove/pkg/cli"
 	"github.com/transcom/mymove/pkg/logging"
@@ -59,7 +57,7 @@ func checkConfig(v *viper.Viper, logger *zap.Logger) error {
 func initFlags(flag *pflag.FlagSet) {
 
 	// Scenario config
-	flag.String(PPMShipmentIDFlag, "", "The move ID to generate a shipment summary worksheet for")
+	flag.String(PPMShipmentIDFlag, "6d1d9d00-2e5e-4830-a3c1-5c21c951e9c1", "The PPMShipmentID to generate a shipment summary worksheet for")
 	flag.Bool(debugFlag, false, "show field debug output")
 
 	// DB Config
@@ -146,7 +144,7 @@ func main() {
 	testAppCode := os.Getenv("HERE_MAPS_APP_CODE")
 	hereClient := &http.Client{Timeout: hereRequestTimeout}
 
-	// TODO: Future cleanup will need to remap to a different planner, or this command should be removed if it is consider deprecated
+	// TODO: Future cleanup will need to remap to a different planner, but this command should remain for testing purposes
 	planner := route.NewHEREPlanner(hereClient, geocodeEndpoint, routingEndpoint, testAppID, testAppCode)
 	ppmComputer := shipmentsummaryworksheet.NewSSWPPMComputer()
 
@@ -159,49 +157,13 @@ func main() {
 		log.Fatalf("%s", errors.Wrap(err, "Error calculating obligations "))
 	}
 
-	page1Data, page2Data, page3Data := ppmComputer.FormatValuesShipmentSummaryWorksheet(*ssfd)
+	page1Data, page2Data := ppmComputer.FormatValuesShipmentSummaryWorksheet(*ssfd)
 	noErr(err)
-
-	// page 1
-	page1Layout := paperwork.ShipmentSummaryPage1Layout
-	page1Template, err := assets.Asset(page1Layout.TemplateImagePath)
+	ppmGenerator, err := shipmentsummaryworksheet.NewSSWPPMGenerator()
 	noErr(err)
-
-	page1Reader := bytes.NewReader(page1Template)
-	err = formFiller.AppendPage(page1Reader, page1Layout.FieldsLayout, page1Data)
+	ssw, info, err := ppmGenerator.FillSSWPDFForm(page1Data, page2Data)
 	noErr(err)
-
-	// page 2
-	page2Layout := paperwork.ShipmentSummaryPage2Layout
-	page2Template, err := assets.Asset(page2Layout.TemplateImagePath)
-	noErr(err)
-
-	page2Reader := bytes.NewReader(page2Template)
-	err = formFiller.AppendPage(page2Reader, page2Layout.FieldsLayout, page2Data)
-	noErr(err)
-
-	// page 3
-	page3Layout := paperwork.ShipmentSummaryPage3Layout
-	page3Template, err := assets.Asset(page3Layout.TemplateImagePath)
-	noErr(err)
-
-	page3Reader := bytes.NewReader(page3Template)
-	err = formFiller.AppendPage(page3Reader, page3Layout.FieldsLayout, page3Data)
-	noErr(err)
-
-	filename := fmt.Sprintf("shipment-summary-worksheet-%s.pdf", time.Now().Format(time.RFC3339))
-
-	output, err := os.Create(filename)
-	noErr(err)
-
-	defer func() {
-		if closeErr := output.Close(); closeErr != nil {
-			logger.Error("Could not close output file", zap.Error(closeErr))
-		}
-	}()
-
-	err = formFiller.Output(output)
-	noErr(err)
-
-	fmt.Println(filename)
+	fmt.Println(ssw.Name())     // Should always return
+	fmt.Println(info.PageCount) // Page count should always be 2
+	// This is a testing command, above lines log information on whether PDF was generated successfully.
 }

pkg/gen/internalapi/configure_mymove.go

@@ -322,9 +322,9 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler {
 			return middleware.NotImplemented("operation service_members.ShowServiceMemberOrders has not yet been implemented")
 		})
 	}
-	if api.MovesShowShipmentSummaryWorksheetHandler == nil {
-		api.MovesShowShipmentSummaryWorksheetHandler = moves.ShowShipmentSummaryWorksheetHandlerFunc(func(params moves.ShowShipmentSummaryWorksheetParams) middleware.Responder {
-			return middleware.NotImplemented("operation moves.ShowShipmentSummaryWorksheet has not yet been implemented")
+	if api.PpmShowShipmentSummaryWorksheetHandler == nil {
+		api.PpmShowShipmentSummaryWorksheetHandler = ppm.ShowShipmentSummaryWorksheetHandlerFunc(func(params ppm.ShowShipmentSummaryWorksheetParams) middleware.Responder {
+			return middleware.NotImplemented("operation ppm.ShowShipmentSummaryWorksheet has not yet been implemented")
 		})
 	}
 	if api.MovesSubmitAmendedOrdersHandler == nil {