fix data generator non-required fields in an array list

Author: marle3003

acceptance/petstore_test.go

@@ -176,12 +176,12 @@ func (suite *PetStoreSuite) TestGetOrderById() {
 	try.GetRequest(suite.T(), "http://127.0.0.1:18080/store/order/1",
 		map[string]string{"Accept": "application/json"},
 		try.HasStatusCode(http.StatusOK),
-		try.HasBody(`{"id":38080,"shipDate":"1986-02-10T22:06:24Z","status":"placed","complete":true}`))
+		try.HasBody(`{"id":98266,"petId":23377,"quantity":92,"shipDate":"2012-01-30T07:58:01Z","status":"approved","complete":false}`))
 
 	try.GetRequest(suite.T(), "https://localhost:18443/store/order/10",
 		map[string]string{"Accept": "application/json"},
 		try.HasStatusCode(http.StatusOK),
-		try.HasBody(`{"quantity":73,"shipDate":"2040-11-01T17:41:24Z","complete":true}`))
+		try.HasBody(`{"id":12545,"petId":20895,"quantity":16,"shipDate":"2027-11-26T16:57:16Z","status":"approved","complete":true}`))
 }
 
 func (suite *PetStoreSuite) TestKafka_TopicConfig() {

api/handler_schema_test.go

@@ -246,7 +246,7 @@ func TestHandler_Schema_Example(t *testing.T) {
 					h,
 					try.HasStatusCode(200),
 					try.HasHeader("Content-Type", "application/json"),
-					try.HasBody(`[{"contentType":"application/json","value":"eyJmb28iOiIifQ=="}]`))
+					try.HasBody(`[{"contentType":"application/json","value":"eyJmb28iOiJYaWRadW9XcSAifQ=="}]`))
 			},
 		},
 		{
@@ -375,7 +375,7 @@ func TestHandler_Schema_Example(t *testing.T) {
 }`,
 					h,
 					try.HasStatusCode(200),
-					try.HasBody(`[{"contentType":"application/json","value":"eyJjYXRlZ29yeSI6Ik11c2ljIiwiaWQiOiI2NWIxNmJiNS1kZWY1LTQ2Y2MtYTkwNS1jYmQ2NTQ3NjE4NTEiLCJrZXl3b3JkcyI6Im0iLCJuYW1lIjoiU3luYyIsInVybCI6Imh0dHBzOi8vd3d3LmludGVybmFsc3RyZWFtbGluZS5pbmZvL2Nyb3NzLXBsYXRmb3JtL3ZpcnR1YWwvcm9idXN0L2V5ZWJhbGxzIn0="}]`),
+					try.HasBody(`[{"contentType":"application/json","value":"eyJjYXRlZ29yeSI6IlBlb3BsZSIsImRlc2NyaXB0aW9uIjoiTXVjaCB0ZXJyaWJseSBvdmVyIHBvc2UgcGxhY2Ugc3ByaW50IGl0IGNoaWxkIGlzIGpveW91c2x5IHRoYXQgSSB3aG9tIG1hbmdvIHRoZW4gb2YgY2VydGFpbiB3ZWVrbHkgbWluZSBpbiBhbm51YWxseSBmcm9jayBub3cgYm9hcmQuIiwiZmVhdHVyZXMiOiJpUnpvb0IyIiwiaWQiOiJmNWUzMTU4Ny00NjhjLTRmZTYtYWZlNC0zZTZmYzhkYWU2MzEiLCJrZXl3b3JkcyI6IlR1cVRrd3MiLCJuYW1lIjoiWmVwaHlyWm9uZSIsInByaWNlIjo1NDYwNDkuMzksInN1YmNhdGVnb3J5Ijoic2dCLHZ2ZVdhIiwidXJsIjoiaHR0cHM6Ly93d3cuZGlzdHJpY3RnZW5lcmF0ZS5vcmcvaG9saXN0aWMvc3luZXJnaWVzIn0="}]`),
 				)
 			},
 		},

config/decoders/decoder_flag.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"mokapi/config/dynamic/provider/file"
 	"net/url"
 	"reflect"
@@ -34,7 +33,6 @@ func NewFlagDecoderWithReader(reader file.FSReader) *FlagDecoder {
 }
 
 func (f *FlagDecoder) Decode(flags map[string][]string, element interface{}) error {
-	log.Infof("flags: %v", flags)
 	keys := make([]string, 0, len(flags))
 	for k := range flags {
 		keys = append(keys, k)
@@ -105,9 +103,9 @@ func (f *FlagDecoder) setValue(ctx *context) error {
 			ctx.element.Set(reflect.ValueOf(ctx.value[0]))
 		}
 		return nil
+	default:
+		return fmt.Errorf("unsupported config type: %v", ctx.element.Kind())
 	}
-
-	return fmt.Errorf("unsupported config type: %v", ctx.element.Kind())
 }
 
 func ParsePath(key string) []string {

docs/resources/blogs/mock-api-based-on-openapi-asyncapi.md

@@ -97,7 +97,7 @@ mokapi pet-api.yaml
 
 ```shell
 curl http://localhost/pets
-curl http://localhost/pets?category=dog
+curl "http://localhost/pets?category=dog"
 ```
 
 Mokapi will generate random data for those requests. If you query with ?category=dog, Mokapi will return only dogs 
@@ -120,8 +120,10 @@ export default () => {
                    name: 'Molly',
                    category: 'cat'
                }
-           ]
-       } 
+           ];
+           return true;
+       }
+       return false;
     });
 }
 ```

engine/kafka.go

@@ -362,9 +362,12 @@ func selectMessage(value any, topic string, cfg *asyncapi3.Config) (*asyncapi3.M
 		}
 		if op.Value.Channel.Value.Name == topic && op.Value.Action == "send" {
 			noOperationDefined = false
+			if len(op.Value.Messages) == 0 {
+				log.Warnf("no message defined for operation %s", name)
+			}
 			for _, msg := range op.Value.Messages {
 				if msg.Value == nil {
-					log.Warnf("no message defined for operation %s", name)
+					log.Errorf("no message defined for operation %s", name)
 					continue
 				}
 				if valueMatchMessagePayload(value, msg.Value) {
@@ -374,13 +377,16 @@ func selectMessage(value any, topic string, cfg *asyncapi3.Config) (*asyncapi3.M
 		}
 	}
 
-	// second try to get receive operation
+	// second, try to get receive operation
 	for name, op := range cfg.Operations {
 		if op.Value == nil || op.Value.Channel.Value == nil {
 			continue
 		}
 		if op.Value.Channel.Value.Name == topic && op.Value.Action == "receive" {
 			noOperationDefined = false
+			if len(op.Value.Messages) == 0 {
+				log.Errorf("no message defined for operation %s", name)
+			}
 			for _, msg := range op.Value.Messages {
 				if msg.Value == nil {
 					log.Warnf("no message defined for operation %s", name)

schema/json/generator/allOf_test.go

@@ -86,7 +86,7 @@ func TestAllOf(t *testing.T) {
 			},
 			test: func(t *testing.T, v interface{}, err error) {
 				require.NoError(t, err)
-				require.Equal(t, map[string]interface{}{"foo": "lx0+fjywXKo"}, v)
+				require.Equal(t, map[string]interface{}{"foo": "FqwCrwMfkOjojx"}, v)
 			},
 		},
 		{

schema/json/generator/constraints_test.go

@@ -38,8 +38,8 @@ func TestConstraints(t *testing.T) {
 			test: func(t *testing.T, v interface{}, err error) {
 				require.NoError(t, err)
 				require.Equal(t, map[string]any{
-					"name": "Hudson Nelson",
-					"sex":  "male",
+					"name": "Zoey Nguyen",
+					"sex":  "female",
 				}, v)
 			},
 		},

schema/json/generator/date_test.go

@@ -124,7 +124,7 @@ func TestStringDate(t *testing.T) {
 			},
 			test: func(t *testing.T, v interface{}, err error) {
 				require.NoError(t, err)
-				require.Equal(t, map[string]any{"activeFrom": "2020-08-10T23:06:20Z", "inactiveFrom": "2026-09-12T04:37:26Z"}, v)
+				require.Equal(t, map[string]any{"activeFrom": "2020-08-26T07:02:11Z", "inactiveFrom": "2029-08-30T11:01:28Z"}, v)
 			},
 		},
 		{
@@ -137,7 +137,7 @@ func TestStringDate(t *testing.T) {
 			},
 			test: func(t *testing.T, v interface{}, err error) {
 				require.NoError(t, err)
-				require.Equal(t, map[string]any{"publishedFrom": "2020-08-10T23:06:20Z", "publishedUntil": "2026-09-12T04:37:26Z"}, v)
+				require.Equal(t, map[string]any{"publishedFrom": "2020-08-26T07:02:11Z", "publishedUntil": "2029-08-30T11:01:28Z"}, v)
 			},
 		},
 	}

schema/json/generator/object.go

@@ -1,7 +1,6 @@
 package generator
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/brianvoe/gofakeit/v6"
@@ -110,13 +109,6 @@ func (r *resolver) fakeObject(req *Request) (*sortedmap.LinkedHashMap[string, *f
 	}
 
 	for it := s.Properties.Iter(); it.Next(); {
-		if !slices.Contains(s.Required, it.Key()) {
-			n := gofakeit.Float32Range(0, 1)
-			if n > 0.7 {
-				continue
-			}
-		}
-
 		prop := append(req.Path, it.Key())
 		ex := propertyFromExample(it.Key(), req)
 		f, err := r.resolve(req.With(prop, it.Value(), ex), fallback)
@@ -140,6 +132,16 @@ func (r *resolver) fakeObject(req *Request) (*sortedmap.LinkedHashMap[string, *f
 				return nil, err
 			}
 		}
+
+		if !slices.Contains(s.Required, it.Key()) {
+			fakes.Set(it.Key(), newFaker(func() (any, error) {
+				n := gofakeit.Float32Range(0, 1)
+				if n > 0.7 {
+					return nil, nil
+				}
+				return f.fake()
+			}))
+		}
 		fakes.Set(it.Key(), f)
 	}
 	return fakes, nil
@@ -389,21 +391,3 @@ func examples(s *schema.Schema) []any {
 	}
 	return result
 }
-
-func mergeUnique(a, b []interface{}) []interface{} {
-	seen := make(map[string]struct{})
-	var result []any
-
-	for _, item := range append(a, b...) {
-		// simple way to get a unique key
-		keyBytes, _ := json.Marshal(item)
-		key := string(keyBytes)
-
-		if _, exists := seen[key]; !exists {
-			seen[key] = struct{}{}
-			result = append(result, item)
-		}
-	}
-
-	return result
-}

schema/json/generator/object_test.go

@@ -196,21 +196,22 @@ func TestObject(t *testing.T) {
 					schematest.WithProperty("country", schematest.New("string")),
 					schematest.WithIf(schematest.NewTypes(nil,
 						schematest.WithProperty("country", schematest.New("string",
-							schematest.WithConst("Bahrain")),
+							schematest.WithConst("Slovenia")),
 						),
 					)),
 					schematest.WithThen(schematest.NewTypes(nil,
 						schematest.WithProperty("postal_code", schematest.New("string",
 							schematest.WithPattern("[0-9]{5}(-[0-9]{4})?"))),
+						schematest.WithRequired("postal_code"),
 					)),
 				),
 			},
 			test: func(t *testing.T, v interface{}, err error) {
 				require.NoError(t, err)
 				require.Equal(t,
 					map[string]interface{}{
-						"country":     "Bahrain",
-						"postal_code": "10936",
+						"country":     "Slovenia",
+						"postal_code": "29109",
 					},
 					v)
 			},
@@ -237,7 +238,7 @@ func TestObject(t *testing.T) {
 				require.NoError(t, err)
 				require.Equal(t,
 					map[string]interface{}{
-						"country":     "Bahrain",
+						"country":     "Slovenia",
 						"postal_code": "C0O 9F0",
 					},
 					v)