Merge error (5f53aff8) · Commits · Diego Correa / PueblosMagicos

backend/package-lock.json

+154 −4

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		"mysql2": "^3.9.2",
		"network": "^0.7.0",
		"nodemailer": "^6.9.15",
		"qrcode": "^1.5.4",
		"reflect-metadata": "^0.2.0",
		"rxjs": "^7.8.1",
		"typeorm": "^0.3.20"
		@@ -39,6 +40,7 @@
		"@types/jest": "^29.5.2",
		"@types/multer": "^1.4.11",
		"@types/node": "^20.3.1",
		"@types/qrcode": "^1.5.5",
		"@types/supertest": "^6.0.0",
		"@typescript-eslint/eslint-plugin": "^6.0.0",
		"@typescript-eslint/parser": "^6.0.0",
		@@ -2900,6 +2902,15 @@
		"integrity": "sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==",
		"optional": true
		},
		"node_modules/@types/qrcode": {
		"version": "1.5.5",
		"resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.5.tgz",
		"integrity": "sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==",
		"dev": true,
		"dependencies": {
		"@types/node": "*"
		}
		},
		"node_modules/@types/qs": {
		"version": "6.9.12",
		"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.12.tgz",
		@@ -4115,7 +4126,6 @@
		"version": "5.3.1",
		"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
		"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
		"dev": true,
		"engines": {
		"node": ">=6"
		}
		@@ -4807,6 +4817,14 @@
		}
		}
		},
		"node_modules/decamelize": {
		"version": "1.2.0",
		"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
		"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
		"engines": {
		"node": ">=0.10.0"
		}
		},
		"node_modules/dedent": {
		"version": "1.5.1",
		"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
		@@ -4971,6 +4989,11 @@
		"node": "^14.15.0 \|\| ^16.10.0 \|\| >=18.0.0"
		}
		},
		"node_modules/dijkstrajs": {
		"version": "1.0.3",
		"resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
		"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
		},
		"node_modules/dir-glob": {
		"version": "3.0.1",
		"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
		@@ -9733,7 +9756,6 @@
		"version": "2.2.0",
		"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
		"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
		"dev": true,
		"engines": {
		"node": ">=6"
		}
		@@ -9835,7 +9857,6 @@
		"version": "4.0.0",
		"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
		"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
		"dev": true,
		"engines": {
		"node": ">=8"
		}
		@@ -10008,6 +10029,14 @@
		"node": ">=4"
		}
		},
		"node_modules/pngjs": {
		"version": "5.0.0",
		"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
		"integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
		"engines": {
		"node": ">=10.13.0"
		}
		},
		"node_modules/prelude-ls": {
		"version": "1.2.1",
		"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
		@@ -10329,6 +10358,118 @@
		}
		]
		},
		"node_modules/qrcode": {
		"version": "1.5.4",
		"resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
		"integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
		"dependencies": {
		"dijkstrajs": "^1.0.1",
		"pngjs": "^5.0.0",
		"yargs": "^15.3.1"
		},
		"bin": {
		"qrcode": "bin/qrcode"
		},
		"engines": {
		"node": ">=10.13.0"
		}
		},
		"node_modules/qrcode/node_modules/cliui": {
		"version": "6.0.0",
		"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
		"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
		"dependencies": {
		"string-width": "^4.2.0",
		"strip-ansi": "^6.0.0",
		"wrap-ansi": "^6.2.0"
		}
		},
		"node_modules/qrcode/node_modules/find-up": {
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
		"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
		"dependencies": {
		"locate-path": "^5.0.0",
		"path-exists": "^4.0.0"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/qrcode/node_modules/locate-path": {
		"version": "5.0.0",
		"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
		"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
		"dependencies": {
		"p-locate": "^4.1.0"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/qrcode/node_modules/p-limit": {
		"version": "2.3.0",
		"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
		"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
		"dependencies": {
		"p-try": "^2.0.0"
		},
		"engines": {
		"node": ">=6"
		},
		"funding": {
		"url": "https://github.com/sponsors/sindresorhus"
		}
		},
		"node_modules/qrcode/node_modules/p-locate": {
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
		"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
		"dependencies": {
		"p-limit": "^2.2.0"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/qrcode/node_modules/y18n": {
		"version": "4.0.3",
		"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
		"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
		},
		"node_modules/qrcode/node_modules/yargs": {
		"version": "15.4.1",
		"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
		"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
		"dependencies": {
		"cliui": "^6.0.0",
		"decamelize": "^1.2.0",
		"find-up": "^4.1.0",
		"get-caller-file": "^2.0.1",
		"require-directory": "^2.1.1",
		"require-main-filename": "^2.0.0",
		"set-blocking": "^2.0.0",
		"string-width": "^4.2.0",
		"which-module": "^2.0.0",
		"y18n": "^4.0.0",
		"yargs-parser": "^18.1.2"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/qrcode/node_modules/yargs-parser": {
		"version": "18.1.3",
		"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
		"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
		"dependencies": {
		"camelcase": "^5.0.0",
		"decamelize": "^1.2.0"
		},
		"engines": {
		"node": ">=6"
		}
		},
		"node_modules/qs": {
		"version": "6.11.0",
		"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
		@@ -10525,6 +10666,11 @@
		"node": ">=0.10.0"
		}
		},
		"node_modules/require-main-filename": {
		"version": "2.0.0",
		"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
		"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
		},
		"node_modules/resolve": {
		"version": "1.22.8",
		"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
		@@ -12653,6 +12799,11 @@
		"node": ">= 8"
		}
		},
		"node_modules/which-module": {
		"version": "2.0.1",
		"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
		"integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
		},
		"node_modules/wide-align": {
		"version": "1.1.5",
		"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
		@@ -12711,7 +12862,6 @@
		"version": "6.2.0",
		"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
		"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
		"dev": true,
		"dependencies": {
		"ansi-styles": "^4.0.0",
		"string-width": "^4.1.0",

backend/package.json

+2 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		"mysql2": "^3.9.2",
		"network": "^0.7.0",
		"nodemailer": "^6.9.15",
		"qrcode": "^1.5.4",
		"reflect-metadata": "^0.2.0",
		"rxjs": "^7.8.1",
		"typeorm": "^0.3.20"
		@@ -50,6 +51,7 @@
		"@types/jest": "^29.5.2",
		"@types/multer": "^1.4.11",
		"@types/node": "^20.3.1",
		"@types/qrcode": "^1.5.5",
		"@types/supertest": "^6.0.0",
		"@typescript-eslint/eslint-plugin": "^6.0.0",
		"@typescript-eslint/parser": "^6.0.0",

backend/src/pointOfInterest/PointOfInterest.service.ts

+10 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@ import { getPointDto } from './dto/getPoint.dto';
		import { ServerConstants } from 'src/constants/server.contants';
		import { createReadStream } from 'fs';
		import { join } from 'path';
		import { generateQRCode } from './utils/qrcode';
		import { Place } from 'src/place/entities/place.entity';

		@Injectable()
		export class PointOfInterestService {
		@@ -19,9 +21,15 @@ export class PointOfInterestService {
		@InjectRepository(PointOfInterest) private pointRepository: Repository<PointOfInterest>,
		@InjectRepository(PointOfInterestTraduction) private pointTraductionRepository,
		private readonly placeService: PlaceService,
		@InjectRepository(Place) private placeRepository: Repository<Place>,
		@InjectDataSource() private dataSource: DataSource,
		) {}
		async create(createPointAndTradDto: CreatePointAndTradDto) {
		const placeRelation = await this.placeRepository.findOne({
		where: { idPlace: createPointAndTradDto.idPlace },
		relations: ['town'],
		});

		const place = await this.placeService.findOne(createPointAndTradDto.idPlace);
		if (!place) {
		throw new BadRequestException('Place not found');
		@@ -50,6 +58,7 @@ export class PointOfInterestService {
		};
		await this.pointTraductionRepository.insert(createTradEs);
		await this.pointTraductionRepository.insert(createTradEn);
		generateQRCode(placeRelation.town.state.stateId, placeRelation.town.townId, placeRelation.idPlace, insertedId);
		}

		async findAllByPlace(idPlace: number, lang: LANGUAGES): Promise<getPointDto[]> {
		@@ -84,6 +93,7 @@ export class PointOfInterestService {
		directions: point.directions,
		};
		});

		return points;
		}

backend/src/pointOfInterest/utils/qrcode.ts

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		import * as qrcode from 'qrcode';
		import * as fs from 'fs';
		import { InternalServerErrorException } from '@nestjs/common';
		import * as path from 'path';
		import { ServerConstants } from 'src/constants/server.contants';

		const QR_FOLDER = 'qr';
		export const generateQRCode = async (idState: number, idTown: number, idActivity: number, idPoint: number) => {
		try {
		const url = `/state/${idState}/town/${idTown}/activity/${idActivity}/travel?id=${idPoint}`;
		const qrCodeImage = await qrcode.toDataURL(url);

		// Decode base64 string
		const base64Data = qrCodeImage.replace(/^data:image\/png;base64,/, '');

		// Save image to the filesystem
		const filename = path.join(ServerConstants.ROOT_STATIC_PATH, QR_FOLDER, `${idPoint}.png`);

		fs.writeFile(filename, base64Data, 'base64', (err) => {
		if (err) {
		console.error(err);
		throw new InternalServerErrorException('Error saving QR code image');
		} else {
		console.log('QR code image saved as qrcode.png');
		}
		});
		} catch (err) {
		console.error(err);
		throw new InternalServerErrorException('Error generating QR code');
		}
		};

backend/src/route/route.service.ts

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,5 +72,6 @@ export class RouteService {
		for (const place of placesChooen) {
		await this.createRoute(email, idTown, place.idPlace, new Date(), new Date());
		}
		return placesChooen;
		}
		}