feature: WEOS-1382 As a developer I should be able to set the type of id that I want auto generated

api.yaml

@@ -46,8 +46,8 @@ components:
       type: object
       properties:
         id:
-          type: string
-          format: ksuid
+          type: integer
+          format: uint
         firstName:
           type: string
         lastName:
@@ -60,7 +60,6 @@ components:
         - lastName
       x-identifier:
         - id
-        - email
     Blog:
       type: object
       properties:

controllers/rest/fixtures/blog-x-schema.yaml

@@ -32,14 +32,15 @@ components:
     Category:
       type: object
       properties:
-        title:
+        id:
           type: string
+          format: uuid
         description:
           type: string
       required:
-        - title
+        - id
       x-identifier:
-        - title
+        - id
     Author:
       type: object
       properties:
@@ -58,7 +59,6 @@ components:
         - lastName
       x-identifier:
         - id
-        - email
     Blog:
       type: object
       properties:
@@ -115,6 +115,15 @@ components:
         created:
           type: string
           format: date-time
+    Archives:
+      type: object
+      properties:
+        id:
+          type: integer
+        title:
+          type: string
+      x-identifier:
+        - id
 paths:
   /health:
     summary: Health Check
@@ -605,4 +614,4 @@ paths:
       summary: Delete author
       responses:
         200:
-          description: Delete author
+          description: Delete author

controllers/rest/middleware_initialize.go

@@ -121,6 +121,7 @@ func newSchema(ref *openapi3.Schema, logger echo.Logger) (ds.Builder, map[string
 			relations[name] = strings.TrimPrefix(p.Ref, "#/components/schemas/")
 		} else {
 			t := p.Value.Type
+			f := p.Value.Format
 			if strings.EqualFold(t, "array") {
 				t2 := p.Value.Items.Value.Type
 				if t2 != "object" {
@@ -133,7 +134,12 @@ func newSchema(ref *openapi3.Schema, logger echo.Logger) (ds.Builder, map[string
 					} else if t2 == "number" {
 						instance.AddField(name, []float64{}, tagString)
 					} else if t == "integer" {
-						instance.AddField(name, []int{}, tagString)
+						if f == "uint" {
+							instance.AddField(name, []uint{}, tagString)
+						} else {
+							instance.AddField(name, []int{}, tagString)
+						}
+
 					} else if t == "boolean" {
 						instance.AddField(name, []bool{}, tagString)
 					}
@@ -166,8 +172,13 @@ func newSchema(ref *openapi3.Schema, logger echo.Logger) (ds.Builder, map[string
 					var numbers *float32
 					defaultValue = numbers
 				case "integer":
-					var integers *int
-					defaultValue = integers
+					if f == "uint" {
+						defaultValue = uint(0)
+					} else {
+						var integers *int
+						defaultValue = integers
+					}
+
 				case "boolean":
 					var boolean *bool
 					defaultValue = boolean

end2end_test.go

@@ -7,8 +7,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
+	"github.com/google/uuid"
+	"github.com/segmentio/ksuid"
 	weosContext "github.com/wepala/weos/context"
+	"io"
 	"mime/multipart"
 	"net/http"
 	"net/http/httptest"
@@ -72,6 +74,7 @@ var filters string
 var enumErr error
 var token string
 var contextWithValues context.Context
+var contentEntity map[string]interface{}
 
 type FilterProperties struct {
 	Operator string
@@ -107,6 +110,7 @@ func InitializeSuite(ctx *godog.TestSuiteContext) {
 	page = 0
 	limit = 0
 	token = ""
+	contentEntity = map[string]interface{}{}
 	result = api.ListApiResponse{}
 	blogfixtures = []interface{}{}
 	total, success, failed = 0, 0, 0
@@ -164,6 +168,7 @@ func reset(ctx context.Context, sc *godog.Scenario) (context.Context, error) {
 	token = ""
 	result = api.ListApiResponse{}
 	errs = nil
+	contentEntity = map[string]interface{}{}
 	header = make(http.Header)
 	rec = httptest.NewRecorder()
 	resp = nil
@@ -460,6 +465,8 @@ func theIsCreated(contentType string, details *godog.Table) error {
 	if rec.Result().StatusCode != http.StatusCreated {
 		return fmt.Errorf("expected the status code to be '%d', got '%d'", http.StatusCreated, rec.Result().StatusCode)
 	}
+	etag := rec.Header().Get("Etag")
+	weosID, _ := api.SplitEtag(etag)
 
 	head := details.Rows[0].Cells
 	compare := map[string]interface{}{}
@@ -470,26 +477,23 @@ func theIsCreated(contentType string, details *godog.Table) error {
 		}
 	}
 
-	contentEntity := map[string]interface{}{}
-	var result *gorm.DB
-	//ETag would help with this
-	for key, value := range compare {
-		result = gormDB.Table(strings.Title(contentType)).Find(&contentEntity, key+" = ?", value)
-		if contentEntity != nil {
-			break
-		}
-	}
-
+	contentEntity = map[string]interface{}{}
+	var resultdb *gorm.DB
+	resultdb = gormDB.Table(strings.Title(contentType)).Find(&contentEntity, "weos_id = ?", weosID)
 	if contentEntity == nil {
 		return fmt.Errorf("unexpected error finding content type in db")
 	}
 
-	if result.Error != nil {
-		return fmt.Errorf("unexpected error finding content type: %s", result.Error)
+	if resultdb.Error != nil {
+		return fmt.Errorf("unexpected error finding content type: %s", resultdb.Error)
 	}
 
 	for key, value := range compare {
 		if contentEntity[key] != value {
+			v, ok := value.(string)
+			if ok && v == "<Generated>" && contentEntity[key] != nil {
+				continue
+			}
 			return fmt.Errorf("expected %s %s %s, got %s", contentType, key, value, contentEntity[key])
 		}
 	}
@@ -1588,6 +1592,27 @@ func thereShouldBeAKeyInTheRequestContextWithValue(key, value string) error {
 	return nil
 }
 
+func theIdShouldBeA(arg1, format string) error {
+	switch format {
+	case "uuid":
+		_, err := uuid.Parse(contentEntity["id"].(string))
+		if err != nil {
+			fmt.Errorf("unexpected error parsing id as uuid: %s", err)
+		}
+	case "integer":
+		_, ok := contentEntity["id"].(int)
+		if !ok {
+			fmt.Errorf("unexpected error parsing id as int")
+		}
+	case "ksuid":
+		_, err := ksuid.Parse(contentEntity["id"].(string))
+		if err != nil {
+			fmt.Errorf("unexpected error parsing id as ksuid: %s", err)
+		}
+	}
+	return nil
+}
+
 func InitializeScenario(ctx *godog.ScenarioContext) {
 	ctx.Before(reset)
 	ctx.After(func(ctx context.Context, sc *godog.Scenario, err error) (context.Context, error) {
@@ -1680,6 +1705,7 @@ func InitializeScenario(ctx *godog.ScenarioContext) {
 	ctx.Step(`^the response body should be$`, theResponseBodyShouldBe)
 	ctx.Step(`^there should be a key "([^"]*)" in the request context with object$`, thereShouldBeAKeyInTheRequestContextWithObject)
 	ctx.Step(`^there should be a key "([^"]*)" in the request context with value "([^"]*)"$`, thereShouldBeAKeyInTheRequestContextWithValue)
+	ctx.Step(`^the "([^"]*)" id should be a "([^"]*)"$`, theIdShouldBeA)
 
 }