eric/onix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved pr comments

Browse Source
This commit is contained in:
AshwiniK-protean
2025-04-29 10:58:28 +05:30
parent a939d7d8ae
commit a209df9c8f
1 changed files with 8 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
pkg/plugin/implementation/schemavalidator/schemavalidator.go
View File

@@ -19,25 +19,9 @@ import (
// Payload represents the structure of the data payload with context information.
type payload struct {
Context struct {
Domain string `json:"domain"`
Version string `json:"version"`
Action string `json:"action"`
BapID string `json:"bap_id"`
BapURI string `json:"bap_uri"`
BppID string `json:"bpp_id"`
BppURI string `json:"bpp_uri"`
MessageID string `json:"message_id"`
TransactionID string `json:"transaction_id"`
Timestamp string `json:"timestamp"`
TTL string `json:"ttl"`
Location struct {
Country struct {
Code string `json:"code"`
} `json:"country"`
City struct {
Code string `json:"code"`
} `json:"city"`
} `json:"location"`
Domain string `json:"domain"`
Version string `json:"version"`
Action string `json:"action"`
} `json:"context"`
}
@@ -78,8 +62,11 @@ func (v *schemaValidator) Validate(ctx context.Context, url *url.URL, data []byt
return model.NewBadReqErr(fmt.Errorf("failed to parse JSON payload: %v", err))
}
if err := validateContext(payloadData); err != nil {
return err
if payloadData.Context.Domain == "" {
return fmt.Errorf("missing field Domain in context")
}
if payloadData.Context.Version == "" {
return fmt.Errorf("missing field Version in context")
}
// Extract domain, version, and endpoint from the payload and uri.
@@ -132,52 +119,6 @@ func (v *schemaValidator) Validate(ctx context.Context, url *url.URL, data []byt
return nil
}
func validateContext(p payload) error {
// Validate the payload context fields FIRST
if p.Context.Domain == "" {
return fmt.Errorf("missing field Domain in context")
}
if p.Context.Version == "" {
return fmt.Errorf("missing field Version in context")
}
if p.Context.Action == "" {
return fmt.Errorf("missing field action in context")
}
if p.Context.BapID == "" {
return fmt.Errorf("missing field bpp_id in context")
}
if p.Context.BapURI == "" {
return fmt.Errorf("missing field bpp_uri in context")
}
if p.Context.BppID == "" {
return fmt.Errorf("missing field bpp_id in context")
}
if p.Context.BppURI == "" {
return fmt.Errorf("missing field bpp_uri in context")
}
if p.Context.MessageID == "" {
return fmt.Errorf("missing field message_id in context")
}
if p.Context.TransactionID == "" {
return fmt.Errorf("missing field transaction_id in context")
}
if p.Context.Timestamp == "" {
return fmt.Errorf("missing field timestamp in context")
}
if p.Context.TTL == "" {
return fmt.Errorf("missing field ttl in context")
}
if p.Context.Location.Country.Code == "" {
return fmt.Errorf("missing Location.Country.Code in context")
}
if p.Context.Location.City.Code == "" {
return fmt.Errorf("missing field Location.City.Code in context")
}
return nil
}
// Initialise initialises the validator provider by compiling all the JSON schema files
// from the specified directory and storing them in a cache indexed by their schema filenames.
func (v *schemaValidator) initialise() error {