1
0
mirror of https://github.com/mainflux/mainflux.git synced 2025-05-01 13:48:56 +08:00
Mirko Teodorovic 530f925c4d
MF-1346 - Create Groups API - add grouping of entities (#1334)
* remove owner id

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* add users endpoint for retrieving users from group

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove  groups from things and users

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move groups into auth

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* separate endpoints for users and things

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix problems with retrieving members

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* add groups test

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove groups from users

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove groups from things

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* rename constant

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* add new errors

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove unnecessary constants

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix validation

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* create groups db mock

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* adding tests

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* revert changes to docker related files

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove groups endpoints from users openapi

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove groups endpoints from users openapi

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move constant from postgres to groups

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move constant from postgres to groups

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move constant from postgres to groups

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove testing group

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* renam typ to groupType

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* add error for max level

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove print

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove groups.Member interface

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix query building and add test cases

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* uncomment tests

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* move groups package

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove group type, add bulk assign and unassign

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* update openapi, remove parentID from create request, reorder endpoints

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* update openapi

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* update openapi for users and things

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix groups test

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix linter errors

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* resolve comments

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* rename assignReq structure

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* refactor mocks, response, remove type from endpoint

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* some refactor, renaming, errors

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* simplify check

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove package alias

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix naming and comment

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* additional comments

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* add members grpc endpoint test

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix retrieving members for different types

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix retrieving members for different types

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove unecessary structure

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix api grpc

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* rename const

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* refactore retrieve parents and children with common function

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* small changes for errors

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix compile error

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix sorting in mock

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove regexp for groups

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* revert as change is made by mistake

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* revert as change is made by mistake

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* refactor groups and keys package

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix naming

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix naming

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix test for timestamp compare

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix error handling

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* remove errors not being used

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* var renaming

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* resolve comments

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* minor changes

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix test

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* add endpoints for groups into nginx

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* reorganize endpoints, remove some errors

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* reorganize endpoints, remove some errors

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* small fix

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix linter errors

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* minor changes

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* resolve comments

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix group save path problem

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* description constant

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* rename variables

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix validation

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* get back return

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix compile

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2021-03-04 10:29:03 +01:00

170 lines
5.4 KiB
Go

// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
package tracing
import (
"context"
"github.com/mainflux/mainflux/things"
opentracing "github.com/opentracing/opentracing-go"
)
const (
saveChannelsOp = "save_channels"
updateChannelOp = "update_channel"
retrieveChannelByIDOp = "retrieve_channel_by_id"
retrieveAllChannelsOp = "retrieve_all_channels"
retrieveChannelsByThingOp = "retrieve_channels_by_thing"
removeChannelOp = "retrieve_channel"
connectOp = "connect"
disconnectOp = "disconnect"
hasThingOp = "has_thing"
hasThingByIDOp = "has_thing_by_id"
)
var (
_ things.ChannelRepository = (*channelRepositoryMiddleware)(nil)
_ things.ChannelCache = (*channelCacheMiddleware)(nil)
)
type channelRepositoryMiddleware struct {
tracer opentracing.Tracer
repo things.ChannelRepository
}
// ChannelRepositoryMiddleware tracks request and their latency, and adds spans
// to context.
func ChannelRepositoryMiddleware(tracer opentracing.Tracer, repo things.ChannelRepository) things.ChannelRepository {
return channelRepositoryMiddleware{
tracer: tracer,
repo: repo,
}
}
func (crm channelRepositoryMiddleware) Save(ctx context.Context, channels ...things.Channel) ([]things.Channel, error) {
span := createSpan(ctx, crm.tracer, saveChannelsOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.Save(ctx, channels...)
}
func (crm channelRepositoryMiddleware) Update(ctx context.Context, ch things.Channel) error {
span := createSpan(ctx, crm.tracer, updateChannelOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.Update(ctx, ch)
}
func (crm channelRepositoryMiddleware) RetrieveByID(ctx context.Context, owner, id string) (things.Channel, error) {
span := createSpan(ctx, crm.tracer, retrieveChannelByIDOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.RetrieveByID(ctx, owner, id)
}
func (crm channelRepositoryMiddleware) RetrieveAll(ctx context.Context, owner string, pm things.PageMetadata) (things.ChannelsPage, error) {
span := createSpan(ctx, crm.tracer, retrieveAllChannelsOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.RetrieveAll(ctx, owner, pm)
}
func (crm channelRepositoryMiddleware) RetrieveByThing(ctx context.Context, owner, thID string, pm things.PageMetadata) (things.ChannelsPage, error) {
span := createSpan(ctx, crm.tracer, retrieveChannelsByThingOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.RetrieveByThing(ctx, owner, thID, pm)
}
func (crm channelRepositoryMiddleware) Remove(ctx context.Context, owner, id string) error {
span := createSpan(ctx, crm.tracer, removeChannelOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.Remove(ctx, owner, id)
}
func (crm channelRepositoryMiddleware) Connect(ctx context.Context, owner string, chIDs, thIDs []string) error {
span := createSpan(ctx, crm.tracer, connectOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.Connect(ctx, owner, chIDs, thIDs)
}
func (crm channelRepositoryMiddleware) Disconnect(ctx context.Context, owner, chanID, thingID string) error {
span := createSpan(ctx, crm.tracer, disconnectOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.Disconnect(ctx, owner, chanID, thingID)
}
func (crm channelRepositoryMiddleware) HasThing(ctx context.Context, chanID, key string) (string, error) {
span := createSpan(ctx, crm.tracer, hasThingOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.HasThing(ctx, chanID, key)
}
func (crm channelRepositoryMiddleware) HasThingByID(ctx context.Context, chanID, thingID string) error {
span := createSpan(ctx, crm.tracer, hasThingByIDOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return crm.repo.HasThingByID(ctx, chanID, thingID)
}
type channelCacheMiddleware struct {
tracer opentracing.Tracer
cache things.ChannelCache
}
// ChannelCacheMiddleware tracks request and their latency, and adds spans
// to context.
func ChannelCacheMiddleware(tracer opentracing.Tracer, cache things.ChannelCache) things.ChannelCache {
return channelCacheMiddleware{
tracer: tracer,
cache: cache,
}
}
func (ccm channelCacheMiddleware) Connect(ctx context.Context, chanID, thingID string) error {
span := createSpan(ctx, ccm.tracer, connectOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return ccm.cache.Connect(ctx, chanID, thingID)
}
func (ccm channelCacheMiddleware) HasThing(ctx context.Context, chanID, thingID string) bool {
span := createSpan(ctx, ccm.tracer, hasThingOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return ccm.cache.HasThing(ctx, chanID, thingID)
}
func (ccm channelCacheMiddleware) Disconnect(ctx context.Context, chanID, thingID string) error {
span := createSpan(ctx, ccm.tracer, disconnectOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return ccm.cache.Disconnect(ctx, chanID, thingID)
}
func (ccm channelCacheMiddleware) Remove(ctx context.Context, chanID string) error {
span := createSpan(ctx, ccm.tracer, removeChannelOp)
defer span.Finish()
ctx = opentracing.ContextWithSpan(ctx, span)
return ccm.cache.Remove(ctx, chanID)
}