@robsun/create-keystone-app 0.2.13 → 0.4.0

package/template/apps/server/internal/modules/example/i18n/locales/en-US.json

@@ -1,18 +1,30 @@
-{
-  "example.item.created": "Item created successfully",
-  "example.item.updated": "Item updated successfully",
-  "example.item.deleted": "Item deleted successfully",
-  "example.item.notFound": "Item not found",
-  "example.item.loadFailed": "Failed to load items",
-  "example.item.createFailed": "Failed to create item",
-  "example.item.updateFailed": "Failed to update item",
-  "example.item.deleteFailed": "Failed to delete item",
-  "example.validation.titleRequired": "Title is required",
-  "example.validation.statusInvalid": "Invalid status value",
-  "example.validation.invalidId": "Invalid ID",
-  "example.validation.invalidPayload": "Invalid request payload",
-  "example.service.unavailable": "Example service is unavailable",
-  "permission.example.item": "Example Items",
-  "permission.example.item.view": "View Items",
-  "permission.example.item.manage": "Manage Items"
-}
+{
+  "example.item.created": "Item created successfully",
+  "example.item.updated": "Item updated successfully",
+  "example.item.deleted": "Item deleted successfully",
+  "example.item.submitted": "Item submitted for approval",
+  "example.item.cancelled": "Approval cancelled",
+  "example.item.notFound": "Item not found",
+  "example.item.loadFailed": "Failed to load items",
+  "example.item.createFailed": "Failed to create item",
+  "example.item.updateFailed": "Failed to update item",
+  "example.item.deleteFailed": "Failed to delete item",
+  "example.item.submitFailed": "Failed to submit item",
+  "example.item.cancelFailed": "Failed to cancel approval",
+  "example.item.exportFailed": "Failed to export items",
+  "example.validation.titleRequired": "Title is required",
+  "example.validation.statusInvalid": "Invalid status value",
+  "example.validation.categoryInvalid": "Invalid category",
+  "example.validation.amountInvalid": "Amount must be zero or greater",
+  "example.validation.itemLocked": "Item cannot be edited or deleted in the current status",
+  "example.validation.submitterRequired": "Submitter is required",
+  "example.validation.approvalNotReady": "Approval flow is not ready",
+  "example.validation.approvalNotPending": "Only pending approvals can be cancelled",
+  "example.validation.approvalInstanceMissing": "Approval instance is missing",
+  "example.validation.invalidId": "Invalid ID",
+  "example.validation.invalidPayload": "Invalid request payload",
+  "example.service.unavailable": "Example service is unavailable",
+  "permission.example.item": "Example Items",
+  "permission.example.item.view": "View Items",
+  "permission.example.item.manage": "Manage Items"
+}

package/template/apps/server/internal/modules/example/i18n/locales/zh-CN.json

@@ -1,18 +1,30 @@
-{
-  "example.item.created": "项目创建成功",
-  "example.item.updated": "项目更新成功",
-  "example.item.deleted": "项目删除成功",
-  "example.item.notFound": "项目不存在",
-  "example.item.loadFailed": "加载项目列表失败",
-  "example.item.createFailed": "创建项目失败",
-  "example.item.updateFailed": "更新项目失败",
-  "example.item.deleteFailed": "删除项目失败",
-  "example.validation.titleRequired": "标题不能为空",
-  "example.validation.statusInvalid": "状态值无效",
-  "example.validation.invalidId": "无效的 ID",
-  "example.validation.invalidPayload": "请求参数无效",
-  "example.service.unavailable": "示例服务暂不可用",
-  "permission.example.item": "示例项目",
-  "permission.example.item.view": "查看项目",
-  "permission.example.item.manage": "管理项目"
-}
+{
+  "example.item.created": "事项创建成功",
+  "example.item.updated": "事项更新成功",
+  "example.item.deleted": "事项删除成功",
+  "example.item.submitted": "事项已提交审批",
+  "example.item.cancelled": "事项已取消审批",
+  "example.item.notFound": "事项不存在",
+  "example.item.loadFailed": "加载事项列表失败",
+  "example.item.createFailed": "创建事项失败",
+  "example.item.updateFailed": "更新事项失败",
+  "example.item.deleteFailed": "删除事项失败",
+  "example.item.submitFailed": "提交审批失败",
+  "example.item.cancelFailed": "取消审批失败",
+  "example.item.exportFailed": "导出事项失败",
+  "example.validation.titleRequired": "标题不能为空",
+  "example.validation.statusInvalid": "状态无效",
+  "example.validation.categoryInvalid": "类别无效",
+  "example.validation.amountInvalid": "金额不能小于 0",
+  "example.validation.itemLocked": "当前状态不允许编辑或删除",
+  "example.validation.submitterRequired": "缺少提交人信息",
+  "example.validation.approvalNotReady": "审批流程未就绪",
+  "example.validation.approvalNotPending": "仅可取消审批中的事项",
+  "example.validation.approvalInstanceMissing": "审批实例不存在",
+  "example.validation.invalidId": "无效的 ID",
+  "example.validation.invalidPayload": "请求参数无效",
+  "example.service.unavailable": "示例服务暂不可用",
+  "permission.example.item": "示例事项",
+  "permission.example.item.view": "查看事项",
+  "permission.example.item.manage": "管理事项"
+}

package/template/apps/server/internal/modules/example/infra/exporter/item_exporter.go

@@ -0,0 +1,119 @@
+package exporter
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	approvalmodels "github.com/robsuncn/keystone/domain/approval/models"
+	coreservice "github.com/robsuncn/keystone/domain/service"
+	coreexporter "github.com/robsuncn/keystone/infra/exporter"
+	"github.com/robsuncn/keystone/infra/jobs"
+
+	examplemodels "__APP_NAME__/apps/server/internal/modules/example/domain/models"
+	exampleservice "__APP_NAME__/apps/server/internal/modules/example/domain/service"
+)
+
+const ExportTypeExampleItems = "example_items"
+
+func RegisterItemExporter(reg *coreexporter.Service, items *exampleservice.ItemService) error {
+	if reg == nil || items == nil {
+		return nil
+	}
+	return reg.Register(ExportTypeExampleItems, coreexporter.Definition{
+		Format: coreexporter.FormatExcel,
+		Build: func(ctx context.Context, payload jobs.ExportJobPayload, tracker coreexporter.ProgressTracker) (coreexporter.Dataset, error) {
+			tenantID, ok := coreservice.TenantIDFromContext(ctx)
+			if !ok || tenantID == 0 {
+				return coreexporter.Dataset{}, fmt.Errorf("tenant id missing")
+			}
+			filter := buildFilter(payload.Options)
+			filter.Page = 1
+			filter.PageSize = 0
+
+			list, _, err := items.List(ctx, tenantID, filter)
+			if err != nil {
+				return coreexporter.Dataset{}, err
+			}
+
+			headers := []string{"Number", "Title", "Category", "Amount", "Status", "Approval Status", "Created At", "Updated At"}
+			rows := make([][]string, 0, len(list))
+			for idx, item := range list {
+				rows = append(rows, []string{
+					item.Number,
+					item.Title,
+					string(item.Category),
+					fmt.Sprintf("%.2f", item.Amount),
+					string(item.Status),
+					string(item.ApprovalStatus),
+					formatTime(item.CreatedAt),
+					formatTime(item.UpdatedAt),
+				})
+				if tracker != nil {
+					_ = tracker.Report(ctx, coreexporter.Progress{Total: len(list), Processed: idx + 1})
+				}
+			}
+
+			return coreexporter.Dataset{Headers: headers, Rows: rows}, nil
+		},
+	})
+}
+
+func buildFilter(options map[string]interface{}) exampleservice.ItemListFilter {
+	filter := exampleservice.ItemListFilter{}
+	if options == nil {
+		return filter
+	}
+	if raw, ok := options["keyword"].(string); ok {
+		filter.Keyword = raw
+	}
+	if raw, ok := options["status"].(string); ok && raw != "" {
+		status := examplemodels.ItemStatus(raw)
+		if status.IsValid() {
+			filter.Status = &status
+		}
+	}
+	if raw, ok := options["approval_status"].(string); ok && raw != "" {
+		status := approvalmodels.InstanceStatus(raw)
+		filter.ApprovalStatus = &status
+	}
+	if raw, ok := options["category"].(string); ok && raw != "" {
+		category := examplemodels.ItemCategory(raw)
+		if category.IsValid() {
+			filter.Category = &category
+		}
+	}
+	if raw, ok := options["start_date"].(string); ok && raw != "" {
+		if parsed, err := parseDate(raw, false); err == nil {
+			filter.StartDate = parsed
+		}
+	}
+	if raw, ok := options["end_date"].(string); ok && raw != "" {
+		if parsed, err := parseDate(raw, true); err == nil {
+			filter.EndDate = parsed
+		}
+	}
+	return filter
+}
+
+func parseDate(value string, endOfDay bool) (*time.Time, error) {
+	layouts := []string{time.RFC3339, "2006-01-02"}
+	for _, layout := range layouts {
+		parsed, err := time.Parse(layout, value)
+		if err != nil {
+			continue
+		}
+		if endOfDay && layout == "2006-01-02" {
+			parsed = parsed.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
+		}
+		return &parsed, nil
+	}
+	return nil, fmt.Errorf("invalid date")
+}
+
+func formatTime(value time.Time) string {
+	if value.IsZero() {
+		return ""
+	}
+	return value.UTC().Format(time.RFC3339)
+}

package/template/apps/server/internal/modules/example/infra/importer/item_importer.go

@@ -0,0 +1,77 @@
+package importer
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+
+	coreimporter "github.com/robsuncn/keystone/infra/importer"
+	coreservice "github.com/robsuncn/keystone/domain/service"
+
+	examplemodels "__APP_NAME__/apps/server/internal/modules/example/domain/models"
+	exampleservice "__APP_NAME__/apps/server/internal/modules/example/domain/service"
+)
+
+const ImportTypeExampleItems = "example_items"
+
+func RegisterItemImporter(reg *coreimporter.Service, items *exampleservice.ItemService) error {
+	if reg == nil || items == nil {
+		return nil
+	}
+	return reg.Register(ImportTypeExampleItems, coreimporter.Definition{
+		Format: coreimporter.FormatExcel,
+		Validator: coreimporter.RequiredColumnsValidator{
+			Columns: []string{"title"},
+		},
+		Handler: func(ctx context.Context, record coreimporter.Record) error {
+			tenantID, ok := coreservice.TenantIDFromContext(ctx)
+			if !ok || tenantID == 0 {
+				return fmt.Errorf("tenant id missing")
+			}
+			input := exampleservice.ItemInput{
+				Title:       record["title"],
+				Description: record["description"],
+				Category:    parseCategory(record["category"]),
+				Amount:      parseAmount(record["amount"]),
+				Status:      parseStatus(record["status"]),
+			}
+			_, err := items.Create(ctx, tenantID, input)
+			return err
+		},
+	})
+}
+
+func parseCategory(raw string) examplemodels.ItemCategory {
+	value := examplemodels.ItemCategory(strings.TrimSpace(raw))
+	if value == "" {
+		return examplemodels.CategoryGeneral
+	}
+	if value.IsValid() {
+		return value
+	}
+	return examplemodels.CategoryGeneral
+}
+
+func parseStatus(raw string) examplemodels.ItemStatus {
+	value := examplemodels.ItemStatus(strings.TrimSpace(raw))
+	if value == "" {
+		return examplemodels.StatusDraft
+	}
+	if value.IsValid() {
+		return value
+	}
+	return examplemodels.StatusDraft
+}
+
+func parseAmount(raw string) float64 {
+	trimmed := strings.TrimSpace(raw)
+	if trimmed == "" {
+		return 0
+	}
+	amount, err := strconv.ParseFloat(trimmed, 64)
+	if err != nil {
+		return 0
+	}
+	return amount
+}

package/template/apps/server/internal/modules/example/infra/repository/item_repository.go

@@ -1,49 +1,99 @@
-package repository
-
-import (
-	"context"
-	"errors"
-
-	"gorm.io/gorm"
-
-	"__APP_NAME__/apps/server/internal/modules/example/domain/models"
-	"__APP_NAME__/apps/server/internal/modules/example/domain/service"
-)
-
-type ItemRepository struct {
-	db *gorm.DB
-}
-
-func NewItemRepository(db *gorm.DB) *ItemRepository {
-	return &ItemRepository{db: db}
-}
-
-func (r *ItemRepository) List(ctx context.Context, tenantID uint) ([]models.ExampleItem, error) {
-	var items []models.ExampleItem
-	err := r.db.WithContext(ctx).
-		Where("tenant_id = ?", tenantID).
-		Order("created_at desc").
-		Find(&items).Error
-	return items, err
-}
-
-func (r *ItemRepository) FindByID(tenantID, id uint) (*models.ExampleItem, error) {
-	var item models.ExampleItem
-	err := r.db.Where("tenant_id = ? AND id = ?", tenantID, id).First(&item).Error
-	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, service.ErrItemNotFound
-	}
-	return &item, err
-}
-
-func (r *ItemRepository) Create(ctx context.Context, item *models.ExampleItem) error {
-	return r.db.WithContext(ctx).Create(item).Error
-}
-
-func (r *ItemRepository) Update(ctx context.Context, item *models.ExampleItem) error {
-	return r.db.WithContext(ctx).Save(item).Error
-}
-
-func (r *ItemRepository) Delete(ctx context.Context, item *models.ExampleItem) error {
-	return r.db.WithContext(ctx).Delete(item).Error
-}
+package repository
+
+import (
+	"context"
+	"errors"
+	"strings"
+
+	"gorm.io/gorm"
+
+	"github.com/robsuncn/keystone/domain/dbutil"
+
+	"__APP_NAME__/apps/server/internal/modules/example/domain/models"
+	"__APP_NAME__/apps/server/internal/modules/example/domain/service"
+)
+
+type ItemRepository struct {
+	db *gorm.DB
+}
+
+func NewItemRepository(db *gorm.DB) *ItemRepository {
+	return &ItemRepository{db: db}
+}
+
+func (r *ItemRepository) List(ctx context.Context, tenantID uint, filter service.ItemListFilter) ([]models.ExampleItem, int64, error) {
+	var items []models.ExampleItem
+	query := r.getDB(ctx).WithContext(ctx).
+		Model(&models.ExampleItem{}).
+		Where("tenant_id = ?", tenantID)
+
+	if filter.Keyword != "" {
+		keyword := strings.ToLower(strings.TrimSpace(filter.Keyword))
+		if keyword != "" {
+			like := "%" + keyword + "%"
+			query = query.Where("LOWER(title) LIKE ? OR LOWER(number) LIKE ?", like, like)
+		}
+	}
+	if filter.Status != nil && *filter.Status != "" {
+		query = query.Where("status = ?", *filter.Status)
+	}
+	if filter.ApprovalStatus != nil && *filter.ApprovalStatus != "" {
+		query = query.Where("approval_status = ?", *filter.ApprovalStatus)
+	}
+	if filter.Category != nil && *filter.Category != "" {
+		query = query.Where("category = ?", *filter.Category)
+	}
+	if filter.StartDate != nil {
+		query = query.Where("created_at >= ?", *filter.StartDate)
+	}
+	if filter.EndDate != nil {
+		query = query.Where("created_at <= ?", *filter.EndDate)
+	}
+
+	var total int64
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	if filter.PageSize > 0 {
+		page := filter.Page
+		if page < 1 {
+			page = 1
+		}
+		offset := (page - 1) * filter.PageSize
+		query = query.Limit(filter.PageSize).Offset(offset)
+	}
+
+	err := query.Order("created_at desc").Find(&items).Error
+	return items, total, err
+}
+
+func (r *ItemRepository) FindByID(tenantID, id uint) (*models.ExampleItem, error) {
+	var item models.ExampleItem
+	err := r.getDB(nil).Where("tenant_id = ? AND id = ?", tenantID, id).First(&item).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, service.ErrItemNotFound
+	}
+	return &item, err
+}
+
+func (r *ItemRepository) Create(ctx context.Context, item *models.ExampleItem) error {
+	return r.getDB(ctx).WithContext(ctx).Create(item).Error
+}
+
+func (r *ItemRepository) Update(ctx context.Context, item *models.ExampleItem) error {
+	return r.getDB(ctx).WithContext(ctx).Save(item).Error
+}
+
+func (r *ItemRepository) Delete(ctx context.Context, item *models.ExampleItem) error {
+	return r.getDB(ctx).WithContext(ctx).Delete(item).Error
+}
+
+func (r *ItemRepository) getDB(ctx context.Context) *gorm.DB {
+	if ctx != nil {
+		if tx := dbutil.TxFromContext(ctx); tx != nil {
+			return tx
+		}
+	}
+	return r.db
+}