updated copy/move test cases

Author: Narek Mkhitaryan

src/superannotate/lib/core/serviceproviders.py

@@ -297,7 +297,7 @@ def copy_move_multiple(
         item_names: List[str],
         duplicate_strategy: Literal["skip", "replace", "replace_annotations_only"],
         operation: Literal["copy", "move"],
-        include_annotations: bool = False,
+        include_annotations: bool = True,
         include_pin: bool = False,
     ) -> ServiceResponse:
         raise NotImplementedError

src/superannotate/lib/infrastructure/controller.py

@@ -544,7 +544,7 @@ def copy_multiple(
         to_folder: FolderEntity,
         duplicate_strategy: Literal["skip", "replace", "replace_annotations_only"],
         item_names: List[str] = None,
-        include_annotations: bool = False,
+        include_annotations: bool = True,
     ):
         if project.type == ProjectType.PIXEL:
             use_case = usecases.CopyItems(

src/superannotate/lib/infrastructure/services/item.py

@@ -122,7 +122,7 @@ def copy_move_multiple(
         item_names: List[str],
         duplicate_strategy: Literal["skip", "replace", "replace_annotations_only"],
         operation: Literal["copy", "move"],
-        include_annotations: bool = False,
+        include_annotations: bool = True,
         include_pin: bool = False,
     ):
         """
@@ -153,7 +153,7 @@ def await_copy_move(
         self, project: entities.ProjectEntity, poll_id: int, items_count
     ):
         try:
-            await_time = items_count * 0.3
+            await_time = 60 + items_count * 0.3  # time for waiting backend processing
             timeout_start = time.time()
             while time.time() < timeout_start + await_time:
                 response = self.client.request(

tests/integration/items/test_copy_items.py

@@ -14,6 +14,7 @@ class TestCopyItems(BaseTestCase):
     PROJECT_DESCRIPTION = "TestCopyItemsVector"
     PROJECT_TYPE = "Vector"
     IMAGE_NAME = "test_image"
+    IMAGE_NAME_2 = "test_image_2"
     FOLDER_1 = "folder_1"
     FOLDER_2 = "folder_2"
     CSV_PATH = "data_set/attach_urls.csv"
@@ -75,6 +76,10 @@ def test_copy_items_wrong_items_list(self):
                 }
             ],
         )
+        sa.set_approval_statuses(self.PROJECT_NAME, "Approved", items=[self.IMAGE_NAME])
+        sa.set_annotation_statuses(
+            self.PROJECT_NAME, "Completed", items=[self.IMAGE_NAME]
+        )
         sa.create_folder(self.PROJECT_NAME, self.FOLDER_1)
         skipped_items = sa.copy_items(
             self.PROJECT_NAME,
@@ -84,4 +89,6 @@ def test_copy_items_wrong_items_list(self):
         items = sa.search_items(f"{self.PROJECT_NAME}/{self.FOLDER_1}")
         assert len(items) == 1
         assert items[0]["name"] == self.IMAGE_NAME
+        assert items[0]["annotation_status"] == "Completed"
+        assert items[0]["approval_status"] == "Approved"
         assert Counter(skipped_items) == Counter(["as", "asd"])

tests/integration/items/test_move_items.py

@@ -12,6 +12,7 @@ class TestMoveItems(BaseTestCase):
     PROJECT_DESCRIPTION = "TestCopyItemsVector"
     PROJECT_TYPE = "Vector"
     IMAGE_NAME = "test_image"
+    IMAGE_NAME_2 = "test_image_2"
     FOLDER_1 = "folder_1"
     FOLDER_2 = "folder_2"
     CSV_PATH = "data_set/attach_urls.csv"
@@ -44,3 +45,54 @@ def test_move_items_from_folder(self):
         assert len(skipped_items) == 0
         assert len(sa.search_items(f"{self.PROJECT_NAME}/{self.FOLDER_2}")) == 7
         assert len(sa.search_items(f"{self.PROJECT_NAME}/{self.FOLDER_1}")) == 0
+
+    def test_move_items_from_folder_with_replace_strategy(self):
+        attachment = [
+            {
+                "url": "https://drive.google.com/uc?export=download&id=1vwfCpTzcjxoEA4hhDxqapPOVvLVeS7ZS",
+                "name": self.IMAGE_NAME,
+            },
+            {
+                "url": "https://drive.google.com/uc?export=download&id=1vwfCpTzcjxoEA4hhDxqapPOVvLVeS7Zw",
+                "name": self.IMAGE_NAME_2,
+            },
+        ]
+        sa.create_folder(self.PROJECT_NAME, self.FOLDER_1)
+        sa.create_folder(self.PROJECT_NAME, self.FOLDER_2)
+        uploaded, _, _ = sa.attach_items(
+            f"{self.PROJECT_NAME}/{self.FOLDER_1}", attachment
+        )
+        assert len(uploaded) == 2
+        sa.set_approval_statuses(
+            f"{self.PROJECT_NAME}/{self.FOLDER_1}",
+            "Approved",
+            items=[self.IMAGE_NAME, self.IMAGE_NAME_2],
+        )
+        sa.set_annotation_statuses(
+            f"{self.PROJECT_NAME}/{self.FOLDER_1}",
+            "Completed",
+            items=[self.IMAGE_NAME, self.IMAGE_NAME_2],
+        )
+
+        uploaded_2, _, _ = sa.attach_items(
+            f"{self.PROJECT_NAME}/{self.FOLDER_2}", attachment
+        )
+        assert len(uploaded_2) == 2
+        folder_2_items = sa.search_items(f"{self.PROJECT_NAME}/{self.FOLDER_2}")
+        assert folder_2_items[0]["annotation_status"] == "NotStarted"
+        assert not folder_2_items[0]["approval_status"]
+
+        skipped_items = sa.move_items(
+            f"{self.PROJECT_NAME}/{self.FOLDER_1}",
+            f"{self.PROJECT_NAME}/{self.FOLDER_2}",
+            duplicate_strategy="replace",
+        )
+        assert len(skipped_items) == 0
+        folder_1_items = sa.search_items(f"{self.PROJECT_NAME}/{self.FOLDER_1}")
+        folder_2_items = sa.search_items(f"{self.PROJECT_NAME}/{self.FOLDER_2}")
+        assert len(folder_1_items) == 0
+        assert len(folder_2_items) == 2
+
+        folder_2_items = sa.search_items(f"{self.PROJECT_NAME}/{self.FOLDER_2}")
+        assert folder_2_items[0]["annotation_status"] == "Completed"
+        assert folder_2_items[0]["approval_status"] == "Approved"