@develit-services/bank 1.0.0 → 1.1.1

package/dist/database/schema.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const database_schema = require('../shared/bank.Qg6TA8fX.cjs');
+const database_schema = require('../shared/bank.B5nOIsGC.cjs');
 require('@develit-io/backend-sdk');
 require('drizzle-orm/sqlite-core');
 require('date-fns');

package/dist/database/schema.mjs

@@ -1,4 +1,4 @@
-export { x as account, y as accountCredentials, z as batch, D as ott, E as payment, F as paymentRelations, G as paymentRequest, H as paymentRequestRelations } from '../shared/bank.CiB2ECAF.mjs';
+export { x as account, y as accountCredentials, z as batch, D as ott, E as payment, F as paymentRelations, G as paymentRequest, H as paymentRequestRelations } from '../shared/bank.DMsXwzJn.mjs';
 import '@develit-io/backend-sdk';
 import 'drizzle-orm/sqlite-core';
 import 'date-fns';

package/dist/export/worker.cjs

@@ -1,17 +1,17 @@
 'use strict';
 
 const backendSdk = require('@develit-io/backend-sdk');
-const database_schema = require('../shared/bank.Qg6TA8fX.cjs');
+const database_schema = require('../shared/bank.B5nOIsGC.cjs');
 const drizzleOrm = require('drizzle-orm');
 const cloudflare_workers = require('cloudflare:workers');
 const d1 = require('drizzle-orm/d1');
-const mock_connector = require('../shared/bank.BXGLMl7o.cjs');
+const mock_connector = require('../shared/bank.B4xJAf0f.cjs');
 require('jose');
 const zod = require('zod');
 const generalCodes = require('@develit-io/general-codes');
 require('date-fns');
 require('node:crypto');
-const credentialsResolver = require('../shared/bank.BbltNpz3.cjs');
+const credentialsResolver = require('../shared/bank.f7ykgYdD.cjs');
 require('drizzle-orm/sqlite-core');
 require('drizzle-orm/relations');
 require('drizzle-zod');

package/dist/export/worker.mjs

@@ -1,15 +1,15 @@
 import { uuidv4, first, buildMultiFilterConditions as buildMultiFilterConditions$1, bankAccountMetadataSchema, structuredAddressSchema, workflowInstanceStatusSchema, develitWorker, createInternalError, action, service } from '@develit-io/backend-sdk';
-import { v as tables, I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, g as PAYMENT_TYPES, b as CONNECTOR_KEYS, a as BATCH_STATUSES, f as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, k as accountInsertSchema, e as PAYMENT_REQUEST_STATUSES, q as isProcessedStatus, r as isTerminalStatus, w as getNonTerminalPaymentRequestsQuery } from '../shared/bank.CiB2ECAF.mjs';
+import { v as tables, I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, g as PAYMENT_TYPES, b as CONNECTOR_KEYS, a as BATCH_STATUSES, f as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, k as accountInsertSchema, e as PAYMENT_REQUEST_STATUSES, q as isProcessedStatus, r as isTerminalStatus, w as getNonTerminalPaymentRequestsQuery } from '../shared/bank.DMsXwzJn.mjs';
 import { eq, sql, and, like, asc, desc, inArray, gte, lte, isNull, count } from 'drizzle-orm';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
-import { j as initiateConnector, g as toIncomingPayment, d as assignAccount, t as toBatchedPayment, h as toPaymentRequestInsert, a as FinbricksClient, F as FINBRICKS_ENDPOINTS } from '../shared/bank.B4EjD9Ok.mjs';
+import { j as initiateConnector, g as toIncomingPayment, d as assignAccount, t as toBatchedPayment, h as toPaymentRequestInsert, a as FinbricksClient, F as FINBRICKS_ENDPOINTS } from '../shared/bank.BxbQdO7w.mjs';
 import 'jose';
 import { z } from 'zod';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
 import 'date-fns';
 import 'node:crypto';
-import { h as encrypt, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, a as getPaymentRequestsByBatchIdQuery, g as getBatchByIdQuery, u as upsertBatchCommand, i as importAesKey, f as createPaymentCommand, b as getAccountByIdQuery } from '../shared/bank.B9-zZrEf.mjs';
+import { h as encrypt, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, a as getPaymentRequestsByBatchIdQuery, g as getBatchByIdQuery, u as upsertBatchCommand, i as importAesKey, f as createPaymentCommand, b as getAccountByIdQuery } from '../shared/bank.rcoRRywt.mjs';
 import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm/relations';
 import 'drizzle-zod';

package/dist/export/workflows.cjs

@@ -1,11 +1,11 @@
 'use strict';
 
 const backendSdk = require('@develit-io/backend-sdk');
-const database_schema = require('../shared/bank.Qg6TA8fX.cjs');
+const database_schema = require('../shared/bank.B5nOIsGC.cjs');
 const batchLifecycle = require('../shared/bank.NF8bZBy0.cjs');
-const mock_connector = require('../shared/bank.BXGLMl7o.cjs');
+const mock_connector = require('../shared/bank.B4xJAf0f.cjs');
 const drizzleOrm = require('drizzle-orm');
-const credentialsResolver = require('../shared/bank.BbltNpz3.cjs');
+const credentialsResolver = require('../shared/bank.f7ykgYdD.cjs');
 const cloudflare_workers = require('cloudflare:workers');
 const cloudflare_workflows = require('cloudflare:workflows');
 const d1 = require('drizzle-orm/d1');

package/dist/export/workflows.mjs

@@ -1,9 +1,9 @@
 import { first, uuidv4, asNonEmpty } from '@develit-io/backend-sdk';
-import { v as tables, o as isPaymentCompleted } from '../shared/bank.CiB2ECAF.mjs';
+import { v as tables, o as isPaymentCompleted } from '../shared/bank.DMsXwzJn.mjs';
 import { i as isBatchAuthorized, b as isBatchFailed, d as isBatchProcessing } from '../shared/bank.XqSw509X.mjs';
-import { e as toBatchedPaymentFromPaymentRequest, i as toPreparedPayment, j as initiateConnector } from '../shared/bank.B4EjD9Ok.mjs';
+import { e as toBatchedPaymentFromPaymentRequest, i as toPreparedPayment, j as initiateConnector } from '../shared/bank.BxbQdO7w.mjs';
 import { eq, and, inArray } from 'drizzle-orm';
-import { g as getBatchByIdQuery, a as getPaymentRequestsByBatchIdQuery, c as checksum, u as upsertBatchCommand, b as getAccountByIdQuery, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, f as createPaymentCommand } from '../shared/bank.B9-zZrEf.mjs';
+import { g as getBatchByIdQuery, a as getPaymentRequestsByBatchIdQuery, c as checksum, u as upsertBatchCommand, b as getAccountByIdQuery, d as createCredentialsResolver, e as updatePaymentRequestStatusCommand, f as createPaymentCommand } from '../shared/bank.rcoRRywt.mjs';
 import { WorkflowEntrypoint } from 'cloudflare:workers';
 import { NonRetryableError } from 'cloudflare:workflows';
 import { drizzle } from 'drizzle-orm/d1';

package/dist/shared/{bank.BXGLMl7o.cjs → bank.B4xJAf0f.cjs}

@@ -3,7 +3,7 @@
 const backendSdk = require('@develit-io/backend-sdk');
 const dateFns = require('date-fns');
 const generalCodes = require('@develit-io/general-codes');
-require('./bank.Qg6TA8fX.cjs');
+require('./bank.B5nOIsGC.cjs');
 require('drizzle-orm');
 const jose = require('jose');
 require('node:crypto');
@@ -349,7 +349,7 @@ const FINBRICKS_ENDPOINTS = {
   BANK_INFO: "/status/bankInfo"
 };
 
-const mapFinbricksStatus = (status) => {
+const mapFinbricksStatus = (status, hasBookingDate) => {
   switch (status) {
     case "BOOK":
       return "BOOKED";
@@ -366,7 +366,7 @@ const mapFinbricksStatus = (status) => {
     case "INFO":
       return "INFO";
     default:
-      return "PENDING";
+      return hasBookingDate ? "BOOKED" : "PENDING";
   }
 };
 const mapFinbricksTransactionStatus = (status) => {
@@ -480,11 +480,11 @@ const mapFinbricksTransactionToPayment = (tx, account) => {
     correlationId: backendSdk.uuidv4(),
     connectorKey: account.connectorKey,
     accountId: account.id,
-    bankRefId: tx.fbxReference,
+    bankRefId: tx.fbxReference ?? tx.entryReference,
     amount: tx.amount?.value || 0,
     currency: tx.amount?.currency || "CZK",
     paymentType: detectPaymentType(tx, isIncoming),
-    status: mapFinbricksStatus(tx.status),
+    status: mapFinbricksStatus(tx.status, !!tx.bookingDate?.date),
     message: tx.entryDetails.transactionDetails?.remittanceInformation?.unstructured || tx.entryDetails.transactionDetails?.additionalRemittanceInformation || tx.entryDetails.transactionDetails?.additionalTransactionInformation || null,
     processedAt: new Date(tx.bookingDate.date),
     ...mapReferencesToPayment(

package/dist/shared/{bank.Qg6TA8fX.cjs → bank.B5nOIsGC.cjs}

@@ -226,7 +226,7 @@ const payment = sqliteCore.sqliteTable(
     debtorIban: sqliteCore.text("debtor_iban")
   },
   (t) => [
-    sqliteCore.unique().on(t.connectorKey, t.bankRefId),
+    sqliteCore.unique().on(t.connectorKey, t.accountId, t.bankRefId),
     sqliteCore.index("payment_account_id_idx").on(t.accountId),
     sqliteCore.index("payment_account_id_status_idx").on(t.accountId, t.status),
     sqliteCore.index("payment_account_id_created_at_idx").on(t.accountId, t.createdAt),

package/dist/shared/{bank.B4EjD9Ok.mjs → bank.BxbQdO7w.mjs}

@@ -1,7 +1,7 @@
 import { uuidv4, createInternalError, useResult } from '@develit-io/backend-sdk';
 import { format, parseISO } from 'date-fns';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
-import './bank.CiB2ECAF.mjs';
+import './bank.DMsXwzJn.mjs';
 import 'drizzle-orm';
 import { importPKCS8, SignJWT } from 'jose';
 import 'node:crypto';
@@ -347,7 +347,7 @@ const FINBRICKS_ENDPOINTS = {
   BANK_INFO: "/status/bankInfo"
 };
 
-const mapFinbricksStatus = (status) => {
+const mapFinbricksStatus = (status, hasBookingDate) => {
   switch (status) {
     case "BOOK":
       return "BOOKED";
@@ -364,7 +364,7 @@ const mapFinbricksStatus = (status) => {
     case "INFO":
       return "INFO";
     default:
-      return "PENDING";
+      return hasBookingDate ? "BOOKED" : "PENDING";
   }
 };
 const mapFinbricksTransactionStatus = (status) => {
@@ -478,11 +478,11 @@ const mapFinbricksTransactionToPayment = (tx, account) => {
     correlationId: uuidv4(),
     connectorKey: account.connectorKey,
     accountId: account.id,
-    bankRefId: tx.fbxReference,
+    bankRefId: tx.fbxReference ?? tx.entryReference,
     amount: tx.amount?.value || 0,
     currency: tx.amount?.currency || "CZK",
     paymentType: detectPaymentType(tx, isIncoming),
-    status: mapFinbricksStatus(tx.status),
+    status: mapFinbricksStatus(tx.status, !!tx.bookingDate?.date),
     message: tx.entryDetails.transactionDetails?.remittanceInformation?.unstructured || tx.entryDetails.transactionDetails?.additionalRemittanceInformation || tx.entryDetails.transactionDetails?.additionalTransactionInformation || null,
     processedAt: new Date(tx.bookingDate.date),
     ...mapReferencesToPayment(

package/dist/shared/{bank.CiB2ECAF.mjs → bank.DMsXwzJn.mjs}

@@ -224,7 +224,7 @@ const payment = sqliteTable(
     debtorIban: text("debtor_iban")
   },
   (t) => [
-    unique().on(t.connectorKey, t.bankRefId),
+    unique().on(t.connectorKey, t.accountId, t.bankRefId),
     index("payment_account_id_idx").on(t.accountId),
     index("payment_account_id_status_idx").on(t.accountId, t.status),
     index("payment_account_id_created_at_idx").on(t.accountId, t.createdAt),

package/dist/shared/{bank.BbltNpz3.cjs → bank.f7ykgYdD.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 const drizzleOrm = require('drizzle-orm');
-const database_schema = require('./bank.Qg6TA8fX.cjs');
+const database_schema = require('./bank.B5nOIsGC.cjs');
 const backendSdk = require('@develit-io/backend-sdk');
 require('date-fns');
 require('jose');
@@ -15,8 +15,12 @@ const createPaymentCommand = (db, { payment }) => {
       creditorIban: payment.creditor.iban,
       debtorIban: payment.debtor.iban
     }).onConflictDoUpdate({
-      // Unique index: (connector_key, bank_ref_id)
-      target: [database_schema.tables.payment.connectorKey, database_schema.tables.payment.bankRefId],
+      // Unique index: (connector_key, account_id, bank_ref_id)
+      target: [
+        database_schema.tables.payment.connectorKey,
+        database_schema.tables.payment.accountId,
+        database_schema.tables.payment.bankRefId
+      ],
       set: {
         status: drizzleOrm.sql`excluded.status`,
         statusReason: drizzleOrm.sql`excluded.status_reason`,

package/dist/shared/{bank.B9-zZrEf.mjs → bank.rcoRRywt.mjs}

@@ -1,5 +1,5 @@
 import { sql, and, eq, isNull } from 'drizzle-orm';
-import { v as tables } from './bank.CiB2ECAF.mjs';
+import { v as tables } from './bank.DMsXwzJn.mjs';
 import { uuidv4 } from '@develit-io/backend-sdk';
 import 'date-fns';
 import 'jose';
@@ -13,8 +13,12 @@ const createPaymentCommand = (db, { payment }) => {
       creditorIban: payment.creditor.iban,
       debtorIban: payment.debtor.iban
     }).onConflictDoUpdate({
-      // Unique index: (connector_key, bank_ref_id)
-      target: [tables.payment.connectorKey, tables.payment.bankRefId],
+      // Unique index: (connector_key, account_id, bank_ref_id)
+      target: [
+        tables.payment.connectorKey,
+        tables.payment.accountId,
+        tables.payment.bankRefId
+      ],
       set: {
         status: sql`excluded.status`,
         statusReason: sql`excluded.status_reason`,

package/dist/types.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-const mock_connector = require('./shared/bank.BXGLMl7o.cjs');
-const database_schema = require('./shared/bank.Qg6TA8fX.cjs');
+const mock_connector = require('./shared/bank.B4xJAf0f.cjs');
+const database_schema = require('./shared/bank.B5nOIsGC.cjs');
 const batchLifecycle = require('./shared/bank.NF8bZBy0.cjs');
 const generalCodes = require('@develit-io/general-codes');
 require('@develit-io/backend-sdk');

package/dist/types.mjs

@@ -1,5 +1,5 @@
-export { C as CsobConnector, D as DbuConnector, E as ErsteConnector, F as FINBRICKS_ENDPOINTS, a as FinbricksClient, b as FinbricksConnector, I as IBankConnector, K as KBConnector, M as MockCobsConnector, c as MockConnector, d as assignAccount, s as signFinbricksJws, t as toBatchedPayment, e as toBatchedPaymentFromPaymentRequest, f as toCompletedPayment, g as toIncomingPayment, h as toPaymentRequestInsert, i as toPreparedPayment, u as useFinbricksFetch } from './shared/bank.B4EjD9Ok.mjs';
-export { A as ACCOUNT_STATUSES, B as BATCH_MODES, a as BATCH_STATUES, a as BATCH_STATUSES, C as CHARGE_BEARERS, b as CONNECTOR_KEYS, c as COUNTRY_CODES, d as CREDENTIALS_TYPES, I as INSTRUCTION_PRIORITIES, P as PAYMENT_DIRECTIONS, e as PAYMENT_REQUEST_STATUSES, f as PAYMENT_STATUSES, g as PAYMENT_TYPES, T as TOKEN_TYPES, h as accountCredentialsInsertSchema, i as accountCredentialsSelectSchema, j as accountCredentialsUpdateSchema, k as accountInsertSchema, l as accountSelectSchema, m as accountUpdateSchema, n as hasPaymentAccountAssigned, o as isPaymentCompleted, p as isPendingStatus, q as isProcessedStatus, r as isTerminalStatus, s as ottInsertSchema, t as ottSelectSchema, u as ottUpdateSchema } from './shared/bank.CiB2ECAF.mjs';
+export { C as CsobConnector, D as DbuConnector, E as ErsteConnector, F as FINBRICKS_ENDPOINTS, a as FinbricksClient, b as FinbricksConnector, I as IBankConnector, K as KBConnector, M as MockCobsConnector, c as MockConnector, d as assignAccount, s as signFinbricksJws, t as toBatchedPayment, e as toBatchedPaymentFromPaymentRequest, f as toCompletedPayment, g as toIncomingPayment, h as toPaymentRequestInsert, i as toPreparedPayment, u as useFinbricksFetch } from './shared/bank.BxbQdO7w.mjs';
+export { A as ACCOUNT_STATUSES, B as BATCH_MODES, a as BATCH_STATUES, a as BATCH_STATUSES, C as CHARGE_BEARERS, b as CONNECTOR_KEYS, c as COUNTRY_CODES, d as CREDENTIALS_TYPES, I as INSTRUCTION_PRIORITIES, P as PAYMENT_DIRECTIONS, e as PAYMENT_REQUEST_STATUSES, f as PAYMENT_STATUSES, g as PAYMENT_TYPES, T as TOKEN_TYPES, h as accountCredentialsInsertSchema, i as accountCredentialsSelectSchema, j as accountCredentialsUpdateSchema, k as accountInsertSchema, l as accountSelectSchema, m as accountUpdateSchema, n as hasPaymentAccountAssigned, o as isPaymentCompleted, p as isPendingStatus, q as isProcessedStatus, r as isTerminalStatus, s as ottInsertSchema, t as ottSelectSchema, u as ottUpdateSchema } from './shared/bank.DMsXwzJn.mjs';
 export { i as isBatchAuthorized, a as isBatchCompleted, b as isBatchFailed, c as isBatchInitiated, d as isBatchProcessing, e as isBatchReadyToSign } from './shared/bank.XqSw509X.mjs';
 export { BANK_CODES, CURRENCY_CODES } from '@develit-io/general-codes';
 import '@develit-io/backend-sdk';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-services/bank",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "author": "Develit.io s.r.o.",
   "type": "module",
   "exports": {