fix: naming of models and set required flags

Author: nadilas

apps/api/api/add.go

@@ -12,11 +12,11 @@ import (
 
 type AddRuleRequest struct {
 	PathParams
-	Rule models.Rule `json:"rule"`
+	Rule models.Rule `json:"rule" validate:"required"`
 }
 
 type AddRuleResponse struct {
-	Rule models.Rule `json:"rule"`
+	Rule models.Rule `json:"rule" validate:"required"`
 }
 
 func (b *BreaseHandler) AddRule(c *gin.Context, r *AddRuleRequest) (*AddRuleResponse, error) {

apps/api/api/handler.go

@@ -21,7 +21,6 @@ type BreaseHandler struct {
 }
 
 func NewHandler(db storage.Database, c cache.Cache, logger *zap.Logger) *BreaseHandler {
-
 	if db == nil {
 		panic("database cannot be nil")
 	}

apps/api/api/openapi.go

@@ -25,7 +25,7 @@ func OpenAPISpecHandler(f *fizz.Fizz, logger *zap.Logger) func(*gin.Context) {
 		patchExpression(doc)
 
 		// update usage of expression in rule model
-		doc.Components.Schemas["ModelsRule"].Value.Properties["expression"] = &openapi3.SchemaRef{Ref: "#/components/schemas/Expression"}
+		doc.Components.Schemas["Rule"].Value.Properties["expression"] = &openapi3.SchemaRef{Ref: "#/components/schemas/Expression"}
 
 		// FIXME: should we validate the override result?
 

apps/api/api/token.go

@@ -12,7 +12,7 @@ import (
 )
 
 type RefreshTokenPairRequest struct {
-	RefreshToken string `json:"refreshToken"`
+	RefreshToken string `json:"refreshToken" validate:"required"`
 }
 
 func (b *BreaseHandler) generateTokenPair(ownerID string, userID string) (tp models.TokenPair, err error) {

apps/api/models/auth.go

@@ -1,6 +1,8 @@
 package models
 
 type TokenPair struct {
-	AccessToken  string `json:"accessToken"`
-	RefreshToken string `json:"refreshToken"`
+	AccessToken  string `json:"accessToken" validate:"required"`
+	RefreshToken string `json:"refreshToken" validate:"required"`
 }
+
+func (*TokenPair) TypeName() string { return "TokenPair" }

apps/api/models/models.go

@@ -12,6 +12,8 @@ type Target struct {
 	Value string `json:"value,omitempty"`
 }
 
+func (*Target) TypeName() string { return "Target" }
+
 type Rule struct {
 	ID          string `json:"id" validate:"required"`
 	Description string `json:"description,omitempty"`
@@ -30,13 +32,17 @@ type Rule struct {
 	Expression map[string]interface{} `json:"expression" validate:"required"`
 }
 
+func (*Rule) TypeName() string { return "Rule" }
+
 type EvaluationResult struct {
 	TargetID   string `json:"targetID"`
 	TargetType string `json:"actionTargetType"`
 	Action     string `json:"action"`
 	Value      string `json:"value"`
 }
 
+func (*EvaluationResult) TypeName() string { return "EvaluationResult" }
+
 func (e EvaluationResult) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 	enc.AddString("targetID", e.TargetID)
 	enc.AddString("targetType", e.TargetType)

apps/api/moon.yml

@@ -8,6 +8,10 @@ project:
   description: Business rules engine service and go package
 
 tasks:
+  build_types:
+    command: noop
+  build_types_watch:
+    command: noop
   clean:
     command: rm -rf ./dist
     platform: system
@@ -42,3 +46,4 @@ tasks:
       - dev
     options:
       cache: false
+    local: true