Create build:db script

.gitignore

@@ -1,3 +1,3 @@
 node_modules
 .env
-package-lock.json
+package-lock.json

.vscode/settings.json

@@ -4,4 +4,4 @@
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": true
     }
-  }
+}

README.md

@@ -4,7 +4,7 @@ Real Estate is an App that facilitates to access and rent or buy available homes
 ## Team Members :busts_in_silhouette::-
 1.  Mohammed haroon
 2.  MOhammed salah
-3.  ameera
+3.  Ameera Abed Alnaser Khalil 
 4.  Elham Fadel
 
 

package.json

@@ -7,7 +7,7 @@
     "start": "cross-env NODE_ENV=production node server",
     "dev": "cross-env NODE_ENV=development nodemon server",
     "test": "cross-env NODE_ENV=test jest",
-    "build:db": "NODE_ENV=development node server/database/config/build"
+    "build:db": "cross-env NODE_ENV=development node server/database/config"
   },
   "repository": {
     "type": "git",

server/database/config/build.js

@@ -1,11 +1,12 @@
 const { readFileSync } = require('fs');
 const { join } = require('path');
 
-const connection = require('../connection');
+const connection = require('./connection');
 
 const dbBuild = () => {
   let sql = readFileSync(join(__dirname, 'build.sql')).toString();
   sql += readFileSync(join(__dirname, 'fakeData.sql')).toString();
   return connection.query(sql);
 };
-module.exports = { dbBuild };
+
+module.exports = dbBuild;

server/database/connection.js → server/database/config/connection.js

@@ -1,3 +1,4 @@
+require('env2')('.env');
 const { Pool } = require('pg');
 
 const {
@@ -17,8 +18,10 @@ switch (NODE_ENV) {
   default:
     throw new Error('There\'s no environment');
 }
+
 const options = {
   connectionString: dbUrl,
   ssl: { rejectUnauthorized: false },
 };
+
 module.exports = new Pool(options);

server/database/config/databaseConfig.sql

@@ -0,0 +1,7 @@
+CREATE DATABASE housydev;
+CREATE USER housyuser WITH superuser password '123456';
+ALTER DATABASE housydev OWNER TO housyuser;
+-- test db
+CREATE DATABASE housytest;
+CREATE USER housyuser2 WITH superuser password '123456';
+ALTER DATABASE housytest OWNER TO housyuser2;

server/database/config/index.js

@@ -0,0 +1,13 @@
+/* eslint-disable no-console */
+const connection = require('./connection');
+const dbBuild = require('./build');
+
+(async () => {
+  try {
+    await dbBuild();
+    console.log('Build Successfully');
+    connection.end();
+  } catch (e) {
+    console.log('Build Failed', e);
+  }
+})();

server/database/quieres/getAllUsersQuery.js

@@ -1,4 +1,4 @@
-const connection = require('../connection');
+const connection = require('../config/connection');
 
 const getAllUsersQuery = () => connection.query('SELECT  * FROM agents');
 

server/database/quieres/userEstatesQuiery.js

@@ -1,3 +1,3 @@
-const connection = require('../connection');
+const connection = require('../config/connection');
 
 module.exports = (userId) => connection.query('SELECT * FROM estates WHERE agent_id = $1', [userId]);

server/index.js

@@ -1,4 +1,3 @@
-require('env2')('.env');
 const app = require('./app');
 
 const port = app.get('port');

server/test/index.test.js

@@ -1,8 +1,8 @@
 /* eslint-disable no-undef */
 const supertest = require('supertest');
 const app = require('../app');
-const { dbBuild } = require('../database/config/build');
-const connection = require('../database/connection');
+const dbBuild = require('../database/config/build');
+const connection = require('../database/config/connection');
 
 beforeEach(() => dbBuild());
 afterAll(() => connection.end());