Merge pull request #861 from ChildMindInstitute/release-20231116.2

Release 20231116.2
ChildMindInstitute · Nov 23, 2023 · cc6bcdd · cc6bcdd
2 parents 26c37da + 0d4d82d
commit cc6bcdd
Show file tree

Hide file tree

Showing 36 changed files with 2,022 additions and 1,309 deletions.
diff --git a/Pipfile b/Pipfile
@@ -7,7 +7,7 @@ name = "pypi"
 aioredis = "~=2.0.1"
 alembic = "~=1.8.1"
 asyncpg = "~=0.27.0"
-asynctest = "*"
+asynctest = "==0.13.0"
 boto3 = "==1.26.10"
 fastapi = "==0.87.0"
 # The latest version of the fastapi is not taken because of the issue
@@ -24,17 +24,19 @@ pydantic = {extras = ["email"], version = "~=1.10.2"}
 python-jose = {version = "~=3.3.0", extras = ["cryptography"]}
 python-multipart = "~=0.0.5"
 sentry-sdk = "~=1.6"
-sqlalchemy = {extras = ["asyncio"], version = "~=1.4.46"}
+sqlalchemy = {extras = ["asyncio"], version = "==1.4.49"}
 uvicorn = {extras = ["standard"], version = "==0.19"}
-aiohttp = "*"
-firebase-admin = "*"
-aio-pika = "*"
-pyld = "*"
-azure-storage-blob = "*"
-taskiq-fastapi = "*"
-taskiq-redis = "*"
-taskiq-aio-pika = "*"
+taskiq = {extras = ["reload"], version = "==0.9.1"}
+aiohttp = "==3.8.5"
+firebase-admin = "==6.2.0"
+aio-pika = "==9.3.0"
+pyld = "==2.0.3"
+azure-storage-blob = "==12.18.2"
+taskiq-fastapi = "==0.3.0"
+taskiq-redis = "==0.5.0"
+taskiq-aio-pika = "==0.4.0"
 sqlalchemy-utils = "==0.41.1"
+typer = {extras = ["all"], version = "==0.9.0"}
 
 [dev-packages]
 black = "~=22.6"
@@ -78,9 +80,8 @@ pycryptodomex = "==3.9.7"
 psycopg2-binary = "==2.9.6"
 cachetools = "==5.3.0"
 pyld = "==2.0.3"
-types-requests = "*"
-taskiq = {extras = ["reload"], version = "*"}
-types-pytz = "*"
+types-requests = "==2.31.0.10"
+types-pytz = "==2023.3.1.1"
 
 [requires]
 python_version = "3.10"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/src/apps/answers/crud/answers.py b/src/apps/answers/crud/answers.py
@@ -37,7 +37,7 @@
     Version,
 )
 from apps.answers.errors import AnswerNotFoundError
-from apps.applets.db.schemas import AppletHistorySchema, AppletSchema
+from apps.applets.db.schemas import AppletHistorySchema
 from apps.shared.filtering import Comparisons, FilterField, Filtering
 from apps.shared.paging import paging
 from infrastructure.database.crud import BaseCRUD
@@ -342,64 +342,6 @@ async def get_by_applet_activity_created_at(
         db_result = await self._execute(query)
         return db_result.scalars().all()
 
-    async def get_activity_flow_by_answer_id(
-        self, answer_id: uuid.UUID
-    ) -> bool:
-        query: Query = select(AnswerItemSchema, ActivityFlowHistoriesSchema)
-        query = query.join(
-            AnswerSchema, AnswerSchema.id == AnswerItemSchema.answer_id
-        )
-        query = query.join(
-            ActivityFlowHistoriesSchema,
-            ActivityFlowHistoriesSchema.id_version
-            == AnswerSchema.flow_history_id,
-            isouter=True,
-        )
-        query = query.where(AnswerItemSchema.is_assessment == False)  # noqa
-        query = query.where(AnswerSchema.id == answer_id)
-
-        db_result = await self._execute(query)
-        (
-            _,
-            flow_history_schema,
-        ) = (
-            db_result.first()
-        )  # type: AnswerItemSchema, ActivityFlowHistoriesSchema
-        if not flow_history_schema:
-            return False
-        return flow_history_schema.is_single_report
-
-    async def get_applet_info_by_answer_id(
-        self, answer: AnswerSchema
-    ) -> tuple[AppletHistorySchema, ActivityHistorySchema]:
-        query: Query = select(
-            AppletSchema,
-            ActivityHistorySchema,
-        )
-        query = query.join(
-            AppletHistorySchema,
-            AppletHistorySchema.id == AppletSchema.id,
-            isouter=True,
-        )
-        query = query.join(
-            ActivityHistorySchema,
-            and_(
-                ActivityHistorySchema.applet_id
-                == AppletHistorySchema.id_version,
-                ActivityHistorySchema.id_version == answer.activity_history_id,
-            ),
-            isouter=True,
-        )
-        query = query.where(
-            and_(
-                AppletSchema.id == answer.applet_id,
-                AppletHistorySchema.version == answer.version,
-            )
-        )
-        db_result = await self._execute(query)
-        res = db_result.first()
-        return res
-
     async def get_activities_which_has_answer(
         self, activity_hist_ids: list[str], respondent_id: uuid.UUID | None
     ) -> list[str]:
@@ -557,6 +499,20 @@ async def update_encrypted_fields(
 
             await self._execute(query)
 
+    async def is_single_report_flow(self, answer_flow_id: str | None) -> bool:
+        query: Query = select(ActivityFlowHistoriesSchema)
+        query = query.where(
+            ActivityFlowHistoriesSchema.id_version == answer_flow_id
+        )
+        db_result = await self._execute(query)
+        db_result = db_result.first()
+        flow_history_schema = (
+            db_result[0] if db_result else None
+        )  # type: ActivityFlowHistoriesSchema | None
+        if not flow_history_schema:
+            return False
+        return flow_history_schema.is_single_report
+
     async def get_last_activity(
         self, respondent_ids: list[uuid.UUID], applet_id: uuid.UUID | None
     ) -> dict[uuid.UUID, datetime.datetime]:

diff --git a/src/apps/answers/fixtures/arbitrary_server_answers.json b/src/apps/answers/fixtures/arbitrary_server_answers.json
@@ -78,12 +78,12 @@
       "user_id": "6cde911e-8a57-47c0-b6b2-685b3664f418",
       "workspace_name": "eRPtCowGI0bcq4BEzB3lGA==",
       "is_modified": false,
-      "database_uri": "postgresql+asyncpg://postgres:postgres@localhost:5432/test_arbitrary",
-      "storage_type": "key",
-      "storage_access_key": "key",
-      "storage_secret_key": "DefaultEndpointsProtocol=https;AccountName=youraccountname;AccountKey=youraccountkey;EndpointSuffix=core.windows.net",
-      "storage_region": "region",
-      "storage_url": "url",
+      "database_uri": "ehwQOnQu9X8higAEDMzDhH9HB5a0jO4FsgU/awOCwMgFccefd2//Ek6e0bKAwvauf6pwAS+PWDChFns1WIyL/z4oH52gEIKpYsBjUmznqYc=",
+      "storage_type": "gEkn6yn8U2jb0U+Ln1KSAw==",
+      "storage_access_key": "gEkn6yn8U2jb0U+Ln1KSAw==",
+      "storage_secret_key": "ww3Y0xCDnjCMQk2Kbmzoh0PGFmo4B1FGaaO7w7h0cUDoLgzFgpIJyoko/xTilJzIMINMa1j4V722KLW1NugxGkjqb+f9bWXJ2ytObwgbw8z6RbqZsJNOp6GFzT+az9Wpq7IW82Lyjok7ctS7R63oGTdDXbOpKzIJtu0/YAGCaNE=",
+      "storage_region": "5yruV8O3eukVP4fK/A5M6g==",
+      "storage_url": "KJ3yVM/QBmlmDQXx3CuuTw==",
       "use_arbitrary": true
     },
     "note": {
@@ -142,7 +142,8 @@
       "meta": {
         "nickname": "f0dd4996-e0eb-461f-b2f8-ba873a674781",
         "secretUserId": "f0dd4996-e0eb-461f-b2f8-ba873a674781"
-      }
+      },
+      "nickname": "hFywashKw+KlcDPazIy5QHz4AdkTOYkD28Q8+dpeDDA="
     }
   },
   {
@@ -180,7 +181,8 @@
       "meta": {
         "nickname": "f0dd4996-e0eb-461f-b2f8-ba873a674781",
         "secretUserId": "f0dd4996-e0eb-461f-b2f8-ba873a674781"
-      }
+      },
+      "nickname": "hFywashKw+KlcDPazIy5QHz4AdkTOYkD28Q8+dpeDDA="
     }
   },
   {
@@ -200,15 +202,16 @@
       "theme_id": null,
       "version": "1.1.0",
       "user_id": "6cde911e-8a57-47c0-b6b2-685b3664f418",
-      "report_server_ip": "",
-      "report_public_key": "",
-      "report_recipients": [],
+      "report_server_ip": "https://report-server.l.trackmage.com",
+      "report_public_key": "-----BEGIN PUBLIC KEY-----\n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\nW2EFUykoTbF2EHjXjAO5b60CAwEAAQ==\n-----END PUBLIC KEY-----",
+      "report_recipients": ["[email protected]"],
       "report_include_user_id": false,
       "report_include_case_id": false,
       "report_email_body": "",
       "id_version": "92917a56-d586-4613-b7aa-991f2c4b15b8_1.1.0",
       "id": "92917a56-d586-4613-b7aa-991f2c4b15b8",
-      "display_name": "Applet0"
+      "display_name": "Applet0",
+      "stream_enabled": false
     },
     "private_key": ""
   },
@@ -652,5 +655,3 @@
   }
 
 ]
-
-
diff --git a/src/apps/answers/fixtures/duplicate_activity_in_flow.json b/src/apps/answers/fixtures/duplicate_activity_in_flow.json
@@ -372,7 +372,8 @@
       "meta": {
         "nickname": "f0dd4996-e0eb-461f-b2f8-ba873a674781",
         "secretUserId": "f0dd4996-e0eb-461f-b2f8-ba873a674781"
-      }
+      },
+      "nickname": "hFywashKw+KlcDPazIy5QHz4AdkTOYkD28Q8+dpeDDA="
     }
   }
 ]