From bfb035e2d7c071cec51350e86733cc6cf79d7e73 Mon Sep 17 00:00:00 2001
From: Atiwit Pattanapukdee <65160394@go.buu.ac.th>
Date: Sun, 16 Mar 2025 21:48:43 +0700
Subject: [PATCH] Project Round 2
---
controllers/tourController.js | 3 +--
models/tourModel.js | 3 +--
models/userModel.js | 46 -----------------------------------
3 files changed, 2 insertions(+), 50 deletions(-)
delete mode 100644 models/userModel.js
diff --git a/controllers/tourController.js b/controllers/tourController.js
index 2ea52c1..82b4058 100644
--- a/controllers/tourController.js
+++ b/controllers/tourController.js
@@ -1,5 +1,4 @@
-const Tour = require('../models/tourModel');
-const User = require('../models/userModel');
+const { User, Tour } = require('../models/tourModel');
exports.getTours = async (req, res) => {
try {
diff --git a/models/tourModel.js b/models/tourModel.js
index 8889f89..60dce7c 100644
--- a/models/tourModel.js
+++ b/models/tourModel.js
@@ -46,5 +46,4 @@ class User {
}
}
-module.exports = User;
-module.exports = Tour;
+module.exports = { User, Tour };
diff --git a/models/userModel.js b/models/userModel.js
deleted file mode 100644
index 42722a9..0000000
--- a/models/userModel.js
+++ /dev/null
@@ -1,46 +0,0 @@
-const db = require('../config/db'); // ดึง Database connection
-const bcrypt = require('bcryptjs');
-
-class User {
- static async findOne(email) {
- return new Promise((resolve, reject) => {
- db.query('SELECT * FROM users WHERE email = ?', [email], (err, results) => {
- if (err) return reject(err);
- resolve(results[0]); // คืนค่า user ที่เจอ หรือ undefined
- });
- });
- }
-
- static async create(name, email, password) {
- return new Promise(async (resolve, reject) => {
- try {
- const hashedPassword = await bcrypt.hash(password, 10);
- db.query(
- 'INSERT INTO users (name, email, password) VALUES (?, ?, ?)',
- [name, email, hashedPassword],
- (err, results) => {
- if (err) return reject(err);
- resolve(results.insertId); // คืนค่า ID ของ user ที่ถูกสร้าง
- }
- );
- } catch (err) {
- reject(err);
- }
- });
- }
-
- static async comparePassword(email, password) {
- return new Promise(async (resolve, reject) => {
- try {
- const user = await this.findOne(email);
- if (!user) return resolve(false); // ไม่เจอผู้ใช้
- const isMatch = await bcrypt.compare(password, user.password);
- resolve(isMatch);
- } catch (err) {
- reject(err);
- }
- });
- }
-}
-
-module.exports = User;
--
GitLab