@rivascva/dt-idl 1.1.112 → 1.1.113

package/go/auth/jwt.go

@@ -17,15 +17,12 @@ func ValidateToken(token string, secret string) (*jwt.Token, ValidationError) {
 	// validate the token
 	parsedToken, err := parser.Parse(token, func(t *jwt.Token) (any, error) { return []byte(secret), nil })
 	if err != nil {
-		return nil, fmt.Errorf("unable to validate the token: %w", err)
+		return nil, ErrorInvalidToken
 	}
 
 	// validate the token expiration time
 	expirationTime, err := parsedToken.Claims.GetExpirationTime()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get the expiration time from the token: %w", err)
-	}
-	if expirationTime.Before(time.Now()) {
+	if err != nil || expirationTime.Before(time.Now()) {
 		return nil, ErrorExpiredToken
 	}
 

package/go/auth/models.go

@@ -24,6 +24,8 @@ var approvedServices = []string{"dt-trade-service", "dt-portfolio-service", "dt-
 type ValidationError = error
 
 var (
+	// ErrorInvalidToken is returned when a token is invalid.
+	ErrorInvalidToken ValidationError = errors.New("invalid token")
 	// ErrorExpiredToken is returned when a token is expired.
 	ErrorExpiredToken ValidationError = errors.New("expired token")
 )

package/go/psql/models.go

@@ -0,0 +1,41 @@
+package psql
+
+import (
+	"github.com/Masterminds/squirrel"
+)
+
+// sq is a PostgreSQL query statement builder.
+var sq = squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar)
+
+// returnAllSuffix is a PostgreSQL suffix that returns all affected rows.
+const returnAllSuffix = "RETURNING *"
+
+// Entries represents the database column/value entries.
+type Entries = map[string]any
+
+// Where is for the where selector.
+type Where = any
+
+// Equal is for the equal syntax in where selectors.
+type Equal = squirrel.Eq
+
+// NotEqual is for the not equal syntax in where selectors.
+type NotEqual = squirrel.NotEq
+
+// LessThan is for the less than syntax in where selectors.
+type LessThan = squirrel.Lt
+
+// LessThanEqual is for the less than or equal syntax in where selectors.
+type LessThanEqual = squirrel.LtOrEq
+
+// GreaterThan is for the greater than syntax in where selectors.
+type GreaterThan = squirrel.Gt
+
+// GreaterThanEqual is for the greater than or equal syntax in where selectors.
+type GreaterThanEqual = squirrel.GtOrEq
+
+// Like is for the like syntax in where selectors.
+type Like = squirrel.Like
+
+// NotLike is for the not like syntax in where selectors.
+type NotLike = squirrel.NotLike

package/go/psql/utils.go

@@ -0,0 +1,81 @@
+package psql
+
+import (
+	"reflect"
+)
+
+// GetEntries gets the database column/value entries from the given struct.
+// It extracts the column names from the "db" tag in the struct.
+// Omits the given database columns.
+func GetEntries(v any, omit ...string) Entries {
+	// convert the struct into a reflect value
+	values := reflect.ValueOf(v)
+	types := values.Type()
+
+	// initiate helper variables
+	numFields := values.NumField()
+	entries := make(Entries, numFields)
+
+	// fill the entries map
+	for i := range numFields {
+		tag := types.Field(i).Tag.Get("db")
+		val := values.Field(i).Interface()
+		entries[tag] = val
+	}
+
+	// delete any omitted columns
+	for _, tag := range omit {
+		delete(entries, tag)
+	}
+
+	return entries
+}
+
+// GetSelectAllQuery builds and returns the query and arguments to perform a select all query on the given table.
+// Provide a where map to specify which rows to select. A nil value will select all rows.
+func GetSelectAllQuery(table string, where ...Where) (string, []any, error) {
+	builder := sq.Select("*").From(table)
+	for _, mp := range where {
+		builder = builder.Where(mp)
+	}
+	return builder.ToSql()
+}
+
+// GetSelectColumnQuery builds and returns the query and arguments to perform a select column query on the given table.
+// Provide a where map to specify which rows to select. A nil value will select all rows.
+func GetSelectColumnQuery(table string, column string, where ...Where) (string, []any, error) {
+	builder := sq.Select(column).From(table)
+	for _, mp := range where {
+		builder = builder.Where(mp)
+	}
+	return builder.ToSql()
+}
+
+// GetInsertQuery builds and returns the query and arguments to perform an insert query on the given table.
+// Get the table entries using the "GetEntries" method.
+func GetInsertQuery(table string, entries Entries) (string, []any, error) {
+	builder := sq.Insert(table).SetMap(entries).Suffix(returnAllSuffix)
+	return builder.ToSql()
+}
+
+// GetUpdateQuery builds and returns the query and arguments to perform an update query on the given table.
+// Provide a where map to specify which rows to update.
+// Get the table entries using the "GetEntries" method.
+func GetUpdateQuery(table string, entries Entries, where ...Where) (string, []any, error) {
+	builder := sq.Update(table).SetMap(entries)
+	for _, mp := range where {
+		builder = builder.Where(mp)
+	}
+	builder = builder.Suffix(returnAllSuffix)
+	return builder.ToSql()
+}
+
+// GetDeleteQuery builds and returns the query and arguments to perform a delete query on the given table.
+// Provide a where map to specify which rows to delete.
+func GetDeleteQuery(table string, where ...Where) (string, []any, error) {
+	builder := sq.Delete(table)
+	for _, mp := range where {
+		builder = builder.Where(mp)
+	}
+	return builder.ToSql()
+}

package/go.mod

@@ -3,6 +3,12 @@ module github.com/RivasCVA/dt-idl
 go 1.23
 
 require (
+	github.com/Masterminds/squirrel v1.5.4
 	github.com/golang-jwt/jwt/v5 v5.2.2
 	github.com/google/uuid v1.6.0
 )
+
+require (
+	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
+	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
+)

package/go.sum

@@ -1,4 +1,16 @@
+github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=
+github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
 github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=
+github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
+github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk=
+github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivascva/dt-idl",
-  "version": "1.1.112",
+  "version": "1.1.113",
   "description": "Dream Trade - Interface Definition Language",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",