Merge pull request #3067 from CarnegieLearningWeb/bugfix/deadlock-2

delete payloads inside the transaction

Author: bcb37

packages/backend/src/api/repositories/ConditionPayloadRepository.ts

@@ -65,8 +65,13 @@ export class ConditionPayloadRepository extends Repository<ConditionPayload> {
     return result.raw[0] || [];
   }
 
-  public async deleteConditionPayload(id: string, logger: UpgradeLogger): Promise<ConditionPayload> {
-    const result = await this.createQueryBuilder()
+  public async deleteConditionPayload(
+    id: string,
+    entityManager: EntityManager,
+    logger?: UpgradeLogger
+  ): Promise<ConditionPayload> {
+    const result = await entityManager
+      .createQueryBuilder()
       .delete()
       .from(ConditionPayload)
       .where('id=:id', { id })
@@ -79,7 +84,9 @@ export class ConditionPayloadRepository extends Repository<ConditionPayload> {
           { id },
           errorMsg
         );
-        logger.error(errorMsg);
+        if (logger) {
+          logger.error(errorMsg);
+        }
         throw errorMsgString;
       });
     return result.raw;

packages/backend/src/api/services/ExperimentService.ts

@@ -966,7 +966,9 @@ export class ExperimentService {
               return doc.id === id;
             })
           ) {
-            toDeleteConditionPayloads.push(this.conditionPayloadRepository.deleteConditionPayload(id, logger));
+            toDeleteConditionPayloads.push(
+              this.conditionPayloadRepository.deleteConditionPayload(id, transactionalEntityManager, logger)
+            );
           }
         });
 
@@ -975,6 +977,7 @@ export class ExperimentService {
           ...toDeleteConditions,
           ...toDeleteDecisionPoints,
           ...toDeleteQueries,
+          ...toDeleteConditionPayloads,
           transactionalEntityManager
             .createQueryBuilder()
             .delete()