From f01191472bdc07a5f8a7a2ca858c4655fb4a364f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Mart=C3=ADn?= <oleurud@gmail.com>
Date: Tue, 22 May 2018 11:56:50 +0200
Subject: [PATCH] refactoring copy controller middlewares

---
 app/controllers/copy_controller.js | 131 +++++++++++++++--------------
 1 file changed, 67 insertions(+), 64 deletions(-)

diff --git a/app/controllers/copy_controller.js b/app/controllers/copy_controller.js
index 1d18cb17..dd927194 100644
--- a/app/controllers/copy_controller.js
+++ b/app/controllers/copy_controller.js
@@ -34,8 +34,8 @@ CopyController.prototype.route = function (app) {
             authorizationMiddleware(this.metadataBackend),
             connectionParamsMiddleware(this.userDatabaseService),
             timeoutLimitsMiddleware(this.metadataBackend),
-            this.handleCopyFrom.bind(this),
-            this.responseCopyFrom.bind(this),
+            handleCopyFrom(),
+            responseCopyFrom(),
             errorMiddleware()
         ];
     };
@@ -106,80 +106,83 @@ function handleCopyTo (statsClient) {
     };
 }
 
-CopyController.prototype.handleCopyFrom = function (req, res, next) {
-    const { sql } = req.query;
+function handleCopyFrom () {
+    return function handleCopyFromMiddleware (req, res, next) {
+        const { sql } = req.query;
 
-    if (!sql) {
-        return next(new Error("Parameter 'sql' is missing, must be in URL or first field in POST"));
-    }
+        if (!sql) {
+            return next(new Error("Parameter 'sql' is missing, must be in URL or first field in POST"));
+        }
 
-    // Only accept SQL that starts with 'COPY'
-    if (!sql.toUpperCase().startsWith("COPY ")) {
-        return next(new Error("SQL must start with COPY"));
-    }
+        // Only accept SQL that starts with 'COPY'
+        if (!sql.toUpperCase().startsWith("COPY ")) {
+            return next(new Error("SQL must start with COPY"));
+        }
 
-    res.locals.copyFromSize = 0;
+        res.locals.copyFromSize = 0;
 
-    try {
-        const start_time = Date.now();
+        try {
+            const start_time = Date.now();
 
-        // Connect and run the COPY
-        const pg = new PSQL(res.locals.userDbParams);
-        pg.connect(function (err, client) {
-            if (err) {
-                return next(err);
-            }
+            // Connect and run the COPY
+            const pg = new PSQL(res.locals.userDbParams);
+            pg.connect(function (err, client) {
+                if (err) {
+                    return next(err);
+                }
 
-            let copyFromStream = copyFrom(sql);
-            const pgstream = client.query(copyFromStream);
-            pgstream.on('error', next);
-            pgstream.on('end', function () {
-                const end_time = Date.now();
-                res.body = {
-                    time: (end_time - start_time) / 1000,
-                    total_rows: copyFromStream.rowCount
-                };
+                let copyFromStream = copyFrom(sql);
+                const pgstream = client.query(copyFromStream);
+                pgstream.on('error', next);
+                pgstream.on('end', function () {
+                    const end_time = Date.now();
+                    res.body = {
+                        time: (end_time - start_time) / 1000,
+                        total_rows: copyFromStream.rowCount
+                    };
 
-                return next();
+                    return next();
+                });
+
+                if (req.get('content-encoding') === 'gzip') {
+                    req
+                        .pipe(zlib.createGunzip())
+                        .on('data', data => res.locals.copyFromSize += data.length)
+                        .pipe(pgstream);
+                } else {
+                    req
+                        .on('data', data => res.locals.copyFromSize += data.length)
+                        .pipe(pgstream);
+                }
             });
 
-            if (req.get('content-encoding') === 'gzip') {
-                req
-                    .pipe(zlib.createGunzip())
-                    .on('data', data => res.locals.copyFromSize += data.length)
-                    .pipe(pgstream);
-            } else {
-                req
-                    .on('data', data => res.locals.copyFromSize += data.length)
-                    .pipe(pgstream);
-            }
-        });
+        } catch (err) {
+            next(err);
+        }
+    };
+}
 
-    } catch (err) {
-        next(err);
-    }
+function responseCopyFrom () {
+    return function responseCopyFromMiddleware (req, res, next) {
+        if (!res.body || !res.body.total_rows) {
+            return next(new Error("No rows copied"));
+        }
 
-};
+        if (req.profiler) {
+            const copyFromMetrics = {
+                size: res.locals.copyFromSize, //bytes
+                format: getFormatFromCopyQuery(req.query.sql),
+                time: res.body.time, //seconds
+                total_rows: res.body.total_rows, 
+                gzip: req.get('content-encoding') === 'gzip'
+            };
 
-CopyController.prototype.responseCopyFrom = function (req, res, next) {
-    if (!res.body || !res.body.total_rows) {
-        return next(new Error("No rows copied"));
-    }
+            req.profiler.add({ copyFrom: copyFromMetrics });
+            res.header('X-SQLAPI-Profiler', req.profiler.toJSONString());
+        }
 
-    if (req.profiler) {
-        const copyFromMetrics = {
-            size: res.locals.copyFromSize, //bytes
-            format: getFormatFromCopyQuery(req.query.sql),
-            time: res.body.time, //seconds
-            total_rows: res.body.total_rows, 
-            gzip: req.get('content-encoding') === 'gzip'
-        };
-
-        req.profiler.add({ copyFrom: copyFromMetrics });
-        res.header('X-SQLAPI-Profiler', req.profiler.toJSONString());
-    }
-
-    res.send(res.body);
-};
+        res.send(res.body);
+    };
+}
 
 module.exports = CopyController;