fix: ensure models that have variables that contain a complexType of …

…`time.Time` import the `time` module (OpenAPITools#17452) * fix: handle variables that have items that contain a complexType of `time.Time` properly Signed-off-by: Paul Horton <[email protected]> * chore: trigger new CI runs Signed-off-by: Paul Horton <[email protected]> * test: added test change an regenerated samples Signed-off-by: Paul Horton <[email protected]> * resolved merge issues with upstream main Signed-off-by: Paul Horton <[email protected]> * regenerated samples Signed-off-by: Paul Horton <[email protected]> --------- Signed-off-by: Paul Horton <[email protected]>
jpfinne · Jan 28, 2024 · 5055eba · 5055eba
1 parent 9952776
commit 5055eba
Show file tree

Hide file tree

Showing 7 changed files with 1,297 additions and 28 deletions.
diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -748,10 +748,11 @@ public ModelsMap postProcessModels(ModelsMap objs) {
             }
 
             for (CodegenProperty cp : codegenProperties) {
-                if (!addedTimeImport && ("time.Time".equals(cp.dataType) || (cp.items != null && "time.Time".equals(cp.items.dataType)))) {
+                if (!addedTimeImport && ("time.Time".equals(cp.dataType) || (cp.items != null && "time.Time".equals(cp.items.complexType)))) {
                     imports.add(createMapping("import", "time"));
                     addedTimeImport = true;
                 }
+
                 if (!addedOSImport && ("*os.File".equals(cp.dataType) ||
                         (cp.items != null && "*os.File".equals(cp.items.dataType)))) {
                     imports.add(createMapping("import", "os"));

diff --git a/...resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/...resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -1335,11 +1335,22 @@ components:
       type: http
       scheme: signature
   schemas:
+    MapWithDateTime:
+      type: object
+      additionalProperties:
+        items:
+          format: date-time
+          type: string
+        type: array
     Foo:
       type: object
+      required:
+        - bar
       properties:
         bar:
           $ref: '#/components/schemas/Bar'
+        map:
+          $ref: '#/components/schemas/MapWithDateTime'
     Bar:
       type: string
       default: bar

diff --git a/samples/client/petstore/go/go.mod b/samples/client/petstore/go/go.mod
@@ -7,7 +7,7 @@ go 1.13
 require (
 	github.com/OpenAPITools/openapi-generator/samples/client/petstore/go/go-petstore v0.0.0-00010101000000-000000000000
 	github.com/go-openapi/swag v0.22.3
-	github.com/stretchr/testify v1.8.1
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/oauth2 v0.2.0
+	github.com/stretchr/testify v1.8.4
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/oauth2 v0.16.0
 )
diff --git a/samples/client/petstore/go/go.sum b/samples/client/petstore/go/go.sum
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml
@@ -1245,13 +1245,33 @@ components:
       description: Pet object that needs to be added to the store
       required: true
   schemas:
+    MapWithDateTime:
+      additionalProperties:
+        items:
+          format: date-time
+          type: string
+        type: array
+      type: object
     Foo:
       example:
         bar: bar
+        map:
+          key:
+          - 2000-01-23T04:56:07.000+00:00
+          - 2000-01-23T04:56:07.000+00:00
       properties:
         bar:
           default: bar
           type: string
+        map:
+          additionalProperties:
+            items:
+              format: date-time
+              type: string
+            type: array
+          type: object
+      required:
+      - bar
       type: object
     Bar:
       default: bar
@@ -2133,6 +2153,10 @@ components:
       example:
         string:
           bar: bar
+          map:
+            key:
+            - 2000-01-23T04:56:07.000+00:00
+            - 2000-01-23T04:56:07.000+00:00
       properties:
         string:
           $ref: '#/components/schemas/Foo'

diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/Foo.md b/samples/openapi3/client/petstore/go/go-petstore/docs/Foo.md
@@ -4,13 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Bar** | Pointer to **string** |  | [optional] [default to "bar"]
+**Bar** | **string** |  | [default to "bar"]
+**Map** | Pointer to [**map[string][]time.Time**](array.md) |  | [optional] 
 
 ## Methods
 
 ### NewFoo
 
-`func NewFoo() *Foo`
+`func NewFoo(bar string, ) *Foo`
 
 NewFoo instantiates a new Foo object
 This constructor will assign default values to properties that have it defined,
@@ -44,11 +45,31 @@ and a boolean to check if the value has been set.
 
 SetBar sets Bar field to given value.
 
-### HasBar
 
-`func (o *Foo) HasBar() bool`
+### GetMap
 
-HasBar returns a boolean if a field has been set.
+`func (o *Foo) GetMap() map[string][]time.Time`
+
+GetMap returns the Map field if non-nil, zero value otherwise.
+
+### GetMapOk
+
+`func (o *Foo) GetMapOk() (*map[string][]time.Time, bool)`
+
+GetMapOk returns a tuple with the Map field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetMap
+
+`func (o *Foo) SetMap(v map[string][]time.Time)`
+
+SetMap sets Map field to given value.
+
+### HasMap
+
+`func (o *Foo) HasMap() bool`
+
+HasMap returns a boolean if a field has been set.
 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_foo.go b/samples/openapi3/client/petstore/go/go-petstore/model_foo.go