Merge pull request #18 from 1998-felix/city-filter

NOISSUE - Add city filter

api/endpoint.go

@@ -43,6 +43,7 @@ func retrieveEndpoint(svc callhome.Service) endpoint.Endpoint {
 			From:    req.from,
 			To:      req.to,
 			Country: req.country,
+			City:    req.city,
 		}
 		tm, err := svc.Retrieve(ctx, pm, filter)
 		if err != nil {
@@ -70,6 +71,7 @@ func retrieveSummaryEndpoint(svc callhome.Service) endpoint.Endpoint {
 			From:    req.from,
 			To:      req.to,
 			Country: req.country,
+			City:    req.city,
 		}
 		summary, err := svc.RetrieveSummary(ctx, filter)
 		if err != nil {
@@ -92,6 +94,7 @@ func serveUI(svc callhome.Service) endpoint.Endpoint {
 			From:    req.from,
 			To:      req.to,
 			Country: req.country,
+			City:    req.city,
 		}
 		res, err := svc.ServeUI(ctx, filter)
 		return uiRes{

api/requests.go

@@ -45,6 +45,7 @@ type listTelemetryReq struct {
 	from    time.Time
 	to      time.Time
 	country string
+	city    string
 }
 
 func (req listTelemetryReq) validate() error {

api/transport.go

@@ -27,6 +27,7 @@ const (
 	fromKey     = "from"
 	toKey       = "to"
 	countryKey  = "country"
+	cityKey     = "city"
 	defOffset   = 0
 	defLimit    = 10
 	staticDir   = "./web/static"
@@ -185,12 +186,18 @@ func decodeRetrieve(_ context.Context, r *http.Request) (interface{}, error) {
 		return nil, err
 	}
 
+	ci, err := ReadStringQuery(r, cityKey, "")
+	if err != nil {
+		return nil, err
+	}
+
 	req := listTelemetryReq{
 		offset:  o,
 		limit:   l,
 		from:    from,
 		to:      to,
 		country: co,
+		city:    ci,
 	}
 	return req, nil
 }

openapi/openapi.yaml

@@ -28,6 +28,7 @@ paths:
         - $ref: "#/components/parameters/From"
         - $ref: "#/components/parameters/To"
         - $ref: "#/components/parameters/Country"
+        - $ref: "#/components/parameters/City"
       responses:
         "200":
           description: found
@@ -47,6 +48,7 @@ paths:
         - $ref: "#/components/parameters/From"
         - $ref: "#/components/parameters/To"
         - $ref: "#/components/parameters/Country"
+        - $ref: "#/components/parameters/City"
       responses:
         "200":
           description: found
@@ -81,6 +83,7 @@ paths:
         - $ref: "#/components/parameters/From"
         - $ref: "#/components/parameters/To"
         - $ref: "#/components/parameters/Country"
+        - $ref: "#/components/parameters/City"
       tags:
         - telemetry
       summary: Retrieve telemetry events
@@ -148,6 +151,14 @@ components:
         type: string
         default: ""
       required: false
+    City:
+      name: city
+      description: From city filter.
+      in: query
+      schema:
+        type: string
+        default: ""
+      required: false
   requestBodies:
     TelemetryReq:
       content:

telemetry.go

@@ -24,6 +24,7 @@ type TelemetryFilters struct {
 	From    time.Time
 	To      time.Time
 	Country string
+	City    string
 }
 
 type PageMetadata struct {

timescale/timescale.go

@@ -167,6 +167,11 @@ func generateQuery(filters callhome.TelemetryFilters) (string, map[string]interf
 		params["country"] = filters.Country
 	}
 
+	if filters.City != "" {
+		queries = append(queries, "city = :city")
+		params["city"] = filters.City
+	}
+
 	switch len(queries) {
 	case 0:
 		return "", params