Merge pull request #110 from alexj212/master

Fixed naming in templates away from hard coded model package.
smallnest · Jun 30, 2020 · 677acfb · 677acfb
2 parents 1470bbb + ae90072
commit 677acfb
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,5 +38,8 @@ example/go.sum
 custom/test/
 example/*.proto
 example/grpc
+example/apis/
+example/daos/
+example/models/
 tests/
 .env
diff --git a/Makefile b/Makefile
@@ -86,6 +86,9 @@ generate_example: clean_example ## generate example project code from sqlite db
 		--mapping=../template/mapping.json \
 		--json \
 		--db \
+      	--api=apis \
+      	--dao=daos \
+      	--model=models \
 		--generate-dao \
 		--generate-proj \
 		--protobuf \
@@ -120,6 +123,7 @@ run_example: example ## run example project server
 
 
 clean_example: ## remove generated example code
+	mkdir -p ./example
 	rm -rf ./example/Makefile \
 	 ./example/README.md \
 	 ./example/api \

diff --git a/README.md b/README.md
diff --git a/_test/dbmeta/main.go b/_test/dbmeta/main.go
@@ -30,7 +30,7 @@ func init() {
 	goopt.Description = func() string {
 		return "ORM and RESTful meta data viewer for SQl databases"
 	}
-	goopt.Version = "v0.9.17 (06/30/2020)"
+	goopt.Version = "v0.9.18 (06/30/2020)"
 	goopt.Summary = `dbmeta [-v] --sqltype=mysql --connstr "user:password@/dbname" --database <databaseName> 
 
            sqltype - sql database type such as [ mysql, mssql, postgres, sqlite, etc. ]

diff --git a/code_http.md b/code_http.md
@@ -138,7 +138,7 @@ func GetInvoices(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 // @Failure 400 {object} api.HTTPError
 // @Failure 404 {object} api.HTTPError
 // @Router /invoices [post]
-// echo '{"billing_postal_code": "AOPIXOYmaQfoGUAAqpPwofbyG","billing_state": "FUKpRZMGWUtJXhtuIOArbtcfy","customer_id": 31,"invoice_date": "2262-12-14T19:22:36.159735656-05:00","billing_address": "gzChfHzuxRyunGDlUmjumNlGa","billing_city": "VASvBrPiKEMOURqwxxgWLwnIq","billing_country": "BjwznZcJbSXovdjoliHaDztId","total": 0.2454785678341827,"invoice_id": 86}' | http POST "http://127.0.0.1:8080/invoices" X-Api-User:user123
+// echo '{"invoice_date": "2193-08-18T16:11:59.078188308-05:00","billing_address": "AqlNHbqeNoJOtnMJaPnzdILQa","billing_state": "tWuCMqsmCwdXbCINBdvKJRFLU","billing_postal_code": "SXZkYaGzotXoZOyOsikBMAFTZ","total": 0.5347164921866526,"invoice_id": 46,"customer_id": 8,"billing_city": "JdgoMLJqAcUmRgbXfqkCZaezO","billing_country": "bAWiKIZfJLnzNgUysoWJrhEkE"}' | http POST "http://127.0.0.1:8080/invoices" X-Api-User:user123
 func AddInvoices(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	ctx := initializeContext(r)
 	invoices := &model.Invoices{}
@@ -192,7 +192,7 @@ func AddInvoices(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 // @Failure 400 {object} api.HTTPError
 // @Failure 404 {object} api.HTTPError
 // @Router /invoices/{argInvoiceID} [patch]
-// echo '{"billing_postal_code": "AOPIXOYmaQfoGUAAqpPwofbyG","billing_state": "FUKpRZMGWUtJXhtuIOArbtcfy","customer_id": 31,"invoice_date": "2262-12-14T19:22:36.159735656-05:00","billing_address": "gzChfHzuxRyunGDlUmjumNlGa","billing_city": "VASvBrPiKEMOURqwxxgWLwnIq","billing_country": "BjwznZcJbSXovdjoliHaDztId","total": 0.2454785678341827,"invoice_id": 86}' | http PUT "http://127.0.0.1:8080/invoices/1"  X-Api-User:user123
+// echo '{"invoice_date": "2193-08-18T16:11:59.078188308-05:00","billing_address": "AqlNHbqeNoJOtnMJaPnzdILQa","billing_state": "tWuCMqsmCwdXbCINBdvKJRFLU","billing_postal_code": "SXZkYaGzotXoZOyOsikBMAFTZ","total": 0.5347164921866526,"invoice_id": 46,"customer_id": 8,"billing_city": "JdgoMLJqAcUmRgbXfqkCZaezO","billing_country": "bAWiKIZfJLnzNgUysoWJrhEkE"}' | http PUT "http://127.0.0.1:8080/invoices/1"  X-Api-User:user123
 func UpdateInvoices(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	ctx := initializeContext(r)
 

diff --git a/readme/main-packr.go → main-packr.go b/readme/main-packr.go → main-packr.go
diff --git a/main.go b/main.go
@@ -94,7 +94,7 @@ func init() {
 	goopt.Description = func() string {
 		return "ORM and RESTful API generator for SQl databases"
 	}
-	goopt.Version = "v0.9.17 (06/30/2020)"
+	goopt.Version = "v0.9.18 (06/30/2020)"
 	goopt.Summary = `gen [-v] --sqltype=mysql --connstr "user:password@/dbname" --database <databaseName> --module=example.com/example [--json] [--gorm] [--guregu] [--generate-dao] [--generate-proj]
 git fetch up
            sqltype - sql database type such as [ mysql, mssql, postgres, sqlite, etc. ]

diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go
diff --git a/readme/main.go b/readme/main.go
@@ -32,7 +32,7 @@ func init() {
 	goopt.Description = func() string {
 		return "ORM and RESTful meta data viewer for SQl databases"
 	}
-	goopt.Version = "v0.9.17 (06/30/2020)"
+	goopt.Version = "v0.9.18 (06/30/2020)"
 	goopt.Summary = `dbmeta [-v] --sqltype=mysql --connstr "user:password@/dbname" --database <databaseName> 
 
            sqltype - sql database type such as [ mysql, mssql, postgres, sqlite, etc. ]

diff --git a/template/GEN_README.md.tmpl b/template/GEN_README.md.tmpl
@@ -249,6 +249,8 @@ Table Name: registration_source
 |ms sql   |y   | y  | y  | y  | y | y| n
 
 ## Version History
+- v0.9.18 (06/30/2020)
+    - Fixed naming in templates away from hard coded model package.
 - v0.9.17 (06/30/2020)
     - Refactored template loading, to better report error in template
     - Added option to run gofmt on output directory

diff --git a/template/protoserver.go.tmpl b/template/protoserver.go.tmpl
@@ -47,7 +47,7 @@ func (s *Server) Get{{ $tableInfo.StructName }}(context context.Context, request
 
     response := &{{$.modelPackageName}}.Get{{ $tableInfo.StructName }}Response{}
     response.Data = result
-    response.Result=&models.Result{Result: models.Result_Success}
+    response.Result=&{{$.modelPackageName}}.Result{Result: {{$.modelPackageName}}.Result_Success}
     return response, nil
 }
 
@@ -62,7 +62,7 @@ func (s *Server) Add{{ $tableInfo.StructName }}(context context.Context, request
 
     response := &{{$.modelPackageName}}.Add{{ $tableInfo.StructName }}Response{}
     response.Data = result
-    response.Result = &models.Result{Result: models.Result_Success}
+    response.Result = &{{$.modelPackageName}}.Result{Result: {{$.modelPackageName}}.Result_Success}
     response.RowsAffected = rowsAffected
     return response, nil
 }
@@ -80,7 +80,7 @@ func (s *Server) Update{{ $tableInfo.StructName }}(context context.Context, requ
 
     response := &{{$.modelPackageName}}.Update{{ $tableInfo.StructName }}Response{}
     response.Data = result
-    response.Result = &models.Result{Result: models.Result_Success}
+    response.Result = &{{$.modelPackageName}}.Result{Result: {{$.modelPackageName}}.Result_Success}
     response.RowsAffected = rowsAffected
     return response, nil
 }

diff --git a/template/router.go.tmpl b/template/router.go.tmpl
@@ -32,7 +32,7 @@ type CrudAPI struct {
 	UpdateURL       string           `json:"update_url"`
 	DeleteURL       string           `json:"delete_url"`
 	FetchDDLURL     string           `json:"fetch_ddl_url"`
-	TableInfo       *{{$.modelPackageName}}.TableInfo `json:"table_info"`
+	TableInfo       *{{.modelPackageName}}.TableInfo `json:"table_info"`
 }
 
 
@@ -294,7 +294,7 @@ func GetDdl(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 
 	argID := ps.ByName("argID")
 
-	if err := ValidateRequest(ctx, r, "ddl", {{$.modelPackageName}}.FetchDDL); err != nil {
+	if err := ValidateRequest(ctx, r, "ddl", {{.modelPackageName}}.FetchDDL); err != nil {
 		returnError(ctx, w, r, err)
 		return
 	}
@@ -322,7 +322,7 @@ func GetDdl(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 func GetDdlEndpoints(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	ctx := initializeContext(r)
 
-	if err := ValidateRequest(ctx, r, "ddl", {{$.modelPackageName}}.FetchDDL); err != nil {
+	if err := ValidateRequest(ctx, r, "ddl", {{.modelPackageName}}.FetchDDL); err != nil {
 		returnError(ctx, w, r, err)
 		return
 	}
@@ -344,7 +344,8 @@ func init() {
 		DeleteURL: "/{{$tableInfo.StructName | toLower}}",
 		FetchDDLURL: "/ddl/{{$tableName}}",
 	}
-	tmp.TableInfo, _ = {{$.modelPackageName}}.GetTableInfo("{{$tableName}}")
+
+	tmp.TableInfo, _ = {{.modelPackageName}}.GetTableInfo("{{$tableName}}")
 	crudEndpoints["{{$tableName}}"] = tmp
 
 	{{end}}