Update module github.com/hashicorp/vault/api to v1.9.1

.gitignore

@@ -1,2 +1,3 @@
 !jwt/testdata/.gitkeep
 jwt/testdata/*
+.idea/*

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "nuxt.isNuxtApp": false
+}

README.md

@@ -0,0 +1,29 @@
+# pkg
+
+ZSmartex common packages
+
+### Why pkg is public?
+- pkg just is a common packages for a normal application build in Go
+- there is no security or anything on this package
+
+### What pkg support?
+- Repository/Queries for Gorm (Very friendly)
+- Queries for Elasticsearch (Very friendly)
+- Usecase interface for Gorm
+- PGX
+- S3 Object Storage Upload/Download/Read
+- JWT
+- Logging
+- EventAPI
+- Redis
+- Gorm
+- Twilio
+- Elasticsearch
+- Kafka (unstable)
+
+### TODO list of ZSmartex:
+- temporal (Q1 2024)
+- grpc-gateway (Q1 2024)
+- saga (Q1 2024)
+- microservices (Q2 2024)
+- futures trading (Q4 2024)

docker-compose.yml

@@ -22,6 +22,18 @@ services:
       - ELASTICSEARCH_PASSWORD=elastic
     ports:
       - "5601:5601"
+
+  questdb:
+    image: questdb/questdb:6.5.5
+    restart: always
+    ports:
+      - "8812:8812"
+      - "9009:9009"
+      - "8041:9000"
+      - "9003:9003"
+    volumes:
+      - questdb:/root/.questdb/db
 
 volumes:
   esdata:
+  questdb:

epa/aggregation/aggregation.go

@@ -0,0 +1,37 @@
+package aggregation
+
+import "encoding/json"
+
+type Aggregation interface {
+	Source() (interface{}, error)
+}
+
+type Aggregations map[string]json.RawMessage
+
+func (a Aggregations) DateHistogram(name string) (items *AggregationBucketHistogramItems, found bool) {
+	if raw, found := a[name]; found {
+		agg := new(AggregationBucketHistogramItems)
+		if raw == nil {
+			return agg, true
+		}
+		if err := json.Unmarshal(raw, agg); err == nil {
+			return agg, true
+		}
+	}
+
+	return nil, false
+}
+
+func (a Aggregations) Sum(name string) (value *AggregationSumValue, found bool) {
+	if raw, found := a[name]; found {
+		agg := new(AggregationSumValue)
+		if raw == nil {
+			return agg, true
+		}
+		if err := json.Unmarshal(raw, agg); err == nil {
+			return agg, true
+		}
+	}
+
+	return nil, false
+}

epa/aggregation/aggregation_bucket_histogram_items.go

@@ -0,0 +1,64 @@
+package aggregation
+
+import "encoding/json"
+
+// AggregationBucketHistogramItem is a single bucket of an AggregationBucketHistogramItems structure.
+type AggregationBucketHistogramItem struct {
+	Aggregations
+
+	Key         float64 //`json:"key"`
+	KeyAsString *string //`json:"key_as_string"`
+	DocCount    int64   //`json:"doc_count"`
+}
+
+// UnmarshalJSON decodes JSON data and initializes an AggregationBucketHistogramItem structure.
+func (a *AggregationBucketHistogramItem) UnmarshalJSON(data []byte) error {
+	var aggs map[string]json.RawMessage
+	if err := json.Unmarshal(data, &aggs); err != nil {
+		return err
+	}
+	if v, ok := aggs["key"]; ok && v != nil {
+		if err := json.Unmarshal(v, &a.Key); err != nil {
+			return err
+		}
+	}
+	if v, ok := aggs["key_as_string"]; ok && v != nil {
+		if err := json.Unmarshal(v, &a.KeyAsString); err != nil {
+			return err
+		}
+	}
+	if v, ok := aggs["doc_count"]; ok && v != nil {
+		if err := json.Unmarshal(v, &a.DocCount); err != nil {
+			return err
+		}
+	}
+	a.Aggregations = aggs
+	return nil
+}
+
+type AggregationBucketHistogramItems struct {
+	Aggregations
+
+	Buckets []*AggregationBucketHistogramItem `json:"buckets,omitempty"`
+	Meta    map[string]interface{}            `json:"meta,omitempty"`
+}
+
+// UnmarshalJSON decodes JSON data and initializes an AggregationBucketHistogramItems structure.
+func (a *AggregationBucketHistogramItems) UnmarshalJSON(data []byte) error {
+	var aggs map[string]json.RawMessage
+	if err := json.Unmarshal(data, &aggs); err != nil {
+		return err
+	}
+	if v, ok := aggs["buckets"]; ok && v != nil {
+		if err := json.Unmarshal(v, &a.Buckets); err != nil {
+			return err
+		}
+	}
+	if v, ok := aggs["meta"]; ok && v != nil {
+		if err := json.Unmarshal(v, &a.Meta); err != nil {
+			return err
+		}
+	}
+	a.Aggregations = aggs
+	return nil
+}

epa/aggregation/aggregation_sum_value.go

@@ -0,0 +1,27 @@
+package aggregation
+
+import (
+	"encoding/json"
+
+	"github.com/shopspring/decimal"
+)
+
+type AggregationSumValue struct {
+	Aggregations
+
+	Value decimal.Decimal `json:"value,omitempty"`
+}
+
+func (a *AggregationSumValue) UnmarshalJSON(data []byte) error {
+	var aggs map[string]json.RawMessage
+	if err := json.Unmarshal(data, &aggs); err != nil {
+		return err
+	}
+	if v, ok := aggs["value"]; ok && v != nil {
+		if err := json.Unmarshal(v, &a.Value); err != nil {
+			return err
+		}
+	}
+	a.Aggregations = aggs
+	return nil
+}

epa/aggregation/date_histogram_aggregation.go

@@ -0,0 +1,105 @@
+package aggregation
+
+import "github.com/zsmartex/pkg/v2/queries"
+
+type DateHistogramAggregation struct {
+	field            string
+	fixedInterval    string
+	calendarInterval string
+	order            string
+	ordering         queries.Ordering
+	minDocCount      *int64
+	timeZone         string
+	format           string
+	offset           string
+}
+
+func NewDateHistogramAggregation(field string) *DateHistogramAggregation {
+	return &DateHistogramAggregation{
+		field:    field,
+		ordering: queries.OrderingAsc,
+	}
+}
+
+func (a *DateHistogramAggregation) FixedInterval(fixedInterval string) *DateHistogramAggregation {
+	a.fixedInterval = fixedInterval
+	return a
+}
+
+func (a *DateHistogramAggregation) CalendarInterval(calendarInterval string) *DateHistogramAggregation {
+	a.calendarInterval = calendarInterval
+	return a
+}
+
+func (a *DateHistogramAggregation) Order(order string, ordering queries.Ordering) *DateHistogramAggregation {
+	a.order = order
+	a.ordering = ordering
+	return a
+}
+
+func (a *DateHistogramAggregation) OrderByCount(ordering queries.Ordering) *DateHistogramAggregation {
+	a.order = "_count"
+	a.ordering = ordering
+	return a
+}
+
+func (a *DateHistogramAggregation) MinDocCount(minDocCount int64) *DateHistogramAggregation {
+	a.minDocCount = &minDocCount
+	return a
+}
+
+func (a *DateHistogramAggregation) TimeZone(timeZone string) *DateHistogramAggregation {
+	a.timeZone = timeZone
+	return a
+}
+
+func (a *DateHistogramAggregation) Format(format string) *DateHistogramAggregation {
+	a.format = format
+	return a
+}
+
+func (a *DateHistogramAggregation) Offset(offset string) *DateHistogramAggregation {
+	a.offset = offset
+	return a
+}
+
+func (a *DateHistogramAggregation) Source() (interface{}, error) {
+	// Example:
+	// {
+	//     "date_histogram" : {
+	//         "field" : "date",
+	//         "fixed_interval" : "month"
+	//     }
+	// }
+	//
+	// This method returns only the { "date_histogram" : { ... } } part.
+	source := make(map[string]interface{})
+	dateHistogram := make(map[string]interface{})
+	source["date_histogram"] = dateHistogram
+	dateHistogram["field"] = a.field
+	if a.fixedInterval != "" {
+		dateHistogram["fixed_interval"] = a.fixedInterval
+	}
+	if a.calendarInterval != "" {
+		dateHistogram["calendar_interval"] = a.calendarInterval
+	}
+	if a.order != "" {
+		dateHistogram["order"] = map[string]interface{}{
+			a.order: a.ordering,
+		}
+	}
+	if a.minDocCount != nil {
+		dateHistogram["min_doc_count"] = *a.minDocCount
+	}
+	if a.timeZone != "" {
+		dateHistogram["time_zone"] = a.timeZone
+	}
+	if a.format != "" {
+		dateHistogram["format"] = a.format
+	}
+	if a.offset != "" {
+		dateHistogram["offset"] = a.offset
+	}
+
+	return source, nil
+}

epa/aggregation/sum_aggregation.go

@@ -0,0 +1,33 @@
+package aggregation
+
+type SumAggregation struct {
+	field string
+}
+
+func NewSumAggregation(field string) *SumAggregation {
+	return &SumAggregation{
+		field: field,
+	}
+}
+
+func (a *SumAggregation) Source() (interface{}, error) {
+	// Example
+	//
+	// {
+	// 		"hat_prices" : {
+	// 			"sum": {
+	// 				"field": "price"
+	// 			}
+	// 		}
+	// }
+	//
+	//
+	// This method returns only the  { "sum": { "field": "..." } } part.
+
+	source := make(map[string]interface{})
+	sum := make(map[string]interface{})
+	source["sum"] = sum
+	sum["field"] = a.field
+
+	return source, nil
+}

epa/filter.go

@@ -1,39 +1,35 @@
 package epa
 
 import (
-	"github.com/olivere/elastic/v7"
-)
-
-type Ordering string
-
-const (
-	OrderingAscending  Ordering = "asc"
-	OrderingDescending Ordering = "desc"
+	"github.com/zsmartex/pkg/v2/epa/aggregation"
+	"github.com/zsmartex/pkg/v2/epa/query"
+	"github.com/zsmartex/pkg/v2/queries"
 )
 
 type Query struct {
-	Page     int
-	Limit    int
-	OrderBy  string
-	Ordering Ordering
-	Filters  []Filter
-	Addons   func(*elastic.SearchService) *elastic.SearchService
+	Indexes      []string
+	Page         int
+	Limit        int
+	OrderBy      string
+	Ordering     queries.Ordering
+	Filters      []Filter
+	Aggregations map[string]aggregation.Aggregation
 }
 
-type Filter func(query *elastic.BoolQuery) *elastic.BoolQuery
+type Filter func(*query.BoolQuery) *query.BoolQuery
 
-func ApplyFilters(query *elastic.BoolQuery, filters []Filter) *elastic.BoolQuery {
+func ApplyFilters(q *query.BoolQuery, filters []Filter) *query.BoolQuery {
 	for _, f := range filters {
-		query = f(query)
+		q = f(q)
 	}
-	return query
+	return q
 }
 
 func ChainFilters(filters ...Filter) Filter {
-	return func(query *elastic.BoolQuery) *elastic.BoolQuery {
+	return func(q *query.BoolQuery) *query.BoolQuery {
 		for _, f := range filters {
-			query = f(query)
+			q = f(q)
 		}
-		return query
+		return q
 	}
 }