fix: Ping for database connectivity

Author: stefanskoricdev

cmd/onboarding-worker/main.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/dxta-dev/app/internal/internal_api/data"
 	"github.com/dxta-dev/app/internal/onboarding"
 	"github.com/dxta-dev/app/internal/onboarding/activity"
+	"github.com/dxta-dev/app/internal/onboarding/data"
 	"github.com/dxta-dev/app/internal/onboarding/workflow"
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/worker"

internal/internal_api/data/tenantDB.go

@@ -1,6 +1,7 @@
 package data
 
 import (
+	"context"
 	"database/sql"
 	"fmt"
 	"os"
@@ -12,7 +13,7 @@ type TenantDB struct {
 	DB *sql.DB
 }
 
-func NewTenantDB(dbUrl string) (TenantDB, error) {
+func NewTenantDB(dbUrl string, ctx context.Context) (TenantDB, error) {
 	driverName := otel.GetDriverName()
 	devToken := os.Getenv("DXTA_DEV_GROUP_TOKEN")
 
@@ -26,6 +27,10 @@ func NewTenantDB(dbUrl string) (TenantDB, error) {
 		return TenantDB{}, err
 	}
 
+	if err := tenantDB.PingContext(ctx); err != nil {
+		return TenantDB{}, err
+	}
+
 	return TenantDB{
 		DB: tenantDB,
 	}, nil

internal/internal_api/internal_api.go

@@ -58,7 +58,7 @@ func InternalApiState(authId string, ctx context.Context) (State, error) {
 		return State{}, err
 	}
 
-	tenantDB, err := data.NewTenantDB(tenantData.DBUrl)
+	tenantDB, err := data.NewTenantDB(tenantData.DBUrl, ctx)
 
 	if err != nil {
 		return State{}, err

internal/onboarding/activity/provision-github-installation-data.go

@@ -3,7 +3,7 @@ package activity
 import (
 	"context"
 
-	"github.com/dxta-dev/app/internal/internal_api/data"
+	"github.com/dxta-dev/app/internal/onboarding/data"
 	"github.com/google/go-github/v72/github"
 )
 

internal/internal_api/data/github.go internal/onboarding/data/github.gointernal/internal_api/data/github.go renamed to internal/onboarding/data/github.go

@@ -20,7 +20,7 @@ func (cfg GithubCfg) GetGithubInstallation(installationId int64, ctx context.Con
 	return installation, nil
 }
 
-func (d TenantDB) SyncGithubInstallationDataToTenant(
+/* func (d TenantDB) SyncGithubInstallationDataToTenant(
 	installationId int64,
 	installationOrgName string,
 	organizationId string,
@@ -33,9 +33,9 @@ func (d TenantDB) SyncGithubInstallationDataToTenant(
 	}
 
 	_, err = tx.Exec(`
-		INSERT INTO github_organizations 
-    		(github_app_installation_id, name) 
-    	VALUES 
+		INSERT INTO github_organizations
+    		(github_app_installation_id, name)
+    	VALUES
 			(?, ?);`,
 		installationId, installationOrgName)
 
@@ -45,12 +45,12 @@ func (d TenantDB) SyncGithubInstallationDataToTenant(
 	}
 
 	_, err = tx.Exec(`
-		INSERT INTO organizations 
-			(external_id) 
-    	VALUES 
-			(?) 
-    	ON CONFLICT 
-			(external_id) 
+		INSERT INTO organizations
+			(external_id)
+    	VALUES
+			(?)
+    	ON CONFLICT
+			(external_id)
     	DO NOTHING;`,
 		organizationId)
 
@@ -60,9 +60,9 @@ func (d TenantDB) SyncGithubInstallationDataToTenant(
 	}
 
 	_, err = tx.Exec(`
-		INSERT INTO 'organizations_github_organizations' 
-    		('organization_id', 'github_app_installation_id') 
-    	VALUES 
+		INSERT INTO 'organizations_github_organizations'
+    		('organization_id', 'github_app_installation_id')
+    	VALUES
     	    (?, ?);`,
 		organizationId, installationId)
 
@@ -72,4 +72,4 @@ func (d TenantDB) SyncGithubInstallationDataToTenant(
 	}
 
 	return nil
-}
+} */