Prune unrelated channel IDs from exported tags

Signed-off-by: DESKTOP-9AKG4SL\ecomeau <ecomeau@caredx.com>

Author: eddcomeau

server/src/com/mirth/connect/server/api/servlets/ChannelServlet.java

@@ -312,6 +312,11 @@ protected void addExportData(Channel channel, Map<String, ChannelMetadata> chann
             channel.getExportData().setChannelTags(channelTags
                     .stream()
                     .filter(tag -> tag.getChannelIds().contains(channel.getId()))
+                    .map(tag -> {
+                        ChannelTag exportTag = new ChannelTag(tag);
+                        exportTag.setChannelIds(Collections.singleton(channel.getId()));
+                        return exportTag;
+                    })
                     .collect(Collectors.toList()));
 
             channel.getExportData().setDependencyIds(channelDependencies
@@ -347,4 +352,4 @@ private List<CodeTemplateLibrary> getCodeTemplateLibraries() {
         }
         return codeTemplateLibraries;
     }
-}
+}

server/test/com/mirth/connect/server/api/servlets/ChannelServletTest.java

@@ -200,8 +200,8 @@ private void verifyChannel1(Channel channel, boolean includeCodeTemplateLibrarie
         assertEquals(Integer.valueOf(7), exportData.getMetadata().getPruningSettings().getPruneContentDays());
 
         assertEquals(2, exportData.getChannelTags().size());
-        assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag1", "Tag 1", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1, CHANNEL_ID_2 })))));
-        assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag2", "Tag 2", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1, CHANNEL_ID_3 })))));
+        assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag1", "Tag 1", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1 })))));
+        assertTrue(exportData.getChannelTags().contains(new ChannelTag("tag2", "Tag 2", new HashSet<>(Arrays.asList(new String[] { CHANNEL_ID_1 })))));
 
         assertEquals(1, exportData.getDependencyIds().size());
         assertTrue(exportData.getDependencyIds().contains(CHANNEL_ID_2));
@@ -234,3 +234,4 @@ protected boolean isUserAuthorized() {
     }
 
 }
+