1
0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-29 13:49:28 +08:00
beres 61b2d6b87b MF-596 - Add subtopic to RawMessage (#642)
* Commit for mainflux-596
Modified and tested:
- cli
- http
- mqtt
- normalizer
- all readers
- sdk messages
- all writers
- ws
Missing:
- coap
- lora

Signed-off-by: ale <ale@metaverso.org>

* - fix subtopic name in, when starting with dot, http/ws/mqtt
- add some test on readers

Signed-off-by: ale <ale@metaverso.org>

* - fix string concatenation
- update http/transport regexp to match subtopic names with only \w-
- update ws/transport regexp like http ones with also the wildcard * and >

Signed-off-by: ale <ale@metaverso.org>

* added subtopic support to coap adapter

Signed-off-by: ale <ale@metaverso.org>

* - update replace functions with replaceall when needed
- renamed getDestChannel to fmtSubject
- update api/transport and ws/transport route to be more readable
- fix mqtt syntax
- renamed func andQuery to query as suggested by @anovakovic01
- have a nice we :)

Signed-off-by: ale <ale@metaverso.org>

* - fix error declaration on ws/nat/publisher
- fix regexp added missing allowed chars - and _ on coap/api/transport
- fix subtopic clean suffix / if present on coap/api/transport
- improve regexp on http and ws /api/transport, now does not accept url that do not strictly match
- add some ws subtopic tests

Signed-off-by: ale <ale@metaverso.org>

* - enabled wildcard chars on coap/api/transport
- allow use special chars on http and ws api/transport

Signed-off-by: ale <ale@metaverso.org>

* - use strings.Replace() insted ReplaceAll()

Signed-off-by: ale <ale@metaverso.org>

* - allow every chars on subtopics
- fix replace error on mqtt

Signed-off-by: ale <ale@metaverso.org>

* fix cassandra test

Signed-off-by: ale <ale@metaverso.org>

* fix ws test with invalid subtopic

Signed-off-by: ale <ale@metaverso.org>

* fix invalid GOCACHE in go1.12, replaced by -count 1, see https://golang.org/doc/go1.10#test

Signed-off-by: ale <ale@metaverso.org>

* - improve regexp on http/ws api/transport
- minor changes

Signed-off-by: ale <ale@metaverso.org>

* - add generic function parseSubtopic on ws/http adapters

Signed-off-by: ale <ale@metaverso.org>

* - add generic function fmtSubtopic on coap adapter

Signed-off-by: ale <ale@metaverso.org>
2019-03-15 18:38:07 +01:00

119 lines
3.1 KiB
Go

//
// Copyright (c) 2018
// Mainflux
//
// SPDX-License-Identifier: Apache-2.0
//
package mongodb
import (
"context"
"github.com/mainflux/mainflux"
"github.com/mainflux/mainflux/readers"
"github.com/mongodb/mongo-go-driver/bson"
"github.com/mongodb/mongo-go-driver/mongo"
"github.com/mongodb/mongo-go-driver/mongo/findopt"
)
const collection = "mainflux"
var _ readers.MessageRepository = (*mongoRepository)(nil)
type mongoRepository struct {
db *mongo.Database
}
// Message struct is used as a MongoDB representation of Mainflux message.
type message struct {
Channel string `bson:"channel,omitempty"`
Subtopic string `bson:"subtopic,omitempty"`
Publisher string `bson:"publisher,omitempty"`
Protocol string `bson:"protocol,omitempty"`
Name string `bson:"name,omitempty"`
Unit string `bson:"unit,omitempty"`
FloatValue *float64 `bson:"value,omitempty"`
StringValue *string `bson:"stringValue,omitempty"`
BoolValue *bool `bson:"boolValue,omitempty"`
DataValue *string `bson:"dataValue,omitempty"`
ValueSum *float64 `bson:"valueSum,omitempty"`
Time float64 `bson:"time,omitempty"`
UpdateTime float64 `bson:"updateTime,omitempty"`
Link string `bson:"link,omitempty"`
}
// New returns new MongoDB reader.
func New(db *mongo.Database) readers.MessageRepository {
return mongoRepository{db: db}
}
func (repo mongoRepository) ReadAll(chanID string, offset, limit uint64, query map[string]string) []mainflux.Message {
col := repo.db.Collection(collection)
sortMap := map[string]interface{}{
"time": -1,
}
filter := fmtCondition(chanID, query)
cursor, err := col.Find(context.Background(), filter, findopt.Sort(sortMap), findopt.Limit(int64(limit)), findopt.Skip(int64(offset)))
if err != nil {
return []mainflux.Message{}
}
defer cursor.Close(context.Background())
messages := []mainflux.Message{}
for cursor.Next(context.Background()) {
var m message
if err := cursor.Decode(&m); err != nil {
return []mainflux.Message{}
}
msg := mainflux.Message{
Channel: m.Channel,
Subtopic: m.Subtopic,
Publisher: m.Publisher,
Protocol: m.Protocol,
Name: m.Name,
Unit: m.Unit,
Time: m.Time,
UpdateTime: m.UpdateTime,
Link: m.Link,
}
switch {
case m.FloatValue != nil:
msg.Value = &mainflux.Message_FloatValue{FloatValue: *m.FloatValue}
case m.StringValue != nil:
msg.Value = &mainflux.Message_StringValue{StringValue: *m.StringValue}
case m.DataValue != nil:
msg.Value = &mainflux.Message_DataValue{DataValue: *m.DataValue}
case m.BoolValue != nil:
msg.Value = &mainflux.Message_BoolValue{BoolValue: *m.BoolValue}
}
if m.ValueSum != nil {
msg.ValueSum = &mainflux.SumValue{Value: *m.ValueSum}
}
messages = append(messages, msg)
}
return messages
}
func fmtCondition(chanID string, query map[string]string) *bson.Document {
filter := bson.NewDocument(bson.EC.String("channel", chanID))
for name, value := range query {
switch name {
case
"channel",
"subtopic",
"publisher",
"name",
"protocol":
filter.Append(bson.EC.String(name, value))
}
}
return filter
}