From fb74bda3fd63388342733cc96d3023a53ddc3fe9 Mon Sep 17 00:00:00 2001
From: Orne Brocaar <info@brocaar.com>
Date: Fri, 1 Jul 2022 14:53:29 +0100
Subject: [PATCH] Fix merging device-profile and device tags.

---
 chirpstack/src/downlink/data.rs   | 2 +-
 chirpstack/src/downlink/tx_ack.rs | 4 ++--
 chirpstack/src/uplink/data.rs     | 4 ++--
 chirpstack/src/uplink/join.rs     | 2 +-
 chirpstack/src/uplink/join_sns.rs | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chirpstack/src/downlink/data.rs b/chirpstack/src/downlink/data.rs
index 904e6585..c855cce6 100644
--- a/chirpstack/src/downlink/data.rs
+++ b/chirpstack/src/downlink/data.rs
@@ -305,7 +305,7 @@ impl Data {
                 dev_eui: self.device.dev_eui.to_string(),
                 tags: {
                     let mut tags = (&*self.device_profile.tags).clone();
-                    tags.clone_from(&*self.device.tags);
+                    tags.extend((*self.device.tags).clone());
                     tags
                 },
             };
diff --git a/chirpstack/src/downlink/tx_ack.rs b/chirpstack/src/downlink/tx_ack.rs
index bfcc131f..802c9bf7 100644
--- a/chirpstack/src/downlink/tx_ack.rs
+++ b/chirpstack/src/downlink/tx_ack.rs
@@ -295,7 +295,7 @@ impl TxAck {
         let dev = self.device.as_ref().unwrap();
 
         let mut tags = (&*dp.tags).clone();
-        tags.clone_from(&*dev.tags);
+        tags.extend((*dev.tags).clone());
 
         let pl = integration_pb::LogEvent {
             time: Some(Utc::now().into()),
@@ -331,7 +331,7 @@ impl TxAck {
         let qi = self.device_queue_item.as_ref().unwrap();
 
         let mut tags = (&*dp.tags).clone();
-        tags.clone_from(&*dev.tags);
+        tags.extend((*dev.tags).clone());
 
         let downlink_id = self.downlink_frame.as_ref().unwrap().downlink_id;
         let gateway_id = self
diff --git a/chirpstack/src/uplink/data.rs b/chirpstack/src/uplink/data.rs
index 76798bbc..d9949ee8 100644
--- a/chirpstack/src/uplink/data.rs
+++ b/chirpstack/src/uplink/data.rs
@@ -219,7 +219,7 @@ impl Data {
         let dev = self.device.as_ref().unwrap();
 
         let mut tags = (&*dp.tags).clone();
-        tags.clone_from(&*dev.tags);
+        tags.extend((*dev.tags).clone());
 
         self.device_info = Some(integration_pb::DeviceInfo {
             tenant_id: tenant.id.to_string(),
@@ -807,7 +807,7 @@ impl Data {
         device_queue::delete_item(&qi.id).await?;
 
         let mut tags = (&*dp.tags).clone();
-        tags.clone_from(&*dev.tags);
+        tags.extend((*dev.tags).clone());
 
         integration::ack_event(
             &app.id,
diff --git a/chirpstack/src/uplink/join.rs b/chirpstack/src/uplink/join.rs
index 87504344..eff3bff9 100644
--- a/chirpstack/src/uplink/join.rs
+++ b/chirpstack/src/uplink/join.rs
@@ -194,7 +194,7 @@ impl JoinRequest {
         let dev = self.device.as_ref().unwrap();
 
         let mut tags = (&*dp.tags).clone();
-        tags.clone_from(&*dev.tags);
+        tags.extend((*dev.tags).clone());
 
         self.device_info = Some(integration_pb::DeviceInfo {
             tenant_id: tenant.id.to_string(),
diff --git a/chirpstack/src/uplink/join_sns.rs b/chirpstack/src/uplink/join_sns.rs
index ea58cd89..f0d5861e 100644
--- a/chirpstack/src/uplink/join_sns.rs
+++ b/chirpstack/src/uplink/join_sns.rs
@@ -172,7 +172,7 @@ impl JoinRequest {
         let dev = self.device.as_ref().unwrap();
 
         let mut tags = (&*dp.tags).clone();
-        tags.clone_from(&*dev.tags);
+        tags.extend((*dev.tags).clone());
 
         self.device_info = Some(integration_pb::DeviceInfo {
             tenant_id: tenant.id.to_string(),