Multitenancy #231

thelissimus-work · 2025-03-27T00:15:25Z

No description provided.

Copilot

Pull Request Overview

This PR introduces multitenancy support across multiple modules by adding tenant context propagation, repository, service, and domain logic.

Adds tenant context to the authentication middleware
Implements tenant service and repository for CRUD operations
Updates domain models and repository mappers to incorporate tenant IDs

Reviewed Changes

Copilot reviewed 13 out of 20 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
pkg/middleware/auth.go	Adds tenant lookup in authentication flow
pkg/constants/middleware.go	Introduces a TenantKey constant
pkg/composables/tenant.go	Provides helper methods for using tenant data
modules/core/services/tenant_service.go	Implements tenant service methods
modules/core/module.go	Registers tenant and tab services; duplicate tab service registration observed
modules/core/infrastructure/persistence/user_repository.go	Adds tenant_id handling in user repository records
modules/core/infrastructure/persistence/tenant_repository.go	Implements tenant repository with query methods
modules/core/infrastructure/persistence/models/models.go	Adds tenant fields to various models
modules/core/infrastructure/persistence/core_mappers.go	Maps tenant_id for user entity conversions
modules/core/domain/entities/tenant/*	Defines tenant entity and repository interface
modules/core/domain/aggregates/user/user.go	Introduces tenantID in the user aggregate

Files not reviewed (7)

modules/bichat/infrastructure/persistence/schema/bichat-schema.sql: Language not supported
modules/core/infrastructure/persistence/schema/core-schema.sql: Language not supported
modules/crm/infrastructure/persistence/schema/crm-schema.sql: Language not supported
modules/finance/infrastructure/persistence/schema/finance-schema.sql: Language not supported
modules/hrm/infrastructure/persistence/schema/hrm-schema.sql: Language not supported
modules/logging/infrastructure/persistence/schema/logging-schema.sql: Language not supported
modules/warehouse/infrastructure/persistence/schema/warehouse-schema.sql: Language not supported

Comments suppressed due to low confidence (1)

modules/core/module.go:67

Duplicate registration of TabService is detected; consider removing the extra registration to avoid potential unexpected behavior.

services.NewTabService(persistence.NewTabRepository()),

pkg/middleware/auth.go

diyor28 · 2025-03-27T14:44:36Z

@thelissimus-work Use UUID for tenants table. We will be migrating to UUID pretty soon, so why not start using UUID for new tables already

Co-authored-by: Copilot <[email protected]>

diyor28 · 2025-04-14T11:38:04Z

modules/core/infrastructure/persistence/session_repository.go

 	sessionUpdateQuery = `
        UPDATE sessions
        SET expires_at = $1,
            ip = $2,
            user_agent = $3
-        WHERE token = $4`
-	sessionDeleteQuery = `DELETE FROM sessions WHERE token = $1`
+        WHERE token = $4 AND tenant_id = $5`


Why is this necessary? Token is already a primary key

diyor28 · 2025-04-14T11:38:15Z

modules/core/infrastructure/persistence/session_repository.go

-        WHERE token = $4`
-	sessionDeleteQuery = `DELETE FROM sessions WHERE token = $1`
+        WHERE token = $4 AND tenant_id = $5`
+	sessionDeleteQuery = `DELETE FROM sessions WHERE token = $1 AND tenant_id = $2`


Here as well

diyor28 · 2025-04-14T11:39:20Z

modules/core/infrastructure/persistence/session_repository.go

 	var count int64
-	if err := tx.QueryRow(ctx, sessionCountQuery).Scan(&count); err != nil {
+	if err := tx.QueryRow(ctx, sessionCountQuery+" WHERE tenant_id = $1", tenant.ID).Scan(&count); err != nil {


For constructing sql queries in the runtime use methods from the repo package. Reference other usages of this package to get an idea on how to use it

diyor28 · 2025-04-14T11:44:30Z

modules/core/domain/entities/tenant/tenant.go

+	"github.com/google/uuid"
+)
+
+type Tenant struct {


Is there a particular reason Tenant isn't an interface like other domain entities?

diyor28 · 2025-04-14T11:50:34Z

modules/core/infrastructure/persistence/setup_test.go

-		if err := tx.Commit(ctx); err != nil {
-			t.Fatal(err)
+		// Rollback instead of commit to ensure clean state
+		// This is safer as it ensures tests don't affect each other


They already don't affect each other since each test runs in a separate db. Committing changes is useful to be able to introspect the db state after a failed test

diyor28 · 2025-04-14T11:55:35Z

pkg/composables/tenant.go

+	ErrNoTenantFound = errors.New("no tenant found in context")
+)
+
+type Tenant struct {


What is this duplicate type for?

# Conflicts: # go.sum # modules/core/domain/aggregates/group/group.go # modules/core/domain/aggregates/group/group_repository.go # modules/core/domain/aggregates/role/role.go # modules/core/domain/aggregates/role/role_repository.go # modules/core/domain/aggregates/user/user.go # modules/core/domain/aggregates/user/user_repository.go # modules/core/domain/entities/session/session.go # modules/core/infrastructure/persistence/core_mappers.go # modules/core/infrastructure/persistence/group_repository.go # modules/core/infrastructure/persistence/models/models.go # modules/core/infrastructure/persistence/role_repository.go # modules/core/infrastructure/persistence/schema/core-schema.sql # modules/core/infrastructure/persistence/session_repository.go # modules/core/infrastructure/persistence/user_repository.go # modules/core/module.go # modules/core/presentation/controllers/login_controller.go # modules/core/seed/seed_user.go # modules/crm/infrastructure/persistence/chat_repository.go # modules/crm/infrastructure/persistence/client_repository.go # modules/crm/infrastructure/persistence/client_repository_test.go # modules/crm/infrastructure/persistence/schema/crm-schema.sql # modules/finance/domain/aggregates/money_account/account.go # modules/finance/domain/aggregates/payment/payment.go # modules/finance/domain/aggregates/payment/payment_impl.go # modules/hrm/domain/aggregates/employee/employee.go # modules/warehouse/domain/aggregates/order/order.go # modules/warehouse/domain/aggregates/order/order_impl.go # modules/warehouse/domain/aggregates/position/position.go # modules/warehouse/domain/aggregates/product/product.go # modules/warehouse/domain/entities/inventory/inventory.go # modules/warehouse/infrastructure/persistence/models/models.go # pkg/constants/middleware.go # pkg/testutils/utils.go

# Conflicts: # modules/core/infrastructure/persistence/permission_repository.go # modules/core/infrastructure/persistence/session_repository.go # modules/core/infrastructure/persistence/upload_repository.go # modules/crm/infrastructure/persistence/chat_repository.go

- Add ID to sidebar navigation for easier testing - Add test to verify newly created user sees tabs in sidebar after login

Multitenancy

ali added 8 commits March 26, 2025 20:05

add: tenant id to schemas

5306bb2

update: user and user_repository to include tenant_id

d09e74d

update: core mappers

9a364bf

update: models to include tenant_id

a878234

add: tenant composable and middleware

ac23e2f

add: tenant service, repository and update auth to get tenant entity

118ea84

Merge branch 'staging' into sdk-213

be0064f

Merge branch 'staging' into sdk-213

231cee2

thelissimus-work changed the title ~~Sdk 213~~ Multitenancy Mar 27, 2025

diyor28 requested a review from Copilot March 27, 2025 14:36

Copilot AI reviewed Mar 27, 2025

View reviewed changes

pkg/middleware/auth.go Outdated Show resolved Hide resolved

ali and others added 18 commits March 28, 2025 13:40

add: tenant id to permission, role and tab repositories

bcce1b1

add: tenant id to authlog and passport repo

063ae66

add: tenant id to session, upload and unit repos

046d6bc

add: core repos tenant_id

5056e79

add: bichat module tenant_id

7346cd7

add: crm module tenant_id

1f1013f

add: finance module tenant_id

5c3b817

add: hrm module tenant_id

777fa26

add: warehouse module tenant_id

8513f0e

add: missing tenant_ids in Go code

e5f6f79

Update pkg/middleware/auth.go

e697173

Co-authored-by: Copilot <[email protected]>

fix: missing log import

499207e

add: core missing tenant_id in Go code

b7b99b2

fix: NewWithID call sites

4d25587

fix: seed

dcff0fc

format: warehouse-schema.sql

0423802

format: logging-schema

2c50151

format: hrm-schema

2ec103c

bektosh-iota requested review from diyor28 and mirolimsgd April 14, 2025 11:31

diyor28 reviewed Apr 14, 2025

View reviewed changes

Diyor Khaydarov added 19 commits May 16, 2025 15:29

merge staging branch

7c7ccdf

merge staging branch

4a413c7

fix: failing ci

3605297

fix: user repository

68483f3

fix: insert in chat repository

ac1f1c5

fix: tests

19a15fa

fix: tests in core

4d8524f

wip: multitenancy

beb4a94

fix: chat repository

fac4e09

fix: empty state for template messages

40d82d5

fix: chat repository

ccc1f98

fix: tests

b7a263b

fix: chat repository

0aef7a7

fix: tab repository

f1c0719

test: add sidebar tabs verification in user registration e2e tests

9ffadc1

- Add ID to sidebar navigation for easier testing - Add test to verify newly created user sees tabs in sidebar after login

fix: create tabs on user create

7fc3483

fix: repositories

e64fdc3

diyor28 merged commit a2e1a4c into staging May 19, 2025
1 check failed

diyor28 deleted the sdk-213 branch May 19, 2025 12:11

diyor28 added a commit that referenced this pull request Jun 24, 2025

Merge pull request #231 from iota-uz/sdk-213

55fc9fd

Multitenancy

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Multitenancy #231

Multitenancy #231

Uh oh!

thelissimus-work commented Mar 27, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

diyor28 commented Mar 27, 2025

Uh oh!

diyor28 Apr 14, 2025

Uh oh!

diyor28 Apr 14, 2025

Uh oh!

diyor28 Apr 14, 2025

Uh oh!

diyor28 Apr 14, 2025

Uh oh!

diyor28 Apr 14, 2025 •

edited

Loading

Uh oh!

diyor28 Apr 14, 2025

Uh oh!

Uh oh!

Uh oh!

Multitenancy #231

Multitenancy #231

Uh oh!

Conversation

thelissimus-work commented Mar 27, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

diyor28 commented Mar 27, 2025

Uh oh!

diyor28 Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

diyor28 Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

diyor28 Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

diyor28 Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

diyor28 Apr 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

diyor28 Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

diyor28 Apr 14, 2025 •

edited

Loading