From 0a48278163197e3890272548ebfa4d156cc7790f Mon Sep 17 00:00:00 2001
From: Atiwit Pattanapukdee <65160394@go.buu.ac.th>
Date: Sun, 16 Mar 2025 18:08:40 +0700
Subject: [PATCH] Project Round 2

---
 controllers/tourController.js |  6 ++----
 models/tourModel.js           | 18 ++++++------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/controllers/tourController.js b/controllers/tourController.js
index d1ef75d..70be82c 100644
--- a/controllers/tourController.js
+++ b/controllers/tourController.js
@@ -47,8 +47,7 @@ exports.postRegister = (req, res) => {
       return res.render('register', { message: 'Passwords do not match' });
   }
 
-  // ส่ง db เป็นพารามิเตอร์ให้กับ User.findOne
-  User.findOne(req.db, email, (err, user) => {
+  User.findOne(email, (err, user) => {
       if (err) {
           return res.render('register', { message: 'Error checking email' });
       }
@@ -57,8 +56,7 @@ exports.postRegister = (req, res) => {
           return res.render('register', { message: 'Email already in use' });
       }
 
-      // ถ้าไม่มีผู้ใช้ ก็ทำการสร้างผู้ใช้ใหม่
-      User.create(req.db, name, email, password, (err, userId) => {
+      User.create(name, email, password, (err, userId) => {
           if (err) {
               return res.render('register', { message: 'Error creating user' });
           }
diff --git a/models/tourModel.js b/models/tourModel.js
index 3ceabd6..d02fe49 100644
--- a/models/tourModel.js
+++ b/models/tourModel.js
@@ -1,5 +1,5 @@
 const db = require('../config/database');
-
+const bcrypt = require('bcryptjs');
 class Tour {
   static async getAllTours() {
     const [rows] = await db.query('SELECT * FROM tours');
@@ -12,20 +12,16 @@ class Tour {
   }
 }
 
-const bcrypt = require('bcryptjs');
-
 class User {
-    // รับ db จากพารามิเตอร์
-    static findOne(db, email, callback) {
+    static findOne(email, callback) {
         const query = 'SELECT * FROM users WHERE email = ?';
         db.query(query, [email], (err, results) => {
             if (err) return callback(err);
-            callback(null, results[0]);
+            callback(null, results[0] || null); // คืนค่า null หากไม่มีผู้ใช้
         });
     }
 
-    // รับ db จากพารามิเตอร์
-    static create(db, name, email, password, callback) {
+    static create(name, email, password, callback) {
         const query = 'INSERT INTO users (name, email, password) VALUES (?, ?, ?)';
         bcrypt.hash(password, 10, (err, hashedPassword) => {
             if (err) return callback(err);
@@ -36,9 +32,8 @@ class User {
         });
     }
 
-    // รับ db จากพารามิเตอร์
-    static comparePassword(db, email, password, callback) {
-        User.findOne(db, email, (err, user) => {
+    static comparePassword(email, password, callback) {
+        User.findOne(email, (err, user) => {
             if (err || !user) return callback(err || 'User not found');
             bcrypt.compare(password, user.password, (err, isMatch) => {
                 if (err) return callback(err);
@@ -49,5 +44,4 @@ class User {
 }
 
 module.exports = User;
-
 module.exports = Tour;
-- 
GitLab