Sync merge transactions

useVenice · Oct 11, 2023 · 67fcc77 · 67fcc77
1 parent 6b67d37
commit 67fcc77
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/apps/app-config/register.node.ts b/apps/app-config/register.node.ts
@@ -60,7 +60,7 @@ implementProxyFn($getFetchFn, () => crossFetch ?? globalThis.fetch, {
 implementProxyFn(
   $makeProxyAgent,
   (input) => {
-    if (globalThis.fetch !== crossFetch) {
+    if ($getFetchFn() !== crossFetch) {
       console.warn(
         '[proxy] Using proxy agent with non-polyfilled fetch may not work',
       )

diff --git a/integrations/integration-merge/def.ts b/integrations/integration-merge/def.ts
@@ -2,6 +2,7 @@
 
 import type {IntegrationDef, IntegrationSchemas} from '@usevenice/cdk-core'
 import {intHelpers} from '@usevenice/cdk-core'
+import type {Standard} from '@usevenice/standard'
 import {z, zCast} from '@usevenice/util'
 
 import {mergeLogoSvg} from './merge-logo.svg'
@@ -78,18 +79,22 @@ export const mergeDef = {
       }
     },
   },
+  // Should be called accounting...
   extension: {
     sourceMapEntity: {
       account: (entity) => ({
         id: entity.id,
         entityName: 'account',
         entity: {name: entity.entity.name ?? ''},
       }),
-      // transaction: (entity) => ({
-      //   id: entity.id,
-      //   entityName: 'transaction',
-      //   entity: {date: entity.entity.transaction_date},
-      // }),
+      transaction: (entity) => ({
+        id: entity.id,
+        entityName: 'transaction',
+        entity: {
+          date: entity.entity.transaction_date ?? '',
+          description: entity.entity.line_items?.[0]?.memo ?? '',
+        } satisfies Standard.Transaction,
+      }),
     },
   },
 } satisfies IntegrationDef<typeof mergeSchemas>

diff --git a/integrations/integration-merge/server.ts b/integrations/integration-merge/server.ts
@@ -91,16 +91,26 @@ export const mergeServer = {
       accountToken: settings.accountToken,
     })
 
-    return rxjs
-      .from(
-        client.accounting
-          .get('/accounts', {})
-          .then((res) =>
-            (res.results ?? [])?.map((acct) =>
-              helpers._opData('account', acct.id ?? '', acct),
-            ),
+    async function* iterateEntities() {
+      yield await client.accounting
+        .get('/accounts', {})
+        .then((res) =>
+          (res.results ?? [])?.map((acct) =>
+            helpers._opData('account', acct.id ?? '', acct),
           ),
-      )
+        )
+
+      yield await client.accounting
+        .get('/transactions', {})
+        .then((res) =>
+          (res.results ?? [])?.map((txn) =>
+            helpers._opData('transaction', txn.id ?? '', txn),
+          ),
+        )
+    }
+
+    return rxjs
+      .from(iterateEntities())
       .pipe(Rx.mergeMap((ops) => rxjs.from(ops)))
   },
 } satisfies IntegrationServer<typeof mergeSchemas>