From 1fa96893af9af4d3dc95d70517a4e596ff058c72 Mon Sep 17 00:00:00 2001 From: David Johnston Date: Fri, 14 Apr 2023 12:29:37 +1000 Subject: [PATCH 1/3] Add gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ca0973 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.DS_Store + From 1f1034aab7208e00d9801a79fad20bd70571a534 Mon Sep 17 00:00:00 2001 From: David Johnston Date: Fri, 14 Apr 2023 12:38:54 +1000 Subject: [PATCH 2/3] Fix ignore file --- backend/.openapi-generator-ignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.openapi-generator-ignore b/backend/.openapi-generator-ignore index 681329e..fc7c12f 100644 --- a/backend/.openapi-generator-ignore +++ b/backend/.openapi-generator-ignore @@ -21,4 +21,4 @@ #docs/*.md # Then explicitly reverse the ignore rule for a single file: #!docs/README.md -api_default_service.go \ No newline at end of file +go/api_default_service.go \ No newline at end of file From e604ca9b4209da542e53a1b3bbcc6326613185b1 Mon Sep 17 00:00:00 2001 From: David Johnston Date: Fri, 14 Apr 2023 12:46:34 +1000 Subject: [PATCH 3/3] Add make file --- Makefile | 2 ++ backend/.openapi-generator/FILES | 2 -- backend/.openapi-generator/VERSION | 2 +- backend/README.md | 2 +- backend/go/routers.go | 18 +++++++++++++++--- 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ee7f278 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +generate_backend_from_source_spec: + openapi-generator generate -g go-server -o ./backend -i ./spec/petstore-separate/spec/swagger.json diff --git a/backend/.openapi-generator/FILES b/backend/.openapi-generator/FILES index e84a556..b5191b9 100644 --- a/backend/.openapi-generator/FILES +++ b/backend/.openapi-generator/FILES @@ -1,11 +1,9 @@ -.openapi-generator-ignore Dockerfile README.md api/openapi.yaml go.mod go/api.go go/api_default.go -go/api_default_service.go go/error.go go/helpers.go go/impl.go diff --git a/backend/.openapi-generator/VERSION b/backend/.openapi-generator/VERSION index 0df17dd..4be2c72 100644 --- a/backend/.openapi-generator/VERSION +++ b/backend/.openapi-generator/VERSION @@ -1 +1 @@ -6.2.1 \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/backend/README.md b/backend/README.md index 42b0081..67766b6 100644 --- a/backend/README.md +++ b/backend/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://openapi-generator.tech) - API version: 1.0.0 -- Build date: 2022-11-23T16:08:42.037+11:00[Australia/Melbourne] +- Build date: 2023-04-14T12:46:04.670471+10:00[Australia/Melbourne] For more information, please visit [http://swagger.io](http://swagger.io) diff --git a/backend/go/routers.go b/backend/go/routers.go index ab32416..db4ff37 100644 --- a/backend/go/routers.go +++ b/backend/go/routers.go @@ -69,7 +69,11 @@ func EncodeJSONResponse(i interface{}, status *int, w http.ResponseWriter) error w.WriteHeader(http.StatusOK) } - return json.NewEncoder(w).Encode(i) + if i != nil { + return json.NewEncoder(w).Encode(i) + } + + return nil } // ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file @@ -160,7 +164,15 @@ func parseInt32Parameter(param string, required bool) (int32, error) { } // parseBoolParameter parses a string parameter to a bool -func parseBoolParameter(param string) (bool, error) { +func parseBoolParameter(param string, required bool) (bool, error) { + if param == "" { + if required { + return false, errors.New(errMsgRequiredMissing) + } + + return false, nil + } + val, err := strconv.ParseBool(param) if err != nil { return false, err @@ -215,4 +227,4 @@ func parseInt32ArrayParameter(param, delim string, required bool) ([]int32, erro } return ints, nil -} \ No newline at end of file +}