chore: merge and resolve conflicts

src/handlers/positions/handler.js

@@ -216,7 +216,7 @@ const positions = async (error, messages) => {
         transferStateId,
         reason: transferInfo.reason
       }
-      await PositionService.changeParticipantPosition(transferInfo.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange)
+      await PositionService.changeParticipantPosition(participantCurrency.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange)
       await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, hubName: Config.HUB_NAME })
       histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId, action })
       return true

src/handlers/transfers/FxFulfilService.js

@@ -416,15 +416,8 @@ class FxFulfilService {
   }
 
   async processFxFulfil({ transfer, payload, action }) {
-    await this.FxTransferModel.fxTransfer.saveFxFulfilResponse(
-      transfer.commitRequestId,
-      payload,
-      action
-    )
-    const cyrilOutput = await this.cyril.processFxFulfilMessage(
-      transfer.commitRequestId,
-      payload
-    )
+    await this.FxTransferModel.fxTransfer.saveFxFulfilResponse(transfer.commitRequestId, payload, action)
+    await this.cyril.processFxFulfilMessage(transfer.commitRequestId)
     const eventDetail = {
       functionality: Type.POSITION,
       action
@@ -434,10 +427,8 @@ class FxFulfilService {
     await this.kafkaProceed({
       consumerCommit,
       eventDetail,
-      messageKey:
-        cyrilOutput.counterPartyFspSourceParticipantCurrencyId.toString(),
-      topicNameOverride:
-        this.Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.COMMIT
+      messageKey: transfer.counterPartyFspSourceParticipantCurrencyId.toString(),
+      topicNameOverride: this.Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.COMMIT
     })
     return true
   }