Adding photos from ads to general photos section

data_providers/nomerogram.js

@@ -1,55 +1,52 @@
-import { createHash } from 'crypto';
+import { createHash } from "crypto";
-import Utils from '../utils/utils.js';
+import Utils from "../utils/utils.js";
-import DebugInfo from '../models/DebugInfo.js';
+import DebugInfo from "../models/DebugInfo.js";
 
-const baseUrl = 'https://www.nomerogram.ru/api/v1.1';
+const baseUrl = "https://www.nomerogram.ru/api/v1.1";
 
-const secretSuffix = 'queivoo1ieNgae2e';
+const secretSuffix = "queivoo1ieNgae2e";
-const appId = 'p15';
+const appId = "p15";
-const deviceId = '01b854631cb28e175ffbcccf6114acc3';
+const deviceId = "01b854631cb28e175ffbcccf6114acc3";
-const from = 'search';
+const from = "search";
-const userAgent = 'Nomerogram/2.18 (iPhone; iOS 13.7; Scale/2.00)';
+const userAgent = "Nomerogram/2.18 (iPhone; iOS 13.7; Scale/2.00)";
 
 class NomerogramProvider {
 	static async getGroups(number) {
 		try {
 			let timestamp = Math.floor(Date.now() / 1000);
-			let secretSource = appId + number + deviceId + from + timestamp + secretSuffix;
+			let secretSource =
+				appId + number + deviceId + from + timestamp + secretSuffix;
 
-			let hash = createHash('sha256');
+			let hash = createHash("sha256");
 			hash.update(secretSource);
-			let secret = hash.digest('hex');
+			let secret = hash.digest("hex");
-			console.log('secret: ', secret);
+			console.log("secret: ", secret);
 
 			let url = `${baseUrl}/group/list?from=${from}&carplate=${number}&timestamp=${timestamp}&secret=${secret}&app_id=${appId}&device_id=${deviceId}`;
 			let result = await fetch(url, {
 				timeout: 5000,
-				headers: { 'User-Agent': userAgent }
+				headers: { "User-Agent": userAgent },
 			});
 			let json = await result.json();
 
 			if (!json.success) {
-				console.log('Nomerogram error: ', json.message);
+				console.log("Nomerogram error: ", json.message);
 				throw Error(json.message);
 				//return [];
 			}
 
-			console.log('Nomerogram found ads: ', json.data.groups.length);
+			console.log("Nomerogram found ads: ", json.data.groups.length);
-			return json.data.groups.map(g => {
+			return json.data.groups.flatMap((g) => {
+				return g.photos.map((p) => {
 					return {
-					id: g.group_id,
+						url: p.src.default,
-					url: g.group_url,
+						thumbnail: p.src.thumbnail,
-					price: g.price,
 						date: Utils.parseDate(g.date),
-					mileage: g.mileage,
-					region: g.region_name,
-					city: g.city_name,
-					adDescription: g.description,
-					photos: g.photos.map(p => p.src.default)
 					};
 				});
+			});
 		} catch (ex) {
-			console.log('Nomerogram error: ', ex.message);
+			console.log("Nomerogram error: ", ex.message);
 			ex.debugInfo = { nomerogram: DebugInfo.fromError(ex.message) };
 			throw ex;
 		}

routes/vehicles.js

@@ -1,32 +1,34 @@
-import { Router } from 'express';
+import { Router } from "express";
-import Jwt from 'jsonwebtoken';
+import Jwt from "jsonwebtoken";
-import cors from 'cors';
+import cors from "cors";
-import AvtocodProvider from '../data_providers/avtocod.js';
+import AvtocodProvider from "../data_providers/avtocod.js";
-import Vin01Provider from '../data_providers/vin01.js';
+import Vin01Provider from "../data_providers/vin01.js";
-import Constants from '../data_providers/constants.js';
+import Constants from "../data_providers/constants.js";
-import RsaProvider from '../data_providers/rsa.js';
+import RsaProvider from "../data_providers/rsa.js";
-import NomerogramProvider from '../data_providers/nomerogram.js';
+import NomerogramProvider from "../data_providers/nomerogram.js";
-import Utils from '../utils/utils.js';
+import Utils from "../utils/utils.js";
-import { ObjectId } from 'mongodb';
+import { ObjectId } from "mongodb";
-import DebugInfo from '../models/DebugInfo.js';
+import DebugInfo from "../models/DebugInfo.js";
-import Vehicle from '../models/vehicle.js';
+import Vehicle from "../models/vehicle.js";
-import { TGProvider } from '../data_providers/tgprovider.js';
+import { TGProvider } from "../data_providers/tgprovider.js";
 
 const router = Router();
 
-const makeError = error => ({ success: false, error });
+const makeError = (error) => ({ success: false, error });
 
-router.post('/check', async (req, res) => {
+router.post("/check", async (req, res) => {
-	const number = req.body.number.replace(/ /g, '').toUpperCase();
+	const number = req.body.number.replace(/ /g, "").toUpperCase();
 	const { googleIdToken, forceUpdate, notes, events } = req.body;
 	const { email } = req.user;
 
-	console.log(`=== checking number: ${number} ====================================`);
+	console.log(
+		`=== checking number: ${number} ====================================`,
+	);
 
-	let collection = req.db.collection('vehicles');
+	let collection = req.db.collection("vehicles");
 	let vehicles = await collection.find({ number }).toArray();
 	if (vehicles.length > 0 && !forceUpdate) {
-		console.log('vehicle found in database');
+		console.log("vehicle found in database");
 		let updatedDate = Date.now();
 
 		if (notes) {
@@ -37,13 +39,16 @@ router.post('/check', async (req, res) => {
 			Vehicle.mergeEvents(vehicles[0], events);
 		}
 
-		await collection.updateOne({ number }, { 
+		await collection.updateOne(
+			{ number },
+			{
 				$set: {
 					updatedDate,
 					events: vehicles[0].events,
-				notes: vehicles[0].notes  
+					notes: vehicles[0].notes,
-			} 
+				},
-		});
+			},
+		);
 		vehicles[0].updatedDate = updatedDate;
 		res.send({ success: true, data: vehicles[0] });
 	} else {
@@ -52,16 +57,21 @@ router.post('/check', async (req, res) => {
 			let all = [autocodPromise];
 
 			if (googleIdToken) {
-				let vin01Promise = Vin01Provider.getReport(number, googleIdToken);
+				let vin01Promise = Vin01Provider.getReport(
+					number,
+					googleIdToken,
+				);
 				all.push(vin01Promise);
 			} else {
-				all.push(Promise.reject({
+				all.push(
+					Promise.reject({
 						debugInfo: {
-						vin01vin: DebugInfo.fromError('No auth token'),
+							vin01vin: DebugInfo.fromError("No auth token"),
-						vin01history: DebugInfo.fromError('No auth token'),
+							vin01history: DebugInfo.fromError("No auth token"),
-						vin01base: DebugInfo.fromError('No auth token')
+							vin01base: DebugInfo.fromError("No auth token"),
-					}
+						},
-				}));
+					}),
+				);
 			}
 
 			all.push(NomerogramProvider.getGroups(number));
@@ -69,12 +79,12 @@ router.post('/check', async (req, res) => {
 			let [autocod, vin01, nomerogram] = await Promise.allSettled(all);
 
 			let vehicle = null;
-			if(autocod.status == 'rejected' && vin01.status == 'rejected') {
+			if (autocod.status == "rejected" && vin01.status == "rejected") {
 				throw autocod.reason;
-			} else if(vin01.status == 'rejected') {
+			} else if (vin01.status == "rejected") {
 				vehicle = autocod.value;
 				Object.assign(vehicle.debugInfo, vin01.reason.debugInfo);
-			} else if(autocod.status == 'rejected') {
+			} else if (autocod.status == "rejected") {
 				vehicle = vin01.value;
 				Object.assign(vehicle.debugInfo, autocod.reason.debugInfo);
 				if (!vehicle.brand?.name?.normalized) {
@@ -84,7 +94,9 @@ router.post('/check', async (req, res) => {
 				vehicle = autocod.value;
 				let vinMatch = false;
 				if (vin01.value.vin1 && vehicle.vin1) {
-					vinMatch = vin01.value.vin1.match(RegExp(vehicle.vin1.replace(/\*/g, '.')));
+					vinMatch = vin01.value.vin1.match(
+						RegExp(vehicle.vin1.replace(/\*/g, ".")),
+					);
 				}
 
 				if (vehicle.vin1 && vinMatch) {
@@ -103,9 +115,12 @@ router.post('/check', async (req, res) => {
 				Object.assign(vehicle.debugInfo, vin01.value.debugInfo);
 			}
 
-			if(nomerogram.status == 'fulfilled') {
+			if (nomerogram.status == "fulfilled") {
-				vehicle.ads = nomerogram.value;
+				let photos = nomerogram.value;
-				Object.assign(vehicle.debugInfo, { nomerogram: new DebugInfo() });
+				vehicle.photos = vehicle.photos?.concat(photos) ?? photos;
+				Object.assign(vehicle.debugInfo, {
+					nomerogram: new DebugInfo(),
+				});
 			} else {
 				Object.assign(vehicle.debugInfo, nomerogram.reason.debugInfo);
 			}
@@ -139,7 +154,7 @@ router.post('/check', async (req, res) => {
 	}
 });
 
-router.get('/', async (req, res) => {
+router.get("/", async (req, res) => {
 	const { email } = req.user;
 	const { pageToken, sortBy, sortOrder } = req.query;
 
@@ -150,25 +165,31 @@ router.get('/', async (req, res) => {
 
 	try {
 		let finalQuery = Utils.makeVehiclesSearchQuery(req.query, email);
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
 
-		let isAscending = sortOrder == 'ascending';
+		let isAscending = sortOrder == "ascending";
 		let response = {};
 		if (!pageToken) {
 			response.count = await collection.countDocuments(finalQuery);
 		} else {
-			let compareOperator = isAscending ? '$gt' : '$lt';
+			let compareOperator = isAscending ? "$gt" : "$lt";
-			let lastVehicle = await collection.findOne({ _id: new ObjectId(pageToken) });
+			let lastVehicle = await collection.findOne({
+				_id: new ObjectId(pageToken),
+			});
 			finalQuery.$or = [
 				{ [sortBy]: { [compareOperator]: lastVehicle[sortBy] } },
 				{
 					[sortBy]: lastVehicle[sortBy],
-					_id: { [compareOperator]: new ObjectId(pageToken) }
+					_id: { [compareOperator]: new ObjectId(pageToken) },
-				}
+				},
 			];
 		}
 
-		let vehicles = await collection.find(finalQuery).sort({ [sortBy]: isAscending ? 1 : -1 }).limit(pageSize).toArray();
+		let vehicles = await collection
+			.find(finalQuery)
+			.sort({ [sortBy]: isAscending ? 1 : -1 })
+			.limit(pageSize)
+			.toArray();
 		if (vehicles.length == pageSize) {
 			response.pageToken = vehicles[vehicles.length - 1]._id;
 		}
@@ -176,21 +197,21 @@ router.get('/', async (req, res) => {
 
 		res.send({ success: true, data: response });
 	} catch (ex) {
-		res.send(makeError('Error reading vehicles from DB'));
+		res.send(makeError("Error reading vehicles from DB"));
 		console.error(ex);
 	}
 });
 
-router.get('/report', async (req, res) => {
+router.get("/report", async (req, res) => {
 	const { number } = req.query;
 
 	try {
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
 		let vehicle = await collection.findOne({ number });
 		if (vehicle) {
 			res.send({ success: true, data: vehicle });
 		} else {
-			res.send(makeError('Vehicle not found'));
+			res.send(makeError("Vehicle not found"));
 		}
 	} catch (ex) {
 		res.send(makeError(ex.message));
@@ -198,85 +219,100 @@ router.get('/report', async (req, res) => {
 	}
 });
 
-router.get('/brands', async (req, res) => {
+router.get("/brands", async (req, res) => {
 	try {
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
-		let brands = await collection.distinct('brand.name.normalized');
+		let brands = await collection.distinct("brand.name.normalized");
 		res.send({ success: true, data: brands.filter(Boolean) });
 	} catch (ex) {
-		res.send(makeError('Error reading vehicle brands from DB'));
+		res.send(makeError("Error reading vehicle brands from DB"));
 		console.error(ex);
 	}
 });
 
-router.get('/models', async (req, res) => {
+router.get("/models", async (req, res) => {
 	try {
 		const { brand } = req.query;
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
-		let models = await collection.distinct('model.name.normalized', { 'brand.name.normalized': brand });
+		let models = await collection.distinct("model.name.normalized", {
+			"brand.name.normalized": brand,
+		});
 		res.send({ success: true, data: models.filter(Boolean) });
 	} catch (ex) {
-		res.send(makeError('Error reading vehicle models from DB'));
+		res.send(makeError("Error reading vehicle models from DB"));
 		console.error(ex);
 	}
 });
 
-router.get('/colors', async (req, res) => {
+router.get("/colors", async (req, res) => {
 	try {
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
-		let colors = await collection.distinct('color');
+		let colors = await collection.distinct("color");
 		res.send({ success: true, data: colors.filter(Boolean) });
 	} catch (ex) {
-		res.send(makeError('Error reading vehicle colors from DB'));
+		res.send(makeError("Error reading vehicle colors from DB"));
 		console.error(ex);
 	}
 });
 
-router.get('/regions', (req, res) => {
+router.get("/regions", (req, res) => {
 	res.send({ success: true, data: Constants.regions });
 });
 
-router.get('/years', async (req, res) => {
+router.get("/years", async (req, res) => {
 	try {
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
-		let colors = await collection.distinct('year');
+		let colors = await collection.distinct("year");
 		res.send({ success: true, data: colors.filter(Boolean) });
 	} catch (ex) {
-		res.send(makeError('Error reading vehicle years from DB'));
+		res.send(makeError("Error reading vehicle years from DB"));
 		console.error(ex);
 	}
 });
 
-router.get('/shared_report', cors({ origin: 'https://auto.aliencat.pro' }), async (req, res) => {
+router.get(
+	"/shared_report",
+	cors({ origin: "https://auto.aliencat.pro" }),
+	async (req, res) => {
 		try {
-		let { plateNumber } = Jwt.verify(req.query.token, process.env.JWT_SECRET_SHARED_REPORT);
+			let { plateNumber } = Jwt.verify(
-		let collection = req.db.collection('vehicles');
+				req.query.token,
-		let vehicles = await collection.find({ number: plateNumber }).toArray();
+				process.env.JWT_SECRET_SHARED_REPORT,
+			);
+			let collection = req.db.collection("vehicles");
+			let vehicles = await collection
+				.find({ number: plateNumber })
+				.toArray();
 			if (vehicles.length > 0) {
 				res.send({ success: true, data: vehicles[0] });
 			} else {
-			res.send(makeError('Vehicle not found'));
+				res.send(makeError("Vehicle not found"));
 			}
 		} catch (ex) {
 			res.send(makeError(ex.message));
 			console.error(ex);
 		}
-});
+	},
+);
 
-router.post('/checkOsago', async (req, res) => {
+router.post("/checkOsago", async (req, res) => {
 	try {
 		const { number, vin, date, token } = req.body;
 
 		let result = await RsaProvider.checkOsago(number, vin, date, token);
 
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
 		let filter = number ? { number } : { vin1: vin };
-		await collection.updateOne(filter, { $push: { osagoContracts: result } });
+		await collection.updateOne(filter, {
+			$push: { osagoContracts: result },
+		});
 		let vehicle = await collection.findOne(filter);
 		if (vehicle) {
 			res.send({ success: true, data: vehicle });
 		} else {
-			res.status(204).send(makeError('There is no vehicle with such plate number or VIN'));
+			res.status(204).send(
+				makeError("There is no vehicle with such plate number or VIN"),
+			);
 		}
 	} catch (ex) {
 		res.send(makeError(ex.message));
@@ -284,12 +320,11 @@ router.post('/checkOsago', async (req, res) => {
 	}
 });
 
-router.post('/checkGbTg', async (req, res) => {
+router.post("/checkGbTg", async (req, res) => {
-
 	let tgProvider = null;
 
 	try {
-		const number = req.body.number.replace(/ /g, '').toUpperCase();
+		const number = req.body.number.replace(/ /g, "").toUpperCase();
 		const token = req.body.token;
 
 		tgProvider = new TGProvider();
@@ -298,30 +333,34 @@ router.post('/checkGbTg', async (req, res) => {
 		await tgProvider.close();
 
 		if (!report?.generalInfo && !report?.insurance) {
-			res.send(makeError('No data found'));
+			res.send(makeError("No data found"));
 			return;
 		}
 
-		let collection = req.db.collection('vehicles');
+		let collection = req.db.collection("vehicles");
 		let vehicle = await collection.findOne({ number });
 
 		if (vehicle) {
-			let vinRegex = RegExp(vehicle.vin1.replace(/\*/g, '.'));
+			let vinRegex = RegExp(vehicle.vin1.replace(/\*/g, "."));
 
 			if (report?.generalInfo?.vin?.match(vinRegex)) {
 				let updatedFields = {
 					vin1: report.generalInfo.vin,
 					color: report.generalInfo.color,
 					sts: report.generalInfo.sts,
-					updatedDate: Date.now()
+					updatedDate: Date.now(),
 				};
 
 				if (report.insurance) {
-					let osagoFound = vehicle.osagoContracts?.some(elem => {
+					let osagoFound =
-						return elem.number = report.insurance.number;
+						vehicle.osagoContracts?.some((elem) => {
+							return (elem.number = report.insurance.number);
 						}) ?? false;
 					if (!osagoFound) {
-						await collection.updateOne({ number }, { $push: { osagoContracts: report.insurance } });
+						await collection.updateOne(
+							{ number },
+							{ $push: { osagoContracts: report.insurance } },
+						);
 					}
 				}
 
@@ -331,14 +370,16 @@ router.post('/checkGbTg', async (req, res) => {
 
 				await collection.updateOne({ number }, { $set: updatedFields });
 				vehicle = await collection.findOne({ number });
-				res.send({ success: true, data: Object.assign(vehicle, updatedFields) });
+				res.send({
+					success: true,
+					data: Object.assign(vehicle, updatedFields),
+				});
 			} else {
-				res.send(makeError('Vehicle doesn\'t match'));
+				res.send(makeError("Vehicle doesn't match"));
 			}
 		} else {
-			res.send(makeError('Vehicle not found'));
+			res.send(makeError("Vehicle not found"));
 		}
-
 	} catch (ex) {
 		res.send(makeError(ex.message));
 		console.error(ex);