Arminta
/
watermanagement-backend-prod
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

Browse Source
master^2
ashok 3 weeks ago
parent 6898c1615d 835e37302f
commit 3ba1a20bae
1 changed files with 314 additions and 133 deletions
Show Stats Download Patch File Download Diff File

375
src/index.js
Unescape View File

@ -1196,10 +1196,70 @@ fastify.post('/api/uploads-user/:customerId', async (request, reply) => {
}); });
fastify.post("/api/uploads-electricty-work/:customerId/:installationId", async (request, reply) => { // fastify.post("/api/uploads-electricty-work/:customerId/:installationId", async (request, reply) => {
// try {
// const { customerId, installationId } = request.params;
// const files = await request.files(); // Await files properly
// if (!files || files.length === 0) {
// return reply.code(400).send({ error: "No files uploaded" });
// }
// const bucketName = "arminta_profile_pictures";
// const publicUrls = [];
// for await (const file of files) {
// const uniqueFileName = `${Date.now()}-${Math.random().toString(36).substring(7)}-${file.filename}`;
// const filePath = `electricty_work_picture/${uniqueFileName}`;
// console.log(`Uploading file: ${file.filename} → ${filePath}`);
// const writeStream = storage.bucket(bucketName).file(filePath).createWriteStream();
// file.file.pipe(writeStream);
// await new Promise((resolve, reject) => {
// writeStream.on("finish", async () => {
// try {
// await storage.bucket(bucketName).file(filePath).makePublic();
// const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`;
// publicUrls.push(publicUrl);
// console.log(`File uploaded: ${publicUrl}`);
// resolve();
// } catch (error) {
// console.error("Failed to make file public:", error);
// reject(error);
// }
// });
// writeStream.on("error", (err) => {
// console.error("Failed to upload file:", err);
// reject(err);
// });
// });
// }
// // Update MongoDB: Convert URLs to { url: "..." } objects
// const updatedRecord = await ElectrictyWorkPictures.findOneAndUpdate(
// { customerId, installationId },
// { $push: { pictureUrl: { $each: publicUrls.map(url => ({ url })) } } }, // Append new images
// { new: true, upsert: true }
// );
// reply.send({ success: true, pictures: publicUrls, details: updatedRecord });
// } catch (err) {
// console.error("Upload Error:", err);
// reply.code(500).send({ error: "An error occurred", details: err.message });
// }
// });
fastify.post(
"/api/uploads-electricty-work/:customerId/:installationId",
{ preHandler: upload.any() }, // allow multiple files
async (request, reply) => {
try { try {
const { customerId, installationId } = request.params; const { customerId, installationId } = request.params;
const files = await request.files(); // Await files properly const files = request.files;
if (!files || files.length === 0) { if (!files || files.length === 0) {
return reply.code(400).send({ error: "No files uploaded" }); return reply.code(400).send({ error: "No files uploaded" });
@ -1208,55 +1268,109 @@ fastify.post("/api/uploads-electricty-work/:customerId/:installationId", async (
const bucketName = "arminta_profile_pictures"; const bucketName = "arminta_profile_pictures";
const publicUrls = []; const publicUrls = [];
for await (const file of files) { for (const file of files) {
const uniqueFileName = `${Date.now()}-${Math.random().toString(36).substring(7)}-${file.filename}`; const uniqueFileName = `${Date.now()}-${Math.random()
.toString(36)
.substring(7)}-${file.originalname}`;
const filePath = `electricty_work_picture/${uniqueFileName}`; const filePath = `electricty_work_picture/${uniqueFileName}`;
console.log(`Uploading file: ${file.filename} → ${filePath}`); // ✅ Handle buffer vs path depending on multer storage
const fileBuffer = file.buffer
const writeStream = storage.bucket(bucketName).file(filePath).createWriteStream(); ? file.buffer // memoryStorage
: await fs.promises.readFile(file.path); // diskStorage
file.file.pipe(writeStream); await storage.bucket(bucketName).file(filePath).save(fileBuffer);
await new Promise((resolve, reject) => {
writeStream.on("finish", async () => {
try {
await storage.bucket(bucketName).file(filePath).makePublic(); await storage.bucket(bucketName).file(filePath).makePublic();
const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`; const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`;
publicUrls.push(publicUrl); publicUrls.push(publicUrl);
console.log(`File uploaded: ${publicUrl}`);
resolve();
} catch (error) {
console.error("Failed to make file public:", error);
reject(error);
}
});
writeStream.on("error", (err) => { console.log(`✅ Uploaded: ${publicUrl}`);
console.error("Failed to upload file:", err);
reject(err);
});
});
} }
// Update MongoDB: Convert URLs to { url: "..." } objects // Update MongoDB
const updatedRecord = await ElectrictyWorkPictures.findOneAndUpdate( const updatedRecord = await ElectrictyWorkPictures.findOneAndUpdate(
{ customerId, installationId }, { customerId, installationId },
{ $push: { pictureUrl: { $each: publicUrls.map(url => ({ url })) } } }, // Append new images { $push: { pictureUrl: { $each: publicUrls.map((url) => ({ url })) } } },
{ new: true, upsert: true } { new: true, upsert: true }
); );
reply.send({ success: true, pictures: publicUrls, details: updatedRecord }); return reply.send({
success: true,
pictures: publicUrls,
details: updatedRecord,
});
} catch (err) { } catch (err) {
console.error("Upload Error:", err); console.error("❌ Upload Error:", err);
reply.code(500).send({ error: "An error occurred", details: err.message }); return reply.code(500).send({ error: "Upload failed", details: err.message });
} }
}); }
);
// fastify.post("/api/uploads-manualTestVideo-work/:customerId/:installationId", async (request, reply) => {
// try {
// const { customerId, installationId } = request.params;
// const files = await request.files(); // Await files properly
// if (!files || files.length === 0) {
// return reply.code(400).send({ error: "No files uploaded" });
// }
// const bucketName = "arminta_profile_pictures";
// const publicUrls = [];
// for await (const file of files) {
// const uniqueFileName = `${Date.now()}-${Math.random().toString(36).substring(7)}-${file.filename}`;
// const filePath = `electricty_work_picture/${uniqueFileName}`;
// console.log(`Uploading file: ${file.filename} → ${filePath}`);
fastify.post("/api/uploads-manualTestVideo-work/:customerId/:installationId", async (request, reply) => { // const writeStream = storage.bucket(bucketName).file(filePath).createWriteStream();
// file.file.pipe(writeStream);
// await new Promise((resolve, reject) => {
// writeStream.on("finish", async () => {
// try {
// await storage.bucket(bucketName).file(filePath).makePublic();
// const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`;
// publicUrls.push(publicUrl);
// console.log(`File uploaded: ${publicUrl}`);
// resolve();
// } catch (error) {
// console.error("Failed to make file public:", error);
// reject(error);
// }
// });
// writeStream.on("error", (err) => {
// console.error("Failed to upload file:", err);
// reject(err);
// });
// });
// }
// // Update MongoDB: Convert URLs to { url: "..." } objects
// const updatedRecord = await ManualTestVideo.findOneAndUpdate(
// { customerId, installationId },
// { $push: { pictureUrl: { $each: publicUrls.map(url => ({ url })) } } }, // Append new images
// { new: true, upsert: true }
// );
// reply.send({ success: true, pictures: publicUrls, details: updatedRecord });
// } catch (err) {
// console.error("Upload Error:", err);
// reply.code(500).send({ error: "An error occurred", details: err.message });
// }
// });
fastify.post(
"/api/uploads-manualTestVideo-work/:customerId/:installationId",
{ preHandler: upload.any() }, // Multer handles multiple files
async (request, reply) => {
try { try {
const { customerId, installationId } = request.params; const { customerId, installationId } = request.params;
const files = await request.files(); // Await files properly const files = request.files; // Multer stores files here
if (!files || files.length === 0) { if (!files || files.length === 0) {
return reply.code(400).send({ error: "No files uploaded" }); return reply.code(400).send({ error: "No files uploaded" });
@ -1265,50 +1379,63 @@ fastify.post("/api/uploads-manualTestVideo-work/:customerId/:installationId", as
const bucketName = "arminta_profile_pictures"; const bucketName = "arminta_profile_pictures";
const publicUrls = []; const publicUrls = [];
for await (const file of files) { for (const file of files) {
const uniqueFileName = `${Date.now()}-${Math.random().toString(36).substring(7)}-${file.filename}`; const uniqueFileName = `${Date.now()}-${Math.random()
const filePath = `electricty_work_picture/${uniqueFileName}`; .toString(36)
.substring(7)}-${file.originalname}`;
const filePath = `manual_test_video/${uniqueFileName}`;
console.log(`Uploading file: ${file.filename} → ${filePath}`); console.log(`Uploading video: ${file.originalname} → ${filePath}`);
const writeStream = storage.bucket(bucketName).file(filePath).createWriteStream(); // Create a write stream for large video files
const gcsFile = storage.bucket(bucketName).file(filePath);
const stream = gcsFile.createWriteStream({
metadata: { contentType: file.mimetype }, // Keep correct video type
resumable: false,
});
file.file.pipe(writeStream); // Write buffer to GCS stream
stream.end(file.buffer);
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
writeStream.on("finish", async () => { stream.on("finish", async () => {
try { try {
await storage.bucket(bucketName).file(filePath).makePublic(); await gcsFile.makePublic();
const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`; const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`;
publicUrls.push(publicUrl); publicUrls.push(publicUrl);
console.log(`File uploaded: ${publicUrl}`); console.log(`✅ Uploaded: ${publicUrl}`);
resolve(); resolve();
} catch (error) { } catch (err) {
console.error("Failed to make file public:", error); reject(err);
reject(error);
} }
}); });
stream.on("error", (err) => {
writeStream.on("error", (err) => { console.error("Upload Error:", err);
console.error("Failed to upload file:", err);
reject(err); reject(err);
}); });
}); });
} }
// Update MongoDB: Convert URLs to { url: "..." } objects // Update MongoDB: store array of { url: "..." }
const updatedRecord = await ManualTestVideo.findOneAndUpdate( const updatedRecord = await ManualTestVideo.findOneAndUpdate(
{ customerId, installationId }, { customerId, installationId },
{ $push: { pictureUrl: { $each: publicUrls.map(url => ({ url })) } } }, // Append new images { $push: { pictureUrl: { $each: publicUrls.map((url) => ({ url })) } } },
{ new: true, upsert: true } { new: true, upsert: true }
); );
reply.send({ success: true, pictures: publicUrls, details: updatedRecord }); return reply.send({
success: true,
videos: publicUrls,
details: updatedRecord,
});
} catch (err) { } catch (err) {
console.error("Upload Error:", err); console.error("Upload Error:", err);
reply.code(500).send({ error: "An error occurred", details: err.message }); return reply
.code(500)
.send({ error: "Upload failed", details: err.message });
} }
}); }
);
fastify.post("/api/uploads-plumbing-work/:customerId/:installationId", async (request, reply) => { fastify.post("/api/uploads-plumbing-work/:customerId/:installationId", async (request, reply) => {
try { try {
@ -1367,62 +1494,62 @@ fastify.post("/api/uploads-plumbing-work/:customerId/:installationId", async (re
} }
}); });
fastify.post("/api/uploads-material-recieved/:customerId/:installationId", async (request, reply) => { // fastify.post("/api/uploads-material-recieved/:customerId/:installationId", async (request, reply) => {
try { // try {
const { customerId, installationId } = request.params; // const { customerId, installationId } = request.params;
const files = await request.files(); // Await files properly // const files = await request.files(); // Await files properly
if (!files || files.length === 0) { // if (!files || files.length === 0) {
return reply.code(400).send({ error: "No files uploaded" }); // return reply.code(400).send({ error: "No files uploaded" });
} // }
const bucketName = "arminta_profile_pictures"; // const bucketName = "arminta_profile_pictures";
const publicUrls = []; // const publicUrls = [];
for await (const file of files) { // for await (const file of files) {
const uniqueFileName = `${Date.now()}-${Math.random().toString(36).substring(7)}-${file.filename}`; // const uniqueFileName = `${Date.now()}-${Math.random().toString(36).substring(7)}-${file.filename}`;
const filePath = `plumbing_work_picture/${uniqueFileName}`; // const filePath = `plumbing_work_picture/${uniqueFileName}`;
console.log(`Uploading file: ${file.filename} → ${filePath}`); // console.log(`Uploading file: ${file.filename} → ${filePath}`);
const writeStream = storage.bucket(bucketName).file(filePath).createWriteStream(); // const writeStream = storage.bucket(bucketName).file(filePath).createWriteStream();
file.file.pipe(writeStream); // file.file.pipe(writeStream);
await new Promise((resolve, reject) => { // await new Promise((resolve, reject) => {
writeStream.on("finish", async () => { // writeStream.on("finish", async () => {
try { // try {
await storage.bucket(bucketName).file(filePath).makePublic(); // await storage.bucket(bucketName).file(filePath).makePublic();
const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`; // const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`;
publicUrls.push(publicUrl); // publicUrls.push(publicUrl);
console.log(`File uploaded: ${publicUrl}`); // console.log(`File uploaded: ${publicUrl}`);
resolve(); // resolve();
} catch (error) { // } catch (error) {
console.error("Failed to make file public:", error); // console.error("Failed to make file public:", error);
reject(error); // reject(error);
} // }
}); // });
writeStream.on("error", (err) => { // writeStream.on("error", (err) => {
console.error("Failed to upload file:", err); // console.error("Failed to upload file:", err);
reject(err); // reject(err);
}); // });
}); // });
} // }
// Update MongoDB: Convert URLs to { url: "..." } objects // // Update MongoDB: Convert URLs to { url: "..." } objects
const updatedRecord = await MaterialRecievedPictures.findOneAndUpdate( // const updatedRecord = await MaterialRecievedPictures.findOneAndUpdate(
{ customerId, installationId }, // { customerId, installationId },
{ $push: { pictureUrl: { $each: publicUrls.map(url => ({ url })) } } }, // Append new images // { $push: { pictureUrl: { $each: publicUrls.map(url => ({ url })) } } }, // Append new images
{ new: true, upsert: true } // { new: true, upsert: true }
); // );
reply.send({ success: true, pictures: publicUrls, details: updatedRecord }); // reply.send({ success: true, pictures: publicUrls, details: updatedRecord });
} catch (err) { // } catch (err) {
console.error("Upload Error:", err); // console.error("Upload Error:", err);
reply.code(500).send({ error: "An error occurred", details: err.message }); // reply.code(500).send({ error: "An error occurred", details: err.message });
} // }
}); // });
// fastify.post("/api/installLogin", { // fastify.post("/api/installLogin", {
@ -1537,7 +1664,61 @@ fastify.post("/api/uploads-material-recieved/:customerId/:installationId", async
// }, // },
// }); // });
fastify.post(
"/api/uploads-material-recieved/:customerId/:installationId",
{ preHandler: upload.any() }, // use 'files' field for multiple uploads
async (request, reply) => {
try {
const { customerId, installationId } = request.params;
const files = request.files; // multer-style files array
if (!files || files.length === 0) {
return reply.code(400).send({ error: "No files uploaded" });
}
const bucketName = "arminta_profile_pictures";
const publicUrls = [];
for (const file of files) {
// Generate unique file name
const uniqueFileName = `${Date.now()}-${Math.random()
.toString(36)
.substring(7)}-${file.originalname}`;
const filePath = `plumbing_work_picture/${uniqueFileName}`;
// Read file buffer
const fileBuffer = await fs.promises.readFile(file.path);
// Upload to GCS
await storage.bucket(bucketName).file(filePath).save(fileBuffer);
// Make file public
await storage.bucket(bucketName).file(filePath).makePublic();
const publicUrl = `https://storage.googleapis.com/${bucketName}/${filePath}`;
publicUrls.push(publicUrl);
}
// Save/Update in DB
const updatedRecord = await MaterialRecievedPictures.findOneAndUpdate(
{ customerId, installationId },
{ $push: { pictureUrl: { $each: publicUrls.map((url) => ({ url })) } } }, // Append images
{ new: true, upsert: true }
);
return reply.send({
success: true,
pictures: publicUrls,
details: updatedRecord,
});
} catch (err) {
request.log.error(err);
return reply
.code(500)
.send({ error: "Upload failed", details: err.message });
}
}
);
fastify.post("/api/installLogin", { fastify.post("/api/installLogin", {
schema: { schema: {
description: "Login as Installation Manager", description: "Login as Installation Manager",

Write Preview
Loading…
Cancel
Save