discriminator and mapping updates

Author: danicc097

bin/project

@@ -1250,14 +1250,19 @@ x.lint.go() {
   # golangci-lint run --config=.golangci.yml --allow-parallel-runners --fast --fix &>/dev/null || true
 }
 
-exhaustruct_lint() {
+exhaustive_lint() {
   local lint_config=$(
     cat <<EOF
 linters:
   disable-all: true
   enable:
     - exhaustruct
+    - exhaustive
 linters-settings:
+  exhaustive:
+    explicit-exhaustive-switch: true
+    explicit-exhaustive-map: true
+    default-case-required: true
   exhaustruct:
     # lint struct usage in all packages that use them
     include:
@@ -1359,7 +1364,7 @@ x.test.backend.setup() {
 x.test.backend() {
   xsetup.backup
   { { {
-    exhaustruct_lint
+    exhaustive_lint
 
     x.test.xo
 

internal/rest/api_work_item.go

@@ -43,10 +43,12 @@ func (h *StrictHandlers) CreateWorkitem(c *gin.Context, request CreateWorkitemRe
 	span.SetAttributes(tracing.MetadataAttribute(jsonBody))
 	c.Request.Body = io.NopCloser(bytes.NewBuffer(jsonBody))
 
-	// body := &models.CreateWorkItemRequest{}
-	// if err := json.Unmarshal(jsonBody, body); err != nil {
-	// 	return nil, nil
-	// }
+	project, err := projectByDiscriminator(request.Body)
+	if err != nil {
+		renderErrorResponse(c, "Failed to get project", err)
+
+		return nil, nil
+	}
 
 	var res any // depends on project
 	b, err := request.Body.ValueByDiscriminator()
@@ -56,16 +58,18 @@ func (h *StrictHandlers) CreateWorkitem(c *gin.Context, request CreateWorkitemRe
 		return nil, nil
 	}
 
-	switch body := b.(type) {
-	case models.CreateDemoWorkItemRequest:
+	//exhaustive:enforce
+	switch project {
+	case models.ProjectNameDemo:
+		body, _ := b.(models.CreateDemoWorkItemRequest)
 		workItem, err := h.svc.DemoWorkItem.Create(ctx, tx, caller, services.DemoWorkItemCreateParams{
 			DemoWorkItemCreateParams: repos.DemoWorkItemCreateParams{
 				DemoProject: body.DemoProject,
 				Base:        body.Base,
 			},
 			WorkItemCreateParams: services.WorkItemCreateParams{
-				// TagIDs: body.TagIDs,
-				// Members: body.Members,
+				TagIDs:  body.TagIDs,
+				Members: restMembersToServices(body.Members),
 			},
 		})
 		if err != nil {
@@ -78,8 +82,18 @@ func (h *StrictHandlers) CreateWorkitem(c *gin.Context, request CreateWorkitemRe
 			WorkItemBase: fillBaseWorkItemResponse(workItem),
 			DemoWorkItem: *workItem.DemoWorkItemJoin,
 		}
-	case models.CreateDemoTwoWorkItemRequest:
-		workItem, err := h.svc.DemoTwoWorkItem.Create(ctx, tx, caller, services.DemoTwoWorkItemCreateParams{})
+	case models.ProjectNameDemoTwo:
+		body, _ := b.(models.CreateDemoTwoWorkItemRequest)
+		workItem, err := h.svc.DemoTwoWorkItem.Create(ctx, tx, caller, services.DemoTwoWorkItemCreateParams{
+			DemoTwoWorkItemCreateParams: repos.DemoTwoWorkItemCreateParams{
+				DemoTwoProject: body.DemoTwoProject,
+				Base:           body.Base,
+			},
+			WorkItemCreateParams: services.WorkItemCreateParams{
+				TagIDs:  body.TagIDs,
+				Members: restMembersToServices(body.Members),
+			},
+		})
 		if err != nil {
 			renderErrorResponse(c, "Could not create work item", err)
 
@@ -91,7 +105,7 @@ func (h *StrictHandlers) CreateWorkitem(c *gin.Context, request CreateWorkitemRe
 			DemoTwoWorkItem: *workItem.DemoTwoWorkItemJoin,
 		}
 	default:
-		renderErrorResponse(c, "Unknown body", internal.NewErrorf(models.ErrorCodeUnknown, "%+v", b))
+		renderErrorResponse(c, "Unknown discriminator", internal.NewErrorf(models.ErrorCodeUnknown, "%+v", b))
 
 		return nil, nil
 	}

internal/rest/discriminator.go

@@ -0,0 +1,20 @@
+package rest
+
+import (
+	"fmt"
+
+	"github.com/danicc097/openapi-go-gin-postgres-sqlc/internal/repos/postgresql/gen/models"
+)
+
+type PolymorphicBody interface {
+	Discriminator() (string, error)
+}
+
+func projectByDiscriminator(b PolymorphicBody) (models.ProjectName, error) {
+	d, err := b.Discriminator()
+	if err != nil {
+		return "", fmt.Errorf("could not get project discriminator: %w", err)
+	}
+
+	return models.ProjectName(d), nil
+}

internal/rest/service_mappings.go

@@ -0,0 +1,19 @@
+package rest
+
+import (
+	"github.com/danicc097/openapi-go-gin-postgres-sqlc/internal/repos/postgresql/gen/models"
+	"github.com/danicc097/openapi-go-gin-postgres-sqlc/internal/services"
+)
+
+// TODO: cannot use body.Members (variable of type []models.ServicesMember) as []services.Member
+// how should mapping be handled for equivalent structs from oapi-codegen, ideally automagically?
+func restMembersToServices(mm []models.ServicesMember) []services.Member {
+	members := make([]services.Member, 0, len(mm))
+	for i, member := range mm {
+		members[i] = services.Member{
+			UserID: member.UserID,
+			Role:   member.Role,
+		}
+	}
+	return members
+}