Skip to content

refactor(controlplane,dataplane): migrate jobs and feature flags from postgres to sqlc #2622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jirevwe wants to merge 8 commits into
base: main
Choose a base branch
from
Open

refactor(controlplane,dataplane): migrate jobs and feature flags from postgres to sqlc #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ffed5c1
refactor: migrate jobs and feature flags from postgres to sqlc
jirevwe Apr 14, 2026
02c8aea
refactor: centralize feature flag service usage across handlers
jirevwe Apr 15, 2026
761db87
refactor: remove package-level logger from postgres and make logger e…
jirevwe Apr 15, 2026
5ddd526
refactor: simplify job count query and remove unused error constant
jirevwe Apr 15, 2026
3f6dc1e
test: remove outdated postgres integration tests
jirevwe Apr 15, 2026
a3f079b
refactor: inject logger into database initialization and migration co…
jirevwe Apr 15, 2026
50bc8c6
refactor: enhance logging and error handling in migration commands
jirevwe Apr 15, 2026
4ba5674
Merge branch 'main' into raymond/refactor/add-sqlc-for-the-rest
jirevwe Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions api/handlers/organisation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/frain-dev/convoy/api/models"
"github.com/frain-dev/convoy/api/policies"
"github.com/frain-dev/convoy/auth"
"github.com/frain-dev/convoy/database/postgres"
"github.com/frain-dev/convoy/datastore"
"github.com/frain-dev/convoy/internal/event_deliveries"
"github.com/frain-dev/convoy/internal/organisation_members"
Expand Down Expand Up @@ -289,7 +288,8 @@ func (h *Handler) GetEarlyAdopterFeatures(w http.ResponseWriter, r *http.Request
features := fflag.GetEarlyAdopterFeatures()
responseFeatures := make([]models.EarlyAdopterFeature, 0, len(features))

earlyAdopterFeatures, err := postgres.LoadEarlyAdopterFeaturesByOrg(r.Context(), h.A.DB, org.UID)
ffService := h.A.FeatureFlagService
earlyAdopterFeatures, err := ffService.LoadEarlyAdopterFeaturesByOrg(r.Context(), org.UID)
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
Expand Down Expand Up @@ -378,7 +378,8 @@ func (h *Handler) updateFeatureFlag(w http.ResponseWriter, r *http.Request, feat
feature.EnabledAt = null.TimeFrom(time.Now())
}

err := postgres.UpsertEarlyAdopterFeature(r.Context(), h.A.DB, feature)
ffService := h.A.FeatureFlagService
err := ffService.UpsertEarlyAdopterFeature(r.Context(), feature)
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return err
Expand Down Expand Up @@ -423,7 +424,8 @@ func (h *Handler) GetAllFeatureFlags(w http.ResponseWriter, r *http.Request) {
return
}

flags, err := postgres.LoadFeatureFlags(r.Context(), h.A.DB)
ffService := h.A.FeatureFlagService
flags, err := ffService.LoadFeatureFlags(r.Context())
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
Expand Down Expand Up @@ -482,7 +484,8 @@ func (h *Handler) GetOrganisationOverrides(w http.ResponseWriter, r *http.Reques
return
}

overrides, err := postgres.LoadFeatureFlagOverridesByOwner(r.Context(), h.A.DB, "organisation", orgID)
ffService := h.A.FeatureFlagService
overrides, err := ffService.LoadFeatureFlagOverridesByOwner(r.Context(), "organisation", orgID)
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
Expand All @@ -496,7 +499,7 @@ func (h *Handler) GetOrganisationOverrides(w http.ResponseWriter, r *http.Reques

enrichedOverrides := make([]OverrideWithKey, 0, len(overrides))
for i := range overrides {
featureFlag, err := postgres.FetchFeatureFlagByID(r.Context(), h.A.DB, overrides[i].FeatureFlagID)
featureFlag, err := ffService.FetchFeatureFlagByID(r.Context(), overrides[i].FeatureFlagID)
if err != nil {
h.A.Logger.WarnContext(r.Context(), fmt.Sprintf("Failed to fetch feature flag for override: %s: %v", overrides[i].FeatureFlagID, err))
continue
Expand Down Expand Up @@ -537,10 +540,12 @@ func (h *Handler) UpdateOrganisationOverride(w http.ResponseWriter, r *http.Requ
return
}

ffService := h.A.FeatureFlagService

// Fetch the feature flag
featureFlag, err := postgres.FetchFeatureFlagByKey(r.Context(), h.A.DB, overrideRequest.FeatureKey)
featureFlag, err := ffService.FetchFeatureFlagByKey(r.Context(), overrideRequest.FeatureKey)
if err != nil {
if errors.Is(err, postgres.ErrFeatureFlagNotFound) {
if errors.Is(err, datastore.ErrFeatureFlagNotFound) {
_ = render.Render(w, r, util.NewErrorResponse("Feature flag not found: "+overrideRequest.FeatureKey, http.StatusBadRequest))
return
}
Expand All @@ -566,7 +571,7 @@ func (h *Handler) UpdateOrganisationOverride(w http.ResponseWriter, r *http.Requ
override.EnabledAt = null.TimeFrom(time.Now())
}

err = postgres.UpsertFeatureFlagOverride(r.Context(), h.A.DB, override)
err = ffService.UpsertFeatureFlagOverride(r.Context(), override)
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
Expand Down Expand Up @@ -594,18 +599,20 @@ func (h *Handler) DeleteOrganisationOverride(w http.ResponseWriter, r *http.Requ
return
}

ffService := h.A.FeatureFlagService

// Fetch the feature flag to get its ID
featureFlag, err := postgres.FetchFeatureFlagByKey(r.Context(), h.A.DB, featureKey)
featureFlag, err := ffService.FetchFeatureFlagByKey(r.Context(), featureKey)
if err != nil {
if errors.Is(err, postgres.ErrFeatureFlagNotFound) {
if errors.Is(err, datastore.ErrFeatureFlagNotFound) {
_ = render.Render(w, r, util.NewErrorResponse("Feature flag not found: "+featureKey, http.StatusBadRequest))
return
}
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
}

err = postgres.DeleteFeatureFlagOverride(r.Context(), h.A.DB, "organisation", orgID, featureFlag.UID)
err = ffService.DeleteFeatureFlagOverride(r.Context(), "organisation", orgID, featureFlag.UID)
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
Expand Down Expand Up @@ -904,10 +911,12 @@ func (h *Handler) UpdateFeatureFlag(w http.ResponseWriter, r *http.Request) {
return
}

ffService := h.A.FeatureFlagService

// Fetch the feature flag
featureFlag, err := postgres.FetchFeatureFlagByKey(r.Context(), h.A.DB, featureKey)
featureFlag, err := ffService.FetchFeatureFlagByKey(r.Context(), featureKey)
if err != nil {
if errors.Is(err, postgres.ErrFeatureFlagNotFound) {
if errors.Is(err, datastore.ErrFeatureFlagNotFound) {
_ = render.Render(w, r, util.NewErrorResponse("Feature flag not found: "+featureKey, http.StatusBadRequest))
return
}
Expand All @@ -917,14 +926,14 @@ func (h *Handler) UpdateFeatureFlag(w http.ResponseWriter, r *http.Request) {

// Update enabled state if provided
if updateRequest.Enabled != nil {
err = postgres.UpdateFeatureFlag(r.Context(), h.A.DB, featureFlag.UID, *updateRequest.Enabled)
err = ffService.UpdateFeatureFlag(r.Context(), featureFlag.UID, *updateRequest.Enabled)
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
}
}

updatedFlag, err := postgres.FetchFeatureFlagByID(r.Context(), h.A.DB, featureFlag.UID)
updatedFlag, err := ffService.FetchFeatureFlagByID(r.Context(), featureFlag.UID)
if err != nil {
_ = render.Render(w, r, util.NewServiceErrResponse(err))
return
Expand Down
6 changes: 4 additions & 2 deletions api/oauth2_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
mcache "github.com/frain-dev/convoy/cache/memory"
"github.com/frain-dev/convoy/config"
"github.com/frain-dev/convoy/database"
"github.com/frain-dev/convoy/database/postgres"
"github.com/frain-dev/convoy/datastore"
"github.com/frain-dev/convoy/internal/api_keys"
"github.com/frain-dev/convoy/internal/endpoints"
"github.com/frain-dev/convoy/internal/feature_flags"
"github.com/frain-dev/convoy/internal/pkg/fflag"
"github.com/frain-dev/convoy/internal/pkg/keys"
"github.com/frain-dev/convoy/internal/pkg/metrics"
Expand Down Expand Up @@ -589,6 +589,8 @@ func (s *OAuth2IntegrationTestSuite) Test_CreateEndpoint_WithOAuth2ClientAsserti
func enableOAuth2FeatureFlag(t *testing.T, db database.Database, orgID string) error {
t.Helper()

ffService := feature_flags.New(log.New("convoy", log.LevelError), db)

// Create or update early adopter feature
feature := &datastore.EarlyAdopterFeature{
OrganisationID: orgID,
Expand All @@ -597,7 +599,7 @@ func enableOAuth2FeatureFlag(t *testing.T, db database.Database, orgID string) e
EnabledAt: null.TimeFrom(time.Now()),
}

return postgres.UpsertEarlyAdopterFeature(context.Background(), db, feature)
return ffService.UpsertEarlyAdopterFeature(context.Background(), feature)
}

func TestOAuth2IntegrationTestSuite(t *testing.T) {
Expand Down
7 changes: 4 additions & 3 deletions api/oss_login_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"github.com/frain-dev/convoy/api/types"
rcache "github.com/frain-dev/convoy/cache/redis"
"github.com/frain-dev/convoy/config"
"github.com/frain-dev/convoy/database/postgres"
"github.com/frain-dev/convoy/datastore"
"github.com/frain-dev/convoy/internal/api_keys"
"github.com/frain-dev/convoy/internal/configuration"
"github.com/frain-dev/convoy/internal/feature_flags"
"github.com/frain-dev/convoy/internal/pkg/fflag"
rlimiter "github.com/frain-dev/convoy/internal/pkg/limiter/redis"
"github.com/frain-dev/convoy/internal/portal_links"
Expand Down Expand Up @@ -134,6 +134,7 @@ func (s *OSSLoginIntegrationTestSuite) buildServerWithMockLicenser(t *testing.T,

noopCache := rcache.NewRedisCacheFromClient(tl.Redis)
limiter := rlimiter.NewLimiterFromRedisClient(tl.Redis)
ffService := feature_flags.New(tl.Logger, db)

ah, err := NewApplicationHandler(
&types.APIOptions{
Expand All @@ -143,8 +144,8 @@ func (s *OSSLoginIntegrationTestSuite) buildServerWithMockLicenser(t *testing.T,
Logger: tl.Logger,
Cache: noopCache,
FFlag: fflag.NewFFlag([]string{string(fflag.Prometheus), string(fflag.FullTextSearch)}),
FeatureFlagFetcher: postgres.NewFeatureFlagFetcher(db),
EarlyAdopterFeatureFetcher: postgres.NewEarlyAdopterFeatureFetcher(db),
FeatureFlagFetcher: ffService,
EarlyAdopterFeatureFetcher: ffService,
Rate: limiter,
ConfigRepo: configuration.New(tl.Logger, db),
Licenser: licenser,
Expand Down
6 changes: 4 additions & 2 deletions api/server_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/frain-dev/convoy/database/postgres"
"github.com/frain-dev/convoy/datastore"
"github.com/frain-dev/convoy/internal/configuration"
"github.com/frain-dev/convoy/internal/feature_flags"
"github.com/frain-dev/convoy/internal/pkg/fflag"
"github.com/frain-dev/convoy/internal/pkg/keys"
noopLicenser "github.com/frain-dev/convoy/internal/pkg/license/noop"
Expand Down Expand Up @@ -182,6 +183,7 @@ func buildServer(t *testing.T) *ApplicationHandler {

noopCache := rcache.NewRedisCacheFromClient(tl.Redis)
limiter := rlimiter.NewLimiterFromRedisClient(tl.Redis)
ffService := feature_flags.New(tl.Logger, db)

ah, err := NewApplicationHandler(
&types.APIOptions{
Expand All @@ -191,8 +193,8 @@ func buildServer(t *testing.T) *ApplicationHandler {
Logger: tl.Logger,
Cache: noopCache,
FFlag: fflag.NewFFlag([]string{string(fflag.Prometheus), string(fflag.FullTextSearch)}),
FeatureFlagFetcher: postgres.NewFeatureFlagFetcher(db),
EarlyAdopterFeatureFetcher: postgres.NewEarlyAdopterFeatureFetcher(db),
FeatureFlagFetcher: ffService,
EarlyAdopterFeatureFetcher: ffService,
Copy link
Copy Markdown

@cursor cursor Bot Apr 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FeatureFlagService nil in test configurations causes panic

High Severity

Both test setup functions create an ffService via feature_flags.New() and assign it to FeatureFlagFetcher and EarlyAdopterFeatureFetcher, but omit the new FeatureFlagService field in APIOptions. The production setup in cmd/server/server.go correctly sets all three. Multiple handler methods in organisation.go directly dereference h.A.FeatureFlagService (e.g., GetEarlyAdopterFeatures, GetAllFeatureFlags, GetOrganisationOverrides), so any test hitting those registered routes will panic with a nil pointer dereference.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 4ba5674. Configure here.

Rate: limiter,
ConfigRepo: configuration.New(tl.Logger, db),
Licenser: noopLicenser.NewLicenser(),
Expand Down
2 changes: 2 additions & 0 deletions api/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/frain-dev/convoy/config"
"github.com/frain-dev/convoy/database"
"github.com/frain-dev/convoy/datastore"
"github.com/frain-dev/convoy/internal/feature_flags"
"github.com/frain-dev/convoy/internal/pkg/billing"
"github.com/frain-dev/convoy/internal/pkg/fflag"
"github.com/frain-dev/convoy/internal/pkg/license"
Expand All @@ -21,6 +22,7 @@ type APIOptions struct {
FFlag *fflag.FFlag
FeatureFlagFetcher fflag.FeatureFlagFetcher
EarlyAdopterFeatureFetcher fflag.EarlyAdopterFeatureFetcher
FeatureFlagService *feature_flags.Service
DB database.Database
Redis redis.UniversalClient
Queue queue.Queuer
Expand Down
2 changes: 1 addition & 1 deletion cmd/hooks/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func PreRun(app *cli.App, db *postgres.Postgres) func(cmd *cobra.Command, args [

lo := log.New("convoy", logLevel)

postgresDB, err := postgres.NewDB(cfg)
postgresDB, err := postgres.NewDB(cfg, lo)
if err != nil {
return errors.New("failed to connect to postgres with err: " + err.Error())
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/frain-dev/convoy/config"
"github.com/frain-dev/convoy/database/postgres"
"github.com/frain-dev/convoy/internal/pkg/cli"
log "github.com/frain-dev/convoy/pkg/logger"
)

func main() {
Expand All @@ -34,6 +35,7 @@ func main() {
app := &cli.App{}
app.Version = convoy.GetVersion()
db := &postgres.Postgres{}
app.Logger = log.New("convoy", log.LevelDebug)

c := cli.NewCli(app)

Expand Down
Loading
Loading