Refactor list things

Signed-off-by: nyagamunene <[email protected]>

pkg/clients/postgres/clients.go

@@ -505,7 +505,7 @@ func PageQuery(pm clients.Page) (string, error) {
 		query = append(query, "id ILIKE '%' || :id || '%'")
 	}
 	if pm.Tag != "" {
-		query = append(query, ":tag = ANY(c.tags)")
+		query = append(query, "EXISTS (SELECT 1 FROM unnest(tags) AS tag WHERE tag ILIKE '%' || :tag || '%')")
 	}
 	if pm.Status != clients.AllStatus {
 		query = append(query, "c.status = :status")
@@ -569,6 +569,9 @@ func ConstructThingSearchQuery(pm clients.Page) (string, string) {
 	if pm.Tag != "" {
 		query = append(query, "EXISTS (SELECT 1 FROM unnest(tags) AS tag WHERE tag ILIKE '%' || :tag || '%')")
 	}
+	if len(pm.IDs) != 0 {
+		query = append(query, fmt.Sprintf("id IN ('%s')", strings.Join(pm.IDs, "','")))
+	}
 
 	if len(query) > 0 {
 		emq = fmt.Sprintf("WHERE %s", strings.Join(query, " AND "))

things/api/http/clients.go

@@ -188,6 +188,10 @@ func decodeListClients(_ context.Context, r *http.Request) (interface{}, error)
 	if err != nil {
 		return nil, errors.Wrap(apiutil.ErrValidation, err)
 	}
+	id, err := apiutil.ReadStringQuery(r, api.IDOrder, "")
+	if err != nil {
+		return nil, errors.Wrap(apiutil.ErrValidation, err)
+	}
 	p, err := apiutil.ReadStringQuery(r, api.PermissionKey, api.DefPermission)
 	if err != nil {
 		return nil, errors.Wrap(apiutil.ErrValidation, err)
@@ -212,6 +216,7 @@ func decodeListClients(_ context.Context, r *http.Request) (interface{}, error)
 		permission: p,
 		listPerms:  lp,
 		userID:     chi.URLParam(r, "userID"),
+		id:         id,
 	}
 	return req, nil
 }

things/api/http/endpoints.go

@@ -109,6 +109,7 @@ func listClientsEndpoint(svc things.Service) endpoint.Endpoint {
 			Metadata:   req.metadata,
 			ListPerms:  req.listPerms,
 			Role:       mgclients.AllRole, // retrieve all things since things don't have roles
+			Id:         req.id,
 		}
 		page, err := svc.ListClients(ctx, req.token, req.userID, pm)
 		if err != nil {

things/api/http/requests.go

@@ -98,6 +98,7 @@ type listClientsReq struct {
 	userID     string
 	listPerms  bool
 	metadata   mgclients.Metadata
+	id         string
 }
 
 func (req listClientsReq) validate() error {

things/service.go

@@ -181,7 +181,7 @@ func (svc service) ListClients(ctx context.Context, token, reqUserID string, pm
 
 	pm.IDs = ids
 
-	tp, err := svc.clients.RetrieveAllByIDs(ctx, pm)
+	tp, err := svc.clients.SearchBasicInfo(ctx, pm)
 	if err != nil {
 		return mgclients.ClientsPage{}, errors.Wrap(svcerr.ErrViewEntity, err)
 	}