M2-3148 Work with arbitrary server is taken into consideration

Author: ivan-g-scnt

src/apps/answers/crud/answers.py

@@ -601,21 +601,19 @@ async def removing_outdated_answers(
             raise AnswerRetentionType()
         border_datetime = datetime.datetime.utcnow() - retention_time
 
-        query = update(AnswerSchema)
+        query: Query = delete(AnswerSchema)
         query = query.where(AnswerSchema.applet_id == applet_id)
         query = query.where(AnswerSchema.created_at < border_datetime)
-        query = query.where(AnswerSchema.soft_exists())
-        query = query.values(is_deleted=True)
         query = query.returning(column("id"))
         deleted_answer_ids: list[uuid.UUID] = [
             x[0] for x in await self._execute(query)
         ]
 
-        query = update(AnswerItemSchema)
-        query = query.where(AnswerItemSchema.answer_id.in_(deleted_answer_ids))
-        query = query.where(AnswerSchema.soft_exists())
-        query = query.values(is_deleted=True)
-        await self._execute(query)
+        item_query: Query = delete(AnswerItemSchema)
+        item_query = item_query.where(
+            AnswerItemSchema.answer_id.in_(deleted_answer_ids)
+        )
+        await self._execute(item_query)
 
     async def update_encrypted_fields(
         self, user_public_key: str, data: list[AnswerItemDataEncrypted]

src/apps/answers/tasks.py

@@ -95,9 +95,23 @@ async def removing_outdated_answers():
             for applet_data in applets_data:
                 applet_id, retention_period, retention_type = applet_data
                 retention_type = DataRetention(retention_type)
-                await AnswersCRUD(session).removing_outdated_answers(
-                    applet_id, retention_period, retention_type
-                )
+
+                arb_uri = await get_arbitrary_info(applet_id, session)
+                if arb_uri:
+                    arb_session_maker = session_manager.get_session(arb_uri)
+                    try:
+                        async with arb_session_maker() as arb_session:
+                            await AnswersCRUD(
+                                arb_session
+                            ).removing_outdated_answers(
+                                applet_id, retention_period, retention_type
+                            )
+                    finally:
+                        await arb_session_maker.remove()
+                else:
+                    await AnswersCRUD(session).removing_outdated_answers(
+                        applet_id, retention_period, retention_type
+                    )
             await session.commit()
     except Exception as e:
         traceback.print_exception(e)

src/apps/applets/service/applet.py

@@ -12,6 +12,7 @@
 from apps.activity_flows.domain.flow_create import FlowCreate, FlowItemCreate
 from apps.activity_flows.service.flow import FlowService
 from apps.answers.crud.answers import AnswersCRUD
+from apps.answers.deps.preprocess_arbitrary import get_arbitrary_info
 from apps.applets.crud import (
     AppletHistoriesCRUD,
     AppletsCRUD,
@@ -58,6 +59,7 @@
 from apps.workspaces.errors import AppletEncryptionUpdateDenied
 from apps.workspaces.service.user_applet_access import UserAppletAccessService
 from config import settings
+from infrastructure.database import session_manager
 
 __all__ = [
     "AppletService",
@@ -827,9 +829,26 @@ async def set_data_retention(
             applet_id, data_retention
         )
         if data_retention.retention != DataRetention.INDEFINITELY:
-            await AnswersCRUD(self.session).removing_outdated_answers(
-                applet_id, data_retention.period or 1, data_retention.retention
-            )
+            arb_uri = await get_arbitrary_info(applet_id, self.session)
+            if arb_uri:
+                arb_session_maker = session_manager.get_session(arb_uri)
+                try:
+                    async with arb_session_maker() as arb_session:
+                        await AnswersCRUD(
+                            arb_session
+                        ).removing_outdated_answers(
+                            applet_id,
+                            data_retention.period or 10**10,
+                            data_retention.retention,
+                        )
+                finally:
+                    await arb_session_maker.remove()
+            else:
+                await AnswersCRUD(self.session).removing_outdated_answers(
+                    applet_id,
+                    data_retention.period or 10**10,
+                    data_retention.retention,
+                )
 
     async def get_full_applet(self, applet_id: uuid.UUID) -> AppletFull:
         schema = await AppletsCRUD(self.session).get_by_id(applet_id)