mirror of
https://github.com/mainflux/mainflux.git
synced 2025-05-01 13:48:56 +08:00

* 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>
250 lines
6.2 KiB
Go
250 lines
6.2 KiB
Go
// Copyright (c) Mainflux
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package redis
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/go-redis/redis"
|
|
"github.com/mainflux/mainflux/things"
|
|
)
|
|
|
|
const (
|
|
streamID = "mainflux.things"
|
|
streamLen = 1000
|
|
)
|
|
|
|
var _ things.Service = (*eventStore)(nil)
|
|
|
|
type eventStore struct {
|
|
svc things.Service
|
|
client *redis.Client
|
|
}
|
|
|
|
// NewEventStoreMiddleware returns wrapper around things service that sends
|
|
// events to event store.
|
|
func NewEventStoreMiddleware(svc things.Service, client *redis.Client) things.Service {
|
|
return eventStore{
|
|
svc: svc,
|
|
client: client,
|
|
}
|
|
}
|
|
|
|
func (es eventStore) CreateThings(ctx context.Context, token string, ths ...things.Thing) ([]things.Thing, error) {
|
|
sths, err := es.svc.CreateThings(ctx, token, ths...)
|
|
if err != nil {
|
|
return sths, err
|
|
}
|
|
|
|
for _, thing := range sths {
|
|
event := createThingEvent{
|
|
id: thing.ID,
|
|
owner: thing.Owner,
|
|
name: thing.Name,
|
|
metadata: thing.Metadata,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
}
|
|
|
|
return sths, nil
|
|
}
|
|
|
|
func (es eventStore) UpdateThing(ctx context.Context, token string, thing things.Thing) error {
|
|
if err := es.svc.UpdateThing(ctx, token, thing); err != nil {
|
|
return err
|
|
}
|
|
|
|
event := updateThingEvent{
|
|
id: thing.ID,
|
|
name: thing.Name,
|
|
metadata: thing.Metadata,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
|
|
return nil
|
|
}
|
|
|
|
// UpdateKey doesn't send event because key shouldn't be sent over stream.
|
|
// Maybe we can start publishing this event at some point, without key value
|
|
// in order to notify adapters to disconnect connected things after key update.
|
|
func (es eventStore) UpdateKey(ctx context.Context, token, id, key string) error {
|
|
return es.svc.UpdateKey(ctx, token, id, key)
|
|
}
|
|
|
|
func (es eventStore) ViewThing(ctx context.Context, token, id string) (things.Thing, error) {
|
|
return es.svc.ViewThing(ctx, token, id)
|
|
}
|
|
|
|
func (es eventStore) ListThings(ctx context.Context, token string, pm things.PageMetadata) (things.Page, error) {
|
|
return es.svc.ListThings(ctx, token, pm)
|
|
}
|
|
|
|
func (es eventStore) ListThingsByChannel(ctx context.Context, token, chID string, pm things.PageMetadata) (things.Page, error) {
|
|
return es.svc.ListThingsByChannel(ctx, token, chID, pm)
|
|
}
|
|
|
|
func (es eventStore) RemoveThing(ctx context.Context, token, id string) error {
|
|
if err := es.svc.RemoveThing(ctx, token, id); err != nil {
|
|
return err
|
|
}
|
|
|
|
event := removeThingEvent{
|
|
id: id,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (es eventStore) CreateChannels(ctx context.Context, token string, channels ...things.Channel) ([]things.Channel, error) {
|
|
schs, err := es.svc.CreateChannels(ctx, token, channels...)
|
|
if err != nil {
|
|
return schs, err
|
|
}
|
|
|
|
for _, channel := range schs {
|
|
event := createChannelEvent{
|
|
id: channel.ID,
|
|
owner: channel.Owner,
|
|
name: channel.Name,
|
|
metadata: channel.Metadata,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
}
|
|
|
|
return schs, nil
|
|
}
|
|
|
|
func (es eventStore) UpdateChannel(ctx context.Context, token string, channel things.Channel) error {
|
|
if err := es.svc.UpdateChannel(ctx, token, channel); err != nil {
|
|
return err
|
|
}
|
|
|
|
event := updateChannelEvent{
|
|
id: channel.ID,
|
|
name: channel.Name,
|
|
metadata: channel.Metadata,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (es eventStore) ViewChannel(ctx context.Context, token, id string) (things.Channel, error) {
|
|
return es.svc.ViewChannel(ctx, token, id)
|
|
}
|
|
|
|
func (es eventStore) ListChannels(ctx context.Context, token string, pm things.PageMetadata) (things.ChannelsPage, error) {
|
|
return es.svc.ListChannels(ctx, token, pm)
|
|
}
|
|
|
|
func (es eventStore) ListChannelsByThing(ctx context.Context, token, thID string, pm things.PageMetadata) (things.ChannelsPage, error) {
|
|
return es.svc.ListChannelsByThing(ctx, token, thID, pm)
|
|
}
|
|
|
|
func (es eventStore) RemoveChannel(ctx context.Context, token, id string) error {
|
|
if err := es.svc.RemoveChannel(ctx, token, id); err != nil {
|
|
return err
|
|
}
|
|
|
|
event := removeChannelEvent{
|
|
id: id,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (es eventStore) Connect(ctx context.Context, token string, chIDs, thIDs []string) error {
|
|
if err := es.svc.Connect(ctx, token, chIDs, thIDs); err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, chID := range chIDs {
|
|
for _, thID := range thIDs {
|
|
event := connectThingEvent{
|
|
chanID: chID,
|
|
thingID: thID,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (es eventStore) Disconnect(ctx context.Context, token, chanID, thingID string) error {
|
|
if err := es.svc.Disconnect(ctx, token, chanID, thingID); err != nil {
|
|
return err
|
|
}
|
|
|
|
event := disconnectThingEvent{
|
|
chanID: chanID,
|
|
thingID: thingID,
|
|
}
|
|
record := &redis.XAddArgs{
|
|
Stream: streamID,
|
|
MaxLenApprox: streamLen,
|
|
Values: event.Encode(),
|
|
}
|
|
es.client.XAdd(record).Err()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (es eventStore) CanAccessByKey(ctx context.Context, chanID string, key string) (string, error) {
|
|
return es.svc.CanAccessByKey(ctx, chanID, key)
|
|
}
|
|
|
|
func (es eventStore) CanAccessByID(ctx context.Context, chanID string, thingID string) error {
|
|
return es.svc.CanAccessByID(ctx, chanID, thingID)
|
|
}
|
|
|
|
func (es eventStore) IsChannelOwner(ctx context.Context, owner, chanID string) error {
|
|
return es.svc.IsChannelOwner(ctx, owner, chanID)
|
|
}
|
|
|
|
func (es eventStore) Identify(ctx context.Context, key string) (string, error) {
|
|
return es.svc.Identify(ctx, key)
|
|
}
|
|
|
|
func (es eventStore) ListMembers(ctx context.Context, token, groupID string, pm things.PageMetadata) (things.Page, error) {
|
|
return es.svc.ListMembers(ctx, token, groupID, pm)
|
|
}
|