chore(multi-tenant): creating multi tenant stubs

Author: levysam

internal/application/services/dummy/GET/service.go

@@ -25,14 +25,14 @@ func (s *Service) Execute(request Request) {
 		s.BadRequest(err.Error())
 		return
 	}
-	s.produceResponseRule(request.Data, request.Client, request.Domain)
+	s.produceResponseRule(request.Data, request.Domain)
 }
 
 func (s *Service) GetResponse() (*Response, *services.Error) {
 	return s.response, s.Error
 }
 
-func (s *Service) produceResponseRule(data *Data, client string, domain *dummy.Dummy) {
+func (s *Service) produceResponseRule(data *Data, domain *dummy.Dummy) {
 	dummyData, err := s.repository.Get(*domain, "id", data.ID)
 
 	if err != nil {

tools/generator/config.toml

@@ -39,13 +39,15 @@ table "{{domain}}" {
 $repeat$"""
 "{{domainType}}" = """type {{domainPascalCase}} struct {
   ID   string `db:"id"`
+  client    string
+  filters   *filters.Filters
 }"""
 "{{pkType}}" = "ID string `param:\"id\"`"
 "{{pkName}}" = "ID"
 "{{pkDbName}}" = "id"
 "{{dataType}}" = ""
-"{{createServiceData}}" = "ID:   s.idCreator.Create(),"
-"{{editServiceData}}" = "ID:        id,"
+"{{createServiceData}}" = ""
+"{{editServiceData}}" = ""
 "{{optionalImports}}" = ""
 "{{idVar}}" = ""
 
@@ -101,7 +103,7 @@ deleteLinePatterns = [
 ]
 
 [stubs.crud.migrator_schema]
-toPath = "tools/migrator/schema/schema.my.hcl"
+toPath = "schemas/schema.my.hcl"
 isGenerated = false
 deleteRegex = "(?s)table \"{{domain}}\" {\\s*.*?\\s*}\n*//tableEnd\n\n"
 

tools/generator/generateFromDb.go

@@ -66,7 +66,7 @@ func (cg *CodeGenerator) generateDomainFromHclBlock(block *hclwrite.Block, table
 	domain := cg.generateDomainStruct(block.Body().Blocks(), tableName, cg.primaryKey, cg.pkType)
 	dataType := cg.generateStruct(block.Body().Blocks(), nil, nil, cg.generateDeclarationLine)
 	createAttrData := cg.generateStruct(block.Body().Blocks(), nil, nil, cg.generateCreateAttributionLine)
-	editAttrData := cg.generateStruct(block.Body().Blocks(), nil, nil, cg.generateEditAttributionLine)
+	editAttrData := cg.generateStruct(block.Body().Blocks(), nil, nil, cg.generateCreateAttributionLine)
 	replacers := GetReplacersConfig(cg.config, cg.domainType, []string{tableName})
 	replacers["{{domainType}}"] = domain
 	replacers["{{dataType}}"] = dataType
@@ -88,6 +88,7 @@ func (cg *CodeGenerator) generateDomainStruct(blocks []*hclwrite.Block, tableNam
 	*pk = cg.findPkOnBlocks(blocks)
 	structString := "type " + PascalCase(tableName) + " struct {\n"
 	structString += cg.generateStruct(blocks, pk, pkType, cg.generateDeclarationLine)
+	structString += "\tclient    string\n\tfilters   *filters.Filters"
 	structString += "}"
 	return structString
 }
@@ -137,36 +138,20 @@ func (cg *CodeGenerator) generateDeclarationLine(str, name, goType, dbTag string
 	)
 }
 
-func (cg *CodeGenerator) generateCreateAttributionLine(str, name, goType, _ string) string {
+func (cg *CodeGenerator) generateCreateAttributionLine(str, name, _, _ string) string {
 	if name == PascalCase(*cg.primaryKey) {
-		if strings.Contains(goType, "int") {
-			*cg.isIntId = true
-			return str
-		}
-		return fmt.Sprintf(
-			"%s	%s: &id,\n",
-			str,
-			name,
-		)
+		return ""
 	}
 	return fmt.Sprintf(
-		"%s	%s: data.%s,\n",
+		"{{domainCamelCase}}Data.%s = data.%s",
 		str,
 		name,
-		name,
 	)
 }
 
-func (cg *CodeGenerator) generateEditAttributionLine(str, name, goType, _ string) string {
+func (cg *CodeGenerator) generateEditAttributionLine(str, name, _, _ string) string {
 	if name == PascalCase(*cg.primaryKey) {
-		if strings.Contains(goType, "int") {
-			return str
-		}
-		return fmt.Sprintf(
-			"%s	%s: &id,\n",
-			str,
-			name,
-		)
+		return ""
 	}
 	return fmt.Sprintf(
 		"%s	%s: data.%s,\n",

tools/generator/generator.go

@@ -89,7 +89,7 @@ func (cg *CodeGenerator) GenerateFilesFromStubs(stubs map[string]Stubs, replacer
 		if !stub.IsGenerated {
 			data, err := GetFileData(stub.ToPath)
 			if err != nil {
-				cg.Logger.Error(err)
+				cg.Logger.Info("File: " + stub.ToPath + " does not exist, generation in this file will be ignored")
 			}
 
 			replData := Replacer(data, replacers)

tools/generator/stubs/crud/domain/{{domain}}.go.stub

@@ -3,11 +3,27 @@ package {{domain}}
 import (
 	"go-skeleton/internal/application/providers/pagination"
 	"go-skeleton/internal/repositories/base_repository"
+	"go-skeleton/internal/application/providers/filters"
 	{{optionalImports}}
 )
 
 {{domainType}}
 
+func (d *{{domainPascalCase}}) SetClient(client string) {
+	d.client = client
+}
+
+func (d *{{domainPascalCase}}) SetFilters(filters *filters.Filters) {
+	d.filters = filters
+}
+
+func (d {{domainPascalCase}}) GetFilters() filters.Filters {
+	if d.filters != nil {
+		return *d.filters
+	}
+	return filters.Filters{}
+}
+
 func (d {{domainPascalCase}}) Schema() string {
 	return "{{domain}}"
 }

tools/generator/stubs/crud/handlers/{{domain}}.go.stub

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	requestContext "go-skeleton/internal/application/context"
 	"go-skeleton/internal/application/domain/{{domain}}"
 	"go-skeleton/internal/application/providers/filters"
 	"go-skeleton/internal/application/providers/pagination"
@@ -43,6 +44,7 @@ func New{{domainPascalCase}}Handlers(reg *registry.Registry) *{{domainPascalCase
 // @Accept       json
 // @Produce      json
 // @Param        {{domainCamelCase}}_id path string true "{{domainPascalCase}} ID"
+// @Param        Tenant header string false "tenant name"
 // @Success      200  {object}  {{domainCamelCase}}Get.Response
 // @Failure      400  {object}  services.Error
 // @Failure      404  {object}  services.Error
@@ -55,9 +57,12 @@ func (hs *{{domainPascalCase}}Handlers) HandleGet{{domainPascalCase}}(context ec
 	if errors := context.Bind(data); errors != nil {
 		return context.JSON(422, errors)
 	}
-
+	tenant := context.Get("tenant").(string)
+	request := {{domainCamelCase}}Get.NewRequest(data)
+	ctx := requestContext.NewPrepareContext(tenant)
+	ctx.SetContext(request.Domain)
 	s.Execute(
-		{{domainCamelCase}}Get.NewRequest(data),
+		request,
 	)
 
 	response, err := s.GetResponse()
@@ -73,6 +78,7 @@ func (hs *{{domainPascalCase}}Handlers) HandleGet{{domainPascalCase}}(context ec
 // @Accept       json
 // @Produce      json
 // @Param        request body {{domainCamelCase}}Create.Data true "body model"
+// @Param        Tenant header string false "tenant name"
 // @Success      200  {object}  {{domainCamelCase}}Create.Response
 // @Failure      400  {object}  services.Error
 // @Failure      404  {object}  services.Error
@@ -85,9 +91,12 @@ func (hs *{{domainPascalCase}}Handlers) HandleCreate{{domainPascalCase}}(context
 	if errors := context.Bind(data); errors != nil {
 		return context.JSON(http.StatusBadRequest, errors)
 	}
-
+	tenant := context.Get("tenant").(string)
+	request := {{domainCamelCase}}Create.NewRequest(data, hs.validator)
+	ctx := requestContext.NewPrepareContext(tenant)
+	ctx.SetContext(request.Domain)
 	s.Execute(
-		{{domainCamelCase}}Create.NewRequest(data, hs.validator),
+		request,
 	)
 
 	response, err := s.GetResponse()
@@ -104,6 +113,7 @@ func (hs *{{domainPascalCase}}Handlers) HandleCreate{{domainPascalCase}}(context
 // @Produce      json
 // @Param        {{domainCamelCase}}_id path string true "{{domainPascalCase}} ID"
 // @Param        request body {{domainCamelCase}}Edit.Data true "body model"
+// @Param        Tenant header string false "tenant name"
 // @Success      200  {object}  {{domainCamelCase}}Edit.Response
 // @Failure      400  {object}  services.Error
 // @Failure      404  {object}  services.Error
@@ -118,8 +128,12 @@ func (hs *{{domainPascalCase}}Handlers) HandleEdit{{domainPascalCase}}(context e
 		return context.JSON(http.StatusBadRequest, errors)
 	}
 
+	tenant := context.Get("tenant").(string)
+	request := {{domainCamelCase}}Edit.NewRequest(id, data, hs.validator)
+	ctx := requestContext.NewPrepareContext(tenant)
+	ctx.SetContext(request.Domain)
 	s.Execute(
-		{{domainCamelCase}}Edit.NewRequest(id, data, hs.validator),
+		request,
 	)
 
 	response, err := s.GetResponse()
@@ -135,6 +149,7 @@ func (hs *{{domainPascalCase}}Handlers) HandleEdit{{domainPascalCase}}(context e
 // @Accept       json
 // @Produce      json
 // @Param        page  query   int  true  "valid int"
+// @Param        Tenant header string false "tenant name"
 // @Success      200  {object}  {{domainCamelCase}}List.Response
 // @Failure      400  {object}  services.Error
 // @Failure      404  {object}  services.Error
@@ -159,8 +174,12 @@ func (hs *{{domainPascalCase}}Handlers) HandleList{{domainPascalCase}}(context e
 
 	f := filters.NewFilters()
 
+	tenant := context.Get("tenant").(string)
+	request := {{domainCamelCase}}List.NewRequest(data, f)
+	ctx := requestContext.NewPrepareContext(tenant)
+	ctx.SetContext(request.Domain)
 	s.Execute(
-		{{domainCamelCase}}List.NewRequest(data, *f),
+		request,
 	)
 
 	response, err := s.GetResponse()
@@ -175,6 +194,7 @@ func (hs *{{domainPascalCase}}Handlers) HandleList{{domainPascalCase}}(context e
 // @Tags         {{domainPascalCase}}
 // @Accept       json
 // @Produce      json
+// @Param        Tenant header string false "tenant name"
 // @Param        {{domainCamelCase}}_id path string true "{{domainPascalCase}} ID"
 // @Success      200  {object}  {{domainCamelCase}}Delete.Response
 // @Failure      400  {object}  services.Error
@@ -189,8 +209,12 @@ func (hs *{{domainPascalCase}}Handlers) HandleDelete{{domainPascalCase}}(context
 		return context.JSON(http.StatusBadRequest, errors)
 	}
 
+	tenant := context.Get("tenant").(string)
+	request := {{domainCamelCase}}Delete.NewRequest(data)
+	ctx := requestContext.NewPrepareContext(tenant)
+	ctx.SetContext(request.Domain)
 	s.Execute(
-		{{domainCamelCase}}Delete.NewRequest(data),
+		request,
 	)
 
 	response, err := s.GetResponse()

tools/generator/stubs/crud/services/CREATE/request.go.stub

@@ -3,19 +3,23 @@ package {{domain}}
 import (
 	{{validatorImport}}
 	{{optionalImports}}
+	"go-skeleton/internal/application/domain/{{domainCamelCase}}"
 )
 
 type Data struct {{{dataType}}}
 
 type Request struct {
 	Data *Data
+	Domain *{{domainCamelCase}}.{{domainPascalCase}}
 	Err error
 	{{validator}}
 }
 
 func NewRequest(data *Data{{,validator}}) Request {
+	domain := &{{domainCamelCase}}.{{domainPascalCase}}{}
 	return Request{
 		Data: data,
+		Domain:    domain,
 		{{validatorInject}}
 	}
 }

tools/generator/stubs/crud/services/CREATE/service.go.stub

@@ -27,29 +27,29 @@ func (s *Service) Execute(request Request) {
 		s.BadRequest(err.Error())
 		return
 	}
-	s.produceResponseRule(request.Data)
+	s.produceResponseRule(request.Data, request.Domain)
 }
 
 func (s *Service) GetResponse() (*Response, *services.Error) {
 	return s.response, s.Error
 }
 
-func (s *Service) produceResponseRule(data *Data) {
-    {{idVar}}
-	{{domainCamelCase}} := {{domain}}.{{domainPascalCase}}{{{createServiceData}}}
+func (s *Service) produceResponseRule(data *Data, {{domainCamelCase}}Data *{{domainCamelCase}}.{{domainPascalCase}}) {
+	{{idVar}}
+	{{createServiceData}}
 
-		tx, txErr := s.repository.InitTX()
-    	if txErr != nil {
-    		s.InternalServerError("error on create", txErr)
-    		return
-    	}
+	tx, txErr := s.repository.InitTX()
+	if txErr != nil {
+		s.InternalServerError("error on create", txErr)
+		return
+	}
 
-	err := s.repository.Create({{domainCamelCase}}, tx, true)
+	err := s.repository.Create(*{{domainCamelCase}}Data, tx, true)
 	if err != nil {
 		s.InternalServerError("error on create", err)
 		return
 	}
 	s.response = &Response{
-		Data:   {{domainCamelCase}},
+		Data: *{{domainCamelCase}}Data,
 	}
 }

tools/generator/stubs/crud/services/DELETE/request.go.stub

@@ -1,21 +1,26 @@
 package {{domain}}
 
+import "go-skeleton/internal/application/domain/{{domainCamelCase}}"
+
 type Data struct {
     {{pkType}}
 }
 
 type Request struct {
 	Data *Data
+	Domain *{{domainCamelCase}}.{{domainPascalCase}}
 	err error
 }
 
 func NewRequest(data *Data) Request {
+	domain := &{{domainCamelCase}}.{{domainPascalCase}}{}
 	return Request{
 		Data: data,
+		Domain: domain,
 	}
 }
 
 func (r *Request) Validate() error {
-    // Add request validations
+	// Add request validations
 	return nil
 }

tools/generator/stubs/crud/services/DELETE/service.go.stub

@@ -25,25 +25,21 @@ func (s *Service) Execute(request Request) {
 		s.BadRequest(err.Error())
 		return
 	}
-	s.produceResponseRule(request.Data)
+	s.produceResponseRule(request.Data, request.Domain)
 }
 
 func (s *Service) GetResponse() (*Response, *services.Error) {
 	return s.response, s.Error
 }
 
-func (s *Service) produceResponseRule(data *Data) {
-	{{domainCamelCase}} := {{domain}}.{{domainPascalCase}}{
-		{{pkName}}: &data.{{pkName}},
-	}
-
-	err := s.repository.Delete("{{pkDbName}}", *{{domainCamelCase}}.{{pkName}})
+func (s *Service) produceResponseRule(data *Data, domain *{{domainCamelCase}}.{{domainPascalCase}}) {
+	err := s.repository.Delete(*domain, "{{pkDbName}}", data.{{pkName}})
 	if err != nil {
-        s.InternalServerError("error on delete", err)
-        return
+		s.InternalServerError("error on delete", err)
+		return
 	}
 
 	s.response = &Response{
-        Message: "OK",
+		Message: "OK",
 	}
 }