refactor: remove unnecessary api package

flohansen · Aug 4, 2024 · ffaaf6d · ffaaf6d
1 parent aece567
commit ffaaf6d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 165 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -4,12 +4,14 @@ import (
 	"database/sql"
 	"flag"
 	"log"
+	"net"
+	"net/http"
 	"path"
 
-	"github.com/flohansen/dasher/internal/api"
 	"github.com/flohansen/dasher/internal/repository"
 	"github.com/flohansen/dasher/internal/routes"
 	"github.com/flohansen/dasher/internal/server/feature"
+	"github.com/flohansen/dasher/pkg/proto"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 
@@ -28,20 +30,38 @@ func run() error {
 		return errors.Wrap(err, "sql open")
 	}
 
-	grpcServer := grpc.NewServer()
-	store := repository.NewFeatureSQLite(db)
-	notifier := feature.NewService(grpcServer, store)
 	migrator := repository.NewSQLiteMigrator(db)
-	routes := routes.New(store, notifier)
-
-	return api.New(
-		api.WithLogging(),
-		api.WithMigrator(migrator),
-		api.WithHttpHandler(":3000", routes),
-		api.WithNetListenerServer(":50051", grpcServer),
-	).Start()
+	if err := migrator.Migrate(); err != nil {
+		return errors.Wrap(err, "migrate")
+	}
+
+	store := repository.NewFeatureSQLite(db)
+	featureService := feature.NewService(store)
+	errs := make(chan error, 1)
+
+	go startGrpcServer(featureService, errs)
+	go startHttpServer(store, featureService, errs)
+	return <-errs
+}
+
+func startGrpcServer(featureService *feature.Service, errs chan error) {
+	grpcServer := grpc.NewServer()
+	proto.RegisterFeatureStateServiceServer(grpcServer, featureService)
+
+	lis, err := net.Listen("tcp", ":50051")
+	if err != nil {
+		errs <- err
+		return
+	}
+
+	errs <- grpcServer.Serve(lis)
+}
+
+func startHttpServer(store *repository.FeatureSQLite, featureService *feature.Service, errs chan error) {
+	routes := routes.New(store, featureService)
+	errs <- http.ListenAndServe(":3000", routes)
 }
 
 func main() {
-	log.Fatal(run())
+	log.Fatalf("fatal error: %s", run())
 }
diff --git a/internal/api/api.go b/internal/api/api.go
diff --git a/internal/api/http.go b/internal/api/http.go
diff --git a/internal/api/log.go b/internal/api/log.go
diff --git a/internal/api/migration.go b/internal/api/migration.go
diff --git a/internal/api/net.go b/internal/api/net.go
diff --git a/internal/api/option.go b/internal/api/option.go
diff --git a/internal/server/feature/service.go b/internal/server/feature/service.go
@@ -10,7 +10,6 @@ import (
 	"github.com/flohansen/dasher/internal/sqlc"
 	"github.com/flohansen/dasher/pkg/proto"
 	"github.com/pkg/errors"
-	"google.golang.org/grpc"
 )
 
 type FeatureStore interface {
@@ -25,12 +24,12 @@ type Service struct {
 	mu            sync.Mutex
 }
 
-func NewService(grpcServer grpc.ServiceRegistrar, store FeatureStore) *Service {
+func NewService(store FeatureStore) *Service {
 	notifier := Service{
 		subscriptions: make(map[string]map[proto.FeatureStateService_SubscribeFeatureChangesServer]struct{}),
 		store:         store,
 	}
-	proto.RegisterFeatureStateServiceServer(grpcServer, &notifier)
+
 	return &notifier
 }
 

diff --git a/internal/server/feature/service_test.go b/internal/server/feature/service_test.go
@@ -26,8 +26,10 @@ func TestService(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	store := mocks.NewMockFeatureStore(ctrl)
 	lis := bufconn.Listen(2048)
+
 	s := grpc.NewServer()
-	notifier := NewService(s, store)
+	svc := NewService(store)
+	proto.RegisterFeatureStateServiceServer(s, svc)
 
 	go func() {
 		s.Serve(lis)
@@ -75,7 +77,7 @@ func TestService(t *testing.T) {
 
 			// when
 			time.Sleep(10 * time.Millisecond) // workaround to wait until both clients subscribed
-			notifier.Notify(sqlc.Feature{FeatureID: "SOME_FEATURE_ID"})
+			svc.Notify(sqlc.Feature{FeatureID: "SOME_FEATURE_ID"})
 
 			// then
 			feature1, err := stream1.Recv()