added gitlab CL configs

Unalo · Unalo · commit 63dfe6d21c3b · 2022-07-01T12:44:13.000+02:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,17 @@
+image: node:latest
+
+services:
+  - postgres:latest
+
+variables:
+  POSTGRES_DB: my_products_tests
+  POSTGRES_USER: codex-coder
+  POSTGRES_PASSWORD: "pg123"
+  
+cache: 
+  path: 
+    - node_modules/
+
+postgresql:
+  script:
+    - npm test
diff --git a/api/categories-api.js b/api/categories-api.js
@@ -21,6 +21,7 @@ module.exports = function (categoryService) {
 		}
 	};
 
+
 	async function add(req, res) {
 		try {
 			let input = req.body;
diff --git a/api/user-api.js b/api/user-api.js
@@ -0,0 +1,73 @@
+module.exports = function (userService) {
+
+	async function user(req, res) {
+		try {
+            let id = req.body.id;
+			let users = await userService.getUserName();
+			res.json({
+				status: 'success',
+				data: users
+			});
+		}
+		catch (err) {
+			res.json({
+				status: "error",
+				error: err.stack
+			});
+		}
+	};
+
+    const validatePassword = async (req, res) => {
+        try {
+            let username = req.body.username;
+            let password = req.body.password;
+            let userPassword = await userService.getUserPassword(username);
+
+            /*
+                - hash password back to normal
+                - use compare method to check if password match
+
+                --- exceptions/ events ---
+                - handle wrong password exception
+                - handle successfull event;
+           */
+
+        } catch (error) {
+            res.json({
+                status: "error",
+                error: err.stack
+            })
+        }
+    } 
+
+    const signUp = async (req, res) => {
+        try {
+            let username = req.body.username;
+            let password = req.body.password;
+
+            /*
+            - set-up salt
+            - hash the password
+            - call signUp service
+
+            --- exception/ event ---
+            - user already exists
+            - handle successfull event
+            - create a user-token 
+            */
+
+        } catch (error) {
+            res.json({
+                status: "error",
+                error: error.stack
+            })
+        }
+    }
+
+    return {
+        user,
+        validatePassword,
+        signUp
+    }
+    
+}
diff --git a/index.js b/index.js
@@ -7,12 +7,15 @@ const Categories = require('./routes/categories');
 const CategoriesAPI = require('./api/categories-api');
 const Products = require('./routes/products');
 const ProductsAPI = require('./api/products-api');
+const UserAPI = require('./api/user-api');
+
 
 const app = express();
 const session = require('express-session');
 const flash = require('express-flash');
 const CategoryService = require('./services/category-service');
 const ProductService = require('./services/product-service');
+const UserService = require('./services/user-service');
 
 const pgp = require('pg-promise')();
 
@@ -27,10 +30,14 @@ const connectionString = process.env.DATABASE_URL || 'postgresql://localhost:543
 
 const categoryService = CategoryService(db);
 const productService = ProductService(db);
+const userService = UserService(db);
+
 const categoryRoutes = Categories(categoryService);
-const categoryAPI = CategoriesAPI(categoryService);
 const productRoutes = Products(productService, categoryService);
+
+const categoryAPI = CategoriesAPI(categoryService);
 const productsAPI = ProductsAPI(productService);
+const userAPI = UserAPI(userService);
 
 app.use(session({
   secret: 'keyboard cat',
@@ -81,6 +88,10 @@ app.post('/api/products', productsAPI.add);
 
 app.get('/api/categories', categoryAPI.all);
 
+app.get('/api/users', userAPI.user);
+// add user/sign-up end-point
+
+
 app.use(errorHandler);
 
 //configure the port number using and environment number
diff --git a/public/client.js b/public/client.js
@@ -1,4 +1,4 @@
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener('DOMContentLoaded', function () {
 
     function compileTemplate(selector) {
         let template = document.querySelector(selector);
@@ -27,38 +27,38 @@ document.addEventListener('DOMContentLoaded', function() {
 
     function showCategoryDropdown() {
         axios
-        .get('/api/categories')
-        .then(function(results){
-            let response = results.data;
-            let data = response.data;
-            let html = categoryListTemplateInstance({
-                categoryList: data
+            .get('/api/categories')
+            .then(function (results) {
+                let response = results.data;
+                let data = response.data;
+                let html = categoryListTemplateInstance({
+                    categoryList: data
+                });
+                categoriesElem.innerHTML = html;
             });
-            categoriesElem.innerHTML = html;
-        });
     }
 
     function showProducts() {
         productService
-        .getProducts()
-        .then(function(results){
-            let response = results.data;
-            let data = response.data;
-            let html = productListTemplateInstance({
-                productList : data
+            .getProducts()
+            .then(function (results) {
+                let response = results.data;
+                let data = response.data;
+                let html = productListTemplateInstance({
+                    productList: data
+                });
+                let productTableHTML = html;
+                productsElem.innerHTML = productTableHTML;
             });
-            let productTableHTML = html;
-            productsElem.innerHTML = productTableHTML;
-        });
     }
-    
+
     function clearFields() {
         productNameElem.value = '';
         categoryIdElem.value = '';
-        priceElem.value= '';
+        priceElem.value = '';
     }
 
-    productBtn.addEventListener('click', function() {
+    productBtn.addEventListener('click', function () {
 
         let description = productNameElem.value;
         let category_id = categoryIdElem.value;
@@ -82,18 +82,18 @@ document.addEventListener('DOMContentLoaded', function() {
                 description,
                 price
             })
-            .then(function() {
-                showProducts();
-                clearFields();
-            })
-            .catch(function(err){
-                alert(err);
-            });
+                .then(function () {
+                    showProducts();
+                    clearFields();
+                })
+                .catch(function (err) {
+                    alert(err);
+                });
         }
         else {
-            errorsElem.innerHTML = errorsTemplateInstance({errors});
+            errorsElem.innerHTML = errorsTemplateInstance({ errors });
         }
-        
+
     });
 
     showCategoryDropdown();
@@ -107,7 +107,7 @@ function editProduct(id) {
 }
 
 function ProductService() {
-    function getProducts(){
+    function getProducts() {
         return axios.get('/api/products')
     }
 
diff --git a/services/product-service.js b/services/product-service.js
@@ -16,39 +16,38 @@ module.exports = function ProductService(db) {
                     values ($1, $2, $3)`, data)
 
     }
-        async function get(id) {
-            let productResult = await db.one('SELECT * FROM products WHERE id = $1', [id])
-            return productResult;
-
-        }
+    async function get(id) {
+        let productResult = await db.one('SELECT * FROM products WHERE id = $1', [id])
+        return productResult;
+    }
 
-        async function update(product) {
-            var data = [
-                product.category_id,
-                product.description,
-                product.price,
-                product.id
-            ];
+    async function update(product) {
+        var data = [
+            product.category_id,
+            product.description,
+            product.price,
+            product.id
+        ];
 
-            let updateQuery = `UPDATE products 
+        let updateQuery = `UPDATE products 
             SET category_id = $1, 
                 description = $2, 
                 price = $3 
             WHERE id = $4`;
 
-            return await db.any(updateQuery, data)
+        return await db.any(updateQuery, data)
 
-        }
+    }
 
-        async function deleteById(id) {
-            return await db.result('DELETE FROM products WHERE id = $1', [id])
-        }
+    async function deleteById(id) {
+        return await db.result('DELETE FROM products WHERE id = $1', [id])
+    }
 
-        return {
-            all,
-            create,
-            delete: deleteById,
-            get,
-            update
-        }
-    }
+    return {
+        all,
+        create,
+        delete: deleteById,
+        get,
+        update
+    }
+}
diff --git a/services/user-service.js b/services/user-service.js
@@ -0,0 +1,22 @@
+module.exports = function userService(db) {
+    const getUserName = async () => {
+        let user = await db.any('select username from users');
+        const userData = user.length > 0 ? user : null;
+        return userData;
+    }
+
+    const getUserPassword = async username => {
+        let userPassword = await db.any('select password from users where username = $1', [username]);
+        const results = userPassword.length > 0 ? userPassword : null;
+        return results;
+    }
+
+    const signUp = async (username, password) => {
+
+    }
+
+    return {
+        getUserName,
+        getUserPassword
+    }
+}
diff --git a/tables.sql b/tables.sql
@@ -11,5 +11,13 @@ create table products (
 	foreign key (category_id) references categories(id) ON DELETE CASCADE
 );
 
+create table users (
+	id serial not null primary key,
+	username text not null,
+	password text not null
+	-- createdAt timestamp not null,
+	-- updatedAt timestamp not null 
+);
+
 alter table categories add constraint uniq_desc_constraint unique(description);
 
diff --git a/test/category-service-tests.js b/test/category-service-tests.js
@@ -3,7 +3,7 @@ const CategoryService = require('../services/category-service');
 const pg = require("pg");
 const Pool = pg.Pool;
 
-const  = process.env.DATABASE_URL || 'postgresql://localhost:5432/my_products_tests';
+const connectionString  = process.env.DATABASE_URL || 'postgresql://localhost:5432/my_products_tests';
 
 const pool = new Pool({
     connectionString

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ module.exports = function (categoryService) {`
`21`	`21`	`}`
`22`	`22`	`};`
`23`	`23`
	`24`	`+`
`24`	`25`	`async function add(req, res) {`
`25`	`26`	`try {`
`26`	`27`	`let input = req.body;`