wip

Author: Toni Sharpe

index.js

@@ -107,21 +107,24 @@ function fastifyPostgres (fastify, options, next) {
     const useTransaction = routeOptions.options && routeOptions.options.useTransaction
 
     if (useTransaction) {
-      console.log('>>>>>>>>>>>>>>>>>>>>>> in useTransaction')
       fastify.addHook('preHandler', async (req, reply) => {
-        console.log('>>>>>>>>>>>>>>>>>>>>>> in preHandler')
-        await fastify.pg.transact(async (client, commit) => {
-          console.log('>>>>>>>>>>>>>>>>>>>>>> in preHandler transact')
-          req.pg = client
-          await req.pg.query('BEGIN')
+        await fastify.pg.transact(async (client, commit, done) => {
+          try {
+            req.pg = client
+            await req.pg.query('BEGIN')
+          } catch (e) {
+
+          }
         })
       })
       fastify.addHook('onSend', async (req, reply) => {
-        console.log('>>>>>>>>>>>>>>>>>>>>>> in onSend')
-        await fastify.pg.transact(async (client, commit) => {
-          console.log('>>>>>>>>>>>>>>>>>>>>>> in onSend transact')
-          // TODO only call this if transaction is complete
-          await req.pg.query('COMMIT')
+        await fastify.pg.transact(async (client, commit, done) => {
+          try {
+            // TODO only call this if transaction is complete
+            await req.pg.query('COMMIT')
+          } catch (e) {
+            await req.pg.query('ROLLBACK', done)
+          }
         })
       })
     }

test/req-initialization.test.js

@@ -72,3 +72,107 @@ test('fastify request should have the correct decoration at the custom namespace
     t.ok(fastify.hasRequestDecorator('pg'))
   })
 })
+
+test('when useTransaction is set to true - ', t => {
+  test('and the transaction is successful - ', t => {
+    test('fastify request should start a transaction', t => {
+      t.plan(2)
+
+      const fastify = Fastify()
+      t.teardown(() => fastify.close())
+
+      fastify.register(fastifyPostgres, {
+        connectionString: process.env.DATABASE_TEST_URL || 'postgres://postgres:postgres@localhost/postgres'
+      })
+
+      fastify.route({
+        method: 'GET',
+        url: '/users',
+        options: { useTransaction: true },
+        handler: (req, reply) => {
+          reply.send('response!')
+          t.ok(req.pg)
+
+          const result = req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', [
+            'root-with-callback'
+          ])
+
+          const userId = result.rows[0].id
+
+          req.pg
+            .query('SELECT * FROM users WHERE id = $1', [userId])
+            .then((result) => {
+              t.is(result.rows[0].username, 'root-with-callback')
+            })
+            .catch((err) => {
+              t.fail(err)
+            })
+        }
+      })
+
+      fastify.inject({
+        method: 'GET',
+        url: '/users'
+      }, (err, res) => {
+        t.error(err)
+      })
+    })
+
+    test('queries should run inside the handler', t => {
+      t.plan(2)
+
+      const fastify = Fastify()
+      t.teardown(() => fastify.close())
+
+      fastify.register(fastifyPostgres, {
+        connectionString: process.env.DATABASE_TEST_URL || 'postgres://postgres:postgres@localhost/postgres'
+      })
+
+      fastify.route({
+        method: 'GET',
+        url: '/users',
+        options: { useTransaction: true },
+        handler: (req, reply) => {
+          reply.send('response!')
+          t.ok(req.pg)
+
+          const result = req.pg.query('INSERT INTO users(username) VALUES($1) RETURNING id', [
+            'root-with-callback'
+          ])
+
+          const userId = result.rows[0].id
+
+          req.pg
+            .query('SELECT * FROM users WHERE id = $1', [userId])
+            .then((result) => {
+              t.is(result.rows[0].username, 'root-with-callback')
+            })
+            .catch((err) => {
+              t.fail(err)
+            })
+        }
+      })
+
+      fastify.inject({
+        method: 'GET',
+        url: '/users'
+      }, (err, res) => {
+        t.error(err)
+      })
+    })
+
+    test('fastify request should commit the transaction')
+
+    t.end()
+  })
+
+  test('and the transaction fails - ', t => {
+    test('throws the correct error')
+
+    test('rolls back the transaction')
+
+    t.end()
+  })
+
+  t.end()
+})