MusicComposition: don't fail if a language isn't provided

trompamusic · Oct 22, 2020 · cabadfc · cabadfc
1 parent 1de2fb3
commit cabadfc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/tests/data/musiccomposition/create_musiccomposition.txt b/tests/data/musiccomposition/create_musiccomposition.txt
@@ -6,9 +6,9 @@ title: "Das Lied von der Erde"
         format: "text/html"
         subject: "Music Composition"
         source: "https://www.cpdl.org/Das_Lied_von_der_Erde"
-        language: en
         inLanguage: "de"
         name: "The Song of the Earth"
+        language: en
 ) {
 identifier
 }

diff --git a/tests/data/musiccomposition/create_musiccomposition_complete.txt b/tests/data/musiccomposition/create_musiccomposition_complete.txt
@@ -6,11 +6,11 @@ title: "Das Lied von der Erde: I. Das Trinklied vom Jammer der Erde"
         format: "text/html"
         subject: "Music Composition"
         source: "https://musicbrainz.org/work/ff15c2ab-0775-3757-975a-331357299635"
-        language: de
         inLanguage: "de"
         name: "Das Lied von der Erde: I. Das Trinklied vom Jammer der Erde"
         description: "First composition of a song-cycle by Mahler"
         position: 1
+        language: de
 ) {
 identifier
 }

diff --git a/tests/mutations/test_musiccomposition.py b/tests/mutations/test_musiccomposition.py
@@ -24,6 +24,14 @@ def test_create(self):
         )
         assert created_musiccomposition == expected
 
+    def test_create_no_language(self):
+        """A musiccomposition can be missing a language value, and this should generate a valid mutation"""
+        musiccomposition.mutation_create_music_composition(
+            title="Das Lied von der Erde", contributor="https://www.cpdl.org", creator="https://www.upf.edu",
+            source="https://www.cpdl.org/Das_Lied_von_der_Erde", format_="text/html", subject="Music Composition",
+            inlanguage="de", name="The Song of the Earth"
+        )
+
     def test_create_all_arguments(self):
         created_musiccomposition = musiccomposition.mutation_create_music_composition(
             title="Das Lied von der Erde: I. Das Trinklied vom Jammer der Erde", contributor="https://musicbrainz.org",

diff --git a/trompace/mutations/musiccomposition.py b/trompace/mutations/musiccomposition.py
@@ -52,12 +52,13 @@ def mutation_create_music_composition(*, title: str, contributor: str, creator:
         "format": format_,
         "subject": subject,
         "source": source,
-        "language": StringConstant(language.lower()),
         "inLanguage": inlanguage,
         "name": name,
         "description": description,
         "position": position
     }
+    if language is not None:
+        args["language"] = StringConstant(language.lower())
 
     args = filter_none_args(args)
 
@@ -101,8 +102,8 @@ def mutation_update_music_composition(identifier: str, *, title: str = None, con
             "format": format_,
             "name": name,
             "description": description,
-            "position": position}
-
+            "position": position
+    }
     if language is not None:
         args["language"] = StringConstant(language.lower())