fix attachment_url for repeats

dimagi · Aug 2, 2017 · fc9413d · fc9413d
1 parent cd27e63
commit fc9413d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/commcare_export/env.py b/commcare_export/env.py
@@ -338,7 +338,7 @@ def attachment_url(val):
         Reference('template'),
         Literal('{}/a/{}/api/form/attachment/{}/{}'),
         Reference('commcarehq_base_url'),
-        Reference('domain'),
+        Reference('$.domain'),
         Reference('$.id'),
         Literal(val)
     )

diff --git a/tests/test_minilinq.py b/tests/test_minilinq.py
@@ -89,6 +89,22 @@ def test_attachment_url(self):
         expected = 'https://www.commcarehq.org/a/d1/api/form/attachment/123/a.jpg'
         assert Apply(Reference('attachment_url'), Reference('photo')).eval(env) == expected
 
+    def test_attachment_url_repeat(self):
+        env = BuiltInEnv({'commcarehq_base_url': 'https://www.commcarehq.org'}) | JsonPathEnv({
+            'id': '123', 'domain': 'd1', 'repeat': [
+                {'photo': 'a.jpg'}, {'photo': 'b.jpg'}
+            ]
+        })
+        expected = [
+            'https://www.commcarehq.org/a/d1/api/form/attachment/123/a.jpg',
+            'https://www.commcarehq.org/a/d1/api/form/attachment/123/b.jpg',
+        ]
+        result = unwrap_val(Map(
+            source=Reference('repeat.[*]'),
+            body=Apply(Reference('attachment_url'), Reference('photo'))
+        ).eval(env))
+        assert result == expected
+
     def test_template(self):
         env = BuiltInEnv() | JsonPathEnv({'a': '1', 'b': '2'})
         assert Apply(Reference('template'), Literal('{}.{}'), Reference('a'), Reference('b')).eval(env) == '1.2'