jason/breedr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api): expose is_champion on all dog queries incl sire/dam/offspring joins

Browse Source
This commit is contained in:
jason
2026-03-09 22:24:39 -05:00
parent 6903e66419
commit 421ea5cb58
1 changed files with 112 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
server/routes/dogs.js
View File

@@ -5,7 +5,6 @@ const multer = require('multer');
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
// Configure multer for photo uploads
const storage = multer.diskStorage({ const storage = multer.diskStorage({
destination: (req, file, cb) => { destination: (req, file, cb) => {
const uploadPath = process.env.UPLOAD_PATH || path.join(__dirname, '../../uploads'); const uploadPath = process.env.UPLOAD_PATH || path.join(__dirname, '../../uploads');
@@ -19,12 +18,10 @@ const storage = multer.diskStorage({
const upload = multer({ const upload = multer({
storage, storage,
limits: { fileSize: 10 * 1024 * 1024 }, // 10MB limit limits: { fileSize: 10 * 1024 * 1024 },
fileFilter: (req, file, cb) => { fileFilter: (req, file, cb) => {
const allowedTypes = /jpeg|jpg|png|gif|webp/; const allowed = /jpeg|jpg|png|gif|webp/;
const extname = allowedTypes.test(path.extname(file.originalname).toLowerCase()); if (allowed.test(path.extname(file.originalname).toLowerCase()) && allowed.test(file.mimetype)) {
const mimetype = allowedTypes.test(file.mimetype);
if (extname && mimetype) {
cb(null, true); cb(null, true);
} else { } else {
cb(new Error('Only image files are allowed')); cb(new Error('Only image files are allowed'));
@@ -32,27 +29,39 @@ const upload = multer({
} }
}); });
// Helper function to convert empty strings to null const emptyToNull = (v) => (v === '' || v === undefined) ? null : v;
const emptyToNull = (value) => {
return (value === '' || value === undefined) ? null : value;
};
// GET all dogs // ── Shared SELECT columns ─────────────────────────────────────────────
const DOG_COLS = `
id, name, registration_number, breed, sex, birth_date,
color, microchip, photo_urls, notes, litter_id, is_active,
is_champion, created_at, updated_at
`;
// ── GET all dogs ───────────────────────────────────────────────────
router.get('/', (req, res) => { router.get('/', (req, res) => {
try { try {
const db = getDatabase(); const db = getDatabase();
const dogs = db.prepare(` const dogs = db.prepare(`
SELECT id, name, registration_number, breed, sex, birth_date, SELECT ${DOG_COLS}
color, microchip, photo_urls, notes, litter_id, is_active,
created_at, updated_at
FROM dogs FROM dogs
WHERE is_active = 1 WHERE is_active = 1
ORDER BY name ORDER BY name
`).all(); `).all();
// Parse photo_urls JSON // Also pull sire/dam so list page can compute bloodline status
const parentStmt = db.prepare(`
SELECT p.parent_type, d.id, d.name, d.is_champion
FROM parents p
JOIN dogs d ON p.parent_id = d.id
WHERE p.dog_id = ?
`);
dogs.forEach(dog => { dogs.forEach(dog => {
dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : []; dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
const parents = parentStmt.all(dog.id);
dog.sire = parents.find(p => p.parent_type === 'sire') || null;
dog.dam = parents.find(p => p.parent_type === 'dam') || null;
}); });
res.json(dogs); res.json(dogs);
@@ -62,27 +71,19 @@ router.get('/', (req, res) => {
} }
}); });
// GET single dog by ID with parents and offspring // ── GET single dog (with parents + offspring) ───────────────────────
router.get('/:id', (req, res) => { router.get('/:id', (req, res) => {
try { try {
const db = getDatabase(); const db = getDatabase();
const dog = db.prepare(` const dog = db.prepare(`SELECT ${DOG_COLS} FROM dogs WHERE id = ?`).get(req.params.id);
SELECT id, name, registration_number, breed, sex, birth_date,
color, microchip, photo_urls, notes, litter_id, is_active,
created_at, updated_at
FROM dogs
WHERE id = ?
`).get(req.params.id);
if (!dog) { if (!dog) return res.status(404).json({ error: 'Dog not found' });
return res.status(404).json({ error: 'Dog not found' });
}
dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : []; dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
// Get parents from parents table // Parents — include is_champion so frontend can render bloodline badge
const parents = db.prepare(` const parents = db.prepare(`
SELECT p.parent_type, d.* SELECT p.parent_type, d.id, d.name, d.is_champion
FROM parents p FROM parents p
JOIN dogs d ON p.parent_id = d.id JOIN dogs d ON p.parent_id = d.id
WHERE p.dog_id = ? WHERE p.dog_id = ?
@@ -91,9 +92,10 @@ router.get('/:id', (req, res) => {
dog.sire = parents.find(p => p.parent_type === 'sire') || null; dog.sire = parents.find(p => p.parent_type === 'sire') || null;
dog.dam = parents.find(p => p.parent_type === 'dam') || null; dog.dam = parents.find(p => p.parent_type === 'dam') || null;
// Get offspring // Offspring — include is_champion for badge on offspring cards
dog.offspring = db.prepare(` dog.offspring = db.prepare(`
SELECT d.* FROM dogs d SELECT d.id, d.name, d.sex, d.is_champion
FROM dogs d
JOIN parents p ON d.id = p.dog_id JOIN parents p ON d.id = p.dog_id
WHERE p.parent_id = ? AND d.is_active = 1 WHERE p.parent_id = ? AND d.is_active = 1
`).all(req.params.id); `).all(req.params.id);
@@ -105,66 +107,50 @@ router.get('/:id', (req, res) => {
} }
}); });
// POST create new dog // ── POST create dog ────────────────────────────────────────────────
router.post('/', (req, res) => { router.post('/', (req, res) => {
try { try {
const { name, registration_number, breed, sex, birth_date, color, microchip, notes, sire_id, dam_id, litter_id } = req.body; const { name, registration_number, breed, sex, birth_date, color,
microchip, notes, sire_id, dam_id, litter_id, is_champion } = req.body;
console.log('Creating dog with data:', { name, breed, sex, sire_id, dam_id, litter_id }); console.log('Creating dog:', { name, breed, sex, sire_id, dam_id, litter_id, is_champion });
if (!name || !breed || !sex) { if (!name || !breed || !sex) {
return res.status(400).json({ error: 'Name, breed, and sex are required' }); return res.status(400).json({ error: 'Name, breed, and sex are required' });
} }
const db = getDatabase(); const db = getDatabase();
// Insert dog (dogs table has NO sire/dam columns)
const result = db.prepare(` const result = db.prepare(`
INSERT INTO dogs (name, registration_number, breed, sex, birth_date, color, microchip, notes, litter_id, photo_urls) INSERT INTO dogs (name, registration_number, breed, sex, birth_date, color,
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) microchip, notes, litter_id, photo_urls, is_champion)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`).run( `).run(
name, name,
emptyToNull(registration_number), emptyToNull(registration_number),
breed, breed, sex,
sex,
emptyToNull(birth_date), emptyToNull(birth_date),
emptyToNull(color), emptyToNull(color),
emptyToNull(microchip), emptyToNull(microchip),
emptyToNull(notes), emptyToNull(notes),
emptyToNull(litter_id), emptyToNull(litter_id),
'[]' '[]',
is_champion ? 1 : 0
); );
const dogId = result.lastInsertRowid; const dogId = result.lastInsertRowid;
console.log(`✓ Dog inserted with ID: ${dogId}`); console.log(`✓ Dog inserted with ID: ${dogId}`);
// Add sire relationship if provided
if (sire_id && sire_id !== '' && sire_id !== null) { if (sire_id && sire_id !== '' && sire_id !== null) {
console.log(` Adding sire relationship: dog ${dogId} -> sire ${sire_id}`); db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(dogId, sire_id, 'sire');
db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
run(dogId, sire_id, 'sire');
console.log(` ✓ Sire relationship added`);
} }
// Add dam relationship if provided
if (dam_id && dam_id !== '' && dam_id !== null) { if (dam_id && dam_id !== '' && dam_id !== null) {
console.log(` Adding dam relationship: dog ${dogId} -> dam ${dam_id}`); db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(dogId, dam_id, 'dam');
db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
run(dogId, dam_id, 'dam');
console.log(` ✓ Dam relationship added`);
} }
// Fetch the created dog const dog = db.prepare(`SELECT ${DOG_COLS} FROM dogs WHERE id = ?`).get(dogId);
const dog = db.prepare(`
SELECT id, name, registration_number, breed, sex, birth_date,
color, microchip, photo_urls, notes, litter_id, is_active,
created_at, updated_at
FROM dogs
WHERE id = ?
`).get(dogId);
dog.photo_urls = []; dog.photo_urls = [];
console.log(`✓ Dog created successfully: ${dog.name} (ID: ${dogId})`); console.log(`✓ Dog created: ${dog.name} (ID: ${dogId})`);
res.status(201).json(dog); res.status(201).json(dog);
} catch (error) { } catch (error) {
console.error('Error creating dog:', error); console.error('Error creating dog:', error);
@@ -172,66 +158,47 @@ router.post('/', (req, res) => {
} }
}); });
// PUT update dog // ── PUT update dog ────────────────────────────────────────────────
router.put('/:id', (req, res) => { router.put('/:id', (req, res) => {
try { try {
const { name, registration_number, breed, sex, birth_date, color, microchip, notes, sire_id, dam_id, litter_id } = req.body; const { name, registration_number, breed, sex, birth_date, color,
microchip, notes, sire_id, dam_id, litter_id, is_champion } = req.body;
console.log(`Updating dog ${req.params.id} with data:`, { name, breed, sex, sire_id, dam_id, litter_id }); console.log(`Updating dog ${req.params.id}:`, { name, breed, sex, sire_id, dam_id, is_champion });
const db = getDatabase(); const db = getDatabase();
// Update dog record (dogs table has NO sire/dam columns)
db.prepare(` db.prepare(`
UPDATE dogs UPDATE dogs
SET name = ?, registration_number = ?, breed = ?, sex = ?, SET name = ?, registration_number = ?, breed = ?, sex = ?,
birth_date = ?, color = ?, microchip = ?, notes = ?, litter_id = ? birth_date = ?, color = ?, microchip = ?, notes = ?,
litter_id = ?, is_champion = ?, updated_at = datetime('now')
WHERE id = ? WHERE id = ?
`).run( `).run(
name, name,
emptyToNull(registration_number), emptyToNull(registration_number),
breed, breed, sex,
sex,
emptyToNull(birth_date), emptyToNull(birth_date),
emptyToNull(color), emptyToNull(color),
emptyToNull(microchip), emptyToNull(microchip),
emptyToNull(notes), emptyToNull(notes),
emptyToNull(litter_id), emptyToNull(litter_id),
is_champion ? 1 : 0,
req.params.id req.params.id
); );
console.log(` ✓ Dog record updated`);
// Remove existing parent relationships // Re-link parents
db.prepare('DELETE FROM parents WHERE dog_id = ?').run(req.params.id); db.prepare('DELETE FROM parents WHERE dog_id = ?').run(req.params.id);
console.log(` ✓ Old parent relationships removed`);
// Add new sire relationship if provided
if (sire_id && sire_id !== '' && sire_id !== null) { if (sire_id && sire_id !== '' && sire_id !== null) {
console.log(` Adding sire relationship: dog ${req.params.id} -> sire ${sire_id}`); db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(req.params.id, sire_id, 'sire');
db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
run(req.params.id, sire_id, 'sire');
console.log(` ✓ Sire relationship added`);
} }
// Add new dam relationship if provided
if (dam_id && dam_id !== '' && dam_id !== null) { if (dam_id && dam_id !== '' && dam_id !== null) {
console.log(` Adding dam relationship: dog ${req.params.id} -> dam ${dam_id}`); db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').run(req.params.id, dam_id, 'dam');
db.prepare('INSERT INTO parents (dog_id, parent_id, parent_type) VALUES (?, ?, ?)').
run(req.params.id, dam_id, 'dam');
console.log(` ✓ Dam relationship added`);
} }
// Fetch updated dog const dog = db.prepare(`SELECT ${DOG_COLS} FROM dogs WHERE id = ?`).get(req.params.id);
const dog = db.prepare(`
SELECT id, name, registration_number, breed, sex, birth_date,
color, microchip, photo_urls, notes, litter_id, is_active,
created_at, updated_at
FROM dogs
WHERE id = ?
`).get(req.params.id);
dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : []; dog.photo_urls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
console.log(`✓ Dog updated successfully: ${dog.name} (ID: ${req.params.id})`); console.log(`✓ Dog updated: ${dog.name} (ID: ${req.params.id})`);
res.json(dog); res.json(dog);
} catch (error) { } catch (error) {
console.error('Error updating dog:', error); console.error('Error updating dog:', error);
@@ -239,7 +206,7 @@ router.put('/:id', (req, res) => {
} }
}); });
// DELETE dog (soft delete) // ── DELETE dog (soft) ───────────────────────────────────────────────
router.delete('/:id', (req, res) => { router.delete('/:id', (req, res) => {
try { try {
const db = getDatabase(); const db = getDatabase();
@@ -252,23 +219,17 @@ router.delete('/:id', (req, res) => {
} }
}); });
// POST upload photo for dog // ── POST upload photo ───────────────────────────────────────────────
router.post('/:id/photos', upload.single('photo'), (req, res) => { router.post('/:id/photos', upload.single('photo'), (req, res) => {
try { try {
if (!req.file) { if (!req.file) return res.status(400).json({ error: 'No file uploaded' });
return res.status(400).json({ error: 'No file uploaded' });
}
const db = getDatabase(); const db = getDatabase();
const dog = db.prepare('SELECT photo_urls FROM dogs WHERE id = ?').get(req.params.id); const dog = db.prepare('SELECT photo_urls FROM dogs WHERE id = ?').get(req.params.id);
if (!dog) return res.status(404).json({ error: 'Dog not found' });
if (!dog) {
return res.status(404).json({ error: 'Dog not found' });
}
const photoUrls = dog.photo_urls ? JSON.parse(dog.photo_urls) : []; const photoUrls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
photoUrls.push(`/uploads/${req.file.filename}`); photoUrls.push(`/uploads/${req.file.filename}`);
db.prepare('UPDATE dogs SET photo_urls = ? WHERE id = ?').run(JSON.stringify(photoUrls), req.params.id); db.prepare('UPDATE dogs SET photo_urls = ? WHERE id = ?').run(JSON.stringify(photoUrls), req.params.id);
res.json({ url: `/uploads/${req.file.filename}`, photos: photoUrls }); res.json({ url: `/uploads/${req.file.filename}`, photos: photoUrls });
@@ -278,27 +239,22 @@ router.post('/:id/photos', upload.single('photo'), (req, res) => {
} }
}); });
// DELETE photo from dog // ── DELETE photo ─────────────────────────────────────────────────────
router.delete('/:id/photos/:photoIndex', (req, res) => { router.delete('/:id/photos/:photoIndex', (req, res) => {
try { try {
const db = getDatabase(); const db = getDatabase();
const dog = db.prepare('SELECT photo_urls FROM dogs WHERE id = ?').get(req.params.id); const dog = db.prepare('SELECT photo_urls FROM dogs WHERE id = ?').get(req.params.id);
if (!dog) return res.status(404).json({ error: 'Dog not found' });
if (!dog) {
return res.status(404).json({ error: 'Dog not found' });
}
const photoUrls = dog.photo_urls ? JSON.parse(dog.photo_urls) : []; const photoUrls = dog.photo_urls ? JSON.parse(dog.photo_urls) : [];
const photoIndex = parseInt(req.params.photoIndex); const photoIndex = parseInt(req.params.photoIndex);
if (photoIndex >= 0 && photoIndex < photoUrls.length) { if (photoIndex >= 0 && photoIndex < photoUrls.length) {
const photoPath = path.join(process.env.UPLOAD_PATH || path.join(__dirname, '../../uploads'), path.basename(photoUrls[photoIndex])); const photoPath = path.join(
process.env.UPLOAD_PATH || path.join(__dirname, '../../uploads'),
// Delete file from disk path.basename(photoUrls[photoIndex])
if (fs.existsSync(photoPath)) { );
fs.unlinkSync(photoPath); if (fs.existsSync(photoPath)) fs.unlinkSync(photoPath);
}
photoUrls.splice(photoIndex, 1); photoUrls.splice(photoIndex, 1);
db.prepare('UPDATE dogs SET photo_urls = ? WHERE id = ?').run(JSON.stringify(photoUrls), req.params.id); db.prepare('UPDATE dogs SET photo_urls = ? WHERE id = ?').run(JSON.stringify(photoUrls), req.params.id);
} }