feat(applet-duplication): add optional report server config flag (M2-7830)

src/apps/applets/api/applets.py

@@ -188,7 +188,9 @@ async def applet_duplicate(
         await CheckAccessService(session, user.id).check_applet_duplicate_access(applet_id)
         applet_for_duplicate = await service.get_by_id_for_duplicate(applet_id)
 
-        applet = await service.duplicate(applet_for_duplicate, schema.display_name, schema.encryption)
+        applet = await service.duplicate(
+            applet_for_duplicate, schema.display_name, schema.encryption, schema.include_report_server
+        )
     return Response(result=public_detail.Applet.from_orm(applet))
 
 

src/apps/applets/domain/applet_create_update.py

@@ -108,3 +108,4 @@ class AppletReportConfiguration(AppletReportConfigurationBase, InternalModel):
 class AppletDuplicateRequest(InternalModel):
     display_name: str
     encryption: Encryption
+    include_report_server: bool = False

src/apps/applets/router.py

@@ -102,7 +102,7 @@
 
 router.post(
     "/{applet_id}/duplicate",
-    description="""This endpoint using for duplicate existing applet""",
+    description="""Duplicate an existing applet, and optionally its report server configuration""",
     response_model_by_alias=True,
     response_model=Response[public_detail.Applet],
     status_code=status.HTTP_201_CREATED,

src/apps/applets/service/applet.py

@@ -25,7 +25,7 @@
 from apps.applets.domain.applet_duplicate import AppletDuplicate
 from apps.applets.domain.applet_full import AppletFull
 from apps.applets.domain.applet_link import AppletLink, CreateAccessLink
-from apps.applets.domain.base import Encryption
+from apps.applets.domain.base import AppletReportConfigurationBase, Encryption
 from apps.applets.errors import (
     AccessLinkDoesNotExistError,
     AppletAlreadyExist,
@@ -219,6 +219,7 @@ async def duplicate(
         applet_exist: AppletDuplicate,
         new_name: str,
         encryption: Encryption,
+        include_report_server: bool,
     ):
         activity_key_id_map = dict()
 
@@ -232,7 +233,7 @@ async def duplicate(
         )
         manager_role = Role.EDITOR if has_editor else Role.MANAGER
 
-        create_data = self._prepare_duplicate(applet_exist, new_name, encryption)
+        create_data = self._prepare_duplicate(applet_exist, new_name, encryption, include_report_server)
 
         applet = await self._create(create_data, self.user_id)
 
@@ -252,7 +253,9 @@ async def duplicate(
         return applet
 
     @staticmethod
-    def _prepare_duplicate(applet_exist: AppletDuplicate, new_name: str, encryption: Encryption) -> AppletCreate:
+    def _prepare_duplicate(
+        applet_exist: AppletDuplicate, new_name: str, encryption: Encryption, include_report_server: bool
+    ) -> AppletCreate:
         activities = list()
         for activity in applet_exist.activities:
             activities.append(
@@ -289,7 +292,20 @@ def _prepare_duplicate(applet_exist: AppletDuplicate, new_name: str, encryption:
                 )
             )
 
+        report_server_config = (
+            AppletReportConfigurationBase(
+                report_server_ip=applet_exist.report_server_ip,
+                report_public_key=applet_exist.report_public_key,
+                report_include_user_id=applet_exist.report_include_user_id,
+                report_include_case_id=applet_exist.report_include_case_id,
+                report_email_body=applet_exist.report_email_body,
+            ).dict()
+            if include_report_server
+            else {}
+        )
+
         return AppletCreate(
+            **report_server_config,
             display_name=new_name,
             description=applet_exist.description,
             about=applet_exist.about,

src/apps/applets/tests/test_applet.py

@@ -23,7 +23,7 @@
 )
 from apps.activity_assignments.crud.assignments import ActivityAssigmentCRUD
 from apps.activity_assignments.db.schemas import ActivityAssigmentSchema
-from apps.applets.domain.applet_create_update import AppletCreate, AppletUpdate
+from apps.applets.domain.applet_create_update import AppletCreate, AppletReportConfiguration, AppletUpdate
 from apps.applets.domain.applet_full import AppletFull
 from apps.applets.domain.base import AppletReportConfigurationBase, Encryption
 from apps.applets.errors import AppletAlreadyExist, AppletVersionNotFoundError
@@ -245,6 +245,72 @@ async def test_duplicate_applet(
         assert response.status_code == http.HTTPStatus.CREATED
         assert response.json()["result"]["displayName"] == new_name
 
+    async def test_duplicate_applet_default_exclude_report_server_config(
+        self, client: TestClient, tom: User, applet_one: AppletFull, encryption: Encryption, session: AsyncSession
+    ):
+        await AppletService(session, tom.id).set_report_configuration(
+            applet_one.id,
+            AppletReportConfiguration(
+                report_server_ip="ipaddress",
+                report_public_key="public key",
+                report_recipients=["recipient1", "recipient1"],
+                report_include_user_id=True,
+                report_include_case_id=True,
+                report_email_body="email body",
+            ),
+        )
+
+        client.login(tom)
+        new_name = "New Name"
+        response = await client.post(
+            self.applet_duplicate_url.format(pk=applet_one.id),
+            data=dict(display_name=new_name, encryption=encryption.dict()),
+        )
+        assert response.status_code == http.HTTPStatus.CREATED
+
+        result = response.json()["result"]
+        assert result["displayName"] == new_name
+        assert result["reportServerIp"] == ""
+        assert result["reportPublicKey"] == ""
+        assert result["reportRecipients"] == []
+        assert result["reportIncludeUserId"] is False
+        assert result["reportIncludeCaseId"] is False
+        assert result["reportEmailBody"] == ""
+
+    async def test_duplicate_applet_include_report_server_config(
+        self, client: TestClient, tom: User, applet_one: AppletFull, encryption: Encryption, session: AsyncSession
+    ):
+        await AppletService(session, tom.id).set_report_configuration(
+            applet_one.id,
+            AppletReportConfiguration(
+                report_server_ip="ipaddress",
+                report_public_key="public key",
+                report_recipients=["recipient1", "recipient1"],
+                report_include_user_id=True,
+                report_include_case_id=True,
+                report_email_body="email body",
+            ),
+        )
+
+        client.login(tom)
+        new_name = "New Name"
+        response = await client.post(
+            self.applet_duplicate_url.format(pk=applet_one.id),
+            data=dict(display_name=new_name, encryption=encryption.dict(), include_report_server=True),
+        )
+        assert response.status_code == http.HTTPStatus.CREATED
+
+        result = response.json()["result"]
+        assert result["displayName"] == new_name
+        assert result["reportServerIp"] == "ipaddress"
+        assert result["reportPublicKey"] == "public key"
+        assert result["reportIncludeUserId"] is True
+        assert result["reportIncludeCaseId"] is True
+        assert result["reportEmailBody"] == "email body"
+
+        # Recipients are excluded
+        assert result["reportRecipients"] == []
+
     async def test_duplicate_applet_name_already_exists(
         self, client: TestClient, tom: User, applet_one: AppletFull, encryption: Encryption
     ):