From 537997bc408f2c858f522ce2c87c4710c314f4de Mon Sep 17 00:00:00 2001 From: Traym17 <51390112+Traym17@users.noreply.github.com> Date: Mon, 18 Jul 2022 22:28:56 -0600 Subject: [PATCH] Listar de guardas de seguridad --- api-gateway/package-lock.json | 11 +++++++++++ api-gateway/package.json | 1 + api-gateway/src/app.controller.ts | 8 ++++++-- api-gateway/src/app.service.ts | 10 ++++++++++ api-gateway/src/main.ts | 8 +++++++- servicio-comunidad-viviendas/package-lock.json | 1 - servicio-usuarios/package-lock.json | 1 + servicio-usuarios/package.json | 1 + servicio-usuarios/src/users/users.controller.ts | 6 ++++++ servicio-usuarios/src/users/users.service.ts | 4 ++++ web-ui/web-react/src/components/GuardasSeguridad.js | 3 ++- 11 files changed, 49 insertions(+), 5 deletions(-) diff --git a/api-gateway/package-lock.json b/api-gateway/package-lock.json index 14bac898..ffffe99e 100644 --- a/api-gateway/package-lock.json +++ b/api-gateway/package-lock.json @@ -12,6 +12,7 @@ "@nestjs/core": "^8.0.0", "@nestjs/microservices": "^8.4.7", "@nestjs/platform-express": "^8.0.0", + "@types/cors": "^2.8.12", "cors": "^2.8.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", @@ -1883,6 +1884,11 @@ "integrity": "sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==", "dev": true }, + "node_modules/@types/cors": { + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + }, "node_modules/@types/eslint": { "version": "8.4.3", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", @@ -10109,6 +10115,11 @@ "integrity": "sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==", "dev": true }, + "@types/cors": { + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + }, "@types/eslint": { "version": "8.4.3", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz", diff --git a/api-gateway/package.json b/api-gateway/package.json index fb1d5eba..78136508 100644 --- a/api-gateway/package.json +++ b/api-gateway/package.json @@ -25,6 +25,7 @@ "@nestjs/core": "^8.0.0", "@nestjs/microservices": "^8.4.7", "@nestjs/platform-express": "^8.0.0", + "@types/cors": "^2.8.12", "cors": "^2.8.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts index 7bcf7867..8730ed02 100644 --- a/api-gateway/src/app.controller.ts +++ b/api-gateway/src/app.controller.ts @@ -1,10 +1,8 @@ import { Controller, Get, Post, Body, Param } from '@nestjs/common'; import { AppService } from "./app.service"; - @Controller() export class AppController { constructor(private readonly appService: AppService) { } - // #==== API Users @Post('user/createAdminSystem') createAdminSystem( @@ -79,6 +77,12 @@ export class AppController { allUsersAdminComunidad() { return this.appService.allUsersAdminComunidad(); } + @Get('user/findGuards/:community') + findGuardsCommunity( + @Param('community_id') community_id: string + ) { + return this.appService.findGuardsCommunity(community_id); + } @Get('user/find/:dni') findUser( diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts index 413b0737..20bd90c9 100644 --- a/api-gateway/src/app.service.ts +++ b/api-gateway/src/app.service.ts @@ -105,6 +105,16 @@ export class AppService { ); } + findGuardsCommunity(community_id: string) { + const pattern = { cmd: 'findGuardsCommunity' }; + const payload = { community_id: community_id }; + return this.clientUserApp + .send(pattern, payload) + .pipe( + map((message: string) => ({ message })), + ); + } + inicioSesion(pEmail: string, pPassword: string) { const pattern = { cmd: 'loginUser' }; const payload = { email: pEmail, password: pPassword}; diff --git a/api-gateway/src/main.ts b/api-gateway/src/main.ts index aba64268..0a197e5f 100644 --- a/api-gateway/src/main.ts +++ b/api-gateway/src/main.ts @@ -3,7 +3,13 @@ import { AppModule } from './app.module'; const cors= require('cors'); async function bootstrap() { const app = await NestFactory.create(AppModule); + + app.enableCors({ + origin: 'http://localhost:3000', + methods: 'GET, PUT, POST, DELETE', + allowedHeaders: 'Content-Type, Authorization', + }); await app.listen(4000); - app.use(cors()) + //app.use(cors(enableCors)) } bootstrap(); diff --git a/servicio-comunidad-viviendas/package-lock.json b/servicio-comunidad-viviendas/package-lock.json index 22c95f9b..46dd3dd0 100644 --- a/servicio-comunidad-viviendas/package-lock.json +++ b/servicio-comunidad-viviendas/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "servicio-comunidad-viviendas", "version": "0.0.1", "license": "UNLICENSED", "dependencies": { diff --git a/servicio-usuarios/package-lock.json b/servicio-usuarios/package-lock.json index e044c9d9..55f87407 100644 --- a/servicio-usuarios/package-lock.json +++ b/servicio-usuarios/package-lock.json @@ -16,6 +16,7 @@ "@nestjs/platform-express": "^8.0.0", "@nestjs/swagger": "^5.2.1", "buffer": "^5.7.1", + "cors": "^2.8.5", "crypto-browserify": "^3.12.0", "md5-typescript": "^1.0.5", "mongoose": "^6.4.1", diff --git a/servicio-usuarios/package.json b/servicio-usuarios/package.json index 453489ec..65b4ea6b 100644 --- a/servicio-usuarios/package.json +++ b/servicio-usuarios/package.json @@ -29,6 +29,7 @@ "@nestjs/platform-express": "^8.0.0", "@nestjs/swagger": "^5.2.1", "buffer": "^5.7.1", + "cors": "^2.8.5", "crypto-browserify": "^3.12.0", "md5-typescript": "^1.0.5", "mongoose": "^6.4.1", diff --git a/servicio-usuarios/src/users/users.controller.ts b/servicio-usuarios/src/users/users.controller.ts index 462a96e3..ba72ee15 100644 --- a/servicio-usuarios/src/users/users.controller.ts +++ b/servicio-usuarios/src/users/users.controller.ts @@ -32,6 +32,12 @@ export class UsersController { let dni = id['dni']; return this.userService.findOneByDNI(dni); } + + @MessagePattern({ cmd: 'findGuardsCommunity' }) + findGuardsCommunity(@Payload() community_id: string) { + let pcommunity_id = community_id['community_id']; + return this.userService.findGuardsCommunity(pcommunity_id); + } @MessagePattern({ cmd: 'updateUser' }) update(@Payload() user: UserDocument) { diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts index b7071691..f4503498 100644 --- a/servicio-usuarios/src/users/users.service.ts +++ b/servicio-usuarios/src/users/users.service.ts @@ -70,6 +70,10 @@ export class UsersService { return this.userModel.find({ user_type: 1 }).exec(); } + //find admin del sistema + async findGuardsCommunity(pcommunity_id: string): Promise { + return this.userModel.find({ user_type: 4 }).exec(); + } //find admin de comunidad async allUsersAdminComunidad(): Promise { return this.userModel.find({ user_type: 2 }).exec(); diff --git a/web-ui/web-react/src/components/GuardasSeguridad.js b/web-ui/web-react/src/components/GuardasSeguridad.js index e3e05eb8..bc4ec2f8 100644 --- a/web-ui/web-react/src/components/GuardasSeguridad.js +++ b/web-ui/web-react/src/components/GuardasSeguridad.js @@ -7,7 +7,7 @@ import { Column } from 'primereact/column'; const GuardasSeguridad = () => { const [pokemones,setPokemones]=useState([]); - const [urlFetch,setUrlFetch]=useState('http://localhost:4000/user/findAdminSistema/'); + const [urlFetch,setUrlFetch]=useState('http://localhost:4000/user/findGuards/62be68215692582bbfd77134'); async function fetchP(){ let nombres=await fetch(urlFetch, {method:'GET'}); let pokemonesRes= await nombres.json(); @@ -46,6 +46,7 @@ const GuardasSeguridad = () => { fetch('http://localhost:4000/user/createGuard', { cache: 'no-cache', method: 'POST', + mode:'cors', body: JSON.stringify(data2), headers: { 'Content-Type': 'application/json'