feat: add tenant and user management with migrations, handlers, and tests
- Implemented tenant and user management features including: - Tenant creation and management with associated migrations. - User creation and management with associated migrations. - Tenant membership management with associated migrations. - Platform user roles management with associated migrations. - Quota management with associated migrations. - Article and template management with associated migrations. - Added HTTP handlers for templates and workspaces. - Created tests for protected and public routes. - Introduced a script to check tenant scope in SQL queries. - Documented task plan for backend completion and frontend foundation.
This commit is contained in:
@@ -0,0 +1,67 @@
|
||||
-- name: ListArticles :many
|
||||
SELECT a.id, a.tenant_id, a.source_type, a.template_id,
|
||||
a.generate_status, a.publish_status, a.created_at, a.updated_at,
|
||||
av.title, av.word_count, av.source_label,
|
||||
t.template_name
|
||||
FROM articles a
|
||||
LEFT JOIN article_versions av ON av.id = a.current_version_id
|
||||
LEFT JOIN article_templates t ON t.id = a.template_id
|
||||
WHERE a.tenant_id = sqlc.arg(tenant_id)
|
||||
AND a.deleted_at IS NULL
|
||||
AND (sqlc.narg(generate_status)::text IS NULL OR a.generate_status = sqlc.narg(generate_status))
|
||||
AND (sqlc.narg(publish_status)::text IS NULL OR a.publish_status = sqlc.narg(publish_status))
|
||||
AND (sqlc.narg(source_type)::text IS NULL OR a.source_type = sqlc.narg(source_type))
|
||||
AND (sqlc.narg(template_id)::bigint IS NULL OR a.template_id = sqlc.narg(template_id))
|
||||
AND (sqlc.narg(keyword)::text IS NULL OR av.title ILIKE '%' || sqlc.narg(keyword) || '%')
|
||||
ORDER BY a.created_at DESC
|
||||
LIMIT sqlc.arg(page_size) OFFSET sqlc.arg(page_offset);
|
||||
|
||||
-- name: CountArticles :one
|
||||
SELECT COUNT(*)
|
||||
FROM articles a
|
||||
LEFT JOIN article_versions av ON av.id = a.current_version_id
|
||||
WHERE a.tenant_id = sqlc.arg(tenant_id)
|
||||
AND a.deleted_at IS NULL
|
||||
AND (sqlc.narg(generate_status)::text IS NULL OR a.generate_status = sqlc.narg(generate_status))
|
||||
AND (sqlc.narg(publish_status)::text IS NULL OR a.publish_status = sqlc.narg(publish_status))
|
||||
AND (sqlc.narg(source_type)::text IS NULL OR a.source_type = sqlc.narg(source_type))
|
||||
AND (sqlc.narg(template_id)::bigint IS NULL OR a.template_id = sqlc.narg(template_id))
|
||||
AND (sqlc.narg(keyword)::text IS NULL OR av.title ILIKE '%' || sqlc.narg(keyword) || '%');
|
||||
|
||||
-- name: GetArticleByID :one
|
||||
SELECT a.id, a.tenant_id, a.source_type, a.template_id, a.current_version_id,
|
||||
a.generate_status, a.publish_status, a.created_at, a.updated_at,
|
||||
av.title, av.html_content, av.markdown_content, av.word_count, av.source_label, av.version_no,
|
||||
t.template_name
|
||||
FROM articles a
|
||||
LEFT JOIN article_versions av ON av.id = a.current_version_id
|
||||
LEFT JOIN article_templates t ON t.id = a.template_id
|
||||
WHERE a.id = sqlc.arg(id) AND a.tenant_id = sqlc.arg(tenant_id) AND a.deleted_at IS NULL;
|
||||
|
||||
-- name: GetArticleVersions :many
|
||||
SELECT id, article_id, version_no, title, word_count, source_label, created_at
|
||||
FROM article_versions
|
||||
WHERE article_id = sqlc.arg(article_id)
|
||||
ORDER BY version_no DESC;
|
||||
|
||||
-- name: CreateArticle :one
|
||||
INSERT INTO articles (tenant_id, source_type, template_id, generate_status, publish_status)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(source_type), sqlc.arg(template_id), 'pending', 'unpublished')
|
||||
RETURNING id;
|
||||
|
||||
-- name: CreateArticleVersion :one
|
||||
INSERT INTO article_versions (article_id, version_no, title, html_content, markdown_content, word_count, source_label)
|
||||
VALUES (sqlc.arg(article_id), sqlc.arg(version_no), sqlc.arg(title), sqlc.arg(html_content), sqlc.arg(markdown_content), sqlc.arg(word_count), sqlc.arg(source_label))
|
||||
RETURNING id;
|
||||
|
||||
-- name: UpdateArticleCurrentVersion :exec
|
||||
UPDATE articles SET current_version_id = sqlc.arg(version_id), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
|
||||
|
||||
-- name: UpdateArticleGenerateStatus :exec
|
||||
UPDATE articles SET generate_status = sqlc.arg(status), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
|
||||
|
||||
-- name: SoftDeleteArticle :exec
|
||||
UPDATE articles SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
@@ -0,0 +1,15 @@
|
||||
-- name: CreateAuditLog :exec
|
||||
INSERT INTO audit_logs (operator_id, tenant_id, module, action, before_json, after_json, result)
|
||||
VALUES (sqlc.arg(operator_id), sqlc.arg(tenant_id), sqlc.arg(module), sqlc.arg(action),
|
||||
sqlc.arg(before_json), sqlc.arg(after_json), sqlc.arg(result));
|
||||
|
||||
-- name: CreateGenerationTask :one
|
||||
INSERT INTO generation_tasks (tenant_id, article_id, quota_reservation_id, task_type, input_params_json, status)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(article_id), sqlc.arg(quota_reservation_id),
|
||||
sqlc.arg(task_type), sqlc.arg(input_params_json), 'queued')
|
||||
RETURNING id;
|
||||
|
||||
-- name: UpdateGenerationTaskStatus :exec
|
||||
UPDATE generation_tasks SET status = sqlc.arg(status), error_message = sqlc.arg(error_message),
|
||||
started_at = sqlc.arg(started_at), completed_at = sqlc.arg(completed_at), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
|
||||
@@ -0,0 +1,20 @@
|
||||
-- name: GetUserByEmail :one
|
||||
SELECT id, email, phone, password_hash, name, avatar_url, status, created_at, updated_at
|
||||
FROM users
|
||||
WHERE email = sqlc.arg(email) AND deleted_at IS NULL;
|
||||
|
||||
-- name: GetUserByID :one
|
||||
SELECT id, email, phone, password_hash, name, avatar_url, status, created_at, updated_at
|
||||
FROM users
|
||||
WHERE id = sqlc.arg(id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: GetTenantMembership :one
|
||||
SELECT id, tenant_id, user_id, tenant_role, created_at
|
||||
FROM tenant_memberships
|
||||
WHERE user_id = sqlc.arg(user_id) AND deleted_at IS NULL
|
||||
LIMIT 1;
|
||||
|
||||
-- name: GetTenantMembershipByTenantAndUser :one
|
||||
SELECT id, tenant_id, user_id, tenant_role, created_at
|
||||
FROM tenant_memberships
|
||||
WHERE tenant_id = sqlc.arg(tenant_id) AND user_id = sqlc.arg(user_id) AND deleted_at IS NULL;
|
||||
@@ -0,0 +1,117 @@
|
||||
-- name: ListBrands :many
|
||||
SELECT id, tenant_id, name, description, status, created_at, updated_at
|
||||
FROM brands
|
||||
WHERE tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL
|
||||
ORDER BY created_at DESC;
|
||||
|
||||
-- name: GetBrandByID :one
|
||||
SELECT id, tenant_id, name, description, status, created_at, updated_at
|
||||
FROM brands
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: CreateBrand :one
|
||||
INSERT INTO brands (tenant_id, name, description, status)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(name), sqlc.arg(description), 'active')
|
||||
RETURNING id, created_at;
|
||||
|
||||
-- name: UpdateBrand :exec
|
||||
UPDATE brands SET name = sqlc.arg(name), description = sqlc.arg(description), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: SoftDeleteBrand :exec
|
||||
UPDATE brands SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: ListKeywords :many
|
||||
SELECT id, tenant_id, brand_id, name, status, created_at, updated_at
|
||||
FROM brand_keywords
|
||||
WHERE brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL
|
||||
ORDER BY created_at DESC;
|
||||
|
||||
-- name: CreateKeyword :one
|
||||
INSERT INTO brand_keywords (tenant_id, brand_id, name, status)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(brand_id), sqlc.arg(name), 'active')
|
||||
RETURNING id, created_at;
|
||||
|
||||
-- name: UpdateKeyword :exec
|
||||
UPDATE brand_keywords SET name = sqlc.arg(name), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: SoftDeleteKeyword :exec
|
||||
UPDATE brand_keywords SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: SoftDeleteKeywordsByBrand :exec
|
||||
UPDATE brand_keywords SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: ListQuestions :many
|
||||
SELECT q.id, q.tenant_id, q.brand_id, q.keyword_id, q.current_version_id, q.status, q.created_at,
|
||||
v.question_text, v.version_no
|
||||
FROM brand_questions q
|
||||
LEFT JOIN brand_question_versions v ON v.id = q.current_version_id
|
||||
WHERE q.brand_id = sqlc.arg(brand_id) AND q.tenant_id = sqlc.arg(tenant_id) AND q.deleted_at IS NULL
|
||||
AND (sqlc.narg(keyword_id)::bigint IS NULL OR q.keyword_id = sqlc.narg(keyword_id))
|
||||
ORDER BY q.created_at DESC;
|
||||
|
||||
-- name: CreateQuestion :one
|
||||
INSERT INTO brand_questions (tenant_id, brand_id, keyword_id, status)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(brand_id), sqlc.arg(keyword_id), 'active')
|
||||
RETURNING id;
|
||||
|
||||
-- name: CreateQuestionVersion :one
|
||||
INSERT INTO brand_question_versions (question_id, question_text, question_hash, version_no, is_active)
|
||||
VALUES (sqlc.arg(question_id), sqlc.arg(question_text), sqlc.arg(question_hash), sqlc.arg(version_no), true)
|
||||
RETURNING id;
|
||||
|
||||
-- name: UpdateQuestionCurrentVersion :exec
|
||||
UPDATE brand_questions SET current_version_id = sqlc.arg(version_id), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
|
||||
|
||||
-- name: DeactivateQuestionVersion :exec
|
||||
UPDATE brand_question_versions SET is_active = false
|
||||
WHERE question_id = sqlc.arg(question_id) AND is_active = true;
|
||||
|
||||
-- name: GetLatestQuestionVersionNo :one
|
||||
SELECT COALESCE(MAX(version_no), 0)::INT AS max_version
|
||||
FROM brand_question_versions
|
||||
WHERE question_id = sqlc.arg(question_id);
|
||||
|
||||
-- name: SoftDeleteQuestion :exec
|
||||
UPDATE brand_questions SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: SoftDeleteQuestionsByBrand :exec
|
||||
UPDATE brand_questions SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: ListQuestionVersions :many
|
||||
SELECT v.id, v.question_id, v.question_text, v.question_hash, v.version_no, v.is_active, v.created_at
|
||||
FROM brand_question_versions v
|
||||
JOIN brand_questions q ON q.id = v.question_id
|
||||
WHERE q.brand_id = sqlc.arg(brand_id) AND q.tenant_id = sqlc.arg(tenant_id)
|
||||
ORDER BY v.created_at DESC;
|
||||
|
||||
-- name: ListCompetitors :many
|
||||
SELECT id, tenant_id, brand_id, name, website, description, product_lines_json, created_at, updated_at
|
||||
FROM competitors
|
||||
WHERE brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL
|
||||
ORDER BY created_at DESC;
|
||||
|
||||
-- name: CreateCompetitor :one
|
||||
INSERT INTO competitors (tenant_id, brand_id, name, website, description, product_lines_json)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(brand_id), sqlc.arg(name), sqlc.arg(website), sqlc.arg(description), sqlc.arg(product_lines_json))
|
||||
RETURNING id, created_at;
|
||||
|
||||
-- name: UpdateCompetitor :exec
|
||||
UPDATE competitors SET name = sqlc.arg(name), website = sqlc.arg(website),
|
||||
description = sqlc.arg(description), product_lines_json = sqlc.arg(product_lines_json), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: SoftDeleteCompetitor :exec
|
||||
UPDATE competitors SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: SoftDeleteCompetitorsByBrand :exec
|
||||
UPDATE competitors SET deleted_at = NOW(), updated_at = NOW()
|
||||
WHERE brand_id = sqlc.arg(brand_id) AND tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
@@ -0,0 +1,30 @@
|
||||
-- name: GetCurrentBalance :one
|
||||
SELECT COALESCE(
|
||||
(SELECT balance_after FROM tenant_quota_ledgers
|
||||
WHERE tenant_id = sqlc.arg(tenant_id) AND quota_type = sqlc.arg(quota_type)
|
||||
ORDER BY created_at DESC LIMIT 1), 0
|
||||
)::INT AS balance;
|
||||
|
||||
-- name: InsertQuotaLedger :one
|
||||
INSERT INTO tenant_quota_ledgers (tenant_id, quota_type, delta, balance_after, reason, reference_type, reference_id)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(quota_type), sqlc.arg(delta), sqlc.arg(balance_after),
|
||||
sqlc.arg(reason), sqlc.arg(reference_type), sqlc.arg(reference_id))
|
||||
RETURNING id;
|
||||
|
||||
-- name: CreateQuotaReservation :one
|
||||
INSERT INTO quota_reservations (tenant_id, quota_type, resource_type, resource_id, reserved_amount, status, expire_at)
|
||||
VALUES (sqlc.arg(tenant_id), sqlc.arg(quota_type), sqlc.arg(resource_type), sqlc.arg(resource_id),
|
||||
sqlc.arg(reserved_amount), 'pending', sqlc.arg(expire_at))
|
||||
RETURNING id;
|
||||
|
||||
-- name: UpdateQuotaReservationResource :exec
|
||||
UPDATE quota_reservations SET resource_id = sqlc.arg(resource_id), updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
|
||||
|
||||
-- name: ConfirmReservation :exec
|
||||
UPDATE quota_reservations SET status = 'confirmed', consumed_amount = reserved_amount, updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
|
||||
|
||||
-- name: RefundReservation :exec
|
||||
UPDATE quota_reservations SET status = 'refunded', refunded_amount = reserved_amount, updated_at = NOW()
|
||||
WHERE id = sqlc.arg(id) AND tenant_id = sqlc.arg(tenant_id);
|
||||
@@ -0,0 +1,22 @@
|
||||
-- name: ListTemplates :many
|
||||
SELECT id, scope, tenant_id, origin_type, template_key, template_name,
|
||||
schema_json, prompt_template, prompt_visibility, card_config_json,
|
||||
status, version_no, created_at, updated_at
|
||||
FROM article_templates
|
||||
WHERE (scope = 'platform' OR tenant_id = sqlc.arg(tenant_id)::bigint)
|
||||
AND status = 'active' AND deleted_at IS NULL
|
||||
ORDER BY created_at DESC;
|
||||
|
||||
-- name: GetTemplateByID :one
|
||||
SELECT id, scope, tenant_id, origin_type, template_key, template_name,
|
||||
schema_json, prompt_template, prompt_visibility, protected_prompt_asset_key,
|
||||
card_config_json, status, version_no, created_at, updated_at
|
||||
FROM article_templates
|
||||
WHERE id = sqlc.arg(id)
|
||||
AND (scope = 'platform' OR tenant_id = sqlc.arg(tenant_id)::bigint)
|
||||
AND deleted_at IS NULL;
|
||||
|
||||
-- name: GetTemplateSchema :one
|
||||
SELECT id, template_name, schema_json
|
||||
FROM article_templates
|
||||
WHERE id = sqlc.arg(id) AND deleted_at IS NULL;
|
||||
@@ -0,0 +1,37 @@
|
||||
-- name: CountArticlesByTenant :one
|
||||
SELECT COUNT(*) FROM articles
|
||||
WHERE tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: CountPublishedArticlesByTenant :one
|
||||
SELECT COUNT(*) FROM articles
|
||||
WHERE tenant_id = sqlc.arg(tenant_id) AND publish_status = 'success' AND deleted_at IS NULL;
|
||||
|
||||
-- name: CountBrandsByTenant :one
|
||||
SELECT COUNT(*) FROM brands
|
||||
WHERE tenant_id = sqlc.arg(tenant_id) AND deleted_at IS NULL;
|
||||
|
||||
-- name: GetRecentArticles :many
|
||||
SELECT a.id, a.generate_status, a.publish_status, a.source_type, a.created_at,
|
||||
av.title, av.word_count, av.source_label,
|
||||
t.template_name
|
||||
FROM articles a
|
||||
LEFT JOIN article_versions av ON av.id = a.current_version_id
|
||||
LEFT JOIN article_templates t ON t.id = a.template_id
|
||||
WHERE a.tenant_id = sqlc.arg(tenant_id) AND a.deleted_at IS NULL
|
||||
ORDER BY a.created_at DESC
|
||||
LIMIT 10;
|
||||
|
||||
-- name: GetQuotaSummary :one
|
||||
SELECT COALESCE(
|
||||
(SELECT balance_after FROM tenant_quota_ledgers
|
||||
WHERE tenant_id = sqlc.arg(tenant_id) AND quota_type = 'article_generation'
|
||||
ORDER BY created_at DESC LIMIT 1), 0
|
||||
)::INT AS balance;
|
||||
|
||||
-- name: GetActivePlanForTenant :one
|
||||
SELECT p.plan_code, p.name AS plan_name, p.quota_policy_json,
|
||||
s.start_at, s.end_at
|
||||
FROM tenant_plan_subscriptions s
|
||||
JOIN plans p ON p.id = s.plan_id
|
||||
WHERE s.tenant_id = sqlc.arg(tenant_id) AND s.status = 'active' AND s.deleted_at IS NULL
|
||||
LIMIT 1;
|
||||
Reference in New Issue
Block a user