Fix critical collection persistence bug where initial items disappeared after first enhancement by implementing database-first pattern with template-based reconstruction

2025-09-22 21:50:18 +02:00
parent 09823d3e4d
commit 5f494b8aa8
5 changed files with 312 additions and 27 deletions
--- a/internal/engine/database_client.go
+++ b/internal/engine/database_client.go
@@ -410,3 +410,109 @@ func (c *DatabaseClient) CreateCollectionTemplate(siteID, collectionID, name, ht
 		return nil, fmt.Errorf("unsupported database type: %s", c.database.GetDBType())
 	}
 }
+
+// GetCollectionTemplates retrieves all templates for a collection
+func (c *DatabaseClient) GetCollectionTemplates(siteID, collectionID string) ([]CollectionTemplateItem, error) {
+	switch c.database.GetDBType() {
+	case "sqlite3":
+		templates, err := c.database.GetSQLiteQueries().GetCollectionTemplates(context.Background(), sqlite.GetCollectionTemplatesParams{
+			CollectionID: collectionID,
+			SiteID:       siteID,
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		result := make([]CollectionTemplateItem, len(templates))
+		for i, template := range templates {
+			result[i] = CollectionTemplateItem{
+				TemplateID:   int(template.TemplateID),
+				CollectionID: template.CollectionID,
+				SiteID:       template.SiteID,
+				Name:         template.Name,
+				HTMLTemplate: template.HtmlTemplate,
+				IsDefault:    template.IsDefault != 0, // SQLite uses INTEGER for boolean
+			}
+		}
+		return result, nil
+
+	case "postgresql":
+		templates, err := c.database.GetPostgreSQLQueries().GetCollectionTemplates(context.Background(), postgresql.GetCollectionTemplatesParams{
+			CollectionID: collectionID,
+			SiteID:       siteID,
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		result := make([]CollectionTemplateItem, len(templates))
+		for i, template := range templates {
+			result[i] = CollectionTemplateItem{
+				TemplateID:   int(template.TemplateID),
+				CollectionID: template.CollectionID,
+				SiteID:       template.SiteID,
+				Name:         template.Name,
+				HTMLTemplate: template.HtmlTemplate,
+				IsDefault:    template.IsDefault, // PostgreSQL uses BOOLEAN
+			}
+		}
+		return result, nil
+
+	default:
+		return nil, fmt.Errorf("unsupported database type: %s", c.database.GetDBType())
+	}
+}
+
+// CreateCollectionItem creates a new collection item
+func (c *DatabaseClient) CreateCollectionItem(siteID, collectionID, itemID string, templateID int, htmlContent string, position int, lastEditedBy string) (*CollectionItemWithTemplate, error) {
+	switch c.database.GetDBType() {
+	case "sqlite3":
+		item, err := c.database.GetSQLiteQueries().CreateCollectionItem(context.Background(), sqlite.CreateCollectionItemParams{
+			ItemID:       itemID,
+			CollectionID: collectionID,
+			SiteID:       siteID,
+			TemplateID:   int64(templateID),
+			HtmlContent:  htmlContent,
+			Position:     int64(position),
+			LastEditedBy: lastEditedBy,
+		})
+		if err != nil {
+			return nil, err
+		}
+		return &CollectionItemWithTemplate{
+			ItemID:       item.ItemID,
+			CollectionID: item.CollectionID,
+			SiteID:       item.SiteID,
+			TemplateID:   int(item.TemplateID),
+			HTMLContent:  item.HtmlContent,
+			Position:     int(item.Position),
+			LastEditedBy: item.LastEditedBy,
+		}, nil
+
+	case "postgresql":
+		item, err := c.database.GetPostgreSQLQueries().CreateCollectionItem(context.Background(), postgresql.CreateCollectionItemParams{
+			ItemID:       itemID,
+			CollectionID: collectionID,
+			SiteID:       siteID,
+			TemplateID:   int32(templateID),
+			HtmlContent:  htmlContent,
+			Position:     int32(position),
+			LastEditedBy: lastEditedBy,
+		})
+		if err != nil {
+			return nil, err
+		}
+		return &CollectionItemWithTemplate{
+			ItemID:       item.ItemID,
+			CollectionID: item.CollectionID,
+			SiteID:       item.SiteID,
+			TemplateID:   int(item.TemplateID),
+			HTMLContent:  item.HtmlContent,
+			Position:     int(item.Position),
+			LastEditedBy: item.LastEditedBy,
+		}, nil
+
+	default:
+		return nil, fmt.Errorf("unsupported database type: %s", c.database.GetDBType())
+	}
+}