@opra/sqb 1.28.5 → 1.29.0

package/README.md

@@ -50,11 +50,15 @@ export class OrdersController extends SqbCollectionService<Order> {
   }
 
   @HttpOperation.Entity.FindMany({ type: Order })
-  findMany() { return super.findMany(); }
+  findMany() {
+    return super.findMany();
+  }
 
   @HttpOperation.Entity.Create({ type: Order })
   async create(dto: CreateOrderDto) {
-    return this.withTransaction(conn => super.create(dto, { connection: conn }));
+    return this.withTransaction(conn =>
+      super.create(dto, { connection: conn }),
+    );
   }
 }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "1.28.5",
+  "version": "1.29.0",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -8,11 +8,11 @@
   "dependencies": {
     "reflect-metadata": "^0.2.2",
     "tslib": "^2.8.1",
-    "valgen": "^6.2.0"
+    "valgen": "^6.2.2"
   },
   "peerDependencies": {
-    "@opra/core": "^1.28.5",
-    "@opra/http": "^1.28.5",
+    "@opra/core": "^1.29.0",
+    "@opra/http": "^1.29.0",
     "@sqb/builder": ">=5.0.1 <6",
     "@sqb/connect": ">=5.0.1 <6"
   },

package/sqb-service-base.d.ts

@@ -41,5 +41,5 @@ export declare class SqbServiceBase extends ServiceBase {
      *
      * @throws If no database connection is configured.
      */
-    getConnection(): SqbConnection | SqbClient | Promise<SqbConnection | SqbClient>;
+    getConnection(): Promise<SqbConnection | SqbClient>;
 }

package/sqb-service-base.js

@@ -1,6 +1,6 @@
 import { ServiceBase } from '@opra/core';
 import { SqbClient, SqbConnection } from '@sqb/connect';
-const transactionKey = Symbol.for('transaction');
+const dbSessionKey = Symbol.for('db-session');
 /**
  * Base class for services using SQB (SQL Builder) for database operations.
  */
@@ -28,7 +28,7 @@ export class SqbServiceBase extends ServiceBase {
     async withTransaction(callback) {
         const ctx = this.context;
         let closeSessionOnFinish = false;
-        let connection = ctx[transactionKey];
+        let connection = ctx[dbSessionKey] || ctx.bundle?.[dbSessionKey];
         if (!connection) {
             /* Determine the SqbClient or SqbConnection instance */
             const db = await this.getConnection();
@@ -41,7 +41,7 @@ export class SqbServiceBase extends ServiceBase {
                 closeSessionOnFinish = true;
             }
             /* Store transaction connection in current context */
-            ctx[transactionKey] = connection;
+            ctx[dbSessionKey] = connection;
         }
         const oldInTransaction = connection.inTransaction;
         connection.retain();
@@ -59,7 +59,7 @@ export class SqbServiceBase extends ServiceBase {
             throw e;
         }
         finally {
-            delete ctx[transactionKey];
+            delete ctx[dbSessionKey];
             /* Release connection */
             if (closeSessionOnFinish) {
                 await connection.close();
@@ -73,14 +73,40 @@ export class SqbServiceBase extends ServiceBase {
      *
      * @throws If no database connection is configured.
      */
-    getConnection() {
+    async getConnection() {
         const ctx = this.context;
-        let db = ctx[transactionKey];
+        let db = ctx[dbSessionKey] || ctx.bundle?.[dbSessionKey];
         if (db)
             return db;
         db = typeof this.db === 'function' ? this.db(this) : this.db;
-        if (db)
-            return db;
-        throw new Error(`Database not set!`);
+        if (!db)
+            throw new Error(`Database not set!`);
+        if (ctx.bundle?.transaction) {
+            const connection = db instanceof SqbConnection
+                ? db
+                : await db.acquire({ autoCommit: false });
+            /* Start transaction */
+            if (!connection.inTransaction) {
+                await connection.startTransaction();
+            }
+            ctx.bundle[dbSessionKey] = connection;
+            /* Commit or Rollback transaction after executed */
+            ctx.bundle.on('after-execute', async () => {
+                delete ctx.bundle[dbSessionKey];
+                try {
+                    if (connection.inTransaction) {
+                        if (ctx.bundle.success)
+                            await connection.commit();
+                        else
+                            await connection.rollback();
+                    }
+                }
+                finally {
+                    await connection.close();
+                }
+            });
+            return connection;
+        }
+        return db;
     }
 }