list tenant users

briskt · Nov 19, 2023 · f190439 · f190439
1 parent e0a4a51
commit f190439
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 18 deletions.
diff --git a/app/tenant.go b/app/tenant.go
@@ -33,6 +33,7 @@ type TenantService interface {
 type Tenant struct {
 	ID        string
 	Name      string
+	UserIDs   []string
 	CreatedAt time.Time
 	UpdatedAt time.Time
 }

diff --git a/assets/pages/admin/tenants/[id].svelte b/assets/pages/admin/tenants/[id].svelte
@@ -7,7 +7,6 @@
 
   export let id: string
 
-  let newTenantName = ''
   let tenant = {} as Tenant
   let showAddTenantUserModal = false
 
@@ -33,7 +32,22 @@
   <dd>{localeTime(tenant.UpdatedAt)}</dd>
 </dl>
 
-
+<h2>Tenant Users</h2>
+
+{#if tenant.UserIDs && tenant.UserIDs.length}
+  <table>
+    <tr>
+      <th>ID</th>
+    </tr>
+    {#each tenant.UserIDs as id (id)}
+      <tr>
+        <td>{id}</td>
+      </tr>
+    {/each}
+  </table>
+{:else}
+  <em>No users</em>
+{/if}
 
 <style>
   dd {

diff --git a/db/tenant.go b/db/tenant.go
@@ -122,11 +122,20 @@ func findTenantByID(ctx echo.Context, id string) (Tenant, error) {
 	return tenant, result.Error
 }
 
-func convertTenant(_ echo.Context, t Tenant) (app.Tenant, error) {
-	return app.Tenant{
+func convertTenant(c echo.Context, t Tenant) (app.Tenant, error) {
+	tenant := app.Tenant{
 		ID:        t.ID,
 		Name:      t.Name,
 		CreatedAt: t.CreatedAt,
 		UpdatedAt: t.UpdatedAt,
-	}, nil
+	}
+	users, n, err := findUsers(c, app.UserFilter{TenantID: &t.ID})
+	if err != nil {
+		return app.Tenant{}, err
+	}
+	tenant.UserIDs = make([]string, n)
+	for i, user := range users {
+		tenant.UserIDs[i] = user.ID
+	}
+	return tenant, nil
 }
diff --git a/migrations/20230617074340_add_tenants_table.sql b/migrations/20230617074340_add_tenants_table.sql
@@ -9,22 +9,13 @@ CREATE TABLE "tenants" (
   PRIMARY KEY(id),
   UNIQUE (name, deleted)
 );
-CREATE TABLE "tenant_users" (
-  id text NOT NULL,
-  tenant_id varchar(255) NOT NULL,
-  user_id varchar(255) NOT NULL,
-  created_at timestamp NOT NULL,
-  updated_at timestamp NOT NULL,
-  deleted timestamp,
-  PRIMARY KEY(id),
-  CONSTRAINT FK_tenant_users_tenants FOREIGN KEY (tenant_id) REFERENCES tenants(id),
-  CONSTRAINT FK_tenant_users_user FOREIGN KEY (user_id) REFERENCES users(id),
-  UNIQUE (tenant_id, user_id, deleted)
-);
+ALTER TABLE "users" ADD "tenant_id" text NULL;
+ALTER TABLE "users" ADD FOREIGN KEY ("tenant_id") REFERENCES "tenants" ("id") ON DELETE SET NULL ON UPDATE SET NULL;
 -- +goose StatementEnd
 
 -- +goose Down
 -- +goose StatementBegin
-DROP TABLE "tenant_users";
+ALTER TABLE "users" DROP CONSTRAINT "users_tenant_id_fkey"
+ALTER TABLE "users" DROP "tenant_id";
 DROP TABLE "tenants";
 -- +goose StatementEnd