Merge pull request #57 from planetary-social/follow_puller_fix

Correctly initialize follows puller

Makefile

@@ -19,8 +19,8 @@ test:
 
 .PHONY: recreate-emulator
 recreate-emulator:
-	sudo docker-compose -f ./docker-compose-integration.yml rm -f -s -v
-	sudo docker-compose -f ./docker-compose-integration.yml up -d
+	docker compose -f ./docker-compose-integration.yml rm -f -s -v
+	docker compose -f ./docker-compose-integration.yml up -d
 
 .PHONY: test-integration
 test-integration:

cmd/notification-service/di/inject_pubsub.go

@@ -14,11 +14,8 @@ var pubsubSet = wire.NewSet(
 	pubsub.NewReceivedEventPubSub,
 	wire.Bind(new(app.ReceivedEventPublisher), new(*pubsub.ReceivedEventPubSub)),
 	wire.Bind(new(app.ReceivedEventSubscriber), new(*pubsub.ReceivedEventPubSub)),
-)
-
-var googlePubsubSet = wire.NewSet(
-	newExternalEventPublisher,
 	newExternalFollowChangeSubscriber,
+	newExternalEventPublisher,
 )
 
 func newExternalEventPublisher(config config.Config, logger watermill.LoggerAdapter) (app.ExternalEventPublisher, error) {

cmd/notification-service/di/wire.go

@@ -10,7 +10,6 @@ import (
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/google/wire"
 	"github.com/planetary-social/go-notification-service/service/adapters/apns"
-	"github.com/planetary-social/go-notification-service/service/adapters/mocks"
 	"github.com/planetary-social/go-notification-service/service/app"
 	"github.com/planetary-social/go-notification-service/service/config"
 	"github.com/planetary-social/go-notification-service/service/domain/notifications"
@@ -26,7 +25,6 @@ func BuildService(context.Context, config.Config) (Service, func(), error) {
 		downloaderSet,
 		generatorSet,
 		pubsubSet,
-		googlePubsubSet,
 		loggingSet,
 		adaptersSet,
 		followChangePullerSet,
@@ -55,11 +53,6 @@ func BuildIntegrationService(context.Context, config.Config) (IntegrationService
 		pubsubSet,
 		loggingSet,
 		integrationAdaptersSet,
-
-		mocks.NewMockExternalEventPublisher,
-		mocks.NewMockExternalFollowChangeSubscriber,
-		wire.Bind(new(app.ExternalEventPublisher), new(*mocks.MockExternalEventPublisher)),
-		wire.Bind(new(app.ExternalFollowChangeSubscriber), new(*mocks.MockExternalFollowChangeSubscriber)),
 	)
 	return IntegrationService{}, nil, nil
 }

docker-compose-integration.yml

@@ -1,4 +1,3 @@
-version: "3.2"
 services:
   firestore_emulator:
     image: mtlynch/firestore-emulator

service/app/follow_change_puller.go

@@ -20,9 +20,10 @@ func NewFollowChangePuller(
 	metrics Metrics,
 ) *FollowChangePuller {
 	return &FollowChangePuller{
-		logger:  logger.New("followChangePuller"),
-		metrics: metrics,
-		counter: 0,
+		externalFollowChangeSubscriber: externalFollowChangeSubscriber,
+		logger:                         logger.New("followChangePuller"),
+		metrics:                        metrics,
+		counter:                        0,
 	}
 }