Fix assignTagToBoxes mutation for box with already multiple tags

Author: pylipp

back/boxtribute_server/business_logic/warehouse/box/mutations.py

@@ -173,13 +173,14 @@ def resolve_assign_tag_to_boxes(*_, update_input):
             on=(
                 (TagsRelation.object_id == Box.id)
                 & (TagsRelation.object_type == TaggableObjectType.Box)
+                & (TagsRelation.tag == tag.id)
             ),
         )
         .where(
             Box.label_identifier << label_identifiers,
             authorized_bases_filter(Location, permission="stock:write"),
-            # Any boxes that already have the new tag assigned are silently ignored
-            (TagsRelation.tag != tag.id) | (TagsRelation.tag.is_null()),
+            # Any boxes that already have the new tag assigned are ignored
+            TagsRelation.tag.is_null(),
             (~Box.deleted_on | Box.deleted_on.is_null()),
         )
         .order_by(Box.id)

back/test/data/tag.py

@@ -52,6 +52,15 @@ def data():
             "type": TagType.Beneficiary,
             "deleted_on": "2022-01-01",
         },
+        {
+            "id": 6,
+            "base": base_data()[0]["id"],
+            "color": "#123456",
+            "description": "for all",
+            "name": "tag-for-all",
+            "type": TagType.All,
+            "deleted_on": None,
+        },
     ]
 
 
@@ -62,7 +71,7 @@ def tags():
 
 @pytest.fixture
 def base1_active_tags():
-    return data()[:3]
+    return data()[:3] + [data()[5]]
 
 
 def create():

back/test/endpoint_tests/test_box.py

@@ -379,6 +379,29 @@ def test_box_mutations(
         "invalidBoxLabelIdentifiers": [],
     }
 
+    another_generic_tag_id = str(tags[5]["id"])
+    mutation = f"""mutation {{ assignTagToBoxes( updateInput: {{
+            labelIdentifiers: [{label_identifiers}],
+            tagId: {another_generic_tag_id} }} ) {{
+                ...on BoxResult {{
+                    updatedBoxes {{ tags {{ id }} }}
+                    invalidBoxLabelIdentifiers
+                }} }} }}"""
+    response = assert_successful_request(client, mutation)
+    assert response == {
+        "updatedBoxes": [
+            {
+                "tags": [
+                    {"id": tag_id},
+                    {"id": generic_tag_id},
+                    {"id": another_generic_tag_id},
+                ]
+            }
+            for _ in range(2)
+        ],
+        "invalidBoxLabelIdentifiers": [],
+    }
+
     # Test case 8.2.24a
     label_identifier = f'"{created_box["labelIdentifier"]}"'
     mutation = f"""mutation {{ unassignTagFromBoxes( updateInput: {{
@@ -389,15 +412,17 @@ def test_box_mutations(
                 }} }} }}"""
     response = assert_successful_request(client, mutation)
     assert response == {
-        "updatedBoxes": [{"tags": [{"id": tag_id}]}],
+        "updatedBoxes": [{"tags": [{"id": tag_id}, {"id": another_generic_tag_id}]}],
         "invalidBoxLabelIdentifiers": [],
     }
 
     # Verify that tag is not removed from the other box
     query = f"""query {{ box(labelIdentifier: "{another_created_box_label_identifier}")
                     {{ tags {{ id }} }} }}"""
     response = assert_successful_request(client, query)
-    assert response == {"tags": [{"id": tag_id}, {"id": generic_tag_id}]}
+    assert response == {
+        "tags": [{"id": tag_id}, {"id": generic_tag_id}, {"id": another_generic_tag_id}]
+    }
 
     # Test case 8.2.24c
     mutation = f"""mutation {{ unassignTagFromBoxes( updateInput: {{
@@ -408,7 +433,7 @@ def test_box_mutations(
                 }} }} }}"""
     response = assert_successful_request(client, mutation)
     assert response == {
-        "updatedBoxes": [{"tags": [{"id": tag_id}]}],
+        "updatedBoxes": [{"tags": [{"id": tag_id}, {"id": another_generic_tag_id}]}],
         "invalidBoxLabelIdentifiers": [created_box["labelIdentifier"]],
     }
 

back/test/endpoint_tests/test_tag.py

@@ -79,10 +79,16 @@ def test_tags_query(
                 },
             ],
         },
+        {
+            "id": str(tags[5]["id"]),
+            "name": tags[5]["name"],
+            "type": tags[5]["type"].name,
+            "taggedResources": [],
+        },
     ]
 
 
-def test_tags_mutations(client, tags, another_beneficiary, lost_box):
+def test_tags_mutations(client, tags, base1_active_tags, another_beneficiary, lost_box):
     # Test case 4.2.9
     deleted_tag_id = tags[0]["id"]
     mutation = f"""mutation {{ deleteTag(id: {deleted_tag_id}) {{
@@ -99,7 +105,7 @@ def test_tags_mutations(client, tags, another_beneficiary, lost_box):
     query = """query { tags { id } }"""
     all_tags = assert_successful_request(client, query)
     # Expect the deleted tag to not appear in the list of active tags of base
-    assert all_tags == [{"id": str(t["id"])} for t in tags[1:3]]
+    assert all_tags == [{"id": str(t["id"])} for t in base1_active_tags[1:]]
 
     # Test case 4.2.1
     name = "Box Group 1"
@@ -379,9 +385,9 @@ def test_assign_tag_with_invalid_resource_type(
 @pytest.mark.parametrize(
     "filter_input,tag_ids",
     [
-        ["", ["1", "2", "3"]],
-        ["(resourceType: Box)", ["2", "3"]],
-        ["(resourceType: Beneficiary)", ["1", "3"]],
+        ["", ["1", "2", "3", "6"]],
+        ["(resourceType: Box)", ["2", "3", "6"]],
+        ["(resourceType: Beneficiary)", ["1", "3", "6"]],
     ],
 )
 def test_base_tags_query(read_only_client, filter_input, tag_ids):