chore: fix build

moov-io · Mar 7, 2024 · 836d081 · 836d081
1 parent 96751d0
commit 836d081
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/internal/environment.go b/internal/environment.go
@@ -176,7 +176,7 @@ func NewEnvironment(env *Environment) (*Environment, error) {
 		env.PublicRouter.Path("/ping").Methods("GET").HandlerFunc(addPingRoute)
 
 		// append HTTP routes
-		web.NewFilesController(env.Config.Logger, env.Config.Inbound.HTTP, httpFiles, inmemEvents, fileReceiver.CancellationResponses).AppendRoutes(env.PublicRouter)
+		web.NewFilesController(env.Config.Logger, env.Config.Inbound.HTTP, httpFiles, fileReceiver.CancellationResponses).AppendRoutes(env.PublicRouter)
 
 		// shard mapping HTTP routes
 		shardMappingService, err := shards.NewShardMappingService(stime.NewStaticTimeService(), env.Config.Logger, shardRepository)

diff --git a/internal/pipeline/aggregate.go b/internal/pipeline/aggregate.go
@@ -166,7 +166,7 @@ func (xfagg *aggregator) acceptFile(ctx context.Context, msg incoming.ACHFile) e
 func (xfagg *aggregator) cancelFile(ctx context.Context, msg incoming.CancelACHFile) (models.FileCancellationResponse, error) {
 	response, err := xfagg.merger.HandleCancel(ctx, msg)
 	if err != nil {
-		return err
+		return models.FileCancellationResponse{}, err
 	}
 
 	// Send the response back

diff --git a/internal/pipeline/mock_xfer_merging.go b/internal/pipeline/mock_xfer_merging.go
@@ -26,9 +26,10 @@ import (
 )
 
 type MockXferMerging struct {
-	LatestFile   *incoming.ACHFile
-	LatestCancel *incoming.CancelACHFile
-	processed    *processedFiles
+	LatestFile           *incoming.ACHFile
+	LatestCancel         *incoming.CancelACHFile
+	CancellationResponse incoming.FileCancellationResponse
+	processed            *processedFiles
 
 	Err error
 }
@@ -38,9 +39,9 @@ func (merge *MockXferMerging) HandleXfer(_ context.Context, xfer incoming.ACHFil
 	return merge.Err
 }
 
-func (merge *MockXferMerging) HandleCancel(_ context.Context, cancel incoming.CancelACHFile) error {
+func (merge *MockXferMerging) HandleCancel(_ context.Context, cancel incoming.CancelACHFile) (incoming.FileCancellationResponse, error) {
 	merge.LatestCancel = &cancel
-	return merge.Err
+	return merge.CancellationResponse, merge.Err
 }
 
 func (merge *MockXferMerging) WithEachMerged(_ context.Context, f func(context.Context, int, upload.Agent, *ach.File) (string, error)) (*processedFiles, error) {

diff --git a/internal/test/upload_test.go b/internal/test/upload_test.go
@@ -167,17 +167,17 @@ func TestUploads(t *testing.T) {
 	require.NoError(t, err)
 	defer streamTopic.Shutdown(context.Background())
 
-	fileController := web.NewFilesController(logger, service.HTTPConfig{}, httpPub)
-	r := mux.NewRouter()
-	fileController.AppendRoutes(r)
-
 	outboundPath := setupTestDirectory(t, uploadConf)
 	fileRepo := &files.MockRepository{}
 
 	fileReceiver, err := pipeline.Start(ctx, logger, uploadConf, shardRepo, fileRepo, httpSub)
 	require.NoError(t, err)
 	t.Cleanup(func() { fileReceiver.Shutdown() })
 
+	fileController := web.NewFilesController(logger, service.HTTPConfig{}, httpPub, fileReceiver.CancellationResponses)
+	r := mux.NewRouter()
+	fileController.AppendRoutes(r)
+
 	adminServer := admintest.Server(t)
 	fileReceiver.RegisterAdminRoutes(adminServer)