feat: Add organization creation activity

Author: stefanskoricdev

internal/onboarding/activity/organization.go

@@ -20,7 +20,7 @@ func (ta *TenantActivities) GetOrganizationIDByAuthID(ctx context.Context, authI
 	db, err := onboarding.GetCachedTenantDB(ta.DBConnections, DBURL, ctx)
 
 	if err != nil {
-		return 0, err
+		return 0, errors.New("failed to get cached tenant DB: " + err.Error())
 	}
 
 	var organizationId int64
@@ -38,3 +38,30 @@ func (ta *TenantActivities) GetOrganizationIDByAuthID(ctx context.Context, authI
 
 	return organizationId, nil
 }
+
+func (ta *TenantActivities) CreateOrganization(
+	ctx context.Context,
+	organizationName string,
+	authID string,
+	DBURL string,
+) (bool, error) {
+
+	db, err := onboarding.GetCachedTenantDB(ta.DBConnections, DBURL, ctx)
+
+	if err != nil {
+		return false, errors.New("failed to get cached tenant DB: " + err.Error())
+	}
+
+	_, err = db.QueryContext(ctx, `
+		INSERT INTO organizations 
+			(name, auth_id) 
+		VALUES 
+			(?, ?);`,
+		organizationName, authID)
+
+	if err != nil {
+		return false, errors.New("failed to create organization: " + err.Error())
+	}
+
+	return true, nil
+}

internal/onboarding/activity/settings.go

@@ -3,19 +3,17 @@ package activity
 import (
 	"context"
 	"errors"
-	"fmt"
 
 	"github.com/dxta-dev/app/internal/onboarding"
 )
 
 func (ta *TenantActivities) UpsertTenantDBInfo(
 	ctx context.Context,
 	DBName string,
-	DBHostName string,
+	DBURL string,
 	DBDomainName string,
 ) (bool, error) {
-	dbUrl := fmt.Sprintf("libsql://%s", DBHostName)
-	db, err := onboarding.GetCachedTenantDB(ta.DBConnections, dbUrl, ctx)
+	db, err := onboarding.GetCachedTenantDB(ta.DBConnections, DBURL, ctx)
 
 	if err != nil {
 		return false, err

internal/onboarding/activity/tenant_db.go

@@ -16,6 +16,7 @@ type DatabaseData struct {
 	DBID     string `json:"DbId"`
 	Hostname string `json:"Hostname"`
 	Name     string `json:"Name"`
+	DBURL    string
 }
 type CreateTenantDBRes struct {
 	Database DatabaseData `json:"database"`
@@ -99,14 +100,16 @@ func (cta CreateTenantActivities) CreateTenantDB(
 
 	fmt.Printf("Success! Data: %v", body)
 
+	body.Database.DBURL = fmt.Sprintf("libsql://%s", body.Database.Hostname)
+
 	return &body, nil
 }
 
 func (cta CreateTenantActivities) AddTenantDBToMap(
 	ctx context.Context,
 	authId string,
 	DBName string,
-	DBHostName string,
+	DBURL string,
 	DBDomainName string,
 ) (bool, error) {
 	db, err := onboarding.GetDB(ctx, cta.config.OrganizationsTenantMapDBURL)
@@ -115,12 +118,10 @@ func (cta CreateTenantActivities) AddTenantDBToMap(
 		return false, errors.New("failed to get organizations-tenant-map db: " + err.Error())
 	}
 
-	dbUrl := fmt.Sprintf("libsql://%s", DBHostName)
-
 	_, err = db.QueryContext(ctx, `
 		INSERT INTO tenants 
 			(organization_id, db_url, name, domain) 
-		VALUES (?, ?, ?, ?);`, authId, dbUrl, DBName, DBDomainName)
+		VALUES (?, ?, ?, ?);`, authId, DBURL, DBName, DBDomainName)
 
 	if err != nil {
 		return false, errors.New("failed to store tenant db data to organizations-tenant-map db: " + err.Error())

internal/onboarding/workflow/create_tenant_db.go

@@ -14,15 +14,16 @@ import (
 )
 
 type CreateTenantDBParams struct {
-	DBName string
-	AuthID string
+	DBName           string
+	AuthID           string
+	OrganizationName string
 }
 
 func CreateTenantDBWorkflow(
 	ctx workflow.Context,
 	params CreateTenantDBParams,
 ) (err error) {
-	if params.DBName == "" || params.AuthID == "" {
+	if params.DBName == "" || params.AuthID == "" || params.OrganizationName == "" {
 		err = errors.New("bad request")
 		return
 	}
@@ -56,18 +57,26 @@ func CreateTenantDBWorkflow(
 		(*activity.CreateTenantActivities).AddTenantDBToMap,
 		params.AuthID,
 		params.DBName,
-		newDBData.Database.Hostname,
+		newDBData.Database.DBURL,
 		newDBData.Database.Name,
 	)
 
 	upsertTenantInfoFuture := workflow.ExecuteActivity(
 		ctx,
 		(*activity.TenantActivities).UpsertTenantDBInfo,
 		params.DBName,
-		newDBData.Database.Hostname,
+		newDBData.Database.DBURL,
 		newDBData.Database.Name,
 	)
 
+	createOrganizationFuture := workflow.ExecuteActivity(
+		ctx,
+		(*activity.TenantActivities).CreateOrganization,
+		params.OrganizationName,
+		params.AuthID,
+		newDBData.Database.DBURL,
+	)
+
 	var tenantDBMapRes bool
 
 	err = mapTenantFuture.Get(ctx, &tenantDBMapRes)
@@ -84,13 +93,22 @@ func CreateTenantDBWorkflow(
 		return
 	}
 
+	var createOrganizationRes bool
+
+	err = createOrganizationFuture.Get(ctx, &createOrganizationRes)
+
+	if err != nil {
+		return
+	}
+
 	return
 }
 
 type ExecuteCreateTenantDBWorkflowParams struct {
 	TemporalOnboardingQueueName string
 	AuthID                      string
 	DBName                      string
+	OrganizationName            string
 }
 
 func ExecuteCreateTenantDBWorkflow(
@@ -110,8 +128,9 @@ func ExecuteCreateTenantDBWorkflow(
 		},
 		CreateTenantDBWorkflow,
 		CreateTenantDBParams{
-			AuthID: params.AuthID,
-			DBName: params.DBName,
+			AuthID:           params.AuthID,
+			DBName:           params.DBName,
+			OrganizationName: params.OrganizationName,
 		},
 	)