NOISSUE - Add LoRa route map validation and fix LoRa messages URL

docker/addons/lora-adapter/docker-compose.yml

@@ -27,7 +27,7 @@ services:
       MF_LORA_ADAPTER_LOG_LEVEL: debug
       MF_THINGS_ES_URL: things-redis:6379
       MF_LORA_ADAPTER_ROUTEMAP_URL: lora-redis:6379
-      MF_LORA_ADAPTER_LORA_MESSAGE_URL: tcp://159.65.205.240:1883
+      MF_LORA_ADAPTER_LORA_MESSAGE_URL: tcp://mainflux.io:1883
       MF_LORA_ADAPTER_HTTP_PORT: 8187
       MF_NATS_URL: nats://nats:4222
     ports:

lora/redis/streams.go

@@ -27,6 +27,17 @@ const (
 	channelRemove = channelPrefix + "remove"
 )
 
+var (
+	// ErrMetadataType indicates an ivalid metadata type.
+	ErrMetadataType = errors.New("metadatada is not of type lora")
+
+	// ErrMetadataAppID indicates a missing application ID in channel metadata.
+	ErrMetadataAppID = errors.New("application ID not found in channel metadatada")
+
+	// ErrMetadataDevEUI indicates a missing device EUI in thing metadata.
+	ErrMetadataDevEUI = errors.New("device EUI not found in channel metadatada")
+)
+
 // EventStore represents event source for things and channels provisioning.
 type EventStore interface {
 	// Subscribes to geven subject and receives events.
@@ -155,7 +166,10 @@ func (es eventStore) handleCreateThing(cte createThingEvent) error {
 	}
 
 	if em.Type != protocol {
-		return errors.New("Lora protocol not found in thing metadatada")
+		return ErrMetadataType
+	}
+	if em.DevEUI != "" {
+		return ErrMetadataDevEUI
 	}
 
 	return es.svc.CreateThing(cte.id, em.DevEUI)
@@ -168,7 +182,10 @@ func (es eventStore) handleUpdateThing(ute updateThingEvent) error {
 	}
 
 	if em.Type != protocol {
-		return errors.New("Lora protocol not found in thing metadatada")
+		return ErrMetadataType
+	}
+	if em.DevEUI != "" {
+		return ErrMetadataDevEUI
 	}
 
 	return es.svc.CreateThing(ute.id, em.DevEUI)
@@ -185,7 +202,10 @@ func (es eventStore) handleCreateChannel(cce createChannelEvent) error {
 	}
 
 	if cm.Type != protocol {
-		return errors.New("Lora protocol not found in channel metadatada")
+		return ErrMetadataType
+	}
+	if cm.AppID != "" {
+		return ErrMetadataAppID
 	}
 
 	return es.svc.CreateChannel(cce.id, cm.AppID)
@@ -198,7 +218,10 @@ func (es eventStore) handleUpdateChannel(uce updateChannelEvent) error {
 	}
 
 	if cm.Type != protocol {
-		return errors.New("Lora protocol not found in channel metadatada")
+		return ErrMetadataType
+	}
+	if cm.AppID != "" {
+		return ErrMetadataAppID
 	}
 
 	return es.svc.UpdateChannel(uce.id, cm.AppID)

lora/service.go

@@ -23,10 +23,10 @@ var (
 	ErrMalformedMessage = errors.New("malformed message received")
 
 	// ErrNotFoundDev indicates a non-existent route map for a device EUI.
-	ErrNotFoundDev = errors.New("route map not found for device EUI")
+	ErrNotFoundDev = errors.New("route map not found for this device EUI")
 
 	// ErrNotFoundApp indicates a non-existent route map for an application ID.
-	ErrNotFoundApp = errors.New("route map not found for application ID")
+	ErrNotFoundApp = errors.New("route map not found for this application ID")
 )
 
 // Service specifies an API that must be fullfiled by the domain service