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
98 changes: 98 additions & 0 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"mongoose": "^8.3.1",
"pdfkit": "^0.19.1",
"qrcode": "^1.5.4",
"redis": "^6.1.0",
"speakeasy": "^2.0.0",
"winston": "^3.19.0"
},
Expand Down
23 changes: 23 additions & 0 deletions server/routes/medicines.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,22 @@ const medicinesLimiter = rateLimit({
router.use(medicinesLimiter);
const Medicine = require('../models/Medicine');
const authMiddleware = require('../middleware/authMiddleware');
const redisClient = require('../utils/redisClient');

// @route GET /api/medicines
// @desc Get all medicines for the logged-in user
// @access Private
router.get('/', authMiddleware, async (req, res) => {
try {
const cacheKey = `meds_${req.user._id}`;

if (redisClient.isConnected()) {
const cachedData = await redisClient.getClient().get(cacheKey);
if (cachedData) {
return res.json(JSON.parse(cachedData));
}
}

const medicines = await Medicine.find({ user: { $eq: req.user._id } }).sort({ createdAt: 1 });

// Format medicines to match the frontend expectations: { id, name, time, date }
Expand All @@ -26,6 +36,10 @@ router.get('/', authMiddleware, async (req, res) => {
date: med.date,
}));

if (redisClient.isConnected()) {
await redisClient.getClient().setEx(cacheKey, 300, JSON.stringify(formatted)); // Cache for 5 mins
}

res.json(formatted);
} catch (err) {
console.error('Fetch medicines error:', err.message);
Expand Down Expand Up @@ -61,6 +75,10 @@ router.post('/', authMiddleware, async (req, res) => {
time: newMedicine.time,
date: newMedicine.date,
});

if (redisClient.isConnected()) {
await redisClient.getClient().del(`meds_${req.user._id}`);
}
} catch (err) {
console.error('Add medicine error:', err.message);
res.status(500).json({ message: 'Server error adding medicine reminder' });
Expand All @@ -80,6 +98,11 @@ router.delete('/:id', authMiddleware, async (req, res) => {
}

await medicine.deleteOne();

if (redisClient.isConnected()) {
await redisClient.getClient().del(`meds_${req.user._id}`);
}

res.json({ message: 'Medicine reminder deleted successfully', id: req.params.id });
} catch (err) {
console.error('Delete medicine error:', err.message);
Expand Down
31 changes: 31 additions & 0 deletions server/utils/redisClient.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const redis = require('redis');

let redisClient;
let isRedisConnected = false;

(async () => {
redisClient = redis.createClient({
url: process.env.REDIS_URL || 'redis://127.0.0.1:6379'
});

redisClient.on('error', (error) => {
console.error(`Redis Error: ${error}`);
isRedisConnected = false;
});

redisClient.on('connect', () => {
console.log('Redis connected');
isRedisConnected = true;
});

try {
await redisClient.connect();
} catch (err) {
console.warn('Redis failed to connect initially. Falling back to DB queries.');
}
})();

module.exports = {
getClient: () => redisClient,
isConnected: () => isRedisConnected
};
Loading