Merge pull request #19 from fac-17/Feature/database-tests

Feature/database tests

package.json

@@ -4,6 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
+    "test": "NODE_ENV=test tape src/tests/*.test.js | tap-spec",
     "start": "node src/index.js"
   },
   "repository": {
@@ -16,11 +17,14 @@
     "url": "https://github.com/fac-17/CFLM/issues"
   },
   "homepage": "https://github.com/fac-17/CFLM#readme",
-  "dev-dependencies": {
+  "devDependencies": {
     "supertest": "^4.0.2",
     "tape": "^4.11.0"
   },
   "dependencies": {
-    "express": "^4.17.1"
+    "env2": "^2.2.2",
+    "express": "^4.17.1",
+    "pg": "^7.12.1",
+    "tap-spec": "^5.0.0"
   }
 }

src/model/database/build.js

@@ -8,4 +8,6 @@ const runDbBuild = cb => {
   dbConnection.query(sql, cb);
 };
 
+runDbBuild();
+
 module.exports = runDbBuild;

src/model/database/build.sql

@@ -26,5 +26,7 @@ VALUES ('Gregor'), ('Andy'), ('Francesca'), ('Jack');
 INSERT INTO animals (name) 
 VALUES ('Pig'), ('Goat'), ('Tiger'), ('Monkey');
 
-INSERT INTO adoption (name) 
-VALUES (1,2), (2,1), (2,4), (3,3), (3,1), (4,1);
+INSERT INTO adoption (user_id, animal_id) 
+VALUES (1,2), (2,1), (2,4), (3,3), (3,1), (4,1);
+
+COMMIT;

src/model/database/buildtest.js

@@ -0,0 +1 @@
+

src/model/database/db_connection.js

@@ -1,10 +1,11 @@
 const { Pool } = require("pg");
 const url = require("url");
-require("env2")("./config.env");
+require("env2")("./.env");
 
 let DB_URL = process.env.DB_URL;
+console.log(DB_URL);
 
-if (process.env.NODE_env === "test") {
+if (process.env.NODE_ENV === "test") {
   DB_URL = process.env.TEST_DB_URL;
 }
 

src/model/queries/getData.js

@@ -0,0 +1,19 @@
+const dbConnection = require("../database/db_connection");
+
+const getUsers = cb => {
+  dbConnection.query("SELECT name FROM users ORDER BY id", (err, res) => {
+    if (err) {
+      cb(err);
+    } else cb(null, res.rows);
+  });
+};
+
+const getAnimals = cb => {
+  dbConnection.query("SELECT name FROM animals ORDER BY id", (err, res) => {
+    if (err) {
+      cb(err);
+    } else cb(null, res.rows);
+  });
+};
+
+module.exports = { getUsers, getAnimals };

src/model/queries/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  getData: require("./getData.js")
+};

src/tests/database.test.js

@@ -0,0 +1,58 @@
+const test = require("tape");
+const runDbBuild = require("../model/database/build");
+const queries = require("../model/queries");
+
+test("Check table builds", t => {
+  runDbBuild((err, res) => {
+    t.error(err, "No error");
+    t.end();
+  });
+});
+
+test("Check getUsers function", t => {
+  const users = [
+    { name: "Gregor" },
+    { name: "Andy" },
+    { name: "Francesca" },
+    { name: "Jack" }
+  ];
+  runDbBuild((err, res) => {
+    t.error(err, "No error for DbBuild");
+    queries.getData.getUsers((err, data) => {
+      t.error(err, "No error for getUsers");
+      t.deepEqual(users, data, "Correct names are returned");
+      t.end();
+    });
+  });
+});
+
+test("Check getAnimals function", t => {
+  const animals = [
+    { name: "Pig" },
+    { name: "Goat" },
+    { name: "Tiger" },
+    { name: "Monkey" }
+  ];
+
+  runDbBuild((err, res) => {
+    t.error(err, "No error for DbBuild");
+    queries.getData.getAnimals((err, data) => {
+      t.error(err, "No error for getAnimals");
+      t.deepEqual(animals, data, "Correct animals are returned");
+      t.end();
+    });
+  });
+});
+
+test("Check return all adopted relationships", t => {
+  const adoptions = "tbd";
+
+  runDbBuild((err, res) => {
+    t.error(err, "No error for DbBuild");
+    queries.getData.getAdoptions((err, data) => {
+      t.error(err, "No error for getAdoptions");
+      t.deepEqual(adoptions, data, "Correct adoptions are returned");
+      t.end();
+    });
+  });
+});