Spaces:
Sleeping
Sleeping
Upload 2 files
Browse files- server/models/Dataset.js +24 -6
- server/models/News.js +24 -6
server/models/Dataset.js
CHANGED
|
@@ -4,16 +4,34 @@ const db = require('../config/db');
|
|
| 4 |
class Dataset {
|
| 5 |
// Get all datasets
|
| 6 |
static async getAll() {
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 10 |
}
|
| 11 |
|
| 12 |
// Get dataset by ID
|
| 13 |
static async getById(id) {
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
}
|
| 18 |
|
| 19 |
// Create new dataset
|
|
|
|
| 4 |
class Dataset {
|
| 5 |
// Get all datasets
|
| 6 |
static async getAll() {
|
| 7 |
+
try {
|
| 8 |
+
if (process.env.HF_SPACES === 'true') {
|
| 9 |
+
return db.mockDatasets;
|
| 10 |
+
}
|
| 11 |
+
|
| 12 |
+
const query = 'SELECT * FROM datasets ORDER BY id';
|
| 13 |
+
const { rows } = await db.query(query);
|
| 14 |
+
return rows.length > 0 ? rows : db.mockDatasets;
|
| 15 |
+
} catch (error) {
|
| 16 |
+
console.warn('Database error, using mock data:', error.message);
|
| 17 |
+
return db.mockDatasets;
|
| 18 |
+
}
|
| 19 |
}
|
| 20 |
|
| 21 |
// Get dataset by ID
|
| 22 |
static async getById(id) {
|
| 23 |
+
try {
|
| 24 |
+
if (process.env.HF_SPACES === 'true') {
|
| 25 |
+
return db.mockDatasets.find(dataset => dataset.id == id);
|
| 26 |
+
}
|
| 27 |
+
|
| 28 |
+
const query = 'SELECT * FROM datasets WHERE id = $1';
|
| 29 |
+
const { rows } = await db.query(query, [id]);
|
| 30 |
+
return rows[0] || db.mockDatasets.find(dataset => dataset.id == id);
|
| 31 |
+
} catch (error) {
|
| 32 |
+
console.warn('Database error, using mock data:', error.message);
|
| 33 |
+
return db.mockDatasets.find(dataset => dataset.id == id);
|
| 34 |
+
}
|
| 35 |
}
|
| 36 |
|
| 37 |
// Create new dataset
|
server/models/News.js
CHANGED
|
@@ -4,16 +4,34 @@ const db = require('../config/db');
|
|
| 4 |
class News {
|
| 5 |
// Get all news
|
| 6 |
static async getAll() {
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 10 |
}
|
| 11 |
|
| 12 |
// Get news by ID
|
| 13 |
static async getById(id) {
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
}
|
| 18 |
|
| 19 |
// Create new news item
|
|
|
|
| 4 |
class News {
|
| 5 |
// Get all news
|
| 6 |
static async getAll() {
|
| 7 |
+
try {
|
| 8 |
+
if (process.env.HF_SPACES === 'true') {
|
| 9 |
+
return db.mockNews;
|
| 10 |
+
}
|
| 11 |
+
|
| 12 |
+
const query = 'SELECT * FROM news ORDER BY date DESC';
|
| 13 |
+
const { rows } = await db.query(query);
|
| 14 |
+
return rows.length > 0 ? rows : db.mockNews;
|
| 15 |
+
} catch (error) {
|
| 16 |
+
console.warn('Database error, using mock data:', error.message);
|
| 17 |
+
return db.mockNews;
|
| 18 |
+
}
|
| 19 |
}
|
| 20 |
|
| 21 |
// Get news by ID
|
| 22 |
static async getById(id) {
|
| 23 |
+
try {
|
| 24 |
+
if (process.env.HF_SPACES === 'true') {
|
| 25 |
+
return db.mockNews.find(news => news.id == id);
|
| 26 |
+
}
|
| 27 |
+
|
| 28 |
+
const query = 'SELECT * FROM news WHERE id = $1';
|
| 29 |
+
const { rows } = await db.query(query, [id]);
|
| 30 |
+
return rows[0] || db.mockNews.find(news => news.id == id);
|
| 31 |
+
} catch (error) {
|
| 32 |
+
console.warn('Database error, using mock data:', error.message);
|
| 33 |
+
return db.mockNews.find(news => news.id == id);
|
| 34 |
+
}
|
| 35 |
}
|
| 36 |
|
| 37 |
// Create new news item
|