Compare commits
5 Commits
4a86f7b7ba
...
v1.0.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0beed021c | ||
|
|
08b95c293c | ||
|
|
c418d6cfc3 | ||
|
|
548a256d04 | ||
|
|
77c00de97a |
25
README.md
25
README.md
@@ -85,36 +85,13 @@ auth:
|
|||||||
go run ./cmd/qfs -migrate
|
go run ./cmd/qfs -migrate
|
||||||
```
|
```
|
||||||
|
|
||||||
### Мигратор OPS -> проекты (preview/apply)
|
|
||||||
|
|
||||||
Переносит квоты, чьи названия начинаются с `OPS-xxxx` (где `x` — цифра), в проект `OPS-xxxx`.
|
|
||||||
Если проекта нет, он будет создан; если архивный — реактивирован.
|
|
||||||
|
|
||||||
Сначала всегда смотрите preview:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
go run ./cmd/migrate_ops_projects -config config.yaml
|
|
||||||
```
|
|
||||||
|
|
||||||
Применение изменений:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
go run ./cmd/migrate_ops_projects -config config.yaml -apply
|
|
||||||
```
|
|
||||||
|
|
||||||
Без интерактивного подтверждения:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
go run ./cmd/migrate_ops_projects -config config.yaml -apply -yes
|
|
||||||
```
|
|
||||||
|
|
||||||
### Минимальные права БД для пользователя квотаций
|
### Минимальные права БД для пользователя квотаций
|
||||||
|
|
||||||
Если нужен пользователь, который может работать с конфигурациями, но не может создавать/удалять прайслисты:
|
Если нужен пользователь, который может работать с конфигурациями, но не может создавать/удалять прайслисты:
|
||||||
|
|
||||||
```sql
|
```sql
|
||||||
-- 1) Создать (или оставить существующего) пользователя
|
-- 1) Создать (или оставить существующего) пользователя
|
||||||
CREATE USER IF NOT EXISTS 'quote_user'@'%' IDENTIFIED BY 'StrongPassword!';
|
CREATE USER IF NOT EXISTS 'quote_user'@'%' IDENTIFIED BY 'DB_PASSWORD_PLACEHOLDER';
|
||||||
|
|
||||||
-- 2) Сбросить лишние права (без пересоздания пользователя)
|
-- 2) Сбросить лишние права (без пересоздания пользователя)
|
||||||
REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'quote_user'@'%';
|
REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'quote_user'@'%';
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ func main() {
|
|||||||
localCount := local.CountConfigurations()
|
localCount := local.CountConfigurations()
|
||||||
log.Printf("Found %d configurations in local SQLite", localCount)
|
log.Printf("Found %d configurations in local SQLite", localCount)
|
||||||
|
|
||||||
if *dryRun {
|
if *dryRun {
|
||||||
log.Println("\n[DRY RUN] Would migrate the following configurations:")
|
log.Println("\n[DRY RUN] Would migrate the following configurations:")
|
||||||
for _, c := range configs {
|
for _, c := range configs {
|
||||||
userName := c.OwnerUsername
|
userName := c.OwnerUsername
|
||||||
@@ -117,7 +117,6 @@ func main() {
|
|||||||
localConfig := &localdb.LocalConfiguration{
|
localConfig := &localdb.LocalConfiguration{
|
||||||
UUID: c.UUID,
|
UUID: c.UUID,
|
||||||
ServerID: &c.ID,
|
ServerID: &c.ID,
|
||||||
ProjectUUID: c.ProjectUUID,
|
|
||||||
Name: c.Name,
|
Name: c.Name,
|
||||||
Items: localItems,
|
Items: localItems,
|
||||||
TotalPrice: c.TotalPrice,
|
TotalPrice: c.TotalPrice,
|
||||||
|
|||||||
@@ -1,283 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"flag"
|
|
||||||
"fmt"
|
|
||||||
"log"
|
|
||||||
"os"
|
|
||||||
"regexp"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/config"
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"gorm.io/driver/mysql"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
"gorm.io/gorm/logger"
|
|
||||||
)
|
|
||||||
|
|
||||||
type configRow struct {
|
|
||||||
ID uint
|
|
||||||
UUID string
|
|
||||||
OwnerUsername string
|
|
||||||
Name string
|
|
||||||
ProjectUUID *string
|
|
||||||
}
|
|
||||||
|
|
||||||
type migrationAction struct {
|
|
||||||
ConfigID uint
|
|
||||||
ConfigUUID string
|
|
||||||
ConfigName string
|
|
||||||
OwnerUsername string
|
|
||||||
TargetProjectName string
|
|
||||||
CurrentProject string
|
|
||||||
NeedCreateProject bool
|
|
||||||
NeedReactivate bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
configPath := flag.String("config", "config.yaml", "path to config file")
|
|
||||||
apply := flag.Bool("apply", false, "apply migration (default is preview only)")
|
|
||||||
yes := flag.Bool("yes", false, "skip interactive confirmation (works only with -apply)")
|
|
||||||
flag.Parse()
|
|
||||||
|
|
||||||
cfg, err := config.Load(*configPath)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("failed to load config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
db, err := gorm.Open(mysql.Open(cfg.Database.DSN()), &gorm.Config{
|
|
||||||
Logger: logger.Default.LogMode(logger.Silent),
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("failed to connect database: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ensureProjectsTable(db); err != nil {
|
|
||||||
log.Fatalf("precheck failed: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
actions, existingProjects, err := buildPlan(db, cfg.Database.User)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("failed to build migration plan: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
printPlan(actions)
|
|
||||||
if len(actions) == 0 {
|
|
||||||
fmt.Println("Nothing to migrate.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if !*apply {
|
|
||||||
fmt.Println("\nPreview complete. Re-run with -apply to execute.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if !*yes {
|
|
||||||
ok, confirmErr := askForConfirmation()
|
|
||||||
if confirmErr != nil {
|
|
||||||
log.Fatalf("confirmation failed: %v", confirmErr)
|
|
||||||
}
|
|
||||||
if !ok {
|
|
||||||
fmt.Println("Aborted.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := executePlan(db, actions, existingProjects); err != nil {
|
|
||||||
log.Fatalf("migration failed: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println("Migration completed successfully.")
|
|
||||||
}
|
|
||||||
|
|
||||||
func ensureProjectsTable(db *gorm.DB) error {
|
|
||||||
var count int64
|
|
||||||
if err := db.Raw("SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = 'qt_projects'").Scan(&count).Error; err != nil {
|
|
||||||
return fmt.Errorf("checking qt_projects table: %w", err)
|
|
||||||
}
|
|
||||||
if count == 0 {
|
|
||||||
return fmt.Errorf("table qt_projects does not exist; run migration 009_add_projects.sql first")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildPlan(db *gorm.DB, fallbackOwner string) ([]migrationAction, map[string]*models.Project, error) {
|
|
||||||
var configs []configRow
|
|
||||||
if err := db.Table("qt_configurations").
|
|
||||||
Select("id, uuid, owner_username, name, project_uuid").
|
|
||||||
Find(&configs).Error; err != nil {
|
|
||||||
return nil, nil, fmt.Errorf("load configurations: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
codeRegex := regexp.MustCompile(`^(OPS-[0-9]{4})`)
|
|
||||||
owners := make(map[string]struct{})
|
|
||||||
projectNames := make(map[string]struct{})
|
|
||||||
type candidate struct {
|
|
||||||
config configRow
|
|
||||||
code string
|
|
||||||
owner string
|
|
||||||
}
|
|
||||||
candidates := make([]candidate, 0)
|
|
||||||
|
|
||||||
for _, cfg := range configs {
|
|
||||||
match := codeRegex.FindStringSubmatch(strings.TrimSpace(cfg.Name))
|
|
||||||
if len(match) < 2 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
owner := strings.TrimSpace(cfg.OwnerUsername)
|
|
||||||
if owner == "" {
|
|
||||||
owner = strings.TrimSpace(fallbackOwner)
|
|
||||||
}
|
|
||||||
if owner == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
code := match[1]
|
|
||||||
owners[owner] = struct{}{}
|
|
||||||
projectNames[code] = struct{}{}
|
|
||||||
candidates = append(candidates, candidate{config: cfg, code: code, owner: owner})
|
|
||||||
}
|
|
||||||
|
|
||||||
ownerList := setKeys(owners)
|
|
||||||
nameList := setKeys(projectNames)
|
|
||||||
existingProjects := make(map[string]*models.Project)
|
|
||||||
if len(ownerList) > 0 && len(nameList) > 0 {
|
|
||||||
var projects []models.Project
|
|
||||||
if err := db.Where("owner_username IN ? AND name IN ?", ownerList, nameList).Find(&projects).Error; err != nil {
|
|
||||||
return nil, nil, fmt.Errorf("load existing projects: %w", err)
|
|
||||||
}
|
|
||||||
for i := range projects {
|
|
||||||
p := projects[i]
|
|
||||||
existingProjects[projectKey(p.OwnerUsername, p.Name)] = &p
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
actions := make([]migrationAction, 0)
|
|
||||||
for _, c := range candidates {
|
|
||||||
key := projectKey(c.owner, c.code)
|
|
||||||
existing := existingProjects[key]
|
|
||||||
|
|
||||||
currentProject := ""
|
|
||||||
if c.config.ProjectUUID != nil {
|
|
||||||
currentProject = *c.config.ProjectUUID
|
|
||||||
}
|
|
||||||
|
|
||||||
if existing != nil && currentProject == existing.UUID {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
action := migrationAction{
|
|
||||||
ConfigID: c.config.ID,
|
|
||||||
ConfigUUID: c.config.UUID,
|
|
||||||
ConfigName: c.config.Name,
|
|
||||||
OwnerUsername: c.owner,
|
|
||||||
TargetProjectName: c.code,
|
|
||||||
CurrentProject: currentProject,
|
|
||||||
}
|
|
||||||
if existing == nil {
|
|
||||||
action.NeedCreateProject = true
|
|
||||||
} else if !existing.IsActive {
|
|
||||||
action.NeedReactivate = true
|
|
||||||
}
|
|
||||||
actions = append(actions, action)
|
|
||||||
}
|
|
||||||
|
|
||||||
return actions, existingProjects, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func printPlan(actions []migrationAction) {
|
|
||||||
createCount := 0
|
|
||||||
reactivateCount := 0
|
|
||||||
for _, a := range actions {
|
|
||||||
if a.NeedCreateProject {
|
|
||||||
createCount++
|
|
||||||
}
|
|
||||||
if a.NeedReactivate {
|
|
||||||
reactivateCount++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Printf("Planned actions: %d\n", len(actions))
|
|
||||||
fmt.Printf("Projects to create: %d\n", createCount)
|
|
||||||
fmt.Printf("Projects to reactivate: %d\n", reactivateCount)
|
|
||||||
fmt.Println("\nDetails:")
|
|
||||||
|
|
||||||
for _, a := range actions {
|
|
||||||
extra := ""
|
|
||||||
if a.NeedCreateProject {
|
|
||||||
extra = " [create project]"
|
|
||||||
} else if a.NeedReactivate {
|
|
||||||
extra = " [reactivate project]"
|
|
||||||
}
|
|
||||||
current := a.CurrentProject
|
|
||||||
if current == "" {
|
|
||||||
current = "NULL"
|
|
||||||
}
|
|
||||||
fmt.Printf("- %s | owner=%s | \"%s\" | project: %s -> %s%s\n",
|
|
||||||
a.ConfigUUID, a.OwnerUsername, a.ConfigName, current, a.TargetProjectName, extra)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func askForConfirmation() (bool, error) {
|
|
||||||
fmt.Print("\nApply these changes? type 'yes' to continue: ")
|
|
||||||
reader := bufio.NewReader(os.Stdin)
|
|
||||||
line, err := reader.ReadString('\n')
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
return strings.EqualFold(strings.TrimSpace(line), "yes"), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func executePlan(db *gorm.DB, actions []migrationAction, existingProjects map[string]*models.Project) error {
|
|
||||||
return db.Transaction(func(tx *gorm.DB) error {
|
|
||||||
projectCache := make(map[string]*models.Project, len(existingProjects))
|
|
||||||
for k, v := range existingProjects {
|
|
||||||
cp := *v
|
|
||||||
projectCache[k] = &cp
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, action := range actions {
|
|
||||||
key := projectKey(action.OwnerUsername, action.TargetProjectName)
|
|
||||||
project := projectCache[key]
|
|
||||||
if project == nil {
|
|
||||||
project = &models.Project{
|
|
||||||
UUID: uuid.NewString(),
|
|
||||||
OwnerUsername: action.OwnerUsername,
|
|
||||||
Name: action.TargetProjectName,
|
|
||||||
IsActive: true,
|
|
||||||
IsSystem: false,
|
|
||||||
}
|
|
||||||
if err := tx.Create(project).Error; err != nil {
|
|
||||||
return fmt.Errorf("create project %s for owner %s: %w", action.TargetProjectName, action.OwnerUsername, err)
|
|
||||||
}
|
|
||||||
projectCache[key] = project
|
|
||||||
} else if !project.IsActive {
|
|
||||||
if err := tx.Model(&models.Project{}).Where("uuid = ?", project.UUID).Update("is_active", true).Error; err != nil {
|
|
||||||
return fmt.Errorf("reactivate project %s (%s): %w", project.Name, project.UUID, err)
|
|
||||||
}
|
|
||||||
project.IsActive = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Table("qt_configurations").Where("id = ?", action.ConfigID).Update("project_uuid", project.UUID).Error; err != nil {
|
|
||||||
return fmt.Errorf("move configuration %s to project %s: %w", action.ConfigUUID, project.UUID, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func setKeys(set map[string]struct{}) []string {
|
|
||||||
keys := make([]string, 0, len(set))
|
|
||||||
for k := range set {
|
|
||||||
keys = append(keys, k)
|
|
||||||
}
|
|
||||||
sort.Strings(keys)
|
|
||||||
return keys
|
|
||||||
}
|
|
||||||
|
|
||||||
func projectKey(owner, name string) string {
|
|
||||||
return owner + "||" + name
|
|
||||||
}
|
|
||||||
357
cmd/qfs/main.go
357
cmd/qfs/main.go
@@ -14,13 +14,12 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
qfassets "git.mchus.pro/mchus/quoteforge"
|
qfassets "git.mchus.pro/mchus/quoteforge"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/appstate"
|
"git.mchus.pro/mchus/quoteforge/internal/appstate"
|
||||||
|
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/config"
|
"git.mchus.pro/mchus/quoteforge/internal/config"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/db"
|
"git.mchus.pro/mchus/quoteforge/internal/db"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/handlers"
|
"git.mchus.pro/mchus/quoteforge/internal/handlers"
|
||||||
@@ -165,35 +164,6 @@ func main() {
|
|||||||
slog.Info("migrations completed")
|
slog.Info("migrations completed")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Always apply SQL migrations on startup when database is available.
|
|
||||||
// This keeps schema in sync for long-running installations without manual steps.
|
|
||||||
// If current DB user does not have enough privileges, continue startup in normal mode.
|
|
||||||
if mariaDB != nil {
|
|
||||||
sqlMigrationsPath := filepath.Join("migrations")
|
|
||||||
needsMigrations, err := models.NeedsSQLMigrations(mariaDB, sqlMigrationsPath)
|
|
||||||
if err != nil {
|
|
||||||
if models.IsMigrationPermissionError(err) {
|
|
||||||
slog.Info("startup SQL migrations skipped: insufficient database privileges", "path", sqlMigrationsPath, "error", err)
|
|
||||||
} else {
|
|
||||||
slog.Error("startup SQL migrations check failed", "path", sqlMigrationsPath, "error", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
} else if needsMigrations {
|
|
||||||
if err := models.RunSQLMigrations(mariaDB, sqlMigrationsPath); err != nil {
|
|
||||||
if models.IsMigrationPermissionError(err) {
|
|
||||||
slog.Info("startup SQL migrations skipped: insufficient database privileges", "path", sqlMigrationsPath, "error", err)
|
|
||||||
} else {
|
|
||||||
slog.Error("startup SQL migrations failed", "path", sqlMigrationsPath, "error", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
slog.Info("startup SQL migrations applied", "path", sqlMigrationsPath)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
slog.Debug("startup SQL migrations not needed", "path", sqlMigrationsPath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
gin.SetMode(cfg.Server.Mode)
|
gin.SetMode(cfg.Server.Mode)
|
||||||
restartSig := make(chan struct{}, 1)
|
restartSig := make(chan struct{}, 1)
|
||||||
|
|
||||||
@@ -468,7 +438,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
var alertService *alerts.Service
|
var alertService *alerts.Service
|
||||||
var pricelistService *pricelist.Service
|
var pricelistService *pricelist.Service
|
||||||
var syncService *sync.Service
|
var syncService *sync.Service
|
||||||
var projectService *services.ProjectService
|
|
||||||
|
|
||||||
// Sync service always uses ConnectionManager (works offline and online)
|
// Sync service always uses ConnectionManager (works offline and online)
|
||||||
syncService = sync.NewService(connMgr, local)
|
syncService = sync.NewService(connMgr, local)
|
||||||
@@ -496,81 +465,8 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Local-first configuration service (replaces old ConfigurationService)
|
// Local-first configuration service (replaces old ConfigurationService)
|
||||||
projectService = services.NewProjectService(local)
|
|
||||||
configService := services.NewLocalConfigurationService(local, syncService, quoteService, isOnline)
|
configService := services.NewLocalConfigurationService(local, syncService, quoteService, isOnline)
|
||||||
|
|
||||||
// Data hygiene: remove empty nameless projects and ensure every configuration is attached to a project.
|
|
||||||
if removed, err := local.ConsolidateSystemProjects(); err == nil && removed > 0 {
|
|
||||||
slog.Info("consolidated duplicate local system projects", "removed", removed)
|
|
||||||
}
|
|
||||||
if removed, err := local.PurgeEmptyNamelessProjects(); err == nil && removed > 0 {
|
|
||||||
slog.Info("purged empty nameless local projects", "removed", removed)
|
|
||||||
}
|
|
||||||
if err := local.BackfillConfigurationProjects(dbUsername); err != nil {
|
|
||||||
slog.Warn("failed to backfill local configuration projects", "error", err)
|
|
||||||
}
|
|
||||||
if mariaDB != nil {
|
|
||||||
serverProjectRepo := repository.NewProjectRepository(mariaDB)
|
|
||||||
if removed, err := serverProjectRepo.PurgeEmptyNamelessProjects(); err == nil && removed > 0 {
|
|
||||||
slog.Info("purged empty nameless server projects", "removed", removed)
|
|
||||||
}
|
|
||||||
if err := serverProjectRepo.EnsureSystemProjectsAndBackfillConfigurations(); err != nil {
|
|
||||||
slog.Warn("failed to backfill server configuration projects", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
syncProjectsFromServer := func() {
|
|
||||||
if !connMgr.IsOnline() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
serverDB, err := connMgr.GetDB()
|
|
||||||
if err != nil || serverDB == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
projectRepo := repository.NewProjectRepository(serverDB)
|
|
||||||
serverProjects, _, err := projectRepo.List(0, 10000, true)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
for i := range serverProjects {
|
|
||||||
sp := serverProjects[i]
|
|
||||||
localProject, getErr := local.GetProjectByUUID(sp.UUID)
|
|
||||||
if getErr == nil && localProject != nil {
|
|
||||||
// Keep unsynced local changes intact.
|
|
||||||
if localProject.SyncStatus == "pending" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
localProject.OwnerUsername = sp.OwnerUsername
|
|
||||||
localProject.Name = sp.Name
|
|
||||||
localProject.IsActive = sp.IsActive
|
|
||||||
localProject.IsSystem = sp.IsSystem
|
|
||||||
localProject.CreatedAt = sp.CreatedAt
|
|
||||||
localProject.UpdatedAt = sp.UpdatedAt
|
|
||||||
serverID := sp.ID
|
|
||||||
localProject.ServerID = &serverID
|
|
||||||
localProject.SyncStatus = "synced"
|
|
||||||
localProject.SyncedAt = &now
|
|
||||||
_ = local.SaveProject(localProject)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
lp := localdb.ProjectToLocal(&sp)
|
|
||||||
lp.SyncStatus = "synced"
|
|
||||||
lp.SyncedAt = &now
|
|
||||||
_ = local.SaveProject(lp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
syncConfigurationsFromServer := func() {
|
|
||||||
if !connMgr.IsOnline() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
_, _ = configService.ImportFromServer()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use filepath.Join for cross-platform path compatibility
|
// Use filepath.Join for cross-platform path compatibility
|
||||||
templatesPath := filepath.Join("web", "templates")
|
templatesPath := filepath.Join("web", "templates")
|
||||||
|
|
||||||
@@ -685,8 +581,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
router.GET("/", webHandler.Index)
|
router.GET("/", webHandler.Index)
|
||||||
router.GET("/configs", webHandler.Configs)
|
router.GET("/configs", webHandler.Configs)
|
||||||
router.GET("/configurator", webHandler.Configurator)
|
router.GET("/configurator", webHandler.Configurator)
|
||||||
router.GET("/projects", webHandler.Projects)
|
|
||||||
router.GET("/projects/:uuid", webHandler.ProjectDetail)
|
|
||||||
router.GET("/pricelists", func(c *gin.Context) {
|
router.GET("/pricelists", func(c *gin.Context) {
|
||||||
// Redirect to admin/pricing with pricelists tab
|
// Redirect to admin/pricing with pricelists tab
|
||||||
c.Redirect(http.StatusFound, "/admin/pricing?tab=pricelists")
|
c.Redirect(http.StatusFound, "/admin/pricing?tab=pricelists")
|
||||||
@@ -747,18 +641,15 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
configs := api.Group("/configs")
|
configs := api.Group("/configs")
|
||||||
{
|
{
|
||||||
configs.GET("", func(c *gin.Context) {
|
configs.GET("", func(c *gin.Context) {
|
||||||
syncConfigurationsFromServer()
|
|
||||||
|
|
||||||
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
|
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
|
||||||
perPage, _ := strconv.Atoi(c.DefaultQuery("per_page", "20"))
|
perPage, _ := strconv.Atoi(c.DefaultQuery("per_page", "20"))
|
||||||
status := c.DefaultQuery("status", "active")
|
status := c.DefaultQuery("status", "active")
|
||||||
search := c.Query("search")
|
|
||||||
if status != "active" && status != "archived" && status != "all" {
|
if status != "active" && status != "archived" && status != "all" {
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid status"})
|
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid status"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
cfgs, total, err := configService.ListAllWithStatus(page, perPage, status, search)
|
cfgs, total, err := configService.ListAllWithStatus(page, perPage, status)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
@@ -770,7 +661,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
"page": page,
|
"page": page,
|
||||||
"per_page": perPage,
|
"per_page": perPage,
|
||||||
"status": status,
|
"status": status,
|
||||||
"search": search,
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -900,32 +790,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
c.JSON(http.StatusOK, config)
|
c.JSON(http.StatusOK, config)
|
||||||
})
|
})
|
||||||
|
|
||||||
configs.PATCH("/:uuid/project", func(c *gin.Context) {
|
|
||||||
uuid := c.Param("uuid")
|
|
||||||
var req struct {
|
|
||||||
ProjectUUID string `json:"project_uuid"`
|
|
||||||
}
|
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
updated, err := configService.SetProjectNoAuth(uuid, req.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, services.ErrConfigNotFound):
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
|
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
|
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
|
|
||||||
default:
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusOK, updated)
|
|
||||||
})
|
|
||||||
|
|
||||||
configs.GET("/:uuid/versions", func(c *gin.Context) {
|
configs.GET("/:uuid/versions", func(c *gin.Context) {
|
||||||
uuid := c.Param("uuid")
|
uuid := c.Param("uuid")
|
||||||
|
|
||||||
@@ -1031,223 +895,6 @@ func setupRouter(cfg *config.Config, local *localdb.LocalDB, connMgr *db.Connect
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
projects := api.Group("/projects")
|
|
||||||
{
|
|
||||||
projects.GET("", func(c *gin.Context) {
|
|
||||||
syncProjectsFromServer()
|
|
||||||
syncConfigurationsFromServer()
|
|
||||||
|
|
||||||
status := c.DefaultQuery("status", "active")
|
|
||||||
search := strings.ToLower(strings.TrimSpace(c.Query("search")))
|
|
||||||
if status != "active" && status != "archived" && status != "all" {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid status"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
allProjects, err := projectService.ListByUser(dbUsername, true)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
filtered := make([]models.Project, 0, len(allProjects))
|
|
||||||
for i := range allProjects {
|
|
||||||
p := allProjects[i]
|
|
||||||
if status == "active" && !p.IsActive {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if status == "archived" && p.IsActive {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if search != "" && !strings.Contains(strings.ToLower(p.Name), search) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
filtered = append(filtered, p)
|
|
||||||
}
|
|
||||||
|
|
||||||
projectRows := make([]gin.H, 0, len(filtered))
|
|
||||||
for i := range filtered {
|
|
||||||
p := filtered[i]
|
|
||||||
configs, err := projectService.ListConfigurations(p.UUID, dbUsername, "active")
|
|
||||||
if err != nil {
|
|
||||||
configs = &services.ProjectConfigurationsResult{
|
|
||||||
ProjectUUID: p.UUID,
|
|
||||||
Configs: []models.Configuration{},
|
|
||||||
Total: 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
projectRows = append(projectRows, gin.H{
|
|
||||||
"id": p.ID,
|
|
||||||
"uuid": p.UUID,
|
|
||||||
"owner_username": p.OwnerUsername,
|
|
||||||
"name": p.Name,
|
|
||||||
"is_active": p.IsActive,
|
|
||||||
"is_system": p.IsSystem,
|
|
||||||
"created_at": p.CreatedAt,
|
|
||||||
"updated_at": p.UpdatedAt,
|
|
||||||
"config_count": len(configs.Configs),
|
|
||||||
"total": configs.Total,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
|
||||||
"projects": projectRows,
|
|
||||||
"status": status,
|
|
||||||
"search": search,
|
|
||||||
"total": len(projectRows),
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.POST("", func(c *gin.Context) {
|
|
||||||
var req services.CreateProjectRequest
|
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(req.Name) == "" {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "project name is required"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
project, err := projectService.Create(dbUsername, &req)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusCreated, project)
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.GET("/:uuid", func(c *gin.Context) {
|
|
||||||
project, err := projectService.GetByUUID(c.Param("uuid"), dbUsername)
|
|
||||||
if err != nil {
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
|
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
|
|
||||||
default:
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusOK, project)
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.PUT("/:uuid", func(c *gin.Context) {
|
|
||||||
var req services.UpdateProjectRequest
|
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(req.Name) == "" {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "project name is required"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
project, err := projectService.Update(c.Param("uuid"), dbUsername, &req)
|
|
||||||
if err != nil {
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
|
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
|
|
||||||
default:
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusOK, project)
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.POST("/:uuid/archive", func(c *gin.Context) {
|
|
||||||
if err := projectService.Archive(c.Param("uuid"), dbUsername); err != nil {
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
|
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
|
|
||||||
default:
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "project archived"})
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.POST("/:uuid/reactivate", func(c *gin.Context) {
|
|
||||||
if err := projectService.Reactivate(c.Param("uuid"), dbUsername); err != nil {
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
|
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
|
|
||||||
default:
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusOK, gin.H{"message": "project reactivated"})
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.GET("/:uuid/configs", func(c *gin.Context) {
|
|
||||||
syncConfigurationsFromServer()
|
|
||||||
|
|
||||||
status := c.DefaultQuery("status", "active")
|
|
||||||
if status != "active" && status != "archived" && status != "all" {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid status"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := projectService.ListConfigurations(c.Param("uuid"), dbUsername, status)
|
|
||||||
if err != nil {
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, services.ErrProjectNotFound):
|
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
|
|
||||||
case errors.Is(err, services.ErrProjectForbidden):
|
|
||||||
c.JSON(http.StatusForbidden, gin.H{"error": err.Error()})
|
|
||||||
default:
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.Header("X-Config-Status", status)
|
|
||||||
c.JSON(http.StatusOK, result)
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.POST("/:uuid/configs", func(c *gin.Context) {
|
|
||||||
var req services.CreateConfigRequest
|
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
projectUUID := c.Param("uuid")
|
|
||||||
req.ProjectUUID = &projectUUID
|
|
||||||
|
|
||||||
config, err := configService.Create(dbUsername, &req)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusCreated, config)
|
|
||||||
})
|
|
||||||
|
|
||||||
projects.POST("/:uuid/configs/:config_uuid/clone", func(c *gin.Context) {
|
|
||||||
var req struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
}
|
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
projectUUID := c.Param("uuid")
|
|
||||||
config, err := configService.CloneNoAuthToProject(c.Param("config_uuid"), req.Name, dbUsername, &projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
c.JSON(http.StatusCreated, config)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pricing admin (public - RBAC disabled)
|
// Pricing admin (public - RBAC disabled)
|
||||||
pricingAdmin := api.Group("/admin/pricing")
|
pricingAdmin := api.Group("/admin/pricing")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -136,160 +136,6 @@ func TestConfigurationVersioningAPI(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestProjectArchiveHidesConfigsAndCloneIntoProject(t *testing.T) {
|
|
||||||
moveToRepoRoot(t)
|
|
||||||
|
|
||||||
local, connMgr, configService := newAPITestStack(t)
|
|
||||||
_ = configService
|
|
||||||
|
|
||||||
cfg := &config.Config{}
|
|
||||||
setConfigDefaults(cfg)
|
|
||||||
router, _, err := setupRouter(cfg, local, connMgr, nil, "tester", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("setup router: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
createProjectReq := httptest.NewRequest(http.MethodPost, "/api/projects", bytes.NewReader([]byte(`{"name":"P1"}`)))
|
|
||||||
createProjectReq.Header.Set("Content-Type", "application/json")
|
|
||||||
createProjectRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(createProjectRec, createProjectReq)
|
|
||||||
if createProjectRec.Code != http.StatusCreated {
|
|
||||||
t.Fatalf("create project status=%d body=%s", createProjectRec.Code, createProjectRec.Body.String())
|
|
||||||
}
|
|
||||||
var project models.Project
|
|
||||||
if err := json.Unmarshal(createProjectRec.Body.Bytes(), &project); err != nil {
|
|
||||||
t.Fatalf("unmarshal project: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
createCfgBody := []byte(`{"name":"Cfg A","items":[{"lot_name":"CPU","quantity":1,"unit_price":100}],"server_count":1}`)
|
|
||||||
createCfgReq := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/configs", bytes.NewReader(createCfgBody))
|
|
||||||
createCfgReq.Header.Set("Content-Type", "application/json")
|
|
||||||
createCfgRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(createCfgRec, createCfgReq)
|
|
||||||
if createCfgRec.Code != http.StatusCreated {
|
|
||||||
t.Fatalf("create project config status=%d body=%s", createCfgRec.Code, createCfgRec.Body.String())
|
|
||||||
}
|
|
||||||
var createdCfg models.Configuration
|
|
||||||
if err := json.Unmarshal(createCfgRec.Body.Bytes(), &createdCfg); err != nil {
|
|
||||||
t.Fatalf("unmarshal project config: %v", err)
|
|
||||||
}
|
|
||||||
if createdCfg.ProjectUUID == nil || *createdCfg.ProjectUUID != project.UUID {
|
|
||||||
t.Fatalf("expected config project_uuid=%s got=%v", project.UUID, createdCfg.ProjectUUID)
|
|
||||||
}
|
|
||||||
|
|
||||||
cloneReq := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/configs/"+createdCfg.UUID+"/clone", bytes.NewReader([]byte(`{"name":"Cfg A Clone"}`)))
|
|
||||||
cloneReq.Header.Set("Content-Type", "application/json")
|
|
||||||
cloneRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(cloneRec, cloneReq)
|
|
||||||
if cloneRec.Code != http.StatusCreated {
|
|
||||||
t.Fatalf("clone in project status=%d body=%s", cloneRec.Code, cloneRec.Body.String())
|
|
||||||
}
|
|
||||||
var cloneCfg models.Configuration
|
|
||||||
if err := json.Unmarshal(cloneRec.Body.Bytes(), &cloneCfg); err != nil {
|
|
||||||
t.Fatalf("unmarshal clone config: %v", err)
|
|
||||||
}
|
|
||||||
if cloneCfg.ProjectUUID == nil || *cloneCfg.ProjectUUID != project.UUID {
|
|
||||||
t.Fatalf("expected clone project_uuid=%s got=%v", project.UUID, cloneCfg.ProjectUUID)
|
|
||||||
}
|
|
||||||
|
|
||||||
projectConfigsReq := httptest.NewRequest(http.MethodGet, "/api/projects/"+project.UUID+"/configs", nil)
|
|
||||||
projectConfigsRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(projectConfigsRec, projectConfigsReq)
|
|
||||||
if projectConfigsRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("project configs status=%d body=%s", projectConfigsRec.Code, projectConfigsRec.Body.String())
|
|
||||||
}
|
|
||||||
var projectConfigsResp struct {
|
|
||||||
Configurations []models.Configuration `json:"configurations"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(projectConfigsRec.Body.Bytes(), &projectConfigsResp); err != nil {
|
|
||||||
t.Fatalf("unmarshal project configs response: %v", err)
|
|
||||||
}
|
|
||||||
if len(projectConfigsResp.Configurations) != 2 {
|
|
||||||
t.Fatalf("expected 2 project configs after clone, got %d", len(projectConfigsResp.Configurations))
|
|
||||||
}
|
|
||||||
|
|
||||||
archiveReq := httptest.NewRequest(http.MethodPost, "/api/projects/"+project.UUID+"/archive", nil)
|
|
||||||
archiveRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(archiveRec, archiveReq)
|
|
||||||
if archiveRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("archive project status=%d body=%s", archiveRec.Code, archiveRec.Body.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
activeReq := httptest.NewRequest(http.MethodGet, "/api/configs?status=active&page=1&per_page=20", nil)
|
|
||||||
activeRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(activeRec, activeReq)
|
|
||||||
if activeRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("active configs status=%d body=%s", activeRec.Code, activeRec.Body.String())
|
|
||||||
}
|
|
||||||
var activeResp struct {
|
|
||||||
Configurations []models.Configuration `json:"configurations"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(activeRec.Body.Bytes(), &activeResp); err != nil {
|
|
||||||
t.Fatalf("unmarshal active configs response: %v", err)
|
|
||||||
}
|
|
||||||
if len(activeResp.Configurations) != 0 {
|
|
||||||
t.Fatalf("expected no active configs after project archive, got %d", len(activeResp.Configurations))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigMoveToProjectEndpoint(t *testing.T) {
|
|
||||||
moveToRepoRoot(t)
|
|
||||||
|
|
||||||
local, connMgr, _ := newAPITestStack(t)
|
|
||||||
cfg := &config.Config{}
|
|
||||||
setConfigDefaults(cfg)
|
|
||||||
router, _, err := setupRouter(cfg, local, connMgr, nil, "tester", nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("setup router: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
createProjectReq := httptest.NewRequest(http.MethodPost, "/api/projects", bytes.NewReader([]byte(`{"name":"Move Project"}`)))
|
|
||||||
createProjectReq.Header.Set("Content-Type", "application/json")
|
|
||||||
createProjectRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(createProjectRec, createProjectReq)
|
|
||||||
if createProjectRec.Code != http.StatusCreated {
|
|
||||||
t.Fatalf("create project status=%d body=%s", createProjectRec.Code, createProjectRec.Body.String())
|
|
||||||
}
|
|
||||||
var project models.Project
|
|
||||||
if err := json.Unmarshal(createProjectRec.Body.Bytes(), &project); err != nil {
|
|
||||||
t.Fatalf("unmarshal project: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
createConfigReq := httptest.NewRequest(http.MethodPost, "/api/configs", bytes.NewReader([]byte(`{"name":"Move Me","items":[],"notes":"","server_count":1}`)))
|
|
||||||
createConfigReq.Header.Set("Content-Type", "application/json")
|
|
||||||
createConfigRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(createConfigRec, createConfigReq)
|
|
||||||
if createConfigRec.Code != http.StatusCreated {
|
|
||||||
t.Fatalf("create config status=%d body=%s", createConfigRec.Code, createConfigRec.Body.String())
|
|
||||||
}
|
|
||||||
var created models.Configuration
|
|
||||||
if err := json.Unmarshal(createConfigRec.Body.Bytes(), &created); err != nil {
|
|
||||||
t.Fatalf("unmarshal config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
moveReq := httptest.NewRequest(http.MethodPatch, "/api/configs/"+created.UUID+"/project", bytes.NewReader([]byte(`{"project_uuid":"`+project.UUID+`"}`)))
|
|
||||||
moveReq.Header.Set("Content-Type", "application/json")
|
|
||||||
moveRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(moveRec, moveReq)
|
|
||||||
if moveRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("move config status=%d body=%s", moveRec.Code, moveRec.Body.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
getReq := httptest.NewRequest(http.MethodGet, "/api/configs/"+created.UUID, nil)
|
|
||||||
getRec := httptest.NewRecorder()
|
|
||||||
router.ServeHTTP(getRec, getReq)
|
|
||||||
if getRec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("get config status=%d body=%s", getRec.Code, getRec.Body.String())
|
|
||||||
}
|
|
||||||
var updated models.Configuration
|
|
||||||
if err := json.Unmarshal(getRec.Body.Bytes(), &updated); err != nil {
|
|
||||||
t.Fatalf("unmarshal updated config: %v", err)
|
|
||||||
}
|
|
||||||
if updated.ProjectUUID == nil || *updated.ProjectUUID != project.UUID {
|
|
||||||
t.Fatalf("expected moved project_uuid=%s, got %v", project.UUID, updated.ProjectUUID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newAPITestStack(t *testing.T) (*localdb.LocalDB, *db.ConnectionManager, *services.LocalConfigurationService) {
|
func newAPITestStack(t *testing.T) (*localdb.LocalDB, *db.ConnectionManager, *services.LocalConfigurationService) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ func NewWebHandler(templatesPath string, componentService *services.ComponentSer
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Load each page template with base
|
// Load each page template with base
|
||||||
simplePages := []string{"login.html", "configs.html", "projects.html", "project_detail.html", "admin_pricing.html", "pricelists.html", "pricelist_detail.html"}
|
simplePages := []string{"login.html", "configs.html", "admin_pricing.html", "pricelists.html", "pricelist_detail.html"}
|
||||||
for _, page := range simplePages {
|
for _, page := range simplePages {
|
||||||
pagePath := filepath.Join(templatesPath, page)
|
pagePath := filepath.Join(templatesPath, page)
|
||||||
var tmpl *template.Template
|
var tmpl *template.Template
|
||||||
@@ -186,17 +186,6 @@ func (h *WebHandler) Configs(c *gin.Context) {
|
|||||||
h.render(c, "configs.html", gin.H{"ActivePage": "configs"})
|
h.render(c, "configs.html", gin.H{"ActivePage": "configs"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *WebHandler) Projects(c *gin.Context) {
|
|
||||||
h.render(c, "projects.html", gin.H{"ActivePage": "projects"})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *WebHandler) ProjectDetail(c *gin.Context) {
|
|
||||||
h.render(c, "project_detail.html", gin.H{
|
|
||||||
"ActivePage": "projects",
|
|
||||||
"ProjectUUID": c.Param("uuid"),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *WebHandler) AdminPricing(c *gin.Context) {
|
func (h *WebHandler) AdminPricing(c *gin.Context) {
|
||||||
h.render(c, "admin_pricing.html", gin.H{"ActivePage": "admin"})
|
h.render(c, "admin_pricing.html", gin.H{"ActivePage": "admin"})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ func ConfigurationToLocal(cfg *models.Configuration) *LocalConfiguration {
|
|||||||
|
|
||||||
local := &LocalConfiguration{
|
local := &LocalConfiguration{
|
||||||
UUID: cfg.UUID,
|
UUID: cfg.UUID,
|
||||||
ProjectUUID: cfg.ProjectUUID,
|
|
||||||
IsActive: true,
|
IsActive: true,
|
||||||
Name: cfg.Name,
|
Name: cfg.Name,
|
||||||
Items: items,
|
Items: items,
|
||||||
@@ -62,7 +61,6 @@ func LocalToConfiguration(local *LocalConfiguration) *models.Configuration {
|
|||||||
cfg := &models.Configuration{
|
cfg := &models.Configuration{
|
||||||
UUID: local.UUID,
|
UUID: local.UUID,
|
||||||
OwnerUsername: local.OriginalUsername,
|
OwnerUsername: local.OriginalUsername,
|
||||||
ProjectUUID: local.ProjectUUID,
|
|
||||||
Name: local.Name,
|
Name: local.Name,
|
||||||
Items: items,
|
Items: items,
|
||||||
TotalPrice: local.TotalPrice,
|
TotalPrice: local.TotalPrice,
|
||||||
@@ -92,40 +90,6 @@ func derefUint(v *uint) uint {
|
|||||||
return *v
|
return *v
|
||||||
}
|
}
|
||||||
|
|
||||||
func ProjectToLocal(project *models.Project) *LocalProject {
|
|
||||||
local := &LocalProject{
|
|
||||||
UUID: project.UUID,
|
|
||||||
OwnerUsername: project.OwnerUsername,
|
|
||||||
Name: project.Name,
|
|
||||||
IsActive: project.IsActive,
|
|
||||||
IsSystem: project.IsSystem,
|
|
||||||
CreatedAt: project.CreatedAt,
|
|
||||||
UpdatedAt: project.UpdatedAt,
|
|
||||||
SyncStatus: "pending",
|
|
||||||
}
|
|
||||||
if project.ID > 0 {
|
|
||||||
serverID := project.ID
|
|
||||||
local.ServerID = &serverID
|
|
||||||
}
|
|
||||||
return local
|
|
||||||
}
|
|
||||||
|
|
||||||
func LocalToProject(local *LocalProject) *models.Project {
|
|
||||||
project := &models.Project{
|
|
||||||
UUID: local.UUID,
|
|
||||||
OwnerUsername: local.OwnerUsername,
|
|
||||||
Name: local.Name,
|
|
||||||
IsActive: local.IsActive,
|
|
||||||
IsSystem: local.IsSystem,
|
|
||||||
CreatedAt: local.CreatedAt,
|
|
||||||
UpdatedAt: local.UpdatedAt,
|
|
||||||
}
|
|
||||||
if local.ServerID != nil {
|
|
||||||
project.ID = *local.ServerID
|
|
||||||
}
|
|
||||||
return project
|
|
||||||
}
|
|
||||||
|
|
||||||
// PricelistToLocal converts models.Pricelist to LocalPricelist
|
// PricelistToLocal converts models.Pricelist to LocalPricelist
|
||||||
func PricelistToLocal(pl *models.Pricelist) *LocalPricelist {
|
func PricelistToLocal(pl *models.Pricelist) *LocalPricelist {
|
||||||
name := pl.Notification
|
name := pl.Notification
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
package localdb
|
package localdb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
"git.mchus.pro/mchus/quoteforge/internal/appmeta"
|
||||||
@@ -55,7 +53,6 @@ func New(dbPath string) (*LocalDB, error) {
|
|||||||
// Auto-migrate all local tables
|
// Auto-migrate all local tables
|
||||||
if err := db.AutoMigrate(
|
if err := db.AutoMigrate(
|
||||||
&ConnectionSettings{},
|
&ConnectionSettings{},
|
||||||
&LocalProject{},
|
|
||||||
&LocalConfiguration{},
|
&LocalConfiguration{},
|
||||||
&LocalConfigurationVersion{},
|
&LocalConfigurationVersion{},
|
||||||
&LocalPricelist{},
|
&LocalPricelist{},
|
||||||
@@ -181,216 +178,6 @@ func (l *LocalDB) GetDBUser() string {
|
|||||||
|
|
||||||
// Configuration methods
|
// Configuration methods
|
||||||
|
|
||||||
// Project methods
|
|
||||||
|
|
||||||
func (l *LocalDB) SaveProject(project *LocalProject) error {
|
|
||||||
return l.db.Save(project).Error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LocalDB) GetProjects(ownerUsername string, includeArchived bool) ([]LocalProject, error) {
|
|
||||||
var projects []LocalProject
|
|
||||||
query := l.db.Model(&LocalProject{}).Where("owner_username = ?", ownerUsername)
|
|
||||||
if !includeArchived {
|
|
||||||
query = query.Where("is_active = ?", true)
|
|
||||||
}
|
|
||||||
err := query.Order("created_at DESC").Find(&projects).Error
|
|
||||||
return projects, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LocalDB) GetAllProjects(includeArchived bool) ([]LocalProject, error) {
|
|
||||||
var projects []LocalProject
|
|
||||||
query := l.db.Model(&LocalProject{})
|
|
||||||
if !includeArchived {
|
|
||||||
query = query.Where("is_active = ?", true)
|
|
||||||
}
|
|
||||||
err := query.Order("created_at DESC").Find(&projects).Error
|
|
||||||
return projects, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LocalDB) GetProjectByUUID(uuid string) (*LocalProject, error) {
|
|
||||||
var project LocalProject
|
|
||||||
if err := l.db.Where("uuid = ?", uuid).First(&project).Error; err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &project, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LocalDB) GetProjectByName(ownerUsername, name string) (*LocalProject, error) {
|
|
||||||
var project LocalProject
|
|
||||||
if err := l.db.Where("owner_username = ? AND name = ?", ownerUsername, name).First(&project).Error; err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &project, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LocalDB) GetProjectConfigurations(projectUUID string) ([]LocalConfiguration, error) {
|
|
||||||
var configs []LocalConfiguration
|
|
||||||
err := l.db.Where("project_uuid = ? AND is_active = ?", projectUUID, true).
|
|
||||||
Order("created_at DESC").
|
|
||||||
Find(&configs).Error
|
|
||||||
return configs, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *LocalDB) EnsureDefaultProject(ownerUsername string) (*LocalProject, error) {
|
|
||||||
project := &LocalProject{}
|
|
||||||
err := l.db.
|
|
||||||
Where("LOWER(TRIM(COALESCE(name, ''))) = LOWER(?) AND is_system = ?", "Без проекта", true).
|
|
||||||
Order("CASE WHEN TRIM(COALESCE(owner_username, '')) = '' THEN 0 ELSE 1 END, created_at ASC, id ASC").
|
|
||||||
First(project).Error
|
|
||||||
if err == nil {
|
|
||||||
return project, nil
|
|
||||||
}
|
|
||||||
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
project = &LocalProject{
|
|
||||||
UUID: uuidpkg.NewString(),
|
|
||||||
OwnerUsername: "",
|
|
||||||
Name: "Без проекта",
|
|
||||||
IsActive: true,
|
|
||||||
IsSystem: true,
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
SyncStatus: "pending",
|
|
||||||
}
|
|
||||||
if err := l.SaveProject(project); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return project, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ConsolidateSystemProjects merges all "Без проекта" projects into one shared canonical project.
|
|
||||||
// Configurations are reassigned to canonical UUID, duplicate projects are deleted.
|
|
||||||
func (l *LocalDB) ConsolidateSystemProjects() (int64, error) {
|
|
||||||
var removed int64
|
|
||||||
err := l.db.Transaction(func(tx *gorm.DB) error {
|
|
||||||
var canonical LocalProject
|
|
||||||
err := tx.
|
|
||||||
Where("LOWER(TRIM(COALESCE(name, ''))) = LOWER(?) AND is_system = ?", "Без проекта", true).
|
|
||||||
Order("CASE WHEN TRIM(COALESCE(owner_username, '')) = '' THEN 0 ELSE 1 END, created_at ASC, id ASC").
|
|
||||||
First(&canonical).Error
|
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
now := time.Now()
|
|
||||||
canonical = LocalProject{
|
|
||||||
UUID: uuidpkg.NewString(),
|
|
||||||
OwnerUsername: "",
|
|
||||||
Name: "Без проекта",
|
|
||||||
IsActive: true,
|
|
||||||
IsSystem: true,
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
SyncStatus: "pending",
|
|
||||||
}
|
|
||||||
if err := tx.Create(&canonical).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
} else if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Model(&LocalProject{}).
|
|
||||||
Where("uuid = ?", canonical.UUID).
|
|
||||||
Updates(map[string]any{
|
|
||||||
"name": "Без проекта",
|
|
||||||
"is_system": true,
|
|
||||||
"is_active": true,
|
|
||||||
}).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var duplicates []LocalProject
|
|
||||||
if err := tx.Where("LOWER(TRIM(COALESCE(name, ''))) = LOWER(?) AND uuid <> ?", "Без проекта", canonical.UUID).
|
|
||||||
Find(&duplicates).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := range duplicates {
|
|
||||||
p := duplicates[i]
|
|
||||||
if err := tx.Model(&LocalConfiguration{}).
|
|
||||||
Where("project_uuid = ?", p.UUID).
|
|
||||||
Update("project_uuid", canonical.UUID).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove stale pending project events for deleted UUIDs.
|
|
||||||
if err := tx.Where("entity_type = ? AND entity_uuid = ?", "project", p.UUID).
|
|
||||||
Delete(&PendingChange{}).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
res := tx.Where("uuid = ?", p.UUID).Delete(&LocalProject{})
|
|
||||||
if res.Error != nil {
|
|
||||||
return res.Error
|
|
||||||
}
|
|
||||||
removed += res.RowsAffected
|
|
||||||
}
|
|
||||||
|
|
||||||
// Backfill orphaned local configurations to canonical project.
|
|
||||||
if err := tx.Model(&LocalConfiguration{}).
|
|
||||||
Where("project_uuid IS NULL OR TRIM(COALESCE(project_uuid, '')) = ''").
|
|
||||||
Update("project_uuid", canonical.UUID).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
return removed, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// PurgeEmptyNamelessProjects removes service-trash projects that have no linked configurations:
|
|
||||||
// 1) projects with empty names;
|
|
||||||
// 2) duplicate "Без проекта" rows without configurations (case-insensitive, trimmed).
|
|
||||||
func (l *LocalDB) PurgeEmptyNamelessProjects() (int64, error) {
|
|
||||||
tx := l.db.Exec(`
|
|
||||||
DELETE FROM local_projects
|
|
||||||
WHERE (
|
|
||||||
TRIM(COALESCE(name, '')) = ''
|
|
||||||
OR LOWER(TRIM(COALESCE(name, ''))) = LOWER('Без проекта')
|
|
||||||
)
|
|
||||||
AND uuid NOT IN (
|
|
||||||
SELECT DISTINCT project_uuid
|
|
||||||
FROM local_configurations
|
|
||||||
WHERE project_uuid IS NOT NULL AND project_uuid <> ''
|
|
||||||
)`)
|
|
||||||
return tx.RowsAffected, tx.Error
|
|
||||||
}
|
|
||||||
|
|
||||||
// BackfillConfigurationProjects ensures every configuration has project_uuid set.
|
|
||||||
// If missing, it assigns system project "Без проекта" for configuration owner.
|
|
||||||
func (l *LocalDB) BackfillConfigurationProjects(defaultOwner string) error {
|
|
||||||
configs, err := l.GetConfigurations()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := range configs {
|
|
||||||
cfg := configs[i]
|
|
||||||
if cfg.ProjectUUID != nil && *cfg.ProjectUUID != "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
owner := strings.TrimSpace(cfg.OriginalUsername)
|
|
||||||
if owner == "" {
|
|
||||||
owner = strings.TrimSpace(defaultOwner)
|
|
||||||
}
|
|
||||||
if owner == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
project, err := l.EnsureDefaultProject(owner)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg.ProjectUUID = &project.UUID
|
|
||||||
if saveErr := l.SaveConfiguration(&cfg); saveErr != nil {
|
|
||||||
return saveErr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SaveConfiguration saves a configuration to local SQLite
|
// SaveConfiguration saves a configuration to local SQLite
|
||||||
func (l *LocalDB) SaveConfiguration(config *LocalConfiguration) error {
|
func (l *LocalDB) SaveConfiguration(config *LocalConfiguration) error {
|
||||||
return l.db.Save(config).Error
|
return l.db.Save(config).Error
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
package localdb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestRunLocalMigrationsBackfillsDefaultProject(t *testing.T) {
|
|
||||||
dbPath := filepath.Join(t.TempDir(), "projects_backfill.db")
|
|
||||||
|
|
||||||
local, err := New(dbPath)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("open localdb: %v", err)
|
|
||||||
}
|
|
||||||
t.Cleanup(func() { _ = local.Close() })
|
|
||||||
|
|
||||||
cfg := &LocalConfiguration{
|
|
||||||
UUID: "cfg-without-project",
|
|
||||||
Name: "Cfg no project",
|
|
||||||
Items: LocalConfigItems{},
|
|
||||||
SyncStatus: "pending",
|
|
||||||
OriginalUsername: "tester",
|
|
||||||
IsActive: true,
|
|
||||||
}
|
|
||||||
if err := local.SaveConfiguration(cfg); err != nil {
|
|
||||||
t.Fatalf("save config: %v", err)
|
|
||||||
}
|
|
||||||
if err := local.DB().
|
|
||||||
Model(&LocalConfiguration{}).
|
|
||||||
Where("uuid = ?", cfg.UUID).
|
|
||||||
Update("project_uuid", nil).Error; err != nil {
|
|
||||||
t.Fatalf("clear project_uuid: %v", err)
|
|
||||||
}
|
|
||||||
if err := local.DB().Where("id = ?", "2026_02_06_projects_backfill").Delete(&LocalSchemaMigration{}).Error; err != nil {
|
|
||||||
t.Fatalf("delete local migration record: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := runLocalMigrations(local.DB()); err != nil {
|
|
||||||
t.Fatalf("run local migrations: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
updated, err := local.GetConfigurationByUUID(cfg.UUID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get updated config: %v", err)
|
|
||||||
}
|
|
||||||
if updated.ProjectUUID == nil || *updated.ProjectUUID == "" {
|
|
||||||
t.Fatalf("expected project_uuid to be backfilled")
|
|
||||||
}
|
|
||||||
|
|
||||||
project, err := local.GetProjectByUUID(*updated.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get system project: %v", err)
|
|
||||||
}
|
|
||||||
if project.Name != "Без проекта" {
|
|
||||||
t.Fatalf("expected system project name, got %q", project.Name)
|
|
||||||
}
|
|
||||||
if !project.IsSystem {
|
|
||||||
t.Fatalf("expected system project flag")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
package localdb
|
package localdb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"time"
|
"time"
|
||||||
@@ -37,11 +36,6 @@ var localMigrations = []localMigration{
|
|||||||
name: "Ensure is_active defaults to true for existing configurations",
|
name: "Ensure is_active defaults to true for existing configurations",
|
||||||
run: backfillConfigurationIsActive,
|
run: backfillConfigurationIsActive,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
id: "2026_02_06_projects_backfill",
|
|
||||||
name: "Create default projects and attach existing configurations",
|
|
||||||
run: backfillProjectsForConfigurations,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func runLocalMigrations(db *gorm.DB) error {
|
func runLocalMigrations(db *gorm.DB) error {
|
||||||
@@ -139,59 +133,6 @@ func backfillConfigurationIsActive(tx *gorm.DB) error {
|
|||||||
return tx.Exec("UPDATE local_configurations SET is_active = 1 WHERE is_active IS NULL").Error
|
return tx.Exec("UPDATE local_configurations SET is_active = 1 WHERE is_active IS NULL").Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func backfillProjectsForConfigurations(tx *gorm.DB) error {
|
|
||||||
var owners []string
|
|
||||||
if err := tx.Model(&LocalConfiguration{}).
|
|
||||||
Distinct("original_username").
|
|
||||||
Pluck("original_username", &owners).Error; err != nil {
|
|
||||||
return fmt.Errorf("load owners for projects backfill: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, owner := range owners {
|
|
||||||
project, err := ensureDefaultProjectTx(tx, owner)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Model(&LocalConfiguration{}).
|
|
||||||
Where("original_username = ? AND (project_uuid IS NULL OR project_uuid = '')", owner).
|
|
||||||
Update("project_uuid", project.UUID).Error; err != nil {
|
|
||||||
return fmt.Errorf("assign default project for owner %s: %w", owner, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func ensureDefaultProjectTx(tx *gorm.DB, ownerUsername string) (*LocalProject, error) {
|
|
||||||
var project LocalProject
|
|
||||||
err := tx.Where("owner_username = ? AND is_system = ? AND name = ?", ownerUsername, true, "Без проекта").
|
|
||||||
First(&project).Error
|
|
||||||
if err == nil {
|
|
||||||
return &project, nil
|
|
||||||
}
|
|
||||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
return nil, fmt.Errorf("load system project for %s: %w", ownerUsername, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
project = LocalProject{
|
|
||||||
UUID: uuid.NewString(),
|
|
||||||
OwnerUsername: ownerUsername,
|
|
||||||
Name: "Без проекта",
|
|
||||||
IsActive: true,
|
|
||||||
IsSystem: true,
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
SyncStatus: "pending",
|
|
||||||
}
|
|
||||||
if err := tx.Create(&project).Error; err != nil {
|
|
||||||
return nil, fmt.Errorf("create system project for %s: %w", ownerUsername, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return &project, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func chooseNonZeroTime(candidate time.Time, fallback time.Time) time.Time {
|
func chooseNonZeroTime(candidate time.Time, fallback time.Time) time.Time {
|
||||||
if candidate.IsZero() {
|
if candidate.IsZero() {
|
||||||
return fallback
|
return fallback
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ type LocalConfiguration struct {
|
|||||||
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
||||||
UUID string `gorm:"uniqueIndex;not null" json:"uuid"`
|
UUID string `gorm:"uniqueIndex;not null" json:"uuid"`
|
||||||
ServerID *uint `json:"server_id"` // ID on MariaDB server, NULL if local only
|
ServerID *uint `json:"server_id"` // ID on MariaDB server, NULL if local only
|
||||||
ProjectUUID *string `gorm:"index" json:"project_uuid,omitempty"`
|
|
||||||
CurrentVersionID *string `gorm:"index" json:"current_version_id,omitempty"`
|
CurrentVersionID *string `gorm:"index" json:"current_version_id,omitempty"`
|
||||||
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
||||||
Name string `gorm:"not null" json:"name"`
|
Name string `gorm:"not null" json:"name"`
|
||||||
@@ -87,24 +86,6 @@ func (LocalConfiguration) TableName() string {
|
|||||||
return "local_configurations"
|
return "local_configurations"
|
||||||
}
|
}
|
||||||
|
|
||||||
type LocalProject struct {
|
|
||||||
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
|
||||||
UUID string `gorm:"uniqueIndex;not null" json:"uuid"`
|
|
||||||
ServerID *uint `json:"server_id,omitempty"`
|
|
||||||
OwnerUsername string `gorm:"not null;index" json:"owner_username"`
|
|
||||||
Name string `gorm:"not null" json:"name"`
|
|
||||||
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
|
||||||
IsSystem bool `gorm:"default:false;index" json:"is_system"`
|
|
||||||
CreatedAt time.Time `json:"created_at"`
|
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
|
||||||
SyncedAt *time.Time `json:"synced_at,omitempty"`
|
|
||||||
SyncStatus string `gorm:"default:'local'" json:"sync_status"` // local/synced/pending
|
|
||||||
}
|
|
||||||
|
|
||||||
func (LocalProject) TableName() string {
|
|
||||||
return "local_projects"
|
|
||||||
}
|
|
||||||
|
|
||||||
// LocalConfigurationVersion stores immutable full snapshots for each configuration version
|
// LocalConfigurationVersion stores immutable full snapshots for each configuration version
|
||||||
type LocalConfigurationVersion struct {
|
type LocalConfigurationVersion struct {
|
||||||
ID string `gorm:"primaryKey" json:"id"`
|
ID string `gorm:"primaryKey" json:"id"`
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ func BuildConfigurationSnapshot(localCfg *LocalConfiguration) (string, error) {
|
|||||||
"id": localCfg.ID,
|
"id": localCfg.ID,
|
||||||
"uuid": localCfg.UUID,
|
"uuid": localCfg.UUID,
|
||||||
"server_id": localCfg.ServerID,
|
"server_id": localCfg.ServerID,
|
||||||
"project_uuid": localCfg.ProjectUUID,
|
|
||||||
"current_version_id": localCfg.CurrentVersionID,
|
"current_version_id": localCfg.CurrentVersionID,
|
||||||
"is_active": localCfg.IsActive,
|
"is_active": localCfg.IsActive,
|
||||||
"name": localCfg.Name,
|
"name": localCfg.Name,
|
||||||
@@ -41,7 +40,6 @@ func BuildConfigurationSnapshot(localCfg *LocalConfiguration) (string, error) {
|
|||||||
// DecodeConfigurationSnapshot returns editable fields from one saved snapshot.
|
// DecodeConfigurationSnapshot returns editable fields from one saved snapshot.
|
||||||
func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
||||||
var snapshot struct {
|
var snapshot struct {
|
||||||
ProjectUUID *string `json:"project_uuid"`
|
|
||||||
IsActive *bool `json:"is_active"`
|
IsActive *bool `json:"is_active"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Items LocalConfigItems `json:"items"`
|
Items LocalConfigItems `json:"items"`
|
||||||
@@ -66,7 +64,6 @@ func DecodeConfigurationSnapshot(data string) (*LocalConfiguration, error) {
|
|||||||
|
|
||||||
return &LocalConfiguration{
|
return &LocalConfiguration{
|
||||||
IsActive: isActive,
|
IsActive: isActive,
|
||||||
ProjectUUID: snapshot.ProjectUUID,
|
|
||||||
Name: snapshot.Name,
|
Name: snapshot.Name,
|
||||||
Items: snapshot.Items,
|
Items: snapshot.Items,
|
||||||
TotalPrice: snapshot.TotalPrice,
|
TotalPrice: snapshot.TotalPrice,
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ type Configuration struct {
|
|||||||
UUID string `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
|
UUID string `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
|
||||||
UserID *uint `json:"user_id,omitempty"` // Legacy field, no longer required for ownership
|
UserID *uint `json:"user_id,omitempty"` // Legacy field, no longer required for ownership
|
||||||
OwnerUsername string `gorm:"size:100;not null;default:'';index" json:"owner_username"`
|
OwnerUsername string `gorm:"size:100;not null;default:'';index" json:"owner_username"`
|
||||||
ProjectUUID *string `gorm:"size:36;index" json:"project_uuid,omitempty"`
|
|
||||||
AppVersion string `gorm:"size:64" json:"app_version,omitempty"`
|
AppVersion string `gorm:"size:64" json:"app_version,omitempty"`
|
||||||
Name string `gorm:"size:200;not null" json:"name"`
|
Name string `gorm:"size:200;not null" json:"name"`
|
||||||
Items ConfigItems `gorm:"type:json;not null" json:"items"`
|
Items ConfigItems `gorm:"type:json;not null" json:"items"`
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ func AllModels() []interface{} {
|
|||||||
&User{},
|
&User{},
|
||||||
&Category{},
|
&Category{},
|
||||||
&LotMetadata{},
|
&LotMetadata{},
|
||||||
&Project{},
|
|
||||||
&Configuration{},
|
&Configuration{},
|
||||||
&PriceOverride{},
|
&PriceOverride{},
|
||||||
&PricingAlert{},
|
&PricingAlert{},
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
package models
|
|
||||||
|
|
||||||
import "time"
|
|
||||||
|
|
||||||
type Project struct {
|
|
||||||
ID uint `gorm:"primaryKey;autoIncrement" json:"id"`
|
|
||||||
UUID string `gorm:"size:36;uniqueIndex;not null" json:"uuid"`
|
|
||||||
OwnerUsername string `gorm:"size:100;not null;index" json:"owner_username"`
|
|
||||||
Name string `gorm:"size:200;not null" json:"name"`
|
|
||||||
IsActive bool `gorm:"default:true;index" json:"is_active"`
|
|
||||||
IsSystem bool `gorm:"default:false;index" json:"is_system"`
|
|
||||||
CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"`
|
|
||||||
UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (Project) TableName() string {
|
|
||||||
return "qt_projects"
|
|
||||||
}
|
|
||||||
@@ -1,227 +0,0 @@
|
|||||||
package models
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
mysqlDriver "github.com/go-sql-driver/mysql"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
)
|
|
||||||
|
|
||||||
type SQLSchemaMigration struct {
|
|
||||||
ID uint `gorm:"primaryKey;autoIncrement"`
|
|
||||||
Filename string `gorm:"size:255;uniqueIndex;not null"`
|
|
||||||
AppliedAt time.Time `gorm:"autoCreateTime"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (SQLSchemaMigration) TableName() string {
|
|
||||||
return "qt_schema_migrations"
|
|
||||||
}
|
|
||||||
|
|
||||||
// NeedsSQLMigrations reports whether at least one SQL migration from migrationsDir
|
|
||||||
// is not yet recorded in qt_schema_migrations.
|
|
||||||
func NeedsSQLMigrations(db *gorm.DB, migrationsDir string) (bool, error) {
|
|
||||||
files, err := listSQLMigrationFiles(migrationsDir)
|
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
if len(files) == 0 {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// If tracking table does not exist yet, migrations are required.
|
|
||||||
if !db.Migrator().HasTable(&SQLSchemaMigration{}) {
|
|
||||||
return true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var count int64
|
|
||||||
if err := db.Model(&SQLSchemaMigration{}).Where("filename IN ?", files).Count(&count).Error; err != nil {
|
|
||||||
return false, fmt.Errorf("check applied migrations: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return count < int64(len(files)), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RunSQLMigrations applies SQL files from migrationsDir once and records them in qt_schema_migrations.
|
|
||||||
// Local SQLite-only scripts are skipped automatically.
|
|
||||||
func RunSQLMigrations(db *gorm.DB, migrationsDir string) error {
|
|
||||||
if err := ensureSQLMigrationsTable(db); err != nil {
|
|
||||||
return fmt.Errorf("migrate qt_schema_migrations table: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
files, err := listSQLMigrationFiles(migrationsDir)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, filename := range files {
|
|
||||||
var count int64
|
|
||||||
if err := db.Model(&SQLSchemaMigration{}).Where("filename = ?", filename).Count(&count).Error; err != nil {
|
|
||||||
return fmt.Errorf("check migration %s: %w", filename, err)
|
|
||||||
}
|
|
||||||
if count > 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
path := filepath.Join(migrationsDir, filename)
|
|
||||||
content, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("read migration %s: %w", filename, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
statements := splitSQLStatements(string(content))
|
|
||||||
if len(statements) == 0 {
|
|
||||||
if err := db.Create(&SQLSchemaMigration{Filename: filename}).Error; err != nil {
|
|
||||||
return fmt.Errorf("record empty migration %s: %w", filename, err)
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := executeMigrationStatements(db, filename, statements); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := db.Create(&SQLSchemaMigration{Filename: filename}).Error; err != nil {
|
|
||||||
return fmt.Errorf("record migration %s: %w", filename, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsMigrationPermissionError returns true if err indicates insufficient privileges
|
|
||||||
// to create/alter/read migration metadata or target schema objects.
|
|
||||||
func IsMigrationPermissionError(err error) bool {
|
|
||||||
if err == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
var mysqlErr *mysqlDriver.MySQLError
|
|
||||||
if errors.As(err, &mysqlErr) {
|
|
||||||
switch mysqlErr.Number {
|
|
||||||
case 1044, 1045, 1142, 1143, 1227:
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lower := strings.ToLower(err.Error())
|
|
||||||
patterns := []string{
|
|
||||||
"command denied to user",
|
|
||||||
"access denied for user",
|
|
||||||
"permission denied",
|
|
||||||
"insufficient privilege",
|
|
||||||
"sqlstate 42000",
|
|
||||||
}
|
|
||||||
for _, pattern := range patterns {
|
|
||||||
if strings.Contains(lower, pattern) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func ensureSQLMigrationsTable(db *gorm.DB) error {
|
|
||||||
stmt := `
|
|
||||||
CREATE TABLE IF NOT EXISTS qt_schema_migrations (
|
|
||||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
|
||||||
filename VARCHAR(255) NOT NULL UNIQUE,
|
|
||||||
applied_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
||||||
);`
|
|
||||||
return db.Exec(stmt).Error
|
|
||||||
}
|
|
||||||
|
|
||||||
func executeMigrationStatements(db *gorm.DB, filename string, statements []string) error {
|
|
||||||
for _, stmt := range statements {
|
|
||||||
if err := db.Exec(stmt).Error; err != nil {
|
|
||||||
if isIgnorableMigrationError(err.Error()) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return fmt.Errorf("exec migration %s statement %q: %w", filename, stmt, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func isSQLiteOnlyMigration(filename string) bool {
|
|
||||||
lower := strings.ToLower(filename)
|
|
||||||
return strings.Contains(lower, "local_")
|
|
||||||
}
|
|
||||||
|
|
||||||
func isIgnorableMigrationError(message string) bool {
|
|
||||||
lower := strings.ToLower(message)
|
|
||||||
ignorable := []string{
|
|
||||||
"duplicate column name",
|
|
||||||
"duplicate key name",
|
|
||||||
"already exists",
|
|
||||||
"can't create table",
|
|
||||||
"duplicate foreign key constraint name",
|
|
||||||
"errno 121",
|
|
||||||
}
|
|
||||||
for _, pattern := range ignorable {
|
|
||||||
if strings.Contains(lower, pattern) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func splitSQLStatements(script string) []string {
|
|
||||||
scanner := bufio.NewScanner(strings.NewReader(script))
|
|
||||||
scanner.Buffer(make([]byte, 1024), 1024*1024)
|
|
||||||
|
|
||||||
lines := make([]string, 0, 128)
|
|
||||||
for scanner.Scan() {
|
|
||||||
line := strings.TrimSpace(scanner.Text())
|
|
||||||
if line == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(line, "--") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
lines = append(lines, scanner.Text())
|
|
||||||
}
|
|
||||||
|
|
||||||
combined := strings.Join(lines, "\n")
|
|
||||||
raw := strings.Split(combined, ";")
|
|
||||||
stmts := make([]string, 0, len(raw))
|
|
||||||
for _, stmt := range raw {
|
|
||||||
trimmed := strings.TrimSpace(stmt)
|
|
||||||
if trimmed == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
stmts = append(stmts, trimmed)
|
|
||||||
}
|
|
||||||
return stmts
|
|
||||||
}
|
|
||||||
|
|
||||||
func listSQLMigrationFiles(migrationsDir string) ([]string, error) {
|
|
||||||
entries, err := os.ReadDir(migrationsDir)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, os.ErrNotExist) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
return nil, fmt.Errorf("read migrations dir %s: %w", migrationsDir, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
files := make([]string, 0, len(entries))
|
|
||||||
for _, entry := range entries {
|
|
||||||
if entry.IsDir() {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
name := entry.Name()
|
|
||||||
if !strings.HasSuffix(strings.ToLower(name), ".sql") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if isSQLiteOnlyMigration(name) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
files = append(files, name)
|
|
||||||
}
|
|
||||||
sort.Strings(files)
|
|
||||||
return files, nil
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,7 @@
|
|||||||
package repository
|
package repository
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -212,31 +210,14 @@ func (r *PricelistRepository) GetItems(pricelistID uint, offset, limit int, sear
|
|||||||
func (r *PricelistRepository) GenerateVersion() (string, error) {
|
func (r *PricelistRepository) GenerateVersion() (string, error) {
|
||||||
today := time.Now().Format("2006-01-02")
|
today := time.Now().Format("2006-01-02")
|
||||||
|
|
||||||
var last models.Pricelist
|
var count int64
|
||||||
err := r.db.Model(&models.Pricelist{}).
|
if err := r.db.Model(&models.Pricelist{}).
|
||||||
Select("version").
|
Where("version LIKE ?", today+"%").
|
||||||
Where("version LIKE ?", today+"-%").
|
Count(&count).Error; err != nil {
|
||||||
Order("version DESC").
|
return "", fmt.Errorf("counting today's pricelists: %w", err)
|
||||||
Limit(1).
|
|
||||||
Take(&last).Error
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
return fmt.Sprintf("%s-001", today), nil
|
|
||||||
}
|
|
||||||
return "", fmt.Errorf("loading latest today's pricelist version: %w", err)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
parts := strings.Split(last.Version, "-")
|
return fmt.Sprintf("%s-%03d", today, count+1), nil
|
||||||
if len(parts) < 4 {
|
|
||||||
return "", fmt.Errorf("invalid pricelist version format: %s", last.Version)
|
|
||||||
}
|
|
||||||
|
|
||||||
n, err := strconv.Atoi(parts[len(parts)-1])
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("parsing pricelist sequence %q: %w", parts[len(parts)-1], err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return fmt.Sprintf("%s-%03d", today, n+1), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CanWrite checks if the current database user has INSERT permission on qt_pricelists
|
// CanWrite checks if the current database user has INSERT permission on qt_pricelists
|
||||||
|
|||||||
@@ -1,64 +0,0 @@
|
|||||||
package repository
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
|
||||||
"github.com/glebarez/sqlite"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestGenerateVersion_FirstOfDay(t *testing.T) {
|
|
||||||
repo := newTestPricelistRepository(t)
|
|
||||||
|
|
||||||
version, err := repo.GenerateVersion()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("GenerateVersion returned error: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
today := time.Now().Format("2006-01-02")
|
|
||||||
want := fmt.Sprintf("%s-001", today)
|
|
||||||
if version != want {
|
|
||||||
t.Fatalf("expected %s, got %s", want, version)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGenerateVersion_UsesMaxSuffixNotCount(t *testing.T) {
|
|
||||||
repo := newTestPricelistRepository(t)
|
|
||||||
today := time.Now().Format("2006-01-02")
|
|
||||||
|
|
||||||
seed := []models.Pricelist{
|
|
||||||
{Version: fmt.Sprintf("%s-001", today), CreatedBy: "test", IsActive: true},
|
|
||||||
{Version: fmt.Sprintf("%s-003", today), CreatedBy: "test", IsActive: true},
|
|
||||||
}
|
|
||||||
for _, pl := range seed {
|
|
||||||
if err := repo.Create(&pl); err != nil {
|
|
||||||
t.Fatalf("seed insert failed: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
version, err := repo.GenerateVersion()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("GenerateVersion returned error: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
want := fmt.Sprintf("%s-004", today)
|
|
||||||
if version != want {
|
|
||||||
t.Fatalf("expected %s, got %s", want, version)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newTestPricelistRepository(t *testing.T) *PricelistRepository {
|
|
||||||
t.Helper()
|
|
||||||
|
|
||||||
db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("open sqlite: %v", err)
|
|
||||||
}
|
|
||||||
if err := db.AutoMigrate(&models.Pricelist{}); err != nil {
|
|
||||||
t.Fatalf("migrate: %v", err)
|
|
||||||
}
|
|
||||||
return NewPricelistRepository(db)
|
|
||||||
}
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
package repository
|
|
||||||
|
|
||||||
import (
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ProjectRepository struct {
|
|
||||||
db *gorm.DB
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewProjectRepository(db *gorm.DB) *ProjectRepository {
|
|
||||||
return &ProjectRepository{db: db}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) Create(project *models.Project) error {
|
|
||||||
return r.db.Create(project).Error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) Update(project *models.Project) error {
|
|
||||||
return r.db.Save(project).Error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) GetByUUID(uuid string) (*models.Project, error) {
|
|
||||||
var project models.Project
|
|
||||||
if err := r.db.Where("uuid = ?", uuid).First(&project).Error; err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &project, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) GetSystemByOwner(ownerUsername string) (*models.Project, error) {
|
|
||||||
var project models.Project
|
|
||||||
if err := r.db.Where("owner_username = ? AND is_system = ? AND name = ?", ownerUsername, true, "Без проекта").
|
|
||||||
First(&project).Error; err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &project, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) List(offset, limit int, includeArchived bool) ([]models.Project, int64, error) {
|
|
||||||
var projects []models.Project
|
|
||||||
var total int64
|
|
||||||
|
|
||||||
query := r.db.Model(&models.Project{})
|
|
||||||
if !includeArchived {
|
|
||||||
query = query.Where("is_active = ?", true)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := query.Count(&total).Error; err != nil {
|
|
||||||
return nil, 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := query.Order("created_at DESC").Offset(offset).Limit(limit).Find(&projects).Error; err != nil {
|
|
||||||
return nil, 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return projects, total, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) ListByOwner(ownerUsername string, includeArchived bool) ([]models.Project, error) {
|
|
||||||
var projects []models.Project
|
|
||||||
|
|
||||||
query := r.db.Where("owner_username = ?", ownerUsername)
|
|
||||||
if !includeArchived {
|
|
||||||
query = query.Where("is_active = ?", true)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := query.Order("created_at DESC").Find(&projects).Error; err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return projects, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) Archive(uuid string) error {
|
|
||||||
return r.db.Model(&models.Project{}).Where("uuid = ?", uuid).Update("is_active", false).Error
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *ProjectRepository) Reactivate(uuid string) error {
|
|
||||||
return r.db.Model(&models.Project{}).Where("uuid = ?", uuid).Update("is_active", true).Error
|
|
||||||
}
|
|
||||||
|
|
||||||
// PurgeEmptyNamelessProjects removes service-trash projects that have no configurations attached:
|
|
||||||
// 1) projects with empty names;
|
|
||||||
// 2) duplicate "Без проекта" rows without configurations (case-insensitive, trimmed).
|
|
||||||
func (r *ProjectRepository) PurgeEmptyNamelessProjects() (int64, error) {
|
|
||||||
tx := r.db.Exec(`
|
|
||||||
DELETE p
|
|
||||||
FROM qt_projects p
|
|
||||||
WHERE (
|
|
||||||
TRIM(COALESCE(p.name, '')) = ''
|
|
||||||
OR LOWER(TRIM(COALESCE(p.name, ''))) = LOWER('Без проекта')
|
|
||||||
)
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM qt_configurations c
|
|
||||||
WHERE c.project_uuid = p.uuid
|
|
||||||
)`)
|
|
||||||
return tx.RowsAffected, tx.Error
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnsureSystemProjectsAndBackfillConfigurations ensures there is a single shared system project
|
|
||||||
// named "Без проекта", reassigns orphan/legacy links to it and removes duplicates.
|
|
||||||
func (r *ProjectRepository) EnsureSystemProjectsAndBackfillConfigurations() error {
|
|
||||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
|
||||||
type row struct {
|
|
||||||
UUID string `gorm:"column:uuid"`
|
|
||||||
}
|
|
||||||
var canonical row
|
|
||||||
err := tx.Raw(`
|
|
||||||
SELECT uuid
|
|
||||||
FROM qt_projects
|
|
||||||
WHERE LOWER(TRIM(COALESCE(name, ''))) = LOWER('Без проекта')
|
|
||||||
AND is_system = TRUE
|
|
||||||
ORDER BY CASE WHEN TRIM(COALESCE(owner_username, '')) = '' THEN 0 ELSE 1 END, created_at ASC, id ASC
|
|
||||||
LIMIT 1`).Scan(&canonical).Error
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if canonical.UUID == "" {
|
|
||||||
if err := tx.Exec(`
|
|
||||||
INSERT INTO qt_projects (uuid, owner_username, name, is_active, is_system, created_at, updated_at)
|
|
||||||
VALUES (UUID(), '', 'Без проекта', TRUE, TRUE, NOW(), NOW())`).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := tx.Raw(`
|
|
||||||
SELECT uuid
|
|
||||||
FROM qt_projects
|
|
||||||
WHERE LOWER(TRIM(COALESCE(name, ''))) = LOWER('Без проекта')
|
|
||||||
ORDER BY created_at DESC, id DESC
|
|
||||||
LIMIT 1`).Scan(&canonical).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if canonical.UUID == "" {
|
|
||||||
return gorm.ErrRecordNotFound
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Exec(`
|
|
||||||
UPDATE qt_projects
|
|
||||||
SET name = 'Без проекта',
|
|
||||||
is_active = TRUE,
|
|
||||||
is_system = TRUE
|
|
||||||
WHERE uuid = ?`, canonical.UUID).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Exec(`
|
|
||||||
UPDATE qt_configurations
|
|
||||||
SET project_uuid = ?
|
|
||||||
WHERE project_uuid IS NULL OR project_uuid = ''`, canonical.UUID).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Exec(`
|
|
||||||
UPDATE qt_configurations c
|
|
||||||
JOIN qt_projects p ON p.uuid = c.project_uuid
|
|
||||||
SET c.project_uuid = ?
|
|
||||||
WHERE LOWER(TRIM(COALESCE(p.name, ''))) = LOWER('Без проекта')
|
|
||||||
AND p.uuid <> ?`, canonical.UUID, canonical.UUID).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return tx.Exec(`
|
|
||||||
DELETE FROM qt_projects
|
|
||||||
WHERE LOWER(TRIM(COALESCE(name, ''))) = LOWER('Без проекта')
|
|
||||||
AND uuid <> ?`, canonical.UUID).Error
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -22,20 +22,17 @@ type ConfigurationGetter interface {
|
|||||||
|
|
||||||
type ConfigurationService struct {
|
type ConfigurationService struct {
|
||||||
configRepo *repository.ConfigurationRepository
|
configRepo *repository.ConfigurationRepository
|
||||||
projectRepo *repository.ProjectRepository
|
|
||||||
componentRepo *repository.ComponentRepository
|
componentRepo *repository.ComponentRepository
|
||||||
quoteService *QuoteService
|
quoteService *QuoteService
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewConfigurationService(
|
func NewConfigurationService(
|
||||||
configRepo *repository.ConfigurationRepository,
|
configRepo *repository.ConfigurationRepository,
|
||||||
projectRepo *repository.ProjectRepository,
|
|
||||||
componentRepo *repository.ComponentRepository,
|
componentRepo *repository.ComponentRepository,
|
||||||
quoteService *QuoteService,
|
quoteService *QuoteService,
|
||||||
) *ConfigurationService {
|
) *ConfigurationService {
|
||||||
return &ConfigurationService{
|
return &ConfigurationService{
|
||||||
configRepo: configRepo,
|
configRepo: configRepo,
|
||||||
projectRepo: projectRepo,
|
|
||||||
componentRepo: componentRepo,
|
componentRepo: componentRepo,
|
||||||
quoteService: quoteService,
|
quoteService: quoteService,
|
||||||
}
|
}
|
||||||
@@ -44,7 +41,6 @@ func NewConfigurationService(
|
|||||||
type CreateConfigRequest struct {
|
type CreateConfigRequest struct {
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Items models.ConfigItems `json:"items"`
|
Items models.ConfigItems `json:"items"`
|
||||||
ProjectUUID *string `json:"project_uuid,omitempty"`
|
|
||||||
CustomPrice *float64 `json:"custom_price"`
|
CustomPrice *float64 `json:"custom_price"`
|
||||||
Notes string `json:"notes"`
|
Notes string `json:"notes"`
|
||||||
IsTemplate bool `json:"is_template"`
|
IsTemplate bool `json:"is_template"`
|
||||||
@@ -52,11 +48,6 @@ type CreateConfigRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *ConfigurationService) Create(ownerUsername string, req *CreateConfigRequest) (*models.Configuration, error) {
|
func (s *ConfigurationService) Create(ownerUsername string, req *CreateConfigRequest) (*models.Configuration, error) {
|
||||||
projectUUID, err := s.resolveProjectUUID(ownerUsername, req.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
|
|
||||||
// If server count is greater than 1, multiply the total by server count
|
// If server count is greater than 1, multiply the total by server count
|
||||||
@@ -67,7 +58,6 @@ func (s *ConfigurationService) Create(ownerUsername string, req *CreateConfigReq
|
|||||||
config := &models.Configuration{
|
config := &models.Configuration{
|
||||||
UUID: uuid.New().String(),
|
UUID: uuid.New().String(),
|
||||||
OwnerUsername: ownerUsername,
|
OwnerUsername: ownerUsername,
|
||||||
ProjectUUID: projectUUID,
|
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Items: req.Items,
|
Items: req.Items,
|
||||||
TotalPrice: &total,
|
TotalPrice: &total,
|
||||||
@@ -111,11 +101,6 @@ func (s *ConfigurationService) Update(uuid string, ownerUsername string, req *Cr
|
|||||||
return nil, ErrConfigForbidden
|
return nil, ErrConfigForbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
projectUUID, err := s.resolveProjectUUID(ownerUsername, req.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
|
|
||||||
// If server count is greater than 1, multiply the total by server count
|
// If server count is greater than 1, multiply the total by server count
|
||||||
@@ -124,7 +109,6 @@ func (s *ConfigurationService) Update(uuid string, ownerUsername string, req *Cr
|
|||||||
}
|
}
|
||||||
|
|
||||||
config.Name = req.Name
|
config.Name = req.Name
|
||||||
config.ProjectUUID = projectUUID
|
|
||||||
config.Items = req.Items
|
config.Items = req.Items
|
||||||
config.TotalPrice = &total
|
config.TotalPrice = &total
|
||||||
config.CustomPrice = req.CustomPrice
|
config.CustomPrice = req.CustomPrice
|
||||||
@@ -172,21 +156,10 @@ func (s *ConfigurationService) Rename(uuid string, ownerUsername string, newName
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *ConfigurationService) Clone(configUUID string, ownerUsername string, newName string) (*models.Configuration, error) {
|
func (s *ConfigurationService) Clone(configUUID string, ownerUsername string, newName string) (*models.Configuration, error) {
|
||||||
return s.CloneToProject(configUUID, ownerUsername, newName, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ConfigurationService) CloneToProject(configUUID string, ownerUsername string, newName string, projectUUID *string) (*models.Configuration, error) {
|
|
||||||
original, err := s.GetByUUID(configUUID, ownerUsername)
|
original, err := s.GetByUUID(configUUID, ownerUsername)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
resolvedProjectUUID := original.ProjectUUID
|
|
||||||
if projectUUID != nil {
|
|
||||||
resolvedProjectUUID, err = s.resolveProjectUUID(ownerUsername, projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create copy with new UUID and name
|
// Create copy with new UUID and name
|
||||||
total := original.Items.Total()
|
total := original.Items.Total()
|
||||||
@@ -199,7 +172,6 @@ func (s *ConfigurationService) CloneToProject(configUUID string, ownerUsername s
|
|||||||
clone := &models.Configuration{
|
clone := &models.Configuration{
|
||||||
UUID: uuid.New().String(),
|
UUID: uuid.New().String(),
|
||||||
OwnerUsername: ownerUsername,
|
OwnerUsername: ownerUsername,
|
||||||
ProjectUUID: resolvedProjectUUID,
|
|
||||||
Name: newName,
|
Name: newName,
|
||||||
Items: original.Items,
|
Items: original.Items,
|
||||||
TotalPrice: &total,
|
TotalPrice: &total,
|
||||||
@@ -257,18 +229,12 @@ func (s *ConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigReques
|
|||||||
return nil, ErrConfigNotFound
|
return nil, ErrConfigNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
projectUUID, err := s.resolveProjectUUID(config.OwnerUsername, req.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
if req.ServerCount > 1 {
|
if req.ServerCount > 1 {
|
||||||
total *= float64(req.ServerCount)
|
total *= float64(req.ServerCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
config.Name = req.Name
|
config.Name = req.Name
|
||||||
config.ProjectUUID = projectUUID
|
|
||||||
config.Items = req.Items
|
config.Items = req.Items
|
||||||
config.TotalPrice = &total
|
config.TotalPrice = &total
|
||||||
config.CustomPrice = req.CustomPrice
|
config.CustomPrice = req.CustomPrice
|
||||||
@@ -309,21 +275,10 @@ func (s *ConfigurationService) RenameNoAuth(uuid string, newName string) (*model
|
|||||||
|
|
||||||
// CloneNoAuth clones configuration without ownership check
|
// CloneNoAuth clones configuration without ownership check
|
||||||
func (s *ConfigurationService) CloneNoAuth(configUUID string, newName string, ownerUsername string) (*models.Configuration, error) {
|
func (s *ConfigurationService) CloneNoAuth(configUUID string, newName string, ownerUsername string) (*models.Configuration, error) {
|
||||||
return s.CloneNoAuthToProject(configUUID, newName, ownerUsername, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ConfigurationService) CloneNoAuthToProject(configUUID string, newName string, ownerUsername string, projectUUID *string) (*models.Configuration, error) {
|
|
||||||
original, err := s.configRepo.GetByUUID(configUUID)
|
original, err := s.configRepo.GetByUUID(configUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, ErrConfigNotFound
|
return nil, ErrConfigNotFound
|
||||||
}
|
}
|
||||||
resolvedProjectUUID := original.ProjectUUID
|
|
||||||
if projectUUID != nil {
|
|
||||||
resolvedProjectUUID, err = s.resolveProjectUUID(ownerUsername, projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
total := original.Items.Total()
|
total := original.Items.Total()
|
||||||
if original.ServerCount > 1 {
|
if original.ServerCount > 1 {
|
||||||
@@ -333,7 +288,6 @@ func (s *ConfigurationService) CloneNoAuthToProject(configUUID string, newName s
|
|||||||
clone := &models.Configuration{
|
clone := &models.Configuration{
|
||||||
UUID: uuid.New().String(),
|
UUID: uuid.New().String(),
|
||||||
OwnerUsername: ownerUsername,
|
OwnerUsername: ownerUsername,
|
||||||
ProjectUUID: resolvedProjectUUID,
|
|
||||||
Name: newName,
|
Name: newName,
|
||||||
Items: original.Items,
|
Items: original.Items,
|
||||||
TotalPrice: &total,
|
TotalPrice: &total,
|
||||||
@@ -350,26 +304,6 @@ func (s *ConfigurationService) CloneNoAuthToProject(configUUID string, newName s
|
|||||||
return clone, nil
|
return clone, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ConfigurationService) resolveProjectUUID(ownerUsername string, projectUUID *string) (*string, error) {
|
|
||||||
_ = ownerUsername
|
|
||||||
if s.projectRepo == nil {
|
|
||||||
return projectUUID, nil
|
|
||||||
}
|
|
||||||
if projectUUID == nil || *projectUUID == "" {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
project, err := s.projectRepo.GetByUUID(*projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, ErrProjectNotFound
|
|
||||||
}
|
|
||||||
if !project.IsActive {
|
|
||||||
return nil, errors.New("project is archived")
|
|
||||||
}
|
|
||||||
|
|
||||||
return &project.UUID, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// RefreshPricesNoAuth refreshes prices without ownership check
|
// RefreshPricesNoAuth refreshes prices without ownership check
|
||||||
func (s *ConfigurationService) RefreshPricesNoAuth(uuid string) (*models.Configuration, error) {
|
func (s *ConfigurationService) RefreshPricesNoAuth(uuid string) (*models.Configuration, error) {
|
||||||
config, err := s.configRepo.GetByUUID(uuid)
|
config, err := s.configRepo.GetByUUID(uuid)
|
||||||
|
|||||||
@@ -55,11 +55,6 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
projectUUID, err := s.resolveProjectUUID(ownerUsername, req.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
if req.ServerCount > 1 {
|
if req.ServerCount > 1 {
|
||||||
total *= float64(req.ServerCount)
|
total *= float64(req.ServerCount)
|
||||||
@@ -68,7 +63,6 @@ func (s *LocalConfigurationService) Create(ownerUsername string, req *CreateConf
|
|||||||
cfg := &models.Configuration{
|
cfg := &models.Configuration{
|
||||||
UUID: uuid.New().String(),
|
UUID: uuid.New().String(),
|
||||||
OwnerUsername: ownerUsername,
|
OwnerUsername: ownerUsername,
|
||||||
ProjectUUID: projectUUID,
|
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Items: req.Items,
|
Items: req.Items,
|
||||||
TotalPrice: &total,
|
TotalPrice: &total,
|
||||||
@@ -124,11 +118,6 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
|
|||||||
return nil, ErrConfigForbidden
|
return nil, ErrConfigForbidden
|
||||||
}
|
}
|
||||||
|
|
||||||
projectUUID, err := s.resolveProjectUUID(ownerUsername, req.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
if req.ServerCount > 1 {
|
if req.ServerCount > 1 {
|
||||||
total *= float64(req.ServerCount)
|
total *= float64(req.ServerCount)
|
||||||
@@ -136,7 +125,6 @@ func (s *LocalConfigurationService) Update(uuid string, ownerUsername string, re
|
|||||||
|
|
||||||
// Update fields
|
// Update fields
|
||||||
localCfg.Name = req.Name
|
localCfg.Name = req.Name
|
||||||
localCfg.ProjectUUID = projectUUID
|
|
||||||
localCfg.Items = localdb.LocalConfigItems{}
|
localCfg.Items = localdb.LocalConfigItems{}
|
||||||
for _, item := range req.Items {
|
for _, item := range req.Items {
|
||||||
localCfg.Items = append(localCfg.Items, localdb.LocalConfigItem{
|
localCfg.Items = append(localCfg.Items, localdb.LocalConfigItem{
|
||||||
@@ -222,21 +210,10 @@ func (s *LocalConfigurationService) Rename(uuid string, ownerUsername string, ne
|
|||||||
|
|
||||||
// Clone clones a configuration
|
// Clone clones a configuration
|
||||||
func (s *LocalConfigurationService) Clone(configUUID string, ownerUsername string, newName string) (*models.Configuration, error) {
|
func (s *LocalConfigurationService) Clone(configUUID string, ownerUsername string, newName string) (*models.Configuration, error) {
|
||||||
return s.CloneToProject(configUUID, ownerUsername, newName, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *LocalConfigurationService) CloneToProject(configUUID string, ownerUsername string, newName string, projectUUID *string) (*models.Configuration, error) {
|
|
||||||
original, err := s.GetByUUID(configUUID, ownerUsername)
|
original, err := s.GetByUUID(configUUID, ownerUsername)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
resolvedProjectUUID := original.ProjectUUID
|
|
||||||
if projectUUID != nil {
|
|
||||||
resolvedProjectUUID, err = s.resolveProjectUUID(ownerUsername, projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
total := original.Items.Total()
|
total := original.Items.Total()
|
||||||
if original.ServerCount > 1 {
|
if original.ServerCount > 1 {
|
||||||
@@ -246,7 +223,6 @@ func (s *LocalConfigurationService) CloneToProject(configUUID string, ownerUsern
|
|||||||
clone := &models.Configuration{
|
clone := &models.Configuration{
|
||||||
UUID: uuid.New().String(),
|
UUID: uuid.New().String(),
|
||||||
OwnerUsername: ownerUsername,
|
OwnerUsername: ownerUsername,
|
||||||
ProjectUUID: resolvedProjectUUID,
|
|
||||||
Name: newName,
|
Name: newName,
|
||||||
Items: original.Items,
|
Items: original.Items,
|
||||||
TotalPrice: &total,
|
TotalPrice: &total,
|
||||||
@@ -386,18 +362,12 @@ func (s *LocalConfigurationService) UpdateNoAuth(uuid string, req *CreateConfigR
|
|||||||
return nil, ErrConfigNotFound
|
return nil, ErrConfigNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
projectUUID, err := s.resolveProjectUUID(localCfg.OriginalUsername, req.ProjectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
total := req.Items.Total()
|
total := req.Items.Total()
|
||||||
if req.ServerCount > 1 {
|
if req.ServerCount > 1 {
|
||||||
total *= float64(req.ServerCount)
|
total *= float64(req.ServerCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
localCfg.Name = req.Name
|
localCfg.Name = req.Name
|
||||||
localCfg.ProjectUUID = projectUUID
|
|
||||||
localCfg.Items = localdb.LocalConfigItems{}
|
localCfg.Items = localdb.LocalConfigItems{}
|
||||||
for _, item := range req.Items {
|
for _, item := range req.Items {
|
||||||
localCfg.Items = append(localCfg.Items, localdb.LocalConfigItem{
|
localCfg.Items = append(localCfg.Items, localdb.LocalConfigItem{
|
||||||
@@ -470,21 +440,10 @@ func (s *LocalConfigurationService) RenameNoAuth(uuid string, newName string) (*
|
|||||||
|
|
||||||
// CloneNoAuth clones configuration without ownership check
|
// CloneNoAuth clones configuration without ownership check
|
||||||
func (s *LocalConfigurationService) CloneNoAuth(configUUID string, newName string, ownerUsername string) (*models.Configuration, error) {
|
func (s *LocalConfigurationService) CloneNoAuth(configUUID string, newName string, ownerUsername string) (*models.Configuration, error) {
|
||||||
return s.CloneNoAuthToProject(configUUID, newName, ownerUsername, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *LocalConfigurationService) CloneNoAuthToProject(configUUID string, newName string, ownerUsername string, projectUUID *string) (*models.Configuration, error) {
|
|
||||||
original, err := s.GetByUUIDNoAuth(configUUID)
|
original, err := s.GetByUUIDNoAuth(configUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
resolvedProjectUUID := original.ProjectUUID
|
|
||||||
if projectUUID != nil {
|
|
||||||
resolvedProjectUUID, err = s.resolveProjectUUID(ownerUsername, projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
total := original.Items.Total()
|
total := original.Items.Total()
|
||||||
if original.ServerCount > 1 {
|
if original.ServerCount > 1 {
|
||||||
@@ -494,7 +453,6 @@ func (s *LocalConfigurationService) CloneNoAuthToProject(configUUID string, newN
|
|||||||
clone := &models.Configuration{
|
clone := &models.Configuration{
|
||||||
UUID: uuid.New().String(),
|
UUID: uuid.New().String(),
|
||||||
OwnerUsername: ownerUsername,
|
OwnerUsername: ownerUsername,
|
||||||
ProjectUUID: resolvedProjectUUID,
|
|
||||||
Name: newName,
|
Name: newName,
|
||||||
Items: original.Items,
|
Items: original.Items,
|
||||||
TotalPrice: &total,
|
TotalPrice: &total,
|
||||||
@@ -513,59 +471,24 @@ func (s *LocalConfigurationService) CloneNoAuthToProject(configUUID string, newN
|
|||||||
return clone, nil
|
return clone, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetProjectNoAuth moves configuration to a different project without ownership check.
|
|
||||||
func (s *LocalConfigurationService) SetProjectNoAuth(uuid string, projectUUID string) (*models.Configuration, error) {
|
|
||||||
localCfg, err := s.localDB.GetConfigurationByUUID(uuid)
|
|
||||||
if err != nil {
|
|
||||||
return nil, ErrConfigNotFound
|
|
||||||
}
|
|
||||||
|
|
||||||
var resolved *string
|
|
||||||
trimmed := strings.TrimSpace(projectUUID)
|
|
||||||
if trimmed == "" {
|
|
||||||
resolved, err = s.resolveProjectUUID(localCfg.OriginalUsername, &projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
project, getErr := s.localDB.GetProjectByUUID(trimmed)
|
|
||||||
if getErr != nil {
|
|
||||||
return nil, ErrProjectNotFound
|
|
||||||
}
|
|
||||||
if !project.IsActive {
|
|
||||||
return nil, errors.New("project is archived")
|
|
||||||
}
|
|
||||||
resolved = &project.UUID
|
|
||||||
}
|
|
||||||
|
|
||||||
localCfg.ProjectUUID = resolved
|
|
||||||
localCfg.UpdatedAt = time.Now()
|
|
||||||
localCfg.SyncStatus = "pending"
|
|
||||||
return s.saveWithVersionAndPending(localCfg, "update", "")
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListAll returns all configurations without user filter
|
// ListAll returns all configurations without user filter
|
||||||
func (s *LocalConfigurationService) ListAll(page, perPage int) ([]models.Configuration, int64, error) {
|
func (s *LocalConfigurationService) ListAll(page, perPage int) ([]models.Configuration, int64, error) {
|
||||||
return s.ListAllWithStatus(page, perPage, "active", "")
|
return s.ListAllWithStatus(page, perPage, "active")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListAllWithStatus returns configurations filtered by status: active|archived|all.
|
// ListAllWithStatus returns configurations filtered by status: active|archived|all.
|
||||||
func (s *LocalConfigurationService) ListAllWithStatus(page, perPage int, status string, search string) ([]models.Configuration, int64, error) {
|
func (s *LocalConfigurationService) ListAllWithStatus(page, perPage int, status string) ([]models.Configuration, int64, error) {
|
||||||
localConfigs, err := s.localDB.GetConfigurations()
|
localConfigs, err := s.localDB.GetConfigurations()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, err
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
search = strings.ToLower(strings.TrimSpace(search))
|
|
||||||
configs := make([]models.Configuration, len(localConfigs))
|
configs := make([]models.Configuration, len(localConfigs))
|
||||||
configs = configs[:0]
|
configs = configs[:0]
|
||||||
for _, lc := range localConfigs {
|
for _, lc := range localConfigs {
|
||||||
if !matchesConfigStatus(lc.IsActive, status) {
|
if !matchesConfigStatus(lc.IsActive, status) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if search != "" && !strings.Contains(strings.ToLower(lc.Name), search) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
configs = append(configs, *localdb.LocalToConfiguration(&lc))
|
configs = append(configs, *localdb.LocalToConfiguration(&lc))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1037,7 +960,6 @@ func (s *LocalConfigurationService) enqueueConfigurationPendingChangeTx(
|
|||||||
EventID: uuid.New().String(),
|
EventID: uuid.New().String(),
|
||||||
IdempotencyKey: fmt.Sprintf("%s:v%d:%s", localCfg.UUID, version.VersionNo, operation),
|
IdempotencyKey: fmt.Sprintf("%s:v%d:%s", localCfg.UUID, version.VersionNo, operation),
|
||||||
ConfigurationUUID: localCfg.UUID,
|
ConfigurationUUID: localCfg.UUID,
|
||||||
ProjectUUID: localCfg.ProjectUUID,
|
|
||||||
Operation: operation,
|
Operation: operation,
|
||||||
CurrentVersionID: version.ID,
|
CurrentVersionID: version.ID,
|
||||||
CurrentVersionNo: version.VersionNo,
|
CurrentVersionNo: version.VersionNo,
|
||||||
@@ -1091,28 +1013,3 @@ func matchesConfigStatus(isActive bool, status string) bool {
|
|||||||
return isActive
|
return isActive
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *LocalConfigurationService) resolveProjectUUID(ownerUsername string, projectUUID *string) (*string, error) {
|
|
||||||
if ownerUsername == "" {
|
|
||||||
ownerUsername = s.localDB.GetDBUser()
|
|
||||||
}
|
|
||||||
|
|
||||||
if projectUUID == nil || strings.TrimSpace(*projectUUID) == "" {
|
|
||||||
project, err := s.localDB.EnsureDefaultProject(ownerUsername)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &project.UUID, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
requested := strings.TrimSpace(*projectUUID)
|
|
||||||
project, err := s.localDB.GetProjectByUUID(requested)
|
|
||||||
if err != nil {
|
|
||||||
return nil, ErrProjectNotFound
|
|
||||||
}
|
|
||||||
if !project.IsActive {
|
|
||||||
return nil, errors.New("project is archived")
|
|
||||||
}
|
|
||||||
|
|
||||||
return &project.UUID, nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
package pricelist
|
package pricelist
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"strings"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||||
@@ -32,35 +30,22 @@ func (s *Service) CreateFromCurrentPrices(createdBy string) (*models.Pricelist,
|
|||||||
return nil, fmt.Errorf("offline mode: cannot create pricelists")
|
return nil, fmt.Errorf("offline mode: cannot create pricelists")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
version, err := s.repo.GenerateVersion()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("generating version: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
expiresAt := time.Now().AddDate(1, 0, 0) // +1 year
|
expiresAt := time.Now().AddDate(1, 0, 0) // +1 year
|
||||||
const maxCreateAttempts = 5
|
|
||||||
var pricelist *models.Pricelist
|
|
||||||
for attempt := 1; attempt <= maxCreateAttempts; attempt++ {
|
|
||||||
version, err := s.repo.GenerateVersion()
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("generating version: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
pricelist = &models.Pricelist{
|
pricelist := &models.Pricelist{
|
||||||
Version: version,
|
Version: version,
|
||||||
CreatedBy: createdBy,
|
CreatedBy: createdBy,
|
||||||
IsActive: true,
|
IsActive: true,
|
||||||
ExpiresAt: &expiresAt,
|
ExpiresAt: &expiresAt,
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := s.repo.Create(pricelist); err != nil {
|
if err := s.repo.Create(pricelist); err != nil {
|
||||||
if isVersionConflictError(err) && attempt < maxCreateAttempts {
|
return nil, fmt.Errorf("creating pricelist: %w", err)
|
||||||
slog.Warn("pricelist version conflict, retrying",
|
|
||||||
"attempt", attempt,
|
|
||||||
"version", version,
|
|
||||||
"error", err,
|
|
||||||
)
|
|
||||||
time.Sleep(time.Duration(attempt*25) * time.Millisecond)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return nil, fmt.Errorf("creating pricelist: %w", err)
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get all components with prices from qt_lot_metadata
|
// Get all components with prices from qt_lot_metadata
|
||||||
@@ -105,14 +90,6 @@ func (s *Service) CreateFromCurrentPrices(createdBy string) (*models.Pricelist,
|
|||||||
return pricelist, nil
|
return pricelist, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func isVersionConflictError(err error) bool {
|
|
||||||
if errors.Is(err, gorm.ErrDuplicatedKey) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
msg := strings.ToLower(err.Error())
|
|
||||||
return strings.Contains(msg, "duplicate entry") && strings.Contains(msg, "idx_qt_pricelists_version")
|
|
||||||
}
|
|
||||||
|
|
||||||
// List returns pricelists with pagination
|
// List returns pricelists with pagination
|
||||||
func (s *Service) List(page, perPage int) ([]models.PricelistSummary, int64, error) {
|
func (s *Service) List(page, perPage int) ([]models.PricelistSummary, int64, error) {
|
||||||
// If no database connection (offline mode), return empty list
|
// If no database connection (offline mode), return empty list
|
||||||
|
|||||||
@@ -1,296 +0,0 @@
|
|||||||
package services
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/services/sync"
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ErrProjectNotFound = errors.New("project not found")
|
|
||||||
ErrProjectForbidden = errors.New("access to project forbidden")
|
|
||||||
)
|
|
||||||
|
|
||||||
type ProjectService struct {
|
|
||||||
localDB *localdb.LocalDB
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewProjectService(localDB *localdb.LocalDB) *ProjectService {
|
|
||||||
return &ProjectService{localDB: localDB}
|
|
||||||
}
|
|
||||||
|
|
||||||
type CreateProjectRequest struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type UpdateProjectRequest struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ProjectConfigurationsResult struct {
|
|
||||||
ProjectUUID string `json:"project_uuid"`
|
|
||||||
Configs []models.Configuration `json:"configurations"`
|
|
||||||
Total float64 `json:"total"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) Create(ownerUsername string, req *CreateProjectRequest) (*models.Project, error) {
|
|
||||||
name := strings.TrimSpace(req.Name)
|
|
||||||
if name == "" {
|
|
||||||
return nil, fmt.Errorf("project name is required")
|
|
||||||
}
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
localProject := &localdb.LocalProject{
|
|
||||||
UUID: uuid.NewString(),
|
|
||||||
OwnerUsername: ownerUsername,
|
|
||||||
Name: name,
|
|
||||||
IsActive: true,
|
|
||||||
IsSystem: false,
|
|
||||||
CreatedAt: now,
|
|
||||||
UpdatedAt: now,
|
|
||||||
SyncStatus: "pending",
|
|
||||||
}
|
|
||||||
if err := s.localDB.SaveProject(localProject); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := s.enqueueProjectPendingChange(localProject, "create"); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return localdb.LocalToProject(localProject), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) Update(projectUUID, ownerUsername string, req *UpdateProjectRequest) (*models.Project, error) {
|
|
||||||
localProject, err := s.localDB.GetProjectByUUID(projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, ErrProjectNotFound
|
|
||||||
}
|
|
||||||
if localProject.OwnerUsername != ownerUsername {
|
|
||||||
return nil, ErrProjectForbidden
|
|
||||||
}
|
|
||||||
|
|
||||||
name := strings.TrimSpace(req.Name)
|
|
||||||
if name == "" {
|
|
||||||
return nil, fmt.Errorf("project name is required")
|
|
||||||
}
|
|
||||||
|
|
||||||
localProject.Name = name
|
|
||||||
localProject.UpdatedAt = time.Now()
|
|
||||||
localProject.SyncStatus = "pending"
|
|
||||||
if err := s.localDB.SaveProject(localProject); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if err := s.enqueueProjectPendingChange(localProject, "update"); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return localdb.LocalToProject(localProject), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) Archive(projectUUID, ownerUsername string) error {
|
|
||||||
return s.setProjectActive(projectUUID, ownerUsername, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) Reactivate(projectUUID, ownerUsername string) error {
|
|
||||||
return s.setProjectActive(projectUUID, ownerUsername, true)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) setProjectActive(projectUUID, ownerUsername string, isActive bool) error {
|
|
||||||
return s.localDB.DB().Transaction(func(tx *gorm.DB) error {
|
|
||||||
var project localdb.LocalProject
|
|
||||||
if err := tx.Where("uuid = ?", projectUUID).First(&project).Error; err != nil {
|
|
||||||
return ErrProjectNotFound
|
|
||||||
}
|
|
||||||
if project.OwnerUsername != ownerUsername {
|
|
||||||
return ErrProjectForbidden
|
|
||||||
}
|
|
||||||
if project.IsActive == isActive {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
project.IsActive = isActive
|
|
||||||
project.UpdatedAt = time.Now()
|
|
||||||
project.SyncStatus = "pending"
|
|
||||||
if err := tx.Save(&project).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := s.enqueueProjectPendingChangeTx(tx, &project, boolToOp(isActive, "reactivate", "archive")); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
var configs []localdb.LocalConfiguration
|
|
||||||
if err := tx.Where("project_uuid = ?", projectUUID).Find(&configs).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for i := range configs {
|
|
||||||
cfg := configs[i]
|
|
||||||
cfg.IsActive = isActive
|
|
||||||
cfg.SyncStatus = "pending"
|
|
||||||
cfg.UpdatedAt = time.Now()
|
|
||||||
if err := tx.Save(&cfg).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
modelCfg := localdb.LocalToConfiguration(&cfg)
|
|
||||||
payload, err := json.Marshal(modelCfg)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
change := &localdb.PendingChange{
|
|
||||||
EntityType: "configuration",
|
|
||||||
EntityUUID: cfg.UUID,
|
|
||||||
Operation: "update",
|
|
||||||
Payload: string(payload),
|
|
||||||
CreatedAt: time.Now(),
|
|
||||||
Attempts: 0,
|
|
||||||
}
|
|
||||||
if err := tx.Create(change).Error; err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) ListByUser(ownerUsername string, includeArchived bool) ([]models.Project, error) {
|
|
||||||
localProjects, err := s.localDB.GetAllProjects(includeArchived)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
projects := make([]models.Project, 0, len(localProjects))
|
|
||||||
for i := range localProjects {
|
|
||||||
projects = append(projects, *localdb.LocalToProject(&localProjects[i]))
|
|
||||||
}
|
|
||||||
return projects, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) GetByUUID(projectUUID, ownerUsername string) (*models.Project, error) {
|
|
||||||
localProject, err := s.localDB.GetProjectByUUID(projectUUID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, ErrProjectNotFound
|
|
||||||
}
|
|
||||||
return localdb.LocalToProject(localProject), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) ListConfigurations(projectUUID, ownerUsername, status string) (*ProjectConfigurationsResult, error) {
|
|
||||||
project, err := s.GetByUUID(projectUUID, ownerUsername)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if !project.IsActive && status == "active" {
|
|
||||||
return &ProjectConfigurationsResult{
|
|
||||||
ProjectUUID: projectUUID,
|
|
||||||
Configs: []models.Configuration{},
|
|
||||||
Total: 0,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
localConfigs, err := s.localDB.GetConfigurations()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
configs := make([]models.Configuration, 0, len(localConfigs))
|
|
||||||
total := 0.0
|
|
||||||
for i := range localConfigs {
|
|
||||||
localCfg := localConfigs[i]
|
|
||||||
if localCfg.ProjectUUID == nil || *localCfg.ProjectUUID != projectUUID {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
switch status {
|
|
||||||
case "active", "":
|
|
||||||
if !localCfg.IsActive {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
case "archived":
|
|
||||||
if localCfg.IsActive {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
case "all":
|
|
||||||
default:
|
|
||||||
if !localCfg.IsActive {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg := localdb.LocalToConfiguration(&localCfg)
|
|
||||||
if cfg.TotalPrice != nil {
|
|
||||||
total += *cfg.TotalPrice
|
|
||||||
}
|
|
||||||
configs = append(configs, *cfg)
|
|
||||||
}
|
|
||||||
|
|
||||||
return &ProjectConfigurationsResult{
|
|
||||||
ProjectUUID: projectUUID,
|
|
||||||
Configs: configs,
|
|
||||||
Total: total,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) ResolveProjectUUID(ownerUsername string, projectUUID *string) (*string, error) {
|
|
||||||
if projectUUID == nil || strings.TrimSpace(*projectUUID) == "" {
|
|
||||||
project, err := s.localDB.EnsureDefaultProject(ownerUsername)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &project.UUID, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
project, err := s.localDB.GetProjectByUUID(strings.TrimSpace(*projectUUID))
|
|
||||||
if err != nil {
|
|
||||||
return nil, ErrProjectNotFound
|
|
||||||
}
|
|
||||||
if project.OwnerUsername != ownerUsername {
|
|
||||||
return nil, ErrProjectForbidden
|
|
||||||
}
|
|
||||||
if !project.IsActive {
|
|
||||||
return nil, fmt.Errorf("project is archived")
|
|
||||||
}
|
|
||||||
|
|
||||||
resolved := project.UUID
|
|
||||||
return &resolved, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) enqueueProjectPendingChange(project *localdb.LocalProject, operation string) error {
|
|
||||||
return s.enqueueProjectPendingChangeTx(s.localDB.DB(), project, operation)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ProjectService) enqueueProjectPendingChangeTx(tx *gorm.DB, project *localdb.LocalProject, operation string) error {
|
|
||||||
payload := sync.ProjectChangePayload{
|
|
||||||
EventID: uuid.NewString(),
|
|
||||||
ProjectUUID: project.UUID,
|
|
||||||
Operation: operation,
|
|
||||||
Snapshot: *localdb.LocalToProject(project),
|
|
||||||
CreatedAt: time.Now().UTC(),
|
|
||||||
IdempotencyKey: fmt.Sprintf("%s:%d:%s", project.UUID, project.UpdatedAt.UnixNano(), operation),
|
|
||||||
}
|
|
||||||
raw, err := json.Marshal(payload)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
change := &localdb.PendingChange{
|
|
||||||
EntityType: "project",
|
|
||||||
EntityUUID: project.UUID,
|
|
||||||
Operation: operation,
|
|
||||||
Payload: string(raw),
|
|
||||||
CreatedAt: time.Now(),
|
|
||||||
Attempts: 0,
|
|
||||||
}
|
|
||||||
return tx.Create(change).Error
|
|
||||||
}
|
|
||||||
|
|
||||||
func boolToOp(v bool, whenTrue, whenFalse string) string {
|
|
||||||
if v {
|
|
||||||
return whenTrue
|
|
||||||
}
|
|
||||||
return whenFalse
|
|
||||||
}
|
|
||||||
@@ -12,7 +12,6 @@ import (
|
|||||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
"git.mchus.pro/mchus/quoteforge/internal/models"
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/repository"
|
"git.mchus.pro/mchus/quoteforge/internal/repository"
|
||||||
"github.com/google/uuid"
|
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -20,9 +19,8 @@ var ErrOffline = errors.New("database is offline")
|
|||||||
|
|
||||||
// Service handles synchronization between MariaDB and local SQLite
|
// Service handles synchronization between MariaDB and local SQLite
|
||||||
type Service struct {
|
type Service struct {
|
||||||
connMgr *db.ConnectionManager
|
connMgr *db.ConnectionManager
|
||||||
localDB *localdb.LocalDB
|
localDB *localdb.LocalDB
|
||||||
directDB *gorm.DB
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewService creates a new sync service
|
// NewService creates a new sync service
|
||||||
@@ -33,14 +31,6 @@ func NewService(connMgr *db.ConnectionManager, localDB *localdb.LocalDB) *Servic
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewServiceWithDB creates sync service that uses a direct DB handle (used in tests).
|
|
||||||
func NewServiceWithDB(mariaDB *gorm.DB, localDB *localdb.LocalDB) *Service {
|
|
||||||
return &Service{
|
|
||||||
localDB: localDB,
|
|
||||||
directDB: mariaDB,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SyncStatus represents the current sync status
|
// SyncStatus represents the current sync status
|
||||||
type SyncStatus struct {
|
type SyncStatus struct {
|
||||||
LastSyncAt *time.Time `json:"last_sync_at"`
|
LastSyncAt *time.Time `json:"last_sync_at"`
|
||||||
@@ -62,7 +52,6 @@ type ConfigurationChangePayload struct {
|
|||||||
EventID string `json:"event_id"`
|
EventID string `json:"event_id"`
|
||||||
IdempotencyKey string `json:"idempotency_key"`
|
IdempotencyKey string `json:"idempotency_key"`
|
||||||
ConfigurationUUID string `json:"configuration_uuid"`
|
ConfigurationUUID string `json:"configuration_uuid"`
|
||||||
ProjectUUID *string `json:"project_uuid,omitempty"`
|
|
||||||
Operation string `json:"operation"` // create/update/rollback/deactivate/reactivate/delete
|
Operation string `json:"operation"` // create/update/rollback/deactivate/reactivate/delete
|
||||||
CurrentVersionID string `json:"current_version_id,omitempty"`
|
CurrentVersionID string `json:"current_version_id,omitempty"`
|
||||||
CurrentVersionNo int `json:"current_version_no,omitempty"`
|
CurrentVersionNo int `json:"current_version_no,omitempty"`
|
||||||
@@ -72,19 +61,10 @@ type ConfigurationChangePayload struct {
|
|||||||
CreatedBy *string `json:"created_by,omitempty"`
|
CreatedBy *string `json:"created_by,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProjectChangePayload struct {
|
|
||||||
EventID string `json:"event_id"`
|
|
||||||
IdempotencyKey string `json:"idempotency_key"`
|
|
||||||
ProjectUUID string `json:"project_uuid"`
|
|
||||||
Operation string `json:"operation"`
|
|
||||||
Snapshot models.Project `json:"snapshot"`
|
|
||||||
CreatedAt time.Time `json:"created_at"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ImportConfigurationsToLocal imports configurations from MariaDB into local SQLite.
|
// ImportConfigurationsToLocal imports configurations from MariaDB into local SQLite.
|
||||||
// Existing local configs with pending local changes are skipped to avoid data loss.
|
// Existing local configs with pending local changes are skipped to avoid data loss.
|
||||||
func (s *Service) ImportConfigurationsToLocal() (*ConfigImportResult, error) {
|
func (s *Service) ImportConfigurationsToLocal() (*ConfigImportResult, error) {
|
||||||
mariaDB, err := s.getDB()
|
mariaDB, err := s.connMgr.GetDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, ErrOffline
|
return nil, ErrOffline
|
||||||
}
|
}
|
||||||
@@ -150,9 +130,9 @@ func (s *Service) GetStatus() (*SyncStatus, error) {
|
|||||||
|
|
||||||
// Count server pricelists (only if already connected, don't reconnect)
|
// Count server pricelists (only if already connected, don't reconnect)
|
||||||
serverCount := 0
|
serverCount := 0
|
||||||
connStatus := s.getConnectionStatus()
|
connStatus := s.connMgr.GetStatus()
|
||||||
if connStatus.IsConnected {
|
if connStatus.IsConnected {
|
||||||
if mariaDB, err := s.getDB(); err == nil && mariaDB != nil {
|
if mariaDB, err := s.connMgr.GetDB(); err == nil && mariaDB != nil {
|
||||||
pricelistRepo := repository.NewPricelistRepository(mariaDB)
|
pricelistRepo := repository.NewPricelistRepository(mariaDB)
|
||||||
activeCount, err := pricelistRepo.CountActive()
|
activeCount, err := pricelistRepo.CountActive()
|
||||||
if err == nil {
|
if err == nil {
|
||||||
@@ -190,13 +170,13 @@ func (s *Service) NeedSync() (bool, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if there are new pricelists on server (only if already connected)
|
// Check if there are new pricelists on server (only if already connected)
|
||||||
connStatus := s.getConnectionStatus()
|
connStatus := s.connMgr.GetStatus()
|
||||||
if !connStatus.IsConnected {
|
if !connStatus.IsConnected {
|
||||||
// If offline, can't check server, no need to sync
|
// If offline, can't check server, no need to sync
|
||||||
return false, nil
|
return false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
mariaDB, err := s.getDB()
|
mariaDB, err := s.connMgr.GetDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// If offline, can't check server, no need to sync
|
// If offline, can't check server, no need to sync
|
||||||
return false, nil
|
return false, nil
|
||||||
@@ -228,7 +208,7 @@ func (s *Service) SyncPricelists() (int, error) {
|
|||||||
slog.Info("starting pricelist sync")
|
slog.Info("starting pricelist sync")
|
||||||
|
|
||||||
// Get database connection
|
// Get database connection
|
||||||
mariaDB, err := s.getDB()
|
mariaDB, err := s.connMgr.GetDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, fmt.Errorf("database not available: %w", err)
|
return 0, fmt.Errorf("database not available: %w", err)
|
||||||
}
|
}
|
||||||
@@ -321,7 +301,7 @@ func (s *Service) SyncPricelistItems(localPricelistID uint) (int, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get database connection
|
// Get database connection
|
||||||
mariaDB, err := s.getDB()
|
mariaDB, err := s.connMgr.GetDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, fmt.Errorf("database not available: %w", err)
|
return 0, fmt.Errorf("database not available: %w", err)
|
||||||
}
|
}
|
||||||
@@ -438,9 +418,8 @@ func (s *Service) PushPendingChanges() (int, error) {
|
|||||||
slog.Info("pushing pending changes", "count", len(changes))
|
slog.Info("pushing pending changes", "count", len(changes))
|
||||||
pushed := 0
|
pushed := 0
|
||||||
var syncedIDs []int64
|
var syncedIDs []int64
|
||||||
sortedChanges := prioritizeProjectChanges(changes)
|
|
||||||
|
|
||||||
for _, change := range sortedChanges {
|
for _, change := range changes {
|
||||||
err := s.pushSingleChange(&change)
|
err := s.pushSingleChange(&change)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Warn("failed to push change", "id", change.ID, "type", change.EntityType, "operation", change.Operation, "error", err)
|
slog.Warn("failed to push change", "id", change.ID, "type", change.EntityType, "operation", change.Operation, "error", err)
|
||||||
@@ -467,8 +446,6 @@ func (s *Service) PushPendingChanges() (int, error) {
|
|||||||
// pushSingleChange pushes a single pending change to the server
|
// pushSingleChange pushes a single pending change to the server
|
||||||
func (s *Service) pushSingleChange(change *localdb.PendingChange) error {
|
func (s *Service) pushSingleChange(change *localdb.PendingChange) error {
|
||||||
switch change.EntityType {
|
switch change.EntityType {
|
||||||
case "project":
|
|
||||||
return s.pushProjectChange(change)
|
|
||||||
case "configuration":
|
case "configuration":
|
||||||
return s.pushConfigurationChange(change)
|
return s.pushConfigurationChange(change)
|
||||||
default:
|
default:
|
||||||
@@ -476,95 +453,6 @@ func (s *Service) pushSingleChange(change *localdb.PendingChange) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func prioritizeProjectChanges(changes []localdb.PendingChange) []localdb.PendingChange {
|
|
||||||
if len(changes) < 2 {
|
|
||||||
return changes
|
|
||||||
}
|
|
||||||
|
|
||||||
projectChanges := make([]localdb.PendingChange, 0, len(changes))
|
|
||||||
otherChanges := make([]localdb.PendingChange, 0, len(changes))
|
|
||||||
for _, change := range changes {
|
|
||||||
if change.EntityType == "project" {
|
|
||||||
projectChanges = append(projectChanges, change)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
otherChanges = append(otherChanges, change)
|
|
||||||
}
|
|
||||||
|
|
||||||
sorted := make([]localdb.PendingChange, 0, len(changes))
|
|
||||||
sorted = append(sorted, projectChanges...)
|
|
||||||
sorted = append(sorted, otherChanges...)
|
|
||||||
return sorted
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Service) pushProjectChange(change *localdb.PendingChange) error {
|
|
||||||
payload, err := decodeProjectChangePayload(change)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("decode project payload: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
mariaDB, err := s.getDB()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("database not available: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
projectRepo := repository.NewProjectRepository(mariaDB)
|
|
||||||
project := payload.Snapshot
|
|
||||||
project.UUID = payload.ProjectUUID
|
|
||||||
|
|
||||||
serverProject, err := projectRepo.GetByUUID(project.UUID)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
if createErr := projectRepo.Create(&project); createErr != nil {
|
|
||||||
return fmt.Errorf("create project on server: %w", createErr)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return fmt.Errorf("get project on server: %w", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
project.ID = serverProject.ID
|
|
||||||
if updateErr := projectRepo.Update(&project); updateErr != nil {
|
|
||||||
return fmt.Errorf("update project on server: %w", updateErr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
localProject, localErr := s.localDB.GetProjectByUUID(project.UUID)
|
|
||||||
if localErr == nil {
|
|
||||||
if project.ID > 0 {
|
|
||||||
serverID := project.ID
|
|
||||||
localProject.ServerID = &serverID
|
|
||||||
}
|
|
||||||
localProject.SyncStatus = "synced"
|
|
||||||
now := time.Now()
|
|
||||||
localProject.SyncedAt = &now
|
|
||||||
_ = s.localDB.SaveProject(localProject)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func decodeProjectChangePayload(change *localdb.PendingChange) (ProjectChangePayload, error) {
|
|
||||||
var payload ProjectChangePayload
|
|
||||||
if err := json.Unmarshal([]byte(change.Payload), &payload); err == nil && payload.ProjectUUID != "" {
|
|
||||||
if payload.Operation == "" {
|
|
||||||
payload.Operation = change.Operation
|
|
||||||
}
|
|
||||||
return payload, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var project models.Project
|
|
||||||
if err := json.Unmarshal([]byte(change.Payload), &project); err != nil {
|
|
||||||
return ProjectChangePayload{}, fmt.Errorf("unmarshal legacy project payload: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return ProjectChangePayload{
|
|
||||||
ProjectUUID: project.UUID,
|
|
||||||
Operation: change.Operation,
|
|
||||||
IdempotencyKey: fmt.Sprintf("%s:%s:legacy", project.UUID, change.Operation),
|
|
||||||
Snapshot: project,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// pushConfigurationChange pushes a configuration change to the server
|
// pushConfigurationChange pushes a configuration change to the server
|
||||||
func (s *Service) pushConfigurationChange(change *localdb.PendingChange) error {
|
func (s *Service) pushConfigurationChange(change *localdb.PendingChange) error {
|
||||||
switch change.Operation {
|
switch change.Operation {
|
||||||
@@ -597,7 +485,7 @@ func (s *Service) pushConfigurationCreate(change *localdb.PendingChange) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get database connection
|
// Get database connection
|
||||||
mariaDB, err := s.getDB()
|
mariaDB, err := s.connMgr.GetDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("database not available: %w", err)
|
return fmt.Errorf("database not available: %w", err)
|
||||||
}
|
}
|
||||||
@@ -607,9 +495,6 @@ func (s *Service) pushConfigurationCreate(change *localdb.PendingChange) error {
|
|||||||
if err := s.ensureConfigurationOwner(mariaDB, &cfg); err != nil {
|
if err := s.ensureConfigurationOwner(mariaDB, &cfg); err != nil {
|
||||||
return fmt.Errorf("resolve configuration owner: %w", err)
|
return fmt.Errorf("resolve configuration owner: %w", err)
|
||||||
}
|
}
|
||||||
if err := s.ensureConfigurationProject(mariaDB, &cfg); err != nil {
|
|
||||||
return fmt.Errorf("resolve configuration project: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create on server
|
// Create on server
|
||||||
if err := configRepo.Create(&cfg); err != nil {
|
if err := configRepo.Create(&cfg); err != nil {
|
||||||
@@ -655,7 +540,7 @@ func (s *Service) pushConfigurationUpdate(change *localdb.PendingChange) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get database connection
|
// Get database connection
|
||||||
mariaDB, err := s.getDB()
|
mariaDB, err := s.connMgr.GetDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("database not available: %w", err)
|
return fmt.Errorf("database not available: %w", err)
|
||||||
}
|
}
|
||||||
@@ -665,9 +550,6 @@ func (s *Service) pushConfigurationUpdate(change *localdb.PendingChange) error {
|
|||||||
if err := s.ensureConfigurationOwner(mariaDB, &cfg); err != nil {
|
if err := s.ensureConfigurationOwner(mariaDB, &cfg); err != nil {
|
||||||
return fmt.Errorf("resolve configuration owner: %w", err)
|
return fmt.Errorf("resolve configuration owner: %w", err)
|
||||||
}
|
}
|
||||||
if err := s.ensureConfigurationProject(mariaDB, &cfg); err != nil {
|
|
||||||
return fmt.Errorf("resolve configuration project: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Ensure we have a server ID before updating
|
// Ensure we have a server ID before updating
|
||||||
// If the payload doesn't have ID, get it from local configuration
|
// If the payload doesn't have ID, get it from local configuration
|
||||||
@@ -738,69 +620,6 @@ func (s *Service) ensureConfigurationOwner(mariaDB *gorm.DB, cfg *models.Configu
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) ensureConfigurationProject(mariaDB *gorm.DB, cfg *models.Configuration) error {
|
|
||||||
if cfg == nil {
|
|
||||||
return fmt.Errorf("configuration is nil")
|
|
||||||
}
|
|
||||||
|
|
||||||
projectRepo := repository.NewProjectRepository(mariaDB)
|
|
||||||
|
|
||||||
if cfg.ProjectUUID != nil && *cfg.ProjectUUID != "" {
|
|
||||||
_, err := projectRepo.GetByUUID(*cfg.ProjectUUID)
|
|
||||||
if err == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
localProject, localErr := s.localDB.GetProjectByUUID(*cfg.ProjectUUID)
|
|
||||||
if localErr != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
modelProject := localdb.LocalToProject(localProject)
|
|
||||||
if modelProject.OwnerUsername == "" {
|
|
||||||
modelProject.OwnerUsername = cfg.OwnerUsername
|
|
||||||
}
|
|
||||||
if createErr := projectRepo.Create(modelProject); createErr != nil {
|
|
||||||
return createErr
|
|
||||||
}
|
|
||||||
if modelProject.ID > 0 {
|
|
||||||
serverID := modelProject.ID
|
|
||||||
localProject.ServerID = &serverID
|
|
||||||
localProject.SyncStatus = "synced"
|
|
||||||
now := time.Now()
|
|
||||||
localProject.SyncedAt = &now
|
|
||||||
_ = s.localDB.SaveProject(localProject)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
systemProject := &models.Project{}
|
|
||||||
err := mariaDB.
|
|
||||||
Where("LOWER(TRIM(COALESCE(name, ''))) = LOWER(?) AND is_system = ?", "Без проекта", true).
|
|
||||||
Order("CASE WHEN TRIM(COALESCE(owner_username, '')) = '' THEN 0 ELSE 1 END, created_at ASC, id ASC").
|
|
||||||
First(systemProject).Error
|
|
||||||
if err != nil {
|
|
||||||
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
systemProject = &models.Project{
|
|
||||||
UUID: uuid.NewString(),
|
|
||||||
OwnerUsername: "",
|
|
||||||
Name: "Без проекта",
|
|
||||||
IsActive: true,
|
|
||||||
IsSystem: true,
|
|
||||||
}
|
|
||||||
if createErr := projectRepo.Create(systemProject); createErr != nil {
|
|
||||||
return createErr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg.ProjectUUID = &systemProject.UUID
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Service) pushConfigurationRollback(change *localdb.PendingChange) error {
|
func (s *Service) pushConfigurationRollback(change *localdb.PendingChange) error {
|
||||||
// Last-write-wins for now: rollback is pushed as an update with rollback metadata.
|
// Last-write-wins for now: rollback is pushed as an update with rollback metadata.
|
||||||
return s.pushConfigurationUpdate(change)
|
return s.pushConfigurationUpdate(change)
|
||||||
@@ -884,7 +703,6 @@ func decodeConfigurationChangePayload(change *localdb.PendingChange) (Configurat
|
|||||||
EventID: "",
|
EventID: "",
|
||||||
IdempotencyKey: fmt.Sprintf("%s:%s:legacy", cfg.UUID, change.Operation),
|
IdempotencyKey: fmt.Sprintf("%s:%s:legacy", cfg.UUID, change.Operation),
|
||||||
ConfigurationUUID: cfg.UUID,
|
ConfigurationUUID: cfg.UUID,
|
||||||
ProjectUUID: cfg.ProjectUUID,
|
|
||||||
Operation: change.Operation,
|
Operation: change.Operation,
|
||||||
ConflictPolicy: "last_write_wins",
|
ConflictPolicy: "last_write_wins",
|
||||||
Snapshot: cfg,
|
Snapshot: cfg,
|
||||||
@@ -941,7 +759,7 @@ func (s *Service) loadCurrentConfigurationState(configurationUUID string) (model
|
|||||||
// pushConfigurationDelete deletes a configuration from the server
|
// pushConfigurationDelete deletes a configuration from the server
|
||||||
func (s *Service) pushConfigurationDelete(change *localdb.PendingChange) error {
|
func (s *Service) pushConfigurationDelete(change *localdb.PendingChange) error {
|
||||||
// Get database connection
|
// Get database connection
|
||||||
mariaDB, err := s.getDB()
|
mariaDB, err := s.connMgr.GetDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("database not available: %w", err)
|
return fmt.Errorf("database not available: %w", err)
|
||||||
}
|
}
|
||||||
@@ -965,23 +783,3 @@ func (s *Service) pushConfigurationDelete(change *localdb.PendingChange) error {
|
|||||||
slog.Info("configuration deleted on server", "uuid", change.EntityUUID)
|
slog.Info("configuration deleted on server", "uuid", change.EntityUUID)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Service) getDB() (*gorm.DB, error) {
|
|
||||||
if s.directDB != nil {
|
|
||||||
return s.directDB, nil
|
|
||||||
}
|
|
||||||
if s.connMgr == nil {
|
|
||||||
return nil, ErrOffline
|
|
||||||
}
|
|
||||||
return s.connMgr.GetDB()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Service) getConnectionStatus() db.ConnectionStatus {
|
|
||||||
if s.directDB != nil {
|
|
||||||
return db.ConnectionStatus{IsConnected: true}
|
|
||||||
}
|
|
||||||
if s.connMgr == nil {
|
|
||||||
return db.ConnectionStatus{IsConnected: false}
|
|
||||||
}
|
|
||||||
return s.connMgr.GetStatus()
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
package sync
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestPrioritizeProjectChanges(t *testing.T) {
|
|
||||||
changes := []localdb.PendingChange{
|
|
||||||
{ID: 1, EntityType: "configuration"},
|
|
||||||
{ID: 2, EntityType: "project"},
|
|
||||||
{ID: 3, EntityType: "configuration"},
|
|
||||||
{ID: 4, EntityType: "project"},
|
|
||||||
}
|
|
||||||
|
|
||||||
sorted := prioritizeProjectChanges(changes)
|
|
||||||
if len(sorted) != 4 {
|
|
||||||
t.Fatalf("unexpected sorted length: %d", len(sorted))
|
|
||||||
}
|
|
||||||
|
|
||||||
if sorted[0].EntityType != "project" || sorted[1].EntityType != "project" {
|
|
||||||
t.Fatalf("expected project changes first, got order: %s, %s", sorted[0].EntityType, sorted[1].EntityType)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,273 +0,0 @@
|
|||||||
package sync_test
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/localdb"
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/models"
|
|
||||||
"git.mchus.pro/mchus/quoteforge/internal/services"
|
|
||||||
syncsvc "git.mchus.pro/mchus/quoteforge/internal/services/sync"
|
|
||||||
"github.com/glebarez/sqlite"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestPushPendingChangesProjectsBeforeConfigurations(t *testing.T) {
|
|
||||||
local := newLocalDBForSyncTest(t)
|
|
||||||
serverDB := newServerDBForSyncTest(t)
|
|
||||||
|
|
||||||
localSync := syncsvc.NewService(nil, local)
|
|
||||||
projectService := services.NewProjectService(local)
|
|
||||||
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
|
||||||
|
|
||||||
project, err := projectService.Create("tester", &services.CreateProjectRequest{Name: "Project A"})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create project: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg, err := configService.Create("tester", &services.CreateConfigRequest{
|
|
||||||
Name: "Cfg A",
|
|
||||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
|
||||||
ServerCount: 1,
|
|
||||||
ProjectUUID: &project.UUID,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
pushService := syncsvc.NewServiceWithDB(serverDB, local)
|
|
||||||
pushed, err := pushService.PushPendingChanges()
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("push pending changes: %v", err)
|
|
||||||
}
|
|
||||||
if pushed < 2 {
|
|
||||||
t.Fatalf("expected at least 2 pushed changes, got %d", pushed)
|
|
||||||
}
|
|
||||||
|
|
||||||
var serverProject models.Project
|
|
||||||
if err := serverDB.Where("uuid = ?", project.UUID).First(&serverProject).Error; err != nil {
|
|
||||||
t.Fatalf("project not pushed to server: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var serverCfg models.Configuration
|
|
||||||
if err := serverDB.Where("uuid = ?", cfg.UUID).First(&serverCfg).Error; err != nil {
|
|
||||||
t.Fatalf("configuration not pushed to server: %v", err)
|
|
||||||
}
|
|
||||||
if serverCfg.ProjectUUID == nil || *serverCfg.ProjectUUID != project.UUID {
|
|
||||||
t.Fatalf("expected project_uuid=%s on pushed config, got %v", project.UUID, serverCfg.ProjectUUID)
|
|
||||||
}
|
|
||||||
|
|
||||||
if got := local.CountPendingChanges(); got != 0 {
|
|
||||||
t.Fatalf("expected pending queue to be empty, got %d", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPushPendingChangesSkipsStaleUpdateAndAppliesLatest(t *testing.T) {
|
|
||||||
local := newLocalDBForSyncTest(t)
|
|
||||||
serverDB := newServerDBForSyncTest(t)
|
|
||||||
|
|
||||||
localSync := syncsvc.NewService(nil, local)
|
|
||||||
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
|
||||||
pushService := syncsvc.NewServiceWithDB(serverDB, local)
|
|
||||||
|
|
||||||
created, err := configService.Create("tester", &services.CreateConfigRequest{
|
|
||||||
Name: "Cfg v1",
|
|
||||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 1, UnitPrice: 1000}},
|
|
||||||
ServerCount: 1,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create config: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pushService.PushPendingChanges(); err != nil {
|
|
||||||
t.Fatalf("initial push: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := configService.UpdateNoAuth(created.UUID, &services.CreateConfigRequest{
|
|
||||||
Name: "Cfg v2",
|
|
||||||
Items: models.ConfigItems{{LotName: "CPU_A", Quantity: 2, UnitPrice: 1000}},
|
|
||||||
ServerCount: 1,
|
|
||||||
ProjectUUID: created.ProjectUUID,
|
|
||||||
}); err != nil {
|
|
||||||
t.Fatalf("update config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
localCfg, err := local.GetConfigurationByUUID(created.UUID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get local config: %v", err)
|
|
||||||
}
|
|
||||||
cfgSnapshot := localdb.LocalToConfiguration(localCfg)
|
|
||||||
stalePayload := syncsvc.ConfigurationChangePayload{
|
|
||||||
EventID: "stale-event",
|
|
||||||
IdempotencyKey: fmt.Sprintf("%s:v1:update", created.UUID),
|
|
||||||
ConfigurationUUID: created.UUID,
|
|
||||||
ProjectUUID: cfgSnapshot.ProjectUUID,
|
|
||||||
Operation: "update",
|
|
||||||
CurrentVersionID: "stale-v1",
|
|
||||||
CurrentVersionNo: 1,
|
|
||||||
ConflictPolicy: "last_write_wins",
|
|
||||||
Snapshot: *cfgSnapshot,
|
|
||||||
CreatedAt: time.Now().UTC().Add(-2 * time.Second),
|
|
||||||
}
|
|
||||||
raw, err := json.Marshal(stalePayload)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("marshal stale payload: %v", err)
|
|
||||||
}
|
|
||||||
if err := local.DB().Create(&localdb.PendingChange{
|
|
||||||
EntityType: "configuration",
|
|
||||||
EntityUUID: created.UUID,
|
|
||||||
Operation: "update",
|
|
||||||
Payload: string(raw),
|
|
||||||
CreatedAt: time.Now().Add(-1 * time.Second),
|
|
||||||
}).Error; err != nil {
|
|
||||||
t.Fatalf("insert stale pending change: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := pushService.PushPendingChanges(); err != nil {
|
|
||||||
t.Fatalf("push pending with stale event: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var serverCfg models.Configuration
|
|
||||||
if err := serverDB.Where("uuid = ?", created.UUID).First(&serverCfg).Error; err != nil {
|
|
||||||
t.Fatalf("get server config: %v", err)
|
|
||||||
}
|
|
||||||
if serverCfg.Name != "Cfg v2" {
|
|
||||||
t.Fatalf("expected latest name to win, got %q", serverCfg.Name)
|
|
||||||
}
|
|
||||||
if got := local.CountPendingChanges(); got != 0 {
|
|
||||||
t.Fatalf("expected empty pending queue, got %d", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPushPendingChangesCreateIsIdempotent(t *testing.T) {
|
|
||||||
local := newLocalDBForSyncTest(t)
|
|
||||||
serverDB := newServerDBForSyncTest(t)
|
|
||||||
|
|
||||||
localSync := syncsvc.NewService(nil, local)
|
|
||||||
configService := services.NewLocalConfigurationService(local, localSync, &services.QuoteService{}, func() bool { return false })
|
|
||||||
pushService := syncsvc.NewServiceWithDB(serverDB, local)
|
|
||||||
|
|
||||||
created, err := configService.Create("tester", &services.CreateConfigRequest{
|
|
||||||
Name: "Cfg Idempotent",
|
|
||||||
Items: models.ConfigItems{{LotName: "CPU_B", Quantity: 1, UnitPrice: 500}},
|
|
||||||
ServerCount: 1,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create config: %v", err)
|
|
||||||
}
|
|
||||||
if _, err := pushService.PushPendingChanges(); err != nil {
|
|
||||||
t.Fatalf("initial push: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
localCfg, err := local.GetConfigurationByUUID(created.UUID)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("get local config: %v", err)
|
|
||||||
}
|
|
||||||
currentVersionNo, currentVersionID := getCurrentVersionInfo(t, local, created.UUID, localCfg.CurrentVersionID)
|
|
||||||
cfgSnapshot := localdb.LocalToConfiguration(localCfg)
|
|
||||||
duplicatePayload := syncsvc.ConfigurationChangePayload{
|
|
||||||
EventID: "duplicate-create-event",
|
|
||||||
IdempotencyKey: fmt.Sprintf("%s:v%d:create", created.UUID, currentVersionNo),
|
|
||||||
ConfigurationUUID: created.UUID,
|
|
||||||
ProjectUUID: cfgSnapshot.ProjectUUID,
|
|
||||||
Operation: "create",
|
|
||||||
CurrentVersionID: currentVersionID,
|
|
||||||
CurrentVersionNo: currentVersionNo,
|
|
||||||
ConflictPolicy: "last_write_wins",
|
|
||||||
Snapshot: *cfgSnapshot,
|
|
||||||
CreatedAt: time.Now().UTC(),
|
|
||||||
}
|
|
||||||
raw, err := json.Marshal(duplicatePayload)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("marshal duplicate payload: %v", err)
|
|
||||||
}
|
|
||||||
if err := local.AddPendingChange("configuration", created.UUID, "create", string(raw)); err != nil {
|
|
||||||
t.Fatalf("add duplicate create pending change: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if pushed, err := pushService.PushPendingChanges(); err != nil {
|
|
||||||
t.Fatalf("push duplicate create: %v", err)
|
|
||||||
} else if pushed != 1 {
|
|
||||||
t.Fatalf("expected 1 pushed change for duplicate create, got %d", pushed)
|
|
||||||
}
|
|
||||||
|
|
||||||
var count int64
|
|
||||||
if err := serverDB.Model(&models.Configuration{}).Where("uuid = ?", created.UUID).Count(&count).Error; err != nil {
|
|
||||||
t.Fatalf("count server configs: %v", err)
|
|
||||||
}
|
|
||||||
if count != 1 {
|
|
||||||
t.Fatalf("expected one server row after idempotent create, got %d", count)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newLocalDBForSyncTest(t *testing.T) *localdb.LocalDB {
|
|
||||||
t.Helper()
|
|
||||||
localPath := filepath.Join(t.TempDir(), "local.db")
|
|
||||||
local, err := localdb.New(localPath)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("init local db: %v", err)
|
|
||||||
}
|
|
||||||
t.Cleanup(func() { _ = local.Close() })
|
|
||||||
return local
|
|
||||||
}
|
|
||||||
|
|
||||||
func newServerDBForSyncTest(t *testing.T) *gorm.DB {
|
|
||||||
t.Helper()
|
|
||||||
serverPath := filepath.Join(t.TempDir(), "server.db")
|
|
||||||
db, err := gorm.Open(sqlite.Open(serverPath), &gorm.Config{})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("open server sqlite: %v", err)
|
|
||||||
}
|
|
||||||
if err := db.Exec(`
|
|
||||||
CREATE TABLE qt_projects (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
uuid TEXT NOT NULL UNIQUE,
|
|
||||||
owner_username TEXT NOT NULL,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
is_active INTEGER NOT NULL DEFAULT 1,
|
|
||||||
is_system INTEGER NOT NULL DEFAULT 0,
|
|
||||||
created_at DATETIME,
|
|
||||||
updated_at DATETIME
|
|
||||||
);`).Error; err != nil {
|
|
||||||
t.Fatalf("create qt_projects: %v", err)
|
|
||||||
}
|
|
||||||
if err := db.Exec(`
|
|
||||||
CREATE TABLE qt_configurations (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
uuid TEXT NOT NULL UNIQUE,
|
|
||||||
user_id INTEGER NULL,
|
|
||||||
owner_username TEXT NOT NULL,
|
|
||||||
project_uuid TEXT NULL,
|
|
||||||
app_version TEXT NULL,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
items TEXT NOT NULL,
|
|
||||||
total_price REAL NULL,
|
|
||||||
custom_price REAL NULL,
|
|
||||||
notes TEXT NULL,
|
|
||||||
is_template INTEGER NOT NULL DEFAULT 0,
|
|
||||||
server_count INTEGER NOT NULL DEFAULT 1,
|
|
||||||
price_updated_at DATETIME NULL,
|
|
||||||
created_at DATETIME
|
|
||||||
);`).Error; err != nil {
|
|
||||||
t.Fatalf("create qt_configurations: %v", err)
|
|
||||||
}
|
|
||||||
return db
|
|
||||||
}
|
|
||||||
|
|
||||||
func getCurrentVersionInfo(t *testing.T, local *localdb.LocalDB, configurationUUID string, currentVersionID *string) (int, string) {
|
|
||||||
t.Helper()
|
|
||||||
if currentVersionID == nil || *currentVersionID == "" {
|
|
||||||
t.Fatalf("current version id is empty for %s", configurationUUID)
|
|
||||||
}
|
|
||||||
|
|
||||||
var version localdb.LocalConfigurationVersion
|
|
||||||
if err := local.DB().
|
|
||||||
Where("id = ? AND configuration_uuid = ?", *currentVersionID, configurationUUID).
|
|
||||||
First(&version).Error; err != nil {
|
|
||||||
t.Fatalf("get current version info: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return version.VersionNo, version.ID
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
-- Add projects and attach configurations to projects
|
|
||||||
|
|
||||||
CREATE TABLE qt_projects (
|
|
||||||
id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
|
|
||||||
uuid CHAR(36) NOT NULL UNIQUE,
|
|
||||||
owner_username VARCHAR(100) NOT NULL,
|
|
||||||
name VARCHAR(200) NOT NULL,
|
|
||||||
is_active BOOLEAN NOT NULL DEFAULT TRUE,
|
|
||||||
is_system BOOLEAN NOT NULL DEFAULT FALSE,
|
|
||||||
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
||||||
INDEX idx_qt_projects_owner_username (owner_username),
|
|
||||||
INDEX idx_qt_projects_is_active (is_active),
|
|
||||||
INDEX idx_qt_projects_is_system (is_system)
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER TABLE qt_configurations
|
|
||||||
ADD COLUMN project_uuid CHAR(36) NULL AFTER app_version,
|
|
||||||
ADD INDEX idx_qt_configurations_project_uuid (project_uuid),
|
|
||||||
ADD CONSTRAINT fk_qt_configurations_project_uuid
|
|
||||||
FOREIGN KEY (project_uuid) REFERENCES qt_projects(uuid)
|
|
||||||
ON UPDATE CASCADE
|
|
||||||
ON DELETE SET NULL;
|
|
||||||
|
|
||||||
-- One system project per owner: "Без проекта"
|
|
||||||
INSERT INTO qt_projects (uuid, owner_username, name, is_active, is_system, created_at, updated_at)
|
|
||||||
SELECT UUID(), owners.owner_username, 'Без проекта', TRUE, TRUE, NOW(), NOW()
|
|
||||||
FROM (
|
|
||||||
SELECT DISTINCT owner_username
|
|
||||||
FROM qt_configurations
|
|
||||||
) AS owners
|
|
||||||
LEFT JOIN qt_projects p
|
|
||||||
ON p.owner_username = owners.owner_username
|
|
||||||
AND p.name = 'Без проекта'
|
|
||||||
AND p.is_system = TRUE
|
|
||||||
WHERE p.id IS NULL;
|
|
||||||
|
|
||||||
-- Attach all existing configurations without project to the system project
|
|
||||||
UPDATE qt_configurations c
|
|
||||||
JOIN qt_projects p
|
|
||||||
ON p.owner_username = c.owner_username
|
|
||||||
AND p.name = 'Без проекта'
|
|
||||||
AND p.is_system = TRUE
|
|
||||||
SET c.project_uuid = p.uuid
|
|
||||||
WHERE c.project_uuid IS NULL OR c.project_uuid = '';
|
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
<div class="flex items-center space-x-8">
|
<div class="flex items-center space-x-8">
|
||||||
<a href="/" class="text-xl font-bold text-blue-600">QuoteForge</a>
|
<a href="/" class="text-xl font-bold text-blue-600">QuoteForge</a>
|
||||||
<div class="hidden md:flex space-x-4">
|
<div class="hidden md:flex space-x-4">
|
||||||
<a href="/projects" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Мои проекты</a>
|
<a href="/configurator" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Конфигуратор</a>
|
||||||
<a id="admin-pricing-link" href="/admin/pricing" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Администратор цен</a>
|
<a id="admin-pricing-link" href="/admin/pricing" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Администратор цен</a>
|
||||||
<a href="/setup" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Настройки</a>
|
<a href="/setup" class="text-gray-600 hover:text-gray-900 px-3 py-2 text-sm">Настройки</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -22,11 +22,6 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="max-w-md">
|
|
||||||
<input id="configs-search" type="text" placeholder="Поиск квоты по названию"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="pricelist-badge" class="mt-4 text-sm text-gray-600 hidden">
|
<div id="pricelist-badge" class="mt-4 text-sm text-gray-600 hidden">
|
||||||
<span class="bg-blue-100 text-blue-800 px-2 py-1 rounded-full">
|
<span class="bg-blue-100 text-blue-800 px-2 py-1 rounded-full">
|
||||||
<svg class="w-4 h-4 inline mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class="w-4 h-4 inline mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
@@ -61,13 +56,6 @@
|
|||||||
<input type="text" id="opportunity-number" placeholder="Например: OPP-2024-001"
|
<input type="text" id="opportunity-number" placeholder="Например: OPP-2024-001"
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
||||||
</div>
|
</div>
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Проект</label>
|
|
||||||
<select id="create-project-select"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
<option value="">Без проекта</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex justify-end space-x-3 mt-6">
|
<div class="flex justify-end space-x-3 mt-6">
|
||||||
@@ -131,65 +119,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Modal for moving configuration to another project -->
|
|
||||||
<div id="move-project-modal" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
|
|
||||||
<div class="bg-white rounded-lg shadow-xl w-full max-w-md mx-4 p-6">
|
|
||||||
<h2 class="text-xl font-semibold mb-4">Перенести в проект</h2>
|
|
||||||
|
|
||||||
<div class="space-y-4">
|
|
||||||
<div class="text-sm text-gray-600">
|
|
||||||
Квота: <span id="move-project-config-name" class="font-medium text-gray-900"></span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Проект</label>
|
|
||||||
<input id="move-project-input"
|
|
||||||
list="move-project-options"
|
|
||||||
placeholder="Начните вводить название проекта"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
<datalist id="move-project-options"></datalist>
|
|
||||||
<div class="mt-2 flex justify-between items-center gap-3">
|
|
||||||
<button type="button" onclick="clearMoveProjectInput()" class="text-sm text-gray-600 hover:text-gray-800">
|
|
||||||
Без проекта
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<input type="hidden" id="move-project-uuid">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex justify-end space-x-3 mt-6">
|
|
||||||
<button onclick="closeMoveProjectModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">
|
|
||||||
Отмена
|
|
||||||
</button>
|
|
||||||
<button onclick="confirmMoveProject()" class="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">
|
|
||||||
Перенести
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Modal for creating project during move -->
|
|
||||||
<div id="create-project-on-move-modal" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
|
|
||||||
<div class="bg-white rounded-lg shadow-xl w-full max-w-md mx-4 p-6">
|
|
||||||
<h2 class="text-xl font-semibold mb-3">Проект не найден</h2>
|
|
||||||
<p class="text-sm text-gray-600 mb-4">Проект "<span id="create-project-on-move-name" class="font-medium text-gray-900"></span>" не найден. Создать и привязать квоту?</p>
|
|
||||||
<div class="flex justify-end space-x-3">
|
|
||||||
<button onclick="closeCreateProjectOnMoveModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">Отмена</button>
|
|
||||||
<button onclick="confirmCreateProjectOnMove()" class="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">Создать и привязать</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// Pagination state
|
// Pagination state
|
||||||
let currentPage = 1;
|
let currentPage = 1;
|
||||||
let totalPages = 1;
|
let totalPages = 1;
|
||||||
let perPage = 20;
|
let perPage = 20;
|
||||||
let configStatusMode = 'active';
|
let configStatusMode = 'active';
|
||||||
let configsSearch = '';
|
|
||||||
let projectsCache = [];
|
|
||||||
let projectNameByUUID = {};
|
|
||||||
let pendingMoveConfigUUID = '';
|
|
||||||
let pendingMoveProjectName = '';
|
|
||||||
|
|
||||||
function renderConfigs(configs) {
|
function renderConfigs(configs) {
|
||||||
const emptyText = configStatusMode === 'archived'
|
const emptyText = configStatusMode === 'archived'
|
||||||
@@ -204,7 +139,6 @@ function renderConfigs(configs) {
|
|||||||
let html = '<div class="bg-white rounded-lg shadow overflow-hidden"><table class="w-full">';
|
let html = '<div class="bg-white rounded-lg shadow overflow-hidden"><table class="w-full">';
|
||||||
html += '<thead class="bg-gray-50"><tr>';
|
html += '<thead class="bg-gray-50"><tr>';
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Дата</th>';
|
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Дата</th>';
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Проект</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Название</th>';
|
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Название</th>';
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Автор</th>';
|
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Автор</th>';
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Цена (за 1 шт)</th>';
|
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Цена (за 1 шт)</th>';
|
||||||
@@ -218,9 +152,6 @@ function renderConfigs(configs) {
|
|||||||
const total = c.total_price ? '$' + c.total_price.toLocaleString('en-US', {minimumFractionDigits: 2}) : '—';
|
const total = c.total_price ? '$' + c.total_price.toLocaleString('en-US', {minimumFractionDigits: 2}) : '—';
|
||||||
const serverCount = c.server_count ? c.server_count : 1;
|
const serverCount = c.server_count ? c.server_count : 1;
|
||||||
const author = c.owner_username || (c.user && c.user.username) || '—';
|
const author = c.owner_username || (c.user && c.user.username) || '—';
|
||||||
const projectName = c.project_uuid && projectNameByUUID[c.project_uuid]
|
|
||||||
? projectNameByUUID[c.project_uuid]
|
|
||||||
: 'Без проекта';
|
|
||||||
|
|
||||||
// Calculate price per unit (total / server count)
|
// Calculate price per unit (total / server count)
|
||||||
let pricePerUnit = '—';
|
let pricePerUnit = '—';
|
||||||
@@ -231,19 +162,6 @@ function renderConfigs(configs) {
|
|||||||
|
|
||||||
html += '<tr class="hover:bg-gray-50">';
|
html += '<tr class="hover:bg-gray-50">';
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-500">' + date + '</td>';
|
html += '<td class="px-4 py-3 text-sm text-gray-500">' + date + '</td>';
|
||||||
if (configStatusMode === 'archived') {
|
|
||||||
if (c.project_uuid) {
|
|
||||||
html += '<td class="px-4 py-3 text-sm"><a href="/projects/' + c.project_uuid + '" class="text-blue-600 hover:text-blue-800 hover:underline">' + escapeHtml(projectName) + '</a></td>';
|
|
||||||
} else {
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-500">' + escapeHtml(projectName) + '</td>';
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (c.project_uuid) {
|
|
||||||
html += '<td class="px-4 py-3 text-sm"><a href="/projects/' + c.project_uuid + '" class="text-blue-600 hover:text-blue-800 hover:underline">' + escapeHtml(projectName) + '</a></td>';
|
|
||||||
} else {
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-700">' + escapeHtml(projectName) + '</td>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (configStatusMode === 'archived') {
|
if (configStatusMode === 'archived') {
|
||||||
html += '<td class="px-4 py-3 text-sm font-medium text-gray-700">' + escapeHtml(c.name) + '</td>';
|
html += '<td class="px-4 py-3 text-sm font-medium text-gray-700">' + escapeHtml(c.name) + '</td>';
|
||||||
} else {
|
} else {
|
||||||
@@ -261,11 +179,6 @@ function renderConfigs(configs) {
|
|||||||
html += '</svg>';
|
html += '</svg>';
|
||||||
html += '</button>';
|
html += '</button>';
|
||||||
} else {
|
} else {
|
||||||
html += '<button onclick="openMoveProjectModal(\'' + c.uuid + '\', \'' + escapeHtml(c.name).replace(/'/g, "\\'") + '\', \'' + (c.project_uuid || '') + '\')" class="text-indigo-600 hover:text-indigo-800" title="Перенести в проект">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">';
|
|
||||||
html += '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16V4m0 0l-3 3m3-3l3 3m7 1v12m0 0l-3-3m3 3l3-3"></path>';
|
|
||||||
html += '</svg>';
|
|
||||||
html += '</button>';
|
|
||||||
html += '<button onclick="openCloneModal(\'' + c.uuid + '\', \'' + escapeHtml(c.name).replace(/'/g, "\\'") + '\')" class="text-green-600 hover:text-green-800" title="Копировать">';
|
html += '<button onclick="openCloneModal(\'' + c.uuid + '\', \'' + escapeHtml(c.name).replace(/'/g, "\\'") + '\')" class="text-green-600 hover:text-green-800" title="Копировать">';
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">';
|
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">';
|
||||||
html += '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"></path>';
|
html += '<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"></path>';
|
||||||
@@ -425,8 +338,6 @@ async function createConfig() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const projectUUID = document.getElementById('create-project-select').value;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const resp = await fetch('/api/configs', {
|
const resp = await fetch('/api/configs', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -437,8 +348,7 @@ async function createConfig() {
|
|||||||
name: name,
|
name: name,
|
||||||
items: [],
|
items: [],
|
||||||
notes: '',
|
notes: '',
|
||||||
server_count: 1,
|
server_count: 1
|
||||||
project_uuid: projectUUID || null
|
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -455,129 +365,6 @@ async function createConfig() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openMoveProjectModal(uuid, configName, currentProjectUUID) {
|
|
||||||
document.getElementById('move-project-uuid').value = uuid;
|
|
||||||
document.getElementById('move-project-config-name').textContent = configName;
|
|
||||||
|
|
||||||
const input = document.getElementById('move-project-input');
|
|
||||||
const options = document.getElementById('move-project-options');
|
|
||||||
options.innerHTML = '';
|
|
||||||
projectsCache.forEach(project => {
|
|
||||||
if (!project.is_active) return;
|
|
||||||
const option = document.createElement('option');
|
|
||||||
option.value = project.name;
|
|
||||||
options.appendChild(option);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (currentProjectUUID && projectNameByUUID[currentProjectUUID]) {
|
|
||||||
input.value = projectNameByUUID[currentProjectUUID];
|
|
||||||
} else {
|
|
||||||
input.value = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('move-project-modal').classList.remove('hidden');
|
|
||||||
document.getElementById('move-project-modal').classList.add('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeMoveProjectModal() {
|
|
||||||
document.getElementById('move-project-modal').classList.add('hidden');
|
|
||||||
document.getElementById('move-project-modal').classList.remove('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function confirmMoveProject() {
|
|
||||||
const uuid = document.getElementById('move-project-uuid').value;
|
|
||||||
const projectName = document.getElementById('move-project-input').value.trim();
|
|
||||||
|
|
||||||
if (!uuid) return;
|
|
||||||
let projectUUID = '';
|
|
||||||
|
|
||||||
if (projectName) {
|
|
||||||
const existingProject = projectsCache.find(p => p.is_active && p.name.toLowerCase() === projectName.toLowerCase());
|
|
||||||
if (existingProject) {
|
|
||||||
projectUUID = existingProject.uuid;
|
|
||||||
} else {
|
|
||||||
pendingMoveConfigUUID = uuid;
|
|
||||||
pendingMoveProjectName = projectName;
|
|
||||||
openCreateProjectOnMoveModal(projectName);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await moveConfigToProject(uuid, projectUUID);
|
|
||||||
}
|
|
||||||
|
|
||||||
function clearMoveProjectInput() {
|
|
||||||
document.getElementById('move-project-input').value = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
function openCreateProjectOnMoveModal(projectName) {
|
|
||||||
document.getElementById('create-project-on-move-name').textContent = projectName;
|
|
||||||
document.getElementById('create-project-on-move-modal').classList.remove('hidden');
|
|
||||||
document.getElementById('create-project-on-move-modal').classList.add('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeCreateProjectOnMoveModal() {
|
|
||||||
document.getElementById('create-project-on-move-modal').classList.add('hidden');
|
|
||||||
document.getElementById('create-project-on-move-modal').classList.remove('flex');
|
|
||||||
pendingMoveConfigUUID = '';
|
|
||||||
pendingMoveProjectName = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
async function confirmCreateProjectOnMove() {
|
|
||||||
const configUUID = pendingMoveConfigUUID;
|
|
||||||
const projectName = pendingMoveProjectName;
|
|
||||||
if (!configUUID || !projectName) {
|
|
||||||
closeCreateProjectOnMoveModal();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const createResp = await fetch('/api/projects', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({ name: projectName })
|
|
||||||
});
|
|
||||||
if (!createResp.ok) {
|
|
||||||
const err = await createResp.json();
|
|
||||||
alert('Не удалось создать проект: ' + (err.error || 'ошибка'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const newProject = await createResp.json();
|
|
||||||
const moved = await moveConfigToProject(configUUID, newProject.uuid);
|
|
||||||
if (moved) {
|
|
||||||
closeCreateProjectOnMoveModal();
|
|
||||||
closeMoveProjectModal();
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
alert('Ошибка создания проекта');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function moveConfigToProject(uuid, projectUUID) {
|
|
||||||
try {
|
|
||||||
const resp = await fetch('/api/configs/' + uuid + '/project', {
|
|
||||||
method: 'PATCH',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ project_uuid: projectUUID })
|
|
||||||
});
|
|
||||||
if (!resp.ok) {
|
|
||||||
const err = await resp.json();
|
|
||||||
alert('Не удалось перенести квоту: ' + (err.error || 'ошибка'));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
closeMoveProjectModal();
|
|
||||||
await loadProjectsForConfigUI();
|
|
||||||
await loadConfigs();
|
|
||||||
return true;
|
|
||||||
} catch (e) {
|
|
||||||
alert('Ошибка переноса квоты');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close modal on outside click
|
// Close modal on outside click
|
||||||
document.getElementById('create-modal').addEventListener('click', function(e) {
|
document.getElementById('create-modal').addEventListener('click', function(e) {
|
||||||
if (e.target === this) {
|
if (e.target === this) {
|
||||||
@@ -597,26 +384,12 @@ document.getElementById('clone-modal').addEventListener('click', function(e) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
document.getElementById('move-project-modal').addEventListener('click', function(e) {
|
|
||||||
if (e.target === this) {
|
|
||||||
closeMoveProjectModal();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document.getElementById('create-project-on-move-modal').addEventListener('click', function(e) {
|
|
||||||
if (e.target === this) {
|
|
||||||
closeCreateProjectOnMoveModal();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Close modal on Escape key
|
// Close modal on Escape key
|
||||||
document.addEventListener('keydown', function(e) {
|
document.addEventListener('keydown', function(e) {
|
||||||
if (e.key === 'Escape') {
|
if (e.key === 'Escape') {
|
||||||
closeCreateModal();
|
closeCreateModal();
|
||||||
closeRenameModal();
|
closeRenameModal();
|
||||||
closeCloneModal();
|
closeCloneModal();
|
||||||
closeMoveProjectModal();
|
|
||||||
closeCreateProjectOnMoveModal();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -688,7 +461,7 @@ function applyStatusModeUI() {
|
|||||||
// Load configs with pagination
|
// Load configs with pagination
|
||||||
async function loadConfigs() {
|
async function loadConfigs() {
|
||||||
try {
|
try {
|
||||||
const resp = await fetch('/api/configs?page=' + currentPage + '&per_page=' + perPage + '&status=' + configStatusMode + '&search=' + encodeURIComponent(configsSearch));
|
const resp = await fetch('/api/configs?page=' + currentPage + '&per_page=' + perPage + '&status=' + configStatusMode);
|
||||||
|
|
||||||
if (!resp.ok) {
|
if (!resp.ok) {
|
||||||
document.getElementById('configs-list').innerHTML =
|
document.getElementById('configs-list').innerHTML =
|
||||||
@@ -739,44 +512,12 @@ async function importConfigsFromServer() {
|
|||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
applyStatusModeUI();
|
applyStatusModeUI();
|
||||||
loadProjectsForConfigUI().then(loadConfigs);
|
loadConfigs();
|
||||||
|
|
||||||
// Load latest pricelist version for badge
|
// Load latest pricelist version for badge
|
||||||
loadLatestPricelistVersion();
|
loadLatestPricelistVersion();
|
||||||
});
|
});
|
||||||
|
|
||||||
document.getElementById('configs-search').addEventListener('input', function(e) {
|
|
||||||
configsSearch = (e.target.value || '').trim();
|
|
||||||
currentPage = 1;
|
|
||||||
loadConfigs();
|
|
||||||
});
|
|
||||||
|
|
||||||
async function loadProjectsForConfigUI() {
|
|
||||||
projectsCache = [];
|
|
||||||
projectNameByUUID = {};
|
|
||||||
try {
|
|
||||||
const resp = await fetch('/api/projects?status=all');
|
|
||||||
if (!resp.ok) return;
|
|
||||||
const data = await resp.json();
|
|
||||||
projectsCache = (data.projects || []);
|
|
||||||
|
|
||||||
const select = document.getElementById('create-project-select');
|
|
||||||
if (select) {
|
|
||||||
select.innerHTML = '<option value="">Без проекта</option>';
|
|
||||||
projectsCache.forEach(project => {
|
|
||||||
projectNameByUUID[project.uuid] = project.name;
|
|
||||||
if (!project.is_active) return;
|
|
||||||
const option = document.createElement('option');
|
|
||||||
option.value = project.uuid;
|
|
||||||
option.textContent = project.name;
|
|
||||||
select.appendChild(option);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// keep default behavior without project selection data
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadLatestPricelistVersion() {
|
async function loadLatestPricelistVersion() {
|
||||||
try {
|
try {
|
||||||
const resp = await fetch('/api/pricelists/latest');
|
const resp = await fetch('/api/pricelists/latest');
|
||||||
|
|||||||
@@ -1,476 +0,0 @@
|
|||||||
{{define "title"}}Проект - QuoteForge{{end}}
|
|
||||||
|
|
||||||
{{define "content"}}
|
|
||||||
<div class="space-y-4">
|
|
||||||
<div class="flex items-center justify-between gap-3">
|
|
||||||
<div class="flex items-center gap-3">
|
|
||||||
<a href="/projects" class="text-gray-500 hover:text-gray-700" title="Назад к проектам">
|
|
||||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<h1 class="text-2xl font-bold" id="project-title">Проект</h1>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="action-buttons" class="mt-4 grid grid-cols-1 sm:grid-cols-2 gap-3">
|
|
||||||
<button onclick="openCreateModal()" class="py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 font-medium">
|
|
||||||
+ Создать новую квоту
|
|
||||||
</button>
|
|
||||||
<button onclick="openImportModal()" class="py-3 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 font-medium">
|
|
||||||
Импорт квоты
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mt-4 inline-flex rounded-lg border border-gray-200 overflow-hidden">
|
|
||||||
<button id="status-active-btn" onclick="setConfigStatusMode('active')" class="px-4 py-2 text-sm font-medium bg-blue-600 text-white">
|
|
||||||
Активные
|
|
||||||
</button>
|
|
||||||
<button id="status-archived-btn" onclick="setConfigStatusMode('archived')" class="px-4 py-2 text-sm font-medium bg-white text-gray-700 hover:bg-gray-50 border-l border-gray-200">
|
|
||||||
Архив
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="configs-list">
|
|
||||||
<div class="text-center py-8 text-gray-500">Загрузка...</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="create-modal" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
|
|
||||||
<div class="bg-white rounded-lg shadow-xl w-full max-w-md mx-4 p-6">
|
|
||||||
<h2 class="text-xl font-semibold mb-4">Новая квота в проекте</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Название квоты</label>
|
|
||||||
<input type="text" id="create-name" placeholder="Например: OPP-2026-001"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-end space-x-3 mt-6">
|
|
||||||
<button onclick="closeCreateModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">Отмена</button>
|
|
||||||
<button onclick="createConfig()" class="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">Создать</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="rename-modal" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
|
|
||||||
<div class="bg-white rounded-lg shadow-xl w-full max-w-md mx-4 p-6">
|
|
||||||
<h2 class="text-xl font-semibold mb-4">Переименовать квоту</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Новое название</label>
|
|
||||||
<input type="text" id="rename-input"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
<input type="hidden" id="rename-uuid">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-end space-x-3 mt-6">
|
|
||||||
<button onclick="closeRenameModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">Отмена</button>
|
|
||||||
<button onclick="renameConfig()" class="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">Сохранить</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="clone-modal" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
|
|
||||||
<div class="bg-white rounded-lg shadow-xl w-full max-w-md mx-4 p-6">
|
|
||||||
<h2 class="text-xl font-semibold mb-4">Копировать квоту</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-gray-700 mb-1">Название копии</label>
|
|
||||||
<input type="text" id="clone-input"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
<input type="hidden" id="clone-uuid">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-end space-x-3 mt-6">
|
|
||||||
<button onclick="closeCloneModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">Отмена</button>
|
|
||||||
<button onclick="cloneConfig()" class="px-4 py-2 bg-green-600 text-white rounded hover:bg-green-700">Копировать</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="import-modal" class="fixed inset-0 bg-black bg-opacity-50 hidden items-center justify-center z-50">
|
|
||||||
<div class="bg-white rounded-lg shadow-xl w-full max-w-md mx-4 p-6">
|
|
||||||
<h2 class="text-xl font-semibold mb-4">Импорт квоты в проект</h2>
|
|
||||||
<div class="space-y-3">
|
|
||||||
<label class="block text-sm font-medium text-gray-700">Квота</label>
|
|
||||||
<input id="import-config-input"
|
|
||||||
list="import-config-options"
|
|
||||||
placeholder="Начните вводить название квоты"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
<datalist id="import-config-options"></datalist>
|
|
||||||
<div class="text-xs text-gray-500">Квота будет перемещена в текущий проект.</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-end gap-2 mt-6">
|
|
||||||
<button onclick="closeImportModal()" class="px-4 py-2 text-gray-600 hover:text-gray-800">Отмена</button>
|
|
||||||
<button onclick="importConfigToProject()" class="px-4 py-2 bg-indigo-600 text-white rounded hover:bg-indigo-700">Импортировать</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
const projectUUID = '{{.ProjectUUID}}';
|
|
||||||
let configStatusMode = 'active';
|
|
||||||
let project = null;
|
|
||||||
let allConfigs = [];
|
|
||||||
|
|
||||||
function escapeHtml(text) {
|
|
||||||
const div = document.createElement('div');
|
|
||||||
div.textContent = text || '';
|
|
||||||
return div.innerHTML;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setConfigStatusMode(mode) {
|
|
||||||
if (mode !== 'active' && mode !== 'archived') return;
|
|
||||||
configStatusMode = mode;
|
|
||||||
applyStatusModeUI();
|
|
||||||
loadConfigs();
|
|
||||||
}
|
|
||||||
|
|
||||||
function applyStatusModeUI() {
|
|
||||||
const activeBtn = document.getElementById('status-active-btn');
|
|
||||||
const archivedBtn = document.getElementById('status-archived-btn');
|
|
||||||
const actionButtons = document.getElementById('action-buttons');
|
|
||||||
|
|
||||||
if (configStatusMode === 'archived') {
|
|
||||||
activeBtn.className = 'px-4 py-2 text-sm font-medium bg-white text-gray-700 hover:bg-gray-50';
|
|
||||||
archivedBtn.className = 'px-4 py-2 text-sm font-medium bg-blue-600 text-white border-l border-gray-200';
|
|
||||||
actionButtons.classList.add('hidden');
|
|
||||||
} else {
|
|
||||||
activeBtn.className = 'px-4 py-2 text-sm font-medium bg-blue-600 text-white';
|
|
||||||
archivedBtn.className = 'px-4 py-2 text-sm font-medium bg-white text-gray-700 hover:bg-gray-50 border-l border-gray-200';
|
|
||||||
actionButtons.classList.remove('hidden');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderConfigs(configs) {
|
|
||||||
const emptyText = configStatusMode === 'archived' ? 'Архив пуст' : 'Нет квот в проекте';
|
|
||||||
if (configs.length === 0) {
|
|
||||||
document.getElementById('configs-list').innerHTML =
|
|
||||||
'<div class="bg-white rounded-lg shadow p-8 text-center text-gray-500">' + emptyText + '</div>';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let totalSum = 0;
|
|
||||||
let html = '<div class="bg-white rounded-lg shadow overflow-hidden"><table class="w-full">';
|
|
||||||
html += '<thead class="bg-gray-50"><tr>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Дата</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Название</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Автор</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Цена (за 1 шт)</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Кол-во</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">Сумма</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">Действия</th>';
|
|
||||||
html += '</tr></thead><tbody class="divide-y">';
|
|
||||||
|
|
||||||
configs.forEach(c => {
|
|
||||||
const date = new Date(c.created_at).toLocaleDateString('ru-RU');
|
|
||||||
const total = c.total_price || 0;
|
|
||||||
const serverCount = c.server_count || 1;
|
|
||||||
const author = c.owner_username || (c.user && c.user.username) || '—';
|
|
||||||
const unitPrice = serverCount > 0 ? (total / serverCount) : 0;
|
|
||||||
totalSum += total;
|
|
||||||
|
|
||||||
html += '<tr class="hover:bg-gray-50">';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-500">' + date + '</td>';
|
|
||||||
if (configStatusMode === 'archived') {
|
|
||||||
html += '<td class="px-4 py-3 text-sm font-medium text-gray-700">' + escapeHtml(c.name) + '</td>';
|
|
||||||
} else {
|
|
||||||
html += '<td class="px-4 py-3 text-sm font-medium"><a href="/configurator?uuid=' + c.uuid + '" class="text-blue-600 hover:text-blue-800 hover:underline">' + escapeHtml(c.name) + '</a></td>';
|
|
||||||
}
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-500">' + escapeHtml(author) + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-500">$' + unitPrice.toLocaleString('en-US', {minimumFractionDigits: 2}) + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-500">' + serverCount + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-right">$' + total.toLocaleString('en-US', {minimumFractionDigits: 2}) + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-right space-x-2">';
|
|
||||||
if (configStatusMode === 'archived') {
|
|
||||||
html += '<button onclick="reactivateConfig(\'' + c.uuid + '\')" class="text-emerald-600 hover:text-emerald-800" title="Восстановить">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path></svg></button>';
|
|
||||||
} else {
|
|
||||||
html += '<button onclick="openCloneModal(\'' + c.uuid + '\', \'' + escapeHtml(c.name).replace(/'/g, "\\'") + '\')" class="text-green-600 hover:text-green-800" title="Копировать">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"></path></svg></button>';
|
|
||||||
html += '<button onclick="openRenameModal(\'' + c.uuid + '\', \'' + escapeHtml(c.name).replace(/'/g, "\\'") + '\')" class="text-blue-600 hover:text-blue-800" title="Переименовать">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg></button>';
|
|
||||||
html += '<button onclick="deleteConfig(\'' + c.uuid + '\')" class="text-red-600 hover:text-red-800" title="В архив">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg></button>';
|
|
||||||
}
|
|
||||||
html += '</td></tr>';
|
|
||||||
});
|
|
||||||
|
|
||||||
html += '</tbody>';
|
|
||||||
html += '<tfoot class="bg-gray-50 border-t">';
|
|
||||||
html += '<tr>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm font-medium text-gray-700" colspan="4">Итого по проекту</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-700">' + configs.length + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-right font-semibold text-gray-900">$' + totalSum.toLocaleString('en-US', {minimumFractionDigits: 2}) + '</td>';
|
|
||||||
html += '<td class="px-4 py-3"></td>';
|
|
||||||
html += '</tr>';
|
|
||||||
html += '</tfoot>';
|
|
||||||
html += '</table></div>';
|
|
||||||
document.getElementById('configs-list').innerHTML = html;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadProject() {
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID);
|
|
||||||
if (!resp.ok) {
|
|
||||||
document.getElementById('configs-list').innerHTML = '<div class="bg-white rounded-lg shadow p-8 text-center text-red-600">Проект не найден</div>';
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
project = await resp.json();
|
|
||||||
document.getElementById('project-title').textContent = project.name;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadConfigs() {
|
|
||||||
try {
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID + '/configs?status=' + configStatusMode);
|
|
||||||
if (!resp.ok) {
|
|
||||||
document.getElementById('configs-list').innerHTML =
|
|
||||||
'<div class="bg-white rounded-lg shadow p-8 text-center text-red-600">Ошибка загрузки</div>';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = await resp.json();
|
|
||||||
allConfigs = (data.configurations || []);
|
|
||||||
renderConfigs(allConfigs);
|
|
||||||
} catch (e) {
|
|
||||||
document.getElementById('configs-list').innerHTML =
|
|
||||||
'<div class="bg-white rounded-lg shadow p-8 text-center text-red-600">Ошибка загрузки</div>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function openCreateModal() {
|
|
||||||
document.getElementById('create-name').value = '';
|
|
||||||
document.getElementById('create-modal').classList.remove('hidden');
|
|
||||||
document.getElementById('create-modal').classList.add('flex');
|
|
||||||
document.getElementById('create-name').focus();
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeCreateModal() {
|
|
||||||
document.getElementById('create-modal').classList.add('hidden');
|
|
||||||
document.getElementById('create-modal').classList.remove('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function createConfig() {
|
|
||||||
const name = document.getElementById('create-name').value.trim();
|
|
||||||
if (!name) {
|
|
||||||
alert('Введите название');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID + '/configs', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: name, items: [], notes: '', server_count: 1})
|
|
||||||
});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось создать квоту');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
closeCreateModal();
|
|
||||||
loadConfigs();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deleteConfig(uuid) {
|
|
||||||
if (!confirm('Переместить квоту в архив?')) return;
|
|
||||||
await fetch('/api/configs/' + uuid, {method: 'DELETE'});
|
|
||||||
loadConfigs();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function reactivateConfig(uuid) {
|
|
||||||
const resp = await fetch('/api/configs/' + uuid + '/reactivate', {method: 'POST'});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось восстановить квоту');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const moved = await fetch('/api/configs/' + uuid + '/project', {
|
|
||||||
method: 'PATCH',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({project_uuid: projectUUID})
|
|
||||||
});
|
|
||||||
if (!moved.ok) {
|
|
||||||
alert('Квота восстановлена, но не удалось вернуть в проект');
|
|
||||||
}
|
|
||||||
loadConfigs();
|
|
||||||
}
|
|
||||||
|
|
||||||
function openRenameModal(uuid, currentName) {
|
|
||||||
document.getElementById('rename-uuid').value = uuid;
|
|
||||||
document.getElementById('rename-input').value = currentName;
|
|
||||||
document.getElementById('rename-modal').classList.remove('hidden');
|
|
||||||
document.getElementById('rename-modal').classList.add('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeRenameModal() {
|
|
||||||
document.getElementById('rename-modal').classList.add('hidden');
|
|
||||||
document.getElementById('rename-modal').classList.remove('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function renameConfig() {
|
|
||||||
const uuid = document.getElementById('rename-uuid').value;
|
|
||||||
const name = document.getElementById('rename-input').value.trim();
|
|
||||||
if (!name) {
|
|
||||||
alert('Введите название');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const resp = await fetch('/api/configs/' + uuid + '/rename', {
|
|
||||||
method: 'PATCH',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: name})
|
|
||||||
});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось переименовать');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
closeRenameModal();
|
|
||||||
loadConfigs();
|
|
||||||
}
|
|
||||||
|
|
||||||
function openCloneModal(uuid, currentName) {
|
|
||||||
document.getElementById('clone-uuid').value = uuid;
|
|
||||||
document.getElementById('clone-input').value = currentName + ' (копия)';
|
|
||||||
document.getElementById('clone-modal').classList.remove('hidden');
|
|
||||||
document.getElementById('clone-modal').classList.add('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeCloneModal() {
|
|
||||||
document.getElementById('clone-modal').classList.add('hidden');
|
|
||||||
document.getElementById('clone-modal').classList.remove('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function cloneConfig() {
|
|
||||||
const uuid = document.getElementById('clone-uuid').value;
|
|
||||||
const name = document.getElementById('clone-input').value.trim();
|
|
||||||
if (!name) {
|
|
||||||
alert('Введите название');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID + '/configs/' + uuid + '/clone', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: name})
|
|
||||||
});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось скопировать');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
closeCloneModal();
|
|
||||||
loadConfigs();
|
|
||||||
}
|
|
||||||
|
|
||||||
function openImportModal() {
|
|
||||||
const activeOther = allConfigs.length ? null : null; // no-op placeholder
|
|
||||||
void activeOther;
|
|
||||||
document.getElementById('import-config-input').value = '';
|
|
||||||
document.getElementById('import-config-options').innerHTML = '';
|
|
||||||
loadImportOptions();
|
|
||||||
document.getElementById('import-modal').classList.remove('hidden');
|
|
||||||
document.getElementById('import-modal').classList.add('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeImportModal() {
|
|
||||||
document.getElementById('import-modal').classList.add('hidden');
|
|
||||||
document.getElementById('import-modal').classList.remove('flex');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadImportOptions() {
|
|
||||||
const resp = await fetch('/api/configs?page=1&per_page=500&status=active');
|
|
||||||
if (!resp.ok) return;
|
|
||||||
const data = await resp.json();
|
|
||||||
const options = document.getElementById('import-config-options');
|
|
||||||
options.innerHTML = '';
|
|
||||||
(data.configurations || [])
|
|
||||||
.filter(c => c.project_uuid !== projectUUID)
|
|
||||||
.forEach(c => {
|
|
||||||
const opt = document.createElement('option');
|
|
||||||
opt.value = c.name;
|
|
||||||
options.appendChild(opt);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function importConfigToProject() {
|
|
||||||
const query = document.getElementById('import-config-input').value.trim();
|
|
||||||
if (!query) {
|
|
||||||
alert('Выберите квоту');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const resp = await fetch('/api/configs?page=1&per_page=500&status=active');
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось загрузить список квот');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const data = await resp.json();
|
|
||||||
const sourceConfigs = (data.configurations || []).filter(c => c.project_uuid !== projectUUID);
|
|
||||||
|
|
||||||
let targets = [];
|
|
||||||
if (query.includes('*')) {
|
|
||||||
targets = sourceConfigs.filter(c => wildcardMatch(c.name || '', query));
|
|
||||||
} else {
|
|
||||||
const found = sourceConfigs.find(c => (c.name || '').toLowerCase() === query.toLowerCase());
|
|
||||||
if (found) {
|
|
||||||
targets = [found];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!targets.length) {
|
|
||||||
alert('Подходящие квоты не найдены');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let moved = 0;
|
|
||||||
let failed = 0;
|
|
||||||
for (const cfg of targets) {
|
|
||||||
const move = await fetch('/api/configs/' + cfg.uuid + '/project', {
|
|
||||||
method: 'PATCH',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({project_uuid: projectUUID})
|
|
||||||
});
|
|
||||||
if (move.ok) {
|
|
||||||
moved++;
|
|
||||||
} else {
|
|
||||||
failed++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!moved) {
|
|
||||||
alert('Не удалось импортировать квоты');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
closeImportModal();
|
|
||||||
await loadConfigs();
|
|
||||||
if (targets.length > 1 || failed > 0) {
|
|
||||||
alert('Импорт завершен: перенесено ' + moved + ', ошибок ' + failed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function wildcardMatch(value, pattern) {
|
|
||||||
const escaped = pattern
|
|
||||||
.replace(/[.+^${}()|[\]\\]/g, '\\$&')
|
|
||||||
.replace(/\*/g, '.*');
|
|
||||||
const regex = new RegExp('^' + escaped + '$', 'i');
|
|
||||||
return regex.test(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('create-modal').addEventListener('click', function(e) { if (e.target === this) closeCreateModal(); });
|
|
||||||
document.getElementById('rename-modal').addEventListener('click', function(e) { if (e.target === this) closeRenameModal(); });
|
|
||||||
document.getElementById('clone-modal').addEventListener('click', function(e) { if (e.target === this) closeCloneModal(); });
|
|
||||||
document.getElementById('import-modal').addEventListener('click', function(e) { if (e.target === this) closeImportModal(); });
|
|
||||||
document.addEventListener('keydown', function(e) {
|
|
||||||
if (e.key === 'Escape') {
|
|
||||||
closeCreateModal();
|
|
||||||
closeRenameModal();
|
|
||||||
closeCloneModal();
|
|
||||||
closeImportModal();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', async function() {
|
|
||||||
applyStatusModeUI();
|
|
||||||
const ok = await loadProject();
|
|
||||||
if (!ok) return;
|
|
||||||
await loadConfigs();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
@@ -1,231 +0,0 @@
|
|||||||
{{define "title"}}Мои проекты - QuoteForge{{end}}
|
|
||||||
|
|
||||||
{{define "content"}}
|
|
||||||
<div class="space-y-4">
|
|
||||||
<div class="flex flex-wrap items-center justify-between gap-3">
|
|
||||||
<h1 class="text-2xl font-bold">Мои проекты</h1>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<a href="/configs" class="px-4 py-2 bg-gray-200 text-gray-800 rounded hover:bg-gray-300">
|
|
||||||
Все конфигурации
|
|
||||||
</a>
|
|
||||||
<button onclick="createProject()" class="px-4 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">
|
|
||||||
+ Новый проект
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="inline-flex rounded-lg border border-gray-200 overflow-hidden">
|
|
||||||
<button id="status-active-btn" onclick="setStatus('active')" class="px-4 py-2 text-sm font-medium bg-blue-600 text-white">Активные</button>
|
|
||||||
<button id="status-archived-btn" onclick="setStatus('archived')" class="px-4 py-2 text-sm font-medium bg-white text-gray-700 hover:bg-gray-50 border-l border-gray-200">Архив</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="max-w-md">
|
|
||||||
<input id="projects-search" type="text" placeholder="Поиск проекта по названию"
|
|
||||||
class="w-full px-3 py-2 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="projects-table" class="bg-white rounded-lg shadow p-4 text-gray-500">Загрузка...</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
let status = 'active';
|
|
||||||
let projectsSearch = '';
|
|
||||||
|
|
||||||
function escapeHtml(text) {
|
|
||||||
const div = document.createElement('div');
|
|
||||||
div.textContent = text || '';
|
|
||||||
return div.innerHTML;
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatMoney(v) {
|
|
||||||
return '$' + (v || 0).toLocaleString('en-US', {minimumFractionDigits: 2});
|
|
||||||
}
|
|
||||||
|
|
||||||
function setStatus(value) {
|
|
||||||
status = value;
|
|
||||||
document.getElementById('status-active-btn').className = value === 'active'
|
|
||||||
? 'px-4 py-2 text-sm font-medium bg-blue-600 text-white'
|
|
||||||
: 'px-4 py-2 text-sm font-medium bg-white text-gray-700 hover:bg-gray-50';
|
|
||||||
document.getElementById('status-archived-btn').className = value === 'archived'
|
|
||||||
? 'px-4 py-2 text-sm font-medium bg-blue-600 text-white border-l border-gray-200'
|
|
||||||
: 'px-4 py-2 text-sm font-medium bg-white text-gray-700 hover:bg-gray-50 border-l border-gray-200';
|
|
||||||
loadProjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadProjects() {
|
|
||||||
const root = document.getElementById('projects-table');
|
|
||||||
root.innerHTML = '<div class="text-gray-500">Загрузка...</div>';
|
|
||||||
|
|
||||||
let rows = [];
|
|
||||||
try {
|
|
||||||
const resp = await fetch('/api/projects?status=' + status + '&search=' + encodeURIComponent(projectsSearch));
|
|
||||||
if (!resp.ok) {
|
|
||||||
throw new Error('HTTP ' + resp.status);
|
|
||||||
}
|
|
||||||
const data = await resp.json();
|
|
||||||
rows = data.projects || [];
|
|
||||||
} catch (e) {
|
|
||||||
root.innerHTML = '<div class="text-red-600">Ошибка загрузки проектов: ' + escapeHtml(String(e.message || e)) + '</div>';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!rows.length) {
|
|
||||||
root.innerHTML = '<div class="text-gray-500">Проектов нет</div>';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let html = '<div class="overflow-x-auto"><table class="w-full">';
|
|
||||||
html += '<thead class="bg-gray-50"><tr>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Название проекта</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Автор</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">Кол-во квот</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">Сумма</th>';
|
|
||||||
html += '<th class="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">Действия</th>';
|
|
||||||
html += '</tr></thead><tbody class="divide-y">';
|
|
||||||
|
|
||||||
rows.forEach(p => {
|
|
||||||
html += '<tr class="hover:bg-gray-50">';
|
|
||||||
html += '<td class="px-4 py-3 text-sm font-medium"><a class="text-blue-600 hover:underline" href="/projects/' + p.uuid + '">' + escapeHtml(p.name) + '</a></td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-gray-600">' + escapeHtml(p.owner_username || '—') + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-right text-gray-700">' + (p.config_count || 0) + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-right text-gray-700">' + formatMoney(p.total) + '</td>';
|
|
||||||
html += '<td class="px-4 py-3 text-sm text-right"><div class="inline-flex items-center gap-2">';
|
|
||||||
|
|
||||||
if (p.is_active) {
|
|
||||||
html += '<button onclick="copyProject(\'' + p.uuid + '\', \'' + escapeHtml(p.name).replace(/'/g, "\\'") + '\')" class="text-green-700 hover:text-green-900" title="Копировать">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"></path></svg>';
|
|
||||||
html += '</button>';
|
|
||||||
|
|
||||||
html += '<button onclick="renameProject(\'' + p.uuid + '\', \'' + escapeHtml(p.name).replace(/'/g, "\\'") + '\')" class="text-blue-700 hover:text-blue-900" title="Переименовать">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>';
|
|
||||||
html += '</button>';
|
|
||||||
|
|
||||||
html += '<button onclick="archiveProject(\'' + p.uuid + '\')" class="text-red-700 hover:text-red-900" title="Удалить (в архив)">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg>';
|
|
||||||
html += '</button>';
|
|
||||||
|
|
||||||
html += '<button onclick="addConfigToProject(\'' + p.uuid + '\')" class="text-indigo-700 hover:text-indigo-900" title="Добавить квоту">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"></path></svg>';
|
|
||||||
html += '</button>';
|
|
||||||
} else {
|
|
||||||
html += '<button onclick="reactivateProject(\'' + p.uuid + '\')" class="text-emerald-700 hover:text-emerald-900" title="Восстановить">';
|
|
||||||
html += '<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path></svg>';
|
|
||||||
html += '</button>';
|
|
||||||
}
|
|
||||||
html += '</div></td>';
|
|
||||||
html += '</tr>';
|
|
||||||
});
|
|
||||||
|
|
||||||
html += '</tbody></table></div>';
|
|
||||||
root.innerHTML = html;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function createProject() {
|
|
||||||
const name = prompt('Название проекта');
|
|
||||||
if (!name || !name.trim()) return;
|
|
||||||
const resp = await fetch('/api/projects', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: name.trim()})
|
|
||||||
});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось создать проект');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
loadProjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function renameProject(projectUUID, currentName) {
|
|
||||||
const name = prompt('Новое название проекта', currentName);
|
|
||||||
if (!name || !name.trim() || name.trim() === currentName) return;
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID, {
|
|
||||||
method: 'PUT',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: name.trim()})
|
|
||||||
});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось переименовать проект');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
loadProjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function archiveProject(projectUUID) {
|
|
||||||
if (!confirm('Переместить проект в архив?')) return;
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID + '/archive', {method: 'POST'});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось архивировать проект');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
loadProjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function reactivateProject(projectUUID) {
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID + '/reactivate', {method: 'POST'});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось восстановить проект');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
loadProjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function addConfigToProject(projectUUID) {
|
|
||||||
const name = prompt('Название новой квоты');
|
|
||||||
if (!name || !name.trim()) return;
|
|
||||||
const resp = await fetch('/api/projects/' + projectUUID + '/configs', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: name.trim(), items: [], notes: '', server_count: 1})
|
|
||||||
});
|
|
||||||
if (!resp.ok) {
|
|
||||||
alert('Не удалось создать квоту');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
loadProjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function copyProject(projectUUID, projectName) {
|
|
||||||
const newName = prompt('Название копии проекта', projectName + ' (копия)');
|
|
||||||
if (!newName || !newName.trim()) return;
|
|
||||||
|
|
||||||
const createResp = await fetch('/api/projects', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: newName.trim()})
|
|
||||||
});
|
|
||||||
if (!createResp.ok) {
|
|
||||||
alert('Не удалось создать копию проекта');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const newProject = await createResp.json();
|
|
||||||
|
|
||||||
const listResp = await fetch('/api/projects/' + projectUUID + '/configs');
|
|
||||||
if (!listResp.ok) {
|
|
||||||
alert('Проект скопирован без квот (не удалось загрузить исходные квоты)');
|
|
||||||
loadProjects();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const listData = await listResp.json();
|
|
||||||
const configs = listData.configurations || [];
|
|
||||||
|
|
||||||
for (const cfg of configs) {
|
|
||||||
await fetch('/api/projects/' + newProject.uuid + '/configs/' + cfg.uuid + '/clone', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({name: cfg.name})
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
loadProjects();
|
|
||||||
}
|
|
||||||
|
|
||||||
loadProjects();
|
|
||||||
|
|
||||||
document.getElementById('projects-search').addEventListener('input', function(e) {
|
|
||||||
projectsSearch = (e.target.value || '').trim();
|
|
||||||
loadProjects();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
Reference in New Issue
Block a user