Skip to content

tweaks #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elitikka merged 1 commit into from
Feb 19, 2026
Merged

tweaks #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 57 additions & 7 deletions backend/src/controllers/avatarController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,16 @@ const getAvatarById = async (req, res) => {
try {
const { id } = req.params;

const avatar = await Avatar.getById(id);
// Convert id to integer (comes from route params as string)
const avatarId = parseInt(id, 10);
if (isNaN(avatarId)) {
return res.status(400).json({
success: false,
message: 'Invalid avatar ID format'
});
}

const avatar = await Avatar.getById(avatarId);

if (!avatar) {
return res.status(404).json({
Expand Down Expand Up @@ -99,9 +108,22 @@ const downloadAvatar = async (req, res) => {
try {
const { id } = req.params;

const avatar = await Avatar.getById(id);
// Convert id to integer (comes from route params as string)
const avatarId = parseInt(id, 10);
if (isNaN(avatarId)) {
return res.status(400).json({
success: false,
message: 'Invalid avatar ID format'
});
}

console.log(`[AvatarController] Downloading avatar ${avatarId}`);

const avatar = await Avatar.getById(avatarId);
console.log(`[AvatarController] Avatar record:`, avatar);

if (!avatar) {
console.log(`[AvatarController] Avatar ${avatarId} not found in database`);
return res.status(404).json({
success: false,
message: 'Avatar not found'
Expand All @@ -112,14 +134,19 @@ const downloadAvatar = async (req, res) => {
const uploadDir = 'uploads/avatars';
const filepath = path.join(uploadDir, avatar.filename);

console.log(`[AvatarController] Looking for file at: ${filepath}`);

// Check if file exists on disk
if (!fs.existsSync(filepath)) {
console.error(`[AvatarController] File not found on disk: ${filepath}`);
return res.status(404).json({
success: false,
message: 'Image file not found on server'
});
}

console.log(`[AvatarController] Serving file: ${filepath}`);

// Send file to client
// sendFile serves inline (displays in browser/app)
res.sendFile(path.resolve(filepath));
Expand All @@ -141,8 +168,17 @@ const deleteAvatar = async (req, res) => {
const userId = req.user.userId;
const { id } = req.params;

// Convert id to integer (comes from route params as string)
const avatarId = parseInt(id, 10);
if (isNaN(avatarId)) {
return res.status(400).json({
success: false,
message: 'Invalid avatar ID format'
});
}

// Get avatar to check permissions
const avatar = await Avatar.getById(id);
const avatar = await Avatar.getById(avatarId);
if (!avatar) {
return res.status(404).json({
success: false,
Expand All @@ -151,7 +187,7 @@ const deleteAvatar = async (req, res) => {
}

// Check if user owns this avatar
const belongsToUser = await Avatar.belongsToUser(id, userId);
const belongsToUser = await Avatar.belongsToUser(avatarId, userId);
if (!belongsToUser) {
return res.status(403).json({
success: false,
Expand Down Expand Up @@ -179,7 +215,7 @@ const deleteAvatar = async (req, res) => {
}

// Delete from database
const deleted = await Avatar.deleteById(id);
const deleted = await Avatar.deleteById(avatarId);
if (!deleted) {
return res.status(500).json({
success: false,
Expand Down Expand Up @@ -216,16 +252,30 @@ const getAvatarByPet = async (req, res) => {
});
}

// Convert petId to integer (comes from route params as string)
const petIdNum = parseInt(petId, 10);
if (isNaN(petIdNum)) {
return res.status(400).json({
success: false,
message: 'Invalid pet ID format'
});
}

console.log(`[AvatarController] Fetching avatar for pet ${petIdNum}, user ${userId}`);

// Verify user has access to pet
const hasAccess = await Pet.userHasAccess(petId, userId);
const hasAccess = await Pet.userHasAccess(petIdNum, userId);
console.log(`[AvatarController] User access to pet ${petIdNum}: ${hasAccess}`);

if (!hasAccess) {
return res.status(403).json({
success: false,
message: 'Not authorized to view this pet'
});
}

const avatar = await Avatar.getByPetId(petId);
const avatar = await Avatar.getByPetId(petIdNum);
console.log(`[AvatarController] Avatar query result:`, avatar);

if (!avatar) {
return res.status(404).json({
Expand Down
Loading