Merge pull request #22 from 1998-felix/service-filter

NOISSUE-Add service filter

api/endpoint.go

@@ -45,6 +45,7 @@ func retrieveEndpoint(svc callhome.Service) endpoint.Endpoint {
 			Country: req.country,
 			City:    req.city,
 			Version: req.version,
+			Service: req.service,
 		}
 		tm, err := svc.Retrieve(ctx, pm, filter)
 		if err != nil {
@@ -74,6 +75,7 @@ func retrieveSummaryEndpoint(svc callhome.Service) endpoint.Endpoint {
 			Country: req.country,
 			City:    req.city,
 			Version: req.version,
+			Service: req.service,
 		}
 		summary, err := svc.RetrieveSummary(ctx, filter)
 		if err != nil {
@@ -98,6 +100,7 @@ func serveUI(svc callhome.Service) endpoint.Endpoint {
 			Country: req.country,
 			City:    req.city,
 			Version: req.version,
+			Service: req.service,
 		}
 		res, err := svc.ServeUI(ctx, filter)
 		return uiRes{

api/requests.go

@@ -47,6 +47,7 @@ type listTelemetryReq struct {
 	country string
 	city    string
 	version string
+	service string
 }
 
 func (req listTelemetryReq) validate() error {

api/transport.go

@@ -29,6 +29,7 @@ const (
 	countryKey  = "country"
 	cityKey     = "city"
 	versionKey  = "version"
+	serviceKey  = "service"
 	defOffset   = 0
 	defLimit    = 10
 	staticDir   = "./web/static"
@@ -197,6 +198,11 @@ func decodeRetrieve(_ context.Context, r *http.Request) (interface{}, error) {
 		return nil, err
 	}
 
+	se, err := ReadStringQuery(r, serviceKey, "")
+	if err != nil {
+		return nil, err
+	}
+
 	req := listTelemetryReq{
 		offset:  o,
 		limit:   l,
@@ -205,6 +211,7 @@ func decodeRetrieve(_ context.Context, r *http.Request) (interface{}, error) {
 		country: co,
 		city:    ci,
 		version: ve,
+		service: se,
 	}
 	return req, nil
 }

openapi/openapi.yaml

@@ -30,6 +30,7 @@ paths:
         - $ref: "#/components/parameters/Country"
         - $ref: "#/components/parameters/City"
         - $ref: "#/components/parameters/Version"
+        - $ref: "#/components/parameters/Service"
       responses:
         "200":
           description: found
@@ -51,6 +52,7 @@ paths:
         - $ref: "#/components/parameters/Country"
         - $ref: "#/components/parameters/City"
         - $ref: "#/components/parameters/Version"
+        - $ref: "#/components/parameters/Service"
       responses:
         "200":
           description: found
@@ -87,6 +89,7 @@ paths:
         - $ref: "#/components/parameters/Country"
         - $ref: "#/components/parameters/City"
         - $ref: "#/components/parameters/Version"
+        - $ref: "#/components/parameters/Service"
       tags:
         - telemetry
       summary: Retrieve telemetry events
@@ -170,6 +173,14 @@ components:
         type: string
         default: ""
       required: false
+    Service:
+      name: service
+      description: From service filter.
+      in: query
+      schema:
+        type: string
+        default: ""
+      required: false
   requestBodies:
     TelemetryReq:
       content:

telemetry.go

@@ -26,6 +26,7 @@ type TelemetryFilters struct {
 	Country string
 	City    string
 	Version string
+	Service string
 }
 
 type PageMetadata struct {

timescale/timescale.go

@@ -176,6 +176,11 @@ func generateQuery(filters callhome.TelemetryFilters) (string, map[string]interf
 		params["version"] = filters.Version
 	}
 
+	if filters.Service != "" {
+		queries = append(queries, "service = :service")
+		params["service"] = filters.Service
+	}
+
 	switch len(queries) {
 	case 0:
 		return "", params