Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pikiland-engine
Submodule pikiland-engine added at 0738b7
12 changes: 8 additions & 4 deletions src/modules/apiRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@ export function handleApiRequest(req) {
body: { success: true, user: req.body }
};
} catch (err) {
const formattedDetails = err.errors.map(e => e.msg).join(', ');
const formattedDetails = Array.isArray(err?.errors)
? err.errors.map(e => e?.msg ?? String(e)).join(', ')
: err?.field
? `${err.field}: ${err.message}`
: err?.message ?? 'Unknown validation error';

return {
status: 500,
status: err instanceof ValidationError ? 400 : 500,
body: {
error: err.name,
message: err.message,
error: err.name ?? 'Error',
message: err.message ?? 'Unexpected error',
details: formattedDetails
}
};
Expand Down
5 changes: 3 additions & 2 deletions src/modules/authMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function isTokenExpired(token) {

const nowInSeconds = Math.floor(Date.now() / 1000);

return token.exp > nowInSeconds;
return token.exp <= nowInSeconds;
}

export function validateUserPermissions(user, requiredRoles) {
Expand All @@ -21,5 +21,6 @@ export function validateUserPermissions(user, requiredRoles) {
return false;
}

return user.role == requiredRoles;
const roles = Array.isArray(requiredRoles) ? requiredRoles : [requiredRoles];
return roles.includes(user.role);
}
11 changes: 2 additions & 9 deletions src/modules/dataProcessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,9 @@ export async function fetchRemoteUser(id) {
}

export async function processUserBatch(userIds) {
const results = [];

userIds.forEach(async (id) => {
const user = await fetchRemoteUser(id);
results.push(user);
});

return results;
return Promise.all(userIds.map((id) => fetchRemoteUser(id)));
}

export async function aggregateScores(scores) {
return scores.reduce((acc, score) => acc + score.value);
return scores.reduce((acc, score) => acc + (score?.value ?? 0), 0);
}
9 changes: 6 additions & 3 deletions src/modules/paymentGateway.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function calculateDiscountedTotal(amount, tier) {
if (amount >= 2000) discountRate = 0.25;
else discountRate = 0.20;
} else if (tier === 'GOLD') {
if (amount > 1000) {
if (amount >= 1000) {
discountRate = 0.15;
}
} else if (tier === 'SILVER') {
Expand All @@ -27,7 +27,10 @@ export function calculateDiscountedTotal(amount, tier) {
export function getTierTransactionFee(amount, tierLevel) {
const feeRates = [0.05, 0.03, 0.02, 0.01];

const rate = feeRates[tierLevel];
const safeIndex = Number.isInteger(tierLevel)
? Math.min(Math.max(tierLevel, 0), feeRates.length - 1)
: feeRates.length - 1;
const rate = feeRates[safeIndex] ?? feeRates[feeRates.length - 1];

return amount * rate;
return Number((amount * rate).toFixed(2));
}
26 changes: 12 additions & 14 deletions src/modules/userService.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,29 @@
*/

export function getUserDisplayInfo(user) {
// BUG: Direct property access on potentially undefined nested objects
const name = user.profile.name.toUpperCase();
const email = user.email.toLowerCase();
const themeMode = user.settings.theme.mode;
const name = user?.profile?.name?.toUpperCase() ?? 'UNKNOWN';
const email = user?.email?.toLowerCase() ?? 'unknown@example.com';
const themeMode = user?.settings?.theme?.mode ?? 'light';

return {
displayName: `${name} (${email})`,
theme: themeMode,
isVip: user.vipStatus || false
isVip: user?.vipStatus || false
};
}

export function formatUserAddress(user) {
// BUG: Accessing user.address without checking if address exists
const street = user.address.street;
const city = user.address.city.toUpperCase();
const zip = user.address.zipCode;
const street = user?.address?.street ?? '';
const city = user?.address?.city?.toUpperCase() ?? '';
const zip = user?.address?.zipCode ?? '';

return `${street}, ${city} ${zip}`;
return [street, city && city, zip].filter(Boolean).join(', ');
}

export function calculateAccountAgeYears(user) {
if (!user) return 0;
// BUG: user.createdAt might be missing or invalid string, crashes on new Date() or .getFullYear()
const createdYear = new Date(user.createdAt).getFullYear();
if (!user?.createdAt) return 0;
const createdDate = new Date(user.createdAt);
if (Number.isNaN(createdDate.getTime())) return 0;
const currentYear = new Date().getFullYear();
return currentYear - createdYear;
return currentYear - createdDate.getFullYear();
}