# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1717516031 -7200
# Node ID dfd42a6c13fa7cbb2e85716fa4f3d65acb68831b
# Parent  c3aa39672db18913f6300627d979ed332700f06f
added test_tags_after_pixel_data

diff -r c3aa39672db1 -r dfd42a6c13fa Database/2024-05-30-GuillemVela.dcm
Binary file Database/2024-05-30-GuillemVela.dcm has changed
diff -r c3aa39672db1 -r dfd42a6c13fa Tests/Tests.py
--- a/Tests/Tests.py	Mon Jun 03 14:20:17 2024 +0200
+++ b/Tests/Tests.py	Tue Jun 04 17:47:11 2024 +0200
@@ -10150,6 +10150,51 @@
         s = re.findall('\(0008,0000\).*?\[(.*?)\]', i)
         self.assertEqual(0, len(s))
 
+
+    def test_tags_after_pixel_data(self):
+        # https://discourse.orthanc-server.org/t/private-tags-with-group-7fe0-are-not-provided-via-rest-api/4744
+        u = UploadInstance(_REMOTE, '2024-05-30-GuillemVela.dcm') ['ID']
+
+        a = DoGet(_REMOTE, '/instances/%s/tags' % u)
+        self.assertFalse('8e05,1000' in a)
+
+        a = DoGet(_REMOTE, '/instances/%s/tags?whole' % u)
+        self.assertTrue('8e05,1000' in a)
+        self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value'])
+        self.assertEqual('acquisition', a['8e05,1000']['Value'])
+        self.assertEqual('specimen', a['8e05,1001']['Value'])
+
+        a = DoGet(_REMOTE, '/instances/%s/tags?full' % u)
+        self.assertFalse('8e05,1000' in a)
+
+        a = DoGet(_REMOTE, '/instances/%s/tags?full&whole' % u)
+        self.assertTrue('8e05,1000' in a)
+        self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value'])
+        self.assertEqual('acquisition', a['8e05,1000']['Value'])
+        self.assertEqual('specimen', a['8e05,1001']['Value'])
+
+        a = DoGet(_REMOTE, '/instances/%s/tags?short' % u)
+        self.assertFalse('8e05,1000' in a)
+
+        a = DoGet(_REMOTE, '/instances/%s/tags?short&whole' % u)
+        self.assertTrue('8e05,1000' in a)
+        self.assertEqual('XEOS_Attributes', a['8e05,0010'])
+        self.assertEqual('acquisition', a['8e05,1000'])
+        self.assertEqual('specimen', a['8e05,1001'])
+
+        a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % u)
+        self.assertFalse('Unknown Tag & Data' in a)
+
+        a = DoGet(_REMOTE, '/instances/%s/tags?simplify&whole' % u)
+        self.assertTrue('Unknown Tag & Data' in a)
+
+        a = DoGet(_REMOTE, '/instances/%s/simplified-tags' % u)
+        self.assertFalse('Unknown Tag & Data' in a)
+
+        a = DoGet(_REMOTE, '/instances/%s/simplified-tags?whole' % u)
+        self.assertTrue('Unknown Tag & Data' in a)
+
+
     def test_requested_tags(self):
         u = UploadInstance(_REMOTE, 'DummyCT.dcm')