Fixing bugs with Mecayle

Author: codex-avee

index.js

@@ -23,7 +23,7 @@ if (process.env.DATABASE_URL && !local){
     useSSL = true;
 }
 // which db connection to use
-const connectionString = process.env.DATABASE_URL || 'postgresql://coder:pg123@localhost:5432/my_products';
+const connectionString = process.env.DATABASE_URL || 'postgresql://localhost:5432/my_products';
 
 const pool = new Pool({
     connectionString,

public/style.css

@@ -105,5 +105,9 @@ th, td {
 }
 
 .errors {
-	color: red;
+	color: crimson;
+	margin-top: 1em;
+	margin-bottom: 0.5em;
+	font-weight: bold;
 }
+

routes/categories.js

@@ -23,13 +23,25 @@ module.exports = function CategoryRoutes(categoryService) {
 	}
 
 	async function add(req, res, next) {
+		const {description} = req.body;
 		try {
-			let input = req.body;
-			await categoryService.add(input);
+			
+			if (!description) {
+				req.flash('error', 'Category is empty!');
+				return res.redirect('/categories/add');
+			}
+
+			await categoryService.add(description);
 			req.flash('info', 'Category added!');
 			res.redirect('/categories');
 		}
 		catch (err) {
+
+			if (err.stack.includes("duplicate key")){
+				req.flash('error', 'Category already exists : ' + description);
+				return res.redirect('/categories/add');
+			}
+
 			next(err)
 		}
 	};
@@ -40,7 +52,7 @@ module.exports = function CategoryRoutes(categoryService) {
 			let result = await categoryService.get(id); // pool.query('SELECT * FROM categories WHERE id = $1', [id]);
 			res.render('categories/edit', {
 				page_title: "Edit Customers - Node.js",
-				data: result.rows[0]
+				data: result
 			});
 		}
 		catch (err) {

services/category-service.js

@@ -3,9 +3,9 @@ module.exports = function CategoryService(pool){
         let categories = await pool.query('SELECT * from categories');
         return categories.rows;
     }
-    async function add(category){
+    async function add(description){
         let data = [
-            category.description
+            description
         ];
         let results = await pool.query(`insert into categories (description)  
             values ($1)

tables.sql

@@ -10,3 +10,6 @@ create table products (
 	category_id int,
 	foreign key (category_id) references categories(id)
 );
+
+alter table categories add constraint uniq_desc_constraint unique(description);
+

test/category-service-tests.js

@@ -12,6 +12,7 @@ const pool = new Pool({
 describe('The basic database web app', function(){
 
     beforeEach(async function(){
+        console.log("*****");
         await pool.query("delete from products;");
         await pool.query("delete from categories;");
     });
@@ -58,5 +59,5 @@ describe('The basic database web app', function(){
 
     after(function(){
         pool.end();
-    })
+    });
 });

views/layouts/main.handlebars

@@ -15,9 +15,16 @@
 			<a href="/products">Products</a>
 		</li>
 	</ul>
+	
+	<div class="errors">
+  		{{messages.error}}
+	</div>
+
 	<div class="message">
-  {{messages.info}}
-</div>
+  		{{messages.info}}
+	</div>
+
+
 	{{{body}}}
 </div>