From 5f5f1ad114026f97b939ead80689d2eac061d00a Mon Sep 17 00:00:00 2001 From: Eden Kirin Date: Mon, 15 Dec 2025 10:37:28 +0100 Subject: [PATCH] Generate cloud instead televendcloud entities --- internal/generator/factory.go | 8 ++++---- internal/generator/filter.go | 6 +++--- internal/generator/generator_test.go | 14 +++++++------- internal/generator/load_options.go | 2 +- internal/generator/manager.go | 6 +++--- internal/generator/model.go | 4 ++-- internal/generator/repository.go | 4 ++-- internal/generator/table.go | 4 ++-- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/generator/factory.go b/internal/generator/factory.go index 06742a7..be45948 100644 --- a/internal/generator/factory.go +++ b/internal/generator/factory.go @@ -26,23 +26,23 @@ func GenerateFactory(ctx *Context) (string, error) { } for moduleName, entityName := range fkImports { - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.factory import (\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.factory import (\n", moduleName)) b.WriteString(fmt.Sprintf(" %sFactory,\n", entityName)) b.WriteString(")\n") } - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.model import (\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.model import (\n", ctx.ModuleName)) b.WriteString(fmt.Sprintf(" %s,\n", ctx.EntityName)) b.WriteString(")\n") b.WriteString("from televend_core.test_extras.factory_boy_utils import (\n") b.WriteString(" CustomSelfAttribute,\n") - b.WriteString(" TelevendBaseFactory,\n") + b.WriteString(" CloudBaseFactory,\n") b.WriteString(")\n\n\n") // Class definition - b.WriteString(fmt.Sprintf("class %sFactory(TelevendBaseFactory):\n", ctx.EntityName)) + b.WriteString(fmt.Sprintf("class %sFactory(CloudBaseFactory):\n", ctx.EntityName)) // Add boolean fields with defaults for _, col := range ctx.TableInfo.Columns { diff --git a/internal/generator/filter.go b/internal/generator/filter.go index 5517ae8..501fd3e 100644 --- a/internal/generator/filter.go +++ b/internal/generator/filter.go @@ -14,7 +14,7 @@ func GenerateFilter(ctx *Context) (string, error) { // Imports b.WriteString("from televend_core.databases.base_filter import BaseFilter\n") b.WriteString("from televend_core.databases.common.filters.filters import EQ, IN, filterfield\n") - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.model import %s\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.model import %s\n", ctx.ModuleName, ctx.EntityName)) b.WriteString("\n\n") @@ -64,8 +64,8 @@ func GenerateFilter(ctx *Context) (string, error) { // Text fields if (col.DataType == "character varying" || col.DataType == "varchar" || - col.DataType == "text" || col.DataType == "char" || col.DataType == "character") && - !strings.HasSuffix(col.Name, "_id") && col.Name != "id" { + col.DataType == "text" || col.DataType == "char" || col.DataType == "character") && + !strings.HasSuffix(col.Name, "_id") && col.Name != "id" { b.WriteString(fmt.Sprintf(" %s: str | None = filterfield(operator=EQ)\n", col.Name)) } diff --git a/internal/generator/generator_test.go b/internal/generator/generator_test.go index 420a68a..c606b46 100644 --- a/internal/generator/generator_test.go +++ b/internal/generator/generator_test.go @@ -17,7 +17,7 @@ func TestGetRelationshipName(t *testing.T) { {"with _id suffix", "author_info_id", "author_info"}, {"with user_id", "user_id", "user"}, {"without _id", "status", "status"}, - {"just id", "id", "id"}, // "id" doesn't have "_id" suffix, so returns as-is + {"just id", "id", "id"}, // "id" doesn't have "_id" suffix, so returns as-is {"empty", "", ""}, } @@ -370,8 +370,8 @@ func TestGenerateRepository(t *testing.T) { "CRUDRepository", "model_cls = User", "from televend_core.databases.base_repository import CRUDRepository", - "from televend_core.databases.televend_repositories.user.filter import", - "from televend_core.databases.televend_repositories.user.model import User", + "from televend_core.databases.cloud_repositories.user.filter import", + "from televend_core.databases.cloud_repositories.user.model import User", } for _, expected := range expectedStrings { @@ -508,7 +508,7 @@ func TestGenerateTable(t *testing.T) { }, expected: []string{ "Enum", - "from televend_core.databases.televend_repositories.order.enum import", + "from televend_core.databases.cloud_repositories.order.enum import", "OrderStatus", `Enum(`, `*OrderStatus.to_value_list()`, @@ -580,7 +580,7 @@ func TestGenerateModel(t *testing.T) { EnumTypes: map[string]database.EnumType{}, }, expected: []string{ - "from televend_core.databases.televend_repositories.user.model import User", + "from televend_core.databases.cloud_repositories.user.model import User", "user_id: int", "user: User", "title: str", @@ -791,7 +791,7 @@ func TestGenerateFactory(t *testing.T) { "from __future__ import annotations", "from typing import Type", "import factory", - "class UserFactory(TelevendBaseFactory):", + "class UserFactory(CloudBaseFactory):", "alive = True", "id = None", `name = factory.Faker("pystr", max_chars=100)`, @@ -816,7 +816,7 @@ func TestGenerateFactory(t *testing.T) { EnumTypes: map[string]database.EnumType{}, }, expected: []string{ - "from televend_core.databases.televend_repositories.user.factory import", + "from televend_core.databases.cloud_repositories.user.factory import", "UserFactory", `user = CustomSelfAttribute("..user", UserFactory)`, "user_id = factory.LazyAttribute(lambda a: a.user.id if a.user else None)", diff --git a/internal/generator/load_options.go b/internal/generator/load_options.go index e30058c..b251662 100644 --- a/internal/generator/load_options.go +++ b/internal/generator/load_options.go @@ -12,7 +12,7 @@ func GenerateLoadOptions(ctx *Context) (string, error) { // Imports b.WriteString("from televend_core.databases.base_load_options import LoadOptions\n") b.WriteString("from televend_core.databases.common.load_options import joinload\n") - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.model import %s\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.model import %s\n", ctx.ModuleName, ctx.EntityName)) b.WriteString("\n\n") diff --git a/internal/generator/manager.go b/internal/generator/manager.go index b731a41..4bc2e59 100644 --- a/internal/generator/manager.go +++ b/internal/generator/manager.go @@ -11,13 +11,13 @@ func GenerateManager(ctx *Context) (string, error) { // Imports b.WriteString("from televend_core.databases.base_manager import CRUDManager\n") - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.filter import (\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.filter import (\n", ctx.ModuleName)) b.WriteString(fmt.Sprintf(" %sFilter,\n", ctx.EntityName)) b.WriteString(")\n") - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.model import %s\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.model import %s\n", ctx.ModuleName, ctx.EntityName)) - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.repository import (\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.repository import (\n", ctx.ModuleName)) b.WriteString(fmt.Sprintf(" %sRepository,\n", ctx.EntityName)) b.WriteString(")\n") diff --git a/internal/generator/model.go b/internal/generator/model.go index b5832cc..848d9a0 100644 --- a/internal/generator/model.go +++ b/internal/generator/model.go @@ -38,7 +38,7 @@ func GenerateModel(ctx *Context) (string, error) { // Import enum types if len(ctx.TableInfo.EnumTypes) > 0 { - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.enum import (\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.enum import (\n", ctx.ModuleName)) for _, enumType := range ctx.TableInfo.EnumTypes { enumName := naming.ToPascalCase(enumType.TypeName) @@ -49,7 +49,7 @@ func GenerateModel(ctx *Context) (string, error) { // Write foreign key imports for moduleName, entityName := range fkImports { - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.model import %s\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.model import %s\n", moduleName, entityName)) } diff --git a/internal/generator/repository.go b/internal/generator/repository.go index 8221569..aa98a58 100644 --- a/internal/generator/repository.go +++ b/internal/generator/repository.go @@ -11,11 +11,11 @@ func GenerateRepository(ctx *Context) (string, error) { // Imports b.WriteString("from televend_core.databases.base_repository import CRUDRepository\n") - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.filter import (\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.filter import (\n", ctx.ModuleName)) b.WriteString(fmt.Sprintf(" %sFilter,\n", ctx.EntityName)) b.WriteString(")\n") - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.model import %s\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.model import %s\n", ctx.ModuleName, ctx.EntityName)) b.WriteString("\n\n") diff --git a/internal/generator/table.go b/internal/generator/table.go index b1da4c1..c7769d8 100644 --- a/internal/generator/table.go +++ b/internal/generator/table.go @@ -72,14 +72,14 @@ func GenerateTable(ctx *Context) (string, error) { if len(ctx.TableInfo.EnumTypes) > 0 { for _, enumType := range ctx.TableInfo.EnumTypes { enumName := naming.ToPascalCase(enumType.TypeName) - b.WriteString(fmt.Sprintf("from televend_core.databases.televend_repositories.%s.enum import (\n", + b.WriteString(fmt.Sprintf("from televend_core.databases.cloud_repositories.%s.enum import (\n", ctx.ModuleName)) b.WriteString(fmt.Sprintf(" %s,\n", enumName)) b.WriteString(")\n") } } - b.WriteString("from televend_core.databases.televend_repositories.table_meta import metadata_obj\n\n") + b.WriteString("from televend_core.databases.cloud_repositories.table_meta import metadata_obj\n\n") // Table definition b.WriteString(fmt.Sprintf("%s = Table(\n", ctx.TableConstant))