Merge branch 'dev' into UH-iniciarsesionV2

This commit is contained in:
Mariela 2022-08-11 01:01:53 -06:00
commit 24edd8b70a
183 changed files with 39579 additions and 36049 deletions

BIN
.DS_Store vendored

Binary file not shown.

12
.envrc Normal file
View File

@ -0,0 +1,12 @@
#!/usr/bin/env bash
# ^ added for shellcheck and file-type detection
# Watch & reload direnv on change
watch_file devshell.toml
if [[ $(type -t use_flake) != function ]]; then
echo "ERROR: use_flake function missing."
echo "Please update direnv to v2.30.0 or later."
exit 1
fi
use flake

View File

@ -5,30 +5,27 @@ name: Node.js CI
on: on:
push: push:
branches: ['master'] branches: ['master', 'dev']
pull_request: pull_request:
branches: ['master'] branches: ['master', 'dev']
jobs: jobs:
build: build-api:
runs-on: ubuntu-latest runs-on: ubuntu-latest
defaults:
run:
working-directory: ./mobile-ui
strategy: strategy:
matrix: matrix:
node-version: [14.x, 16.x, 18.x] node-version: [14.x, 16.x, 18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/ # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps: steps:
- uses: actions/checkout@v3 - name: checkout
run: cd ./mobile-ui uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
cache: 'npm' cache: 'npm'
- name: Test
run: | run: |
cd ./api-gateway
npm ci npm ci
npm run build --if-present npm run build --if-present
npm test

25
.jsbeautifyrc Normal file
View File

@ -0,0 +1,25 @@
{
"editorconfig": false,
"indent_size": 2,
"end_with_newline": true,
"html": {
"brace_style": "collapse",
"indent_char": " ",
"indent_scripts": "normal",
"indent_inner_html": true,
"indent_empty_lines": false,
"wrap_line_length": 120,
"wrap_attributes": "force-expand-multiline",
"unformatted": [
"sub",
"sup",
"b",
"i",
"u",
"em",
"strong"
],
"preserve_newlines": true,
"max_preserve_newlines": 2
}
}

4
.prettierignore Normal file
View File

@ -0,0 +1,4 @@
node_modules/*
e2e/*
dist/*
src/assets/scss/bootstrap/*

11
.prettierrc Normal file
View File

@ -0,0 +1,11 @@
{
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"singleQuote": true,
"trailingComma": "all",
"bracketSpacing": true,
"arrowParens": "always",
"jsxBracketSameLine": false,
"semi": true
}

View File

@ -1,8 +1,8 @@
import { Controller, Get, Post, Body, Param, Delete } from '@nestjs/common'; import { Controller, Get, Post, Put, Body, Param, Delete } from '@nestjs/common';
import { AppService } from "./app.service"; import { AppService } from './app.service';
@Controller() @Controller()
export class AppController { export class AppController {
constructor(private readonly appService: AppService) { } constructor(private readonly appService: AppService) {}
// #==== API Users // #==== API Users
@Post('user/createAdminSystem') @Post('user/createAdminSystem')
createAdminSystem( createAdminSystem(
@ -11,13 +11,12 @@ export class AppController {
@Body('last_name') last_name: string, @Body('last_name') last_name: string,
@Body('email') email: string, @Body('email') email: string,
@Body('phone') phone: number, @Body('phone') phone: number,
@Body('password') password: string,
@Body('user_type') user_type: string, @Body('user_type') user_type: string,
@Body('status') status: string, @Body('status') status: string,
@Body('date_entry') date_entry: Date, @Body('date_entry') date_entry: Date,
) { ) {
return this.appService.createAdminSystem(dni, name, last_name, email, phone, password, return this.appService.createAdminSystem(dni, name, last_name, email, phone,
user_type, status, date_entry); user_type, status, date_entry);
} }
@Post('user/createGuard') @Post('user/createGuard')
@ -28,13 +27,29 @@ export class AppController {
@Body('last_name') last_name: string, @Body('last_name') last_name: string,
@Body('email') email: string, @Body('email') email: string,
@Body('phone') phone: number, @Body('phone') phone: number,
@Body('password') password: string, @Body('user_type') user_type: string,
@Body('status') status: string,
@Body('date_entry') date_entry: Date,
@Body('community_id') community_id: string,
) {
return this.appService.createGuard(dni, name, last_name, email, phone,
user_type, status, date_entry,community_id);
}
@Post('user/createAdminCommunity')
createAdminCommunity(
//Nombre, Apellidos, Correo electrónico, Cédula, Teléfono, Contraseña
@Body('dni') dni: string,
@Body('name') name: string,
@Body('last_name') last_name: string,
@Body('email') email: string,
@Body('phone') phone: number,
@Body('user_type') user_type: string, @Body('user_type') user_type: string,
@Body('status') status: string, @Body('status') status: string,
@Body('date_entry') date_entry: Date, @Body('date_entry') date_entry: Date,
@Body('community_id') community_id:string @Body('community_id') community_id:string
) { ) {
return this.appService.createGuard(dni, name, last_name, email, phone, password, return this.appService.createAdminCommunity(dni, name, last_name, email, phone,
user_type, status, date_entry,community_id); user_type, status, date_entry,community_id);
} }
@ -51,8 +66,45 @@ export class AppController {
@Body('date_entry') date_entry: Date, @Body('date_entry') date_entry: Date,
@Body('community_id') community_id: string, @Body('community_id') community_id: string,
) { ) {
return this.appService.createUser(dni, name, last_name, email, phone, password, return this.appService.createUser(
user_type, status, date_entry, community_id); dni,
name,
last_name,
email,
phone,
password,
user_type,
status,
date_entry,
community_id,
);
}
@Put('user/updateUser')
updateUser(
@Body('dni') dni: string,
@Body('name') name: string,
@Body('last_name') last_name: string,
@Body('email') email: string,
@Body('phone') phone: number,
@Body('password') password: string,
@Body('user_type') user_type: string,
@Body('status') status: string,
@Body('date_entry') date_entry: Date,
@Body('community_id') community_id: string,
) {
return this.appService.updateUser(
dni,
name,
last_name,
email,
phone,
password,
user_type,
status,
date_entry,
community_id,
);
} }
@Get('user/allUsers') @Get('user/allUsers')
@ -65,7 +117,7 @@ export class AppController {
@Body('email') pEmail: string, @Body('email') pEmail: string,
@Body('password') pPassword: string, @Body('password') pPassword: string,
) { ) {
return this.appService.inicioSesion(pEmail,pPassword); return this.appService.inicioSesion(pEmail, pPassword);
} }
@Get('user/findAdminSistema') @Get('user/findAdminSistema')
@ -77,28 +129,40 @@ export class AppController {
allUsersAdminComunidad() { allUsersAdminComunidad() {
return this.appService.allUsersAdminComunidad(); return this.appService.allUsersAdminComunidad();
} }
@Get('user/findGuards/:community') @Get('user/findGuards/:community')
findGuardsCommunity( findGuardsCommunity(@Param('community_id') community_id: string) {
@Param('community_id') community_id: string
) {
return this.appService.findGuardsCommunity(community_id); return this.appService.findGuardsCommunity(community_id);
} }
@Get('user/findTenants/:community_id')
allUsersTenants(@Param('community_id') paramCommunity_id: string) {
return this.appService.findTenantsCommunity(paramCommunity_id);
}
@Get('user/find/:dni') @Get('user/find/:dni')
findUser( findUser(@Param('dni') paramUserDNI: string) {
@Param('dni') paramUserDNI: string
) {
return this.appService.findUser(paramUserDNI); return this.appService.findUser(paramUserDNI);
} }
@Get('user/findUserById/:id')
findUserById(@Param('id') id: string) {
return this.appService.findUserById(id);
}
@Delete('user/deleteAdminSystem/:id') @Delete('user/deleteAdminSystem/:id')
deleteAdminSystem( deleteAdminSystem(@Param('id') id: string) {
@Param('id') id: string,
) {
return this.appService.deleteAdminSystem(id); return this.appService.deleteAdminSystem(id);
} }
@Post('user/changeStatus')
changeStatusUser(
@Body('id') pId: string,
@Body('status') pStatus: string,
) {
return this.appService.changeStatusUser(pId, pStatus);
}
// #==== API Communities // #==== API Communities
@Post('community/createCommunity') @Post('community/createCommunity')
createCommunity( createCommunity(
@ -111,11 +175,18 @@ export class AppController {
@Body('status') status: string, @Body('status') status: string,
@Body('date_entry') date_entry: Date, @Body('date_entry') date_entry: Date,
@Body('houses') houses: [], @Body('houses') houses: [],
) { ) {
return this.appService.createCommunity(name, province, canton, return this.appService.createCommunity(
district, num_houses, phone, name,
status, date_entry, houses); province,
canton,
district,
num_houses,
phone,
status,
date_entry,
houses,
);
} }
@Get('community/allCommunities') @Get('community/allCommunities')
@ -124,28 +195,26 @@ export class AppController {
} }
@Get('community/findCommunity/:id') @Get('community/findCommunity/:id')
findCommunity( findCommunity(@Param('id') paramCommunityId: string) {
@Param('id') paramCommunityId: string
) {
return this.appService.findCommunity(paramCommunityId); return this.appService.findCommunity(paramCommunityId);
} }
@Get('community/findCommunityName/:id') @Get('community/findCommunityName/:id')
findCommunityName( findCommunityName(@Param('id') paramCommunityId: string) {
@Param('id') paramCommunityId: string
) {
return this.appService.findCommunityName(paramCommunityId); return this.appService.findCommunityName(paramCommunityId);
} }
@Post('community/findCommunityAdmin') @Post('community/findCommunityAdmin')
findCommunityAdmin( findCommunityAdmin(@Body('community_id') community_id: string) {
@Body('community_id') community_id: string,
) {
return this.appService.findCommunityAdmin(community_id); return this.appService.findCommunityAdmin(community_id);
} }
@Post('community/changeStatus')
changeStatusCommunity(
@Body('id') pId: string,
@Body('status') pStatus: string,
) {
return this.appService.changeStatusCommunity(pId, pStatus);
}
// #==== API Common Areas // #==== API Common Areas
@Post('commonArea/createCommonArea') @Post('commonArea/createCommonArea')
createCommonArea( createCommonArea(
@ -155,25 +224,36 @@ export class AppController {
@Body('bookable') bookable: number, @Body('bookable') bookable: number,
@Body('community_id') community_id: string, @Body('community_id') community_id: string,
) { ) {
return this.appService.createCommonArea(
return this.appService.createCommonArea(name, hourMin, hourMax, name,
bookable, community_id); hourMin,
hourMax,
bookable,
community_id,
);
} }
@Get('commonArea/allCommonAreas') @Get('commonArea/allCommonAreas')
allCommonAreas() { allCommonAreas() {
return this.appService.allCommonAreas(); return this.appService.allCommonAreas();
} }
@Get('commonArea/findCommonArea/:id') @Get('commonArea/findCommonArea/:id')
findCommonArea( findCommonArea(@Param('id') paramCommonAreaId: string) {
@Param('id') paramCommonAreaId: string
) {
return this.appService.findCommonArea(paramCommonAreaId); return this.appService.findCommonArea(paramCommonAreaId);
} }
@Get('commonArea/findByCommunity/:community_id')
findByCommunity(@Param('community_id') paramCommunityId: string) {
return this.appService.findByCommunity(paramCommunityId);
}
@Delete('commonArea/deleteCommonArea/:id')
deleteCommonArea(@Param('id') id: string) {
return this.appService.deleteCommonArea(id);
}
// #==== API GUEST // #==== API GUEST
//#API userService - create user //#API userService - create user
@Post('guest/createGuest') @Post('guest/createGuest')
@ -186,7 +266,15 @@ export class AppController {
@Body('status') status: string, @Body('status') status: string,
@Body('date_entry') date_entry: Date, @Body('date_entry') date_entry: Date,
) { ) {
return this.appService.createGuest(name, last_name, dni, number_plate, phone, status, date_entry); return this.appService.createGuest(
name,
last_name,
dni,
number_plate,
phone,
status,
date_entry,
);
} }
@Get('guest/allGuests') @Get('guest/allGuests')
@ -195,13 +283,10 @@ export class AppController {
} }
@Get('guest/find/:dni') @Get('guest/find/:dni')
findGuest( findGuest(@Param('dni') paramGuestDNI: string) {
@Param('dni') paramGuestDNI: string
) {
return this.appService.findGuest(paramGuestDNI); return this.appService.findGuest(paramGuestDNI);
} }
// #==== API Payment // #==== API Payment
@Post('payment/createPayment') @Post('payment/createPayment')
@ -214,8 +299,15 @@ export class AppController {
@Body('user_id') user_id: string, @Body('user_id') user_id: string,
@Body('communty_id') communty_id: string, @Body('communty_id') communty_id: string,
) { ) {
return this.appService.createPayment(date_payment, mount, description, return this.appService.createPayment(
period, status, user_id, communty_id); date_payment,
mount,
description,
period,
status,
user_id,
communty_id,
);
} }
@Get('payment/allPayments') @Get('payment/allPayments')
@ -224,9 +316,7 @@ export class AppController {
} }
@Get('payment/find/:dni') @Get('payment/find/:dni')
findPayment( findPayment(@Param('dni') paramPaymentDNI: string) {
@Param('dni') paramPaymentDNI: string
) {
return this.appService.findPayment(paramPaymentDNI); return this.appService.findPayment(paramPaymentDNI);
} }
@ -241,8 +331,14 @@ export class AppController {
@Body('user_id') user_id: string, @Body('user_id') user_id: string,
@Body('common_area_id') common_area_id: string, @Body('common_area_id') common_area_id: string,
) { ) {
return this.appService.createReservation(start_time, finish_time, status, return this.appService.createReservation(
date_entry, user_id, common_area_id); start_time,
finish_time,
status,
date_entry,
user_id,
common_area_id,
);
} }
@Get('reservation/allReservations') @Get('reservation/allReservations')
@ -251,13 +347,10 @@ export class AppController {
} }
@Get('reservation/find/:id') @Get('reservation/find/:id')
findReservation( findReservation(@Param('id') paramReservation: string) {
@Param('id') paramReservation: string
) {
return this.appService.findReservation(paramReservation); return this.appService.findReservation(paramReservation);
} }
// #==== API Post // #==== API Post
@Post('post/createPost') @Post('post/createPost')
@ -276,13 +369,10 @@ export class AppController {
} }
@Get('post/find/:id') @Get('post/find/:id')
findPost( findPost(@Param('id') paramPost: string) {
@Param('id') paramPost: string
) {
return this.appService.findPost(paramPost); return this.appService.findPost(paramPost);
} }
// #==== API Comment // #==== API Comment
@Post('post/createComment') @Post('post/createComment')
@ -301,14 +391,10 @@ export class AppController {
} }
@Get('post/findComment/:id') @Get('post/findComment/:id')
findComment( findComment(@Param('id') paramComment: string) {
@Param('id') paramComment: string
) {
return this.appService.findComment(paramComment); return this.appService.findComment(paramComment);
} }
// #==== API Report // #==== API Report
@Post('report/createReport') @Post('report/createReport')
@ -318,7 +404,12 @@ export class AppController {
@Body('date_entry') date_entry: Date, @Body('date_entry') date_entry: Date,
@Body('user_id') user_id: string, @Body('user_id') user_id: string,
) { ) {
return this.appService.createReport(action, description, date_entry, user_id); return this.appService.createReport(
action,
description,
date_entry,
user_id,
);
} }
@Get('report/allReports') @Get('report/allReports')
@ -327,26 +418,16 @@ export class AppController {
} }
@Get('report/find/:id') @Get('report/find/:id')
findReport( findReport(@Param('id') paramReport: string) {
@Param('id') paramReport: string
) {
return this.appService.findReport(paramReport); return this.appService.findReport(paramReport);
} }
@Post('email/sendMail') @Post('email/sendMail')
senMail( senMail(@Body('email') email: string) {
@Body('email') email: string,
) {
return this.appService.sendMail(email); return this.appService.sendMail(email);
} }
@Post('email/html') @Post('email/html')
html( html(@Body('email') email: string, @Body('name') name: string) {
@Body('email') email: string,
@Body('name') name: string,
) {
return this.appService.html(email, name); return this.appService.html(email, name);
} }
} }

View File

@ -1,99 +1,99 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { AppController } from './app.controller'; import { AppController } from './app.controller';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
import { AppService } from './app.service'; import { AppService } from './app.service';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_USUARIOS", name: 'SERVICIO_USUARIOS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3001 port: 3001,
} },
} },
]), ]),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_COMUNIDADES", name: 'SERVICIO_COMUNIDADES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3002 port: 3002,
} },
} },
]), ]),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_AREAS_COMUNES", name: 'SERVICIO_AREAS_COMUNES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3003 port: 3003,
} },
} },
]), ]),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_INVITADOS", name: 'SERVICIO_INVITADOS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3004 port: 3004,
} },
} },
]), ]),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_PAGOS", name: 'SERVICIO_PAGOS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3005 port: 3005,
} },
} },
]), ]),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_RESERVACIONES", name: 'SERVICIO_RESERVACIONES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3006 port: 3006,
} },
} },
]), ]),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_POSTS", name: 'SERVICIO_POSTS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3007 port: 3007,
} },
} },
]),
ClientsModule.register([
{
name: "SERVICIO_REPORTES",
transport: Transport.TCP,
options: {
host: "127.0.0.1",
port: 3008
}
}
]), ]),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_NOTIFICACIONES", name: 'SERVICIO_REPORTES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3009 port: 3008,
} },
} },
]),
ClientsModule.register([
{
name: 'SERVICIO_NOTIFICACIONES',
transport: Transport.TCP,
options: {
host: '127.0.0.1',
port: 3009,
},
},
]), ]),
], ],
controllers: [AppController], controllers: [AppController],

View File

@ -1,61 +1,121 @@
import { Injectable, Inject } from '@nestjs/common'; import { Injectable, Inject } from '@nestjs/common';
import { ClientProxy } from "@nestjs/microservices"; import { ClientProxy } from '@nestjs/microservices';
import { map } from "rxjs/operators"; import { map } from 'rxjs/operators';
@Injectable() @Injectable()
export class AppService { export class AppService {
constructor( constructor(
@Inject('SERVICIO_USUARIOS') private readonly clientUserApp: ClientProxy, @Inject('SERVICIO_USUARIOS') private readonly clientUserApp: ClientProxy,
@Inject('SERVICIO_COMUNIDADES') private readonly clientCommunityApp: ClientProxy, @Inject('SERVICIO_COMUNIDADES')
@Inject('SERVICIO_AREAS_COMUNES') private readonly clientCommonAreaApp: ClientProxy, private readonly clientCommunityApp: ClientProxy,
@Inject('SERVICIO_AREAS_COMUNES')
private readonly clientCommonAreaApp: ClientProxy,
@Inject('SERVICIO_INVITADOS') private readonly clientGuestApp: ClientProxy, @Inject('SERVICIO_INVITADOS') private readonly clientGuestApp: ClientProxy,
@Inject('SERVICIO_PAGOS') private readonly clientPaymentApp: ClientProxy, @Inject('SERVICIO_PAGOS') private readonly clientPaymentApp: ClientProxy,
@Inject('SERVICIO_RESERVACIONES') private readonly clientReservationApp: ClientProxy, @Inject('SERVICIO_RESERVACIONES')
private readonly clientReservationApp: ClientProxy,
@Inject('SERVICIO_POSTS') private readonly clientPostApp: ClientProxy, @Inject('SERVICIO_POSTS') private readonly clientPostApp: ClientProxy,
@Inject('SERVICIO_REPORTES') private readonly clientReportApp: ClientProxy, @Inject('SERVICIO_REPORTES') private readonly clientReportApp: ClientProxy,
@Inject('SERVICIO_NOTIFICACIONES') private readonly clientNotificationtApp: ClientProxy, @Inject('SERVICIO_NOTIFICACIONES')
private readonly clientNotificationtApp: ClientProxy,
) { } ) { }
// ====================== USERS =============================== // ====================== USERS ===============================
//POST parameter from API //POST parameter from API
createUser(dni: string, name: string, last_name: string, email: string, phone: number createUser(
, password: string, user_type: string, status: string, date_entry: Date, community_id: string) { dni: string,
name: string,
last_name: string,
email: string,
phone: number,
password: string,
user_type: string,
status: string,
date_entry: Date,
community_id: string,
) {
const pattern = { cmd: 'createUser' }; const pattern = { cmd: 'createUser' };
const payload = { const payload = {
dni: dni, name: name, last_name: last_name, email: email, phone: phone, dni: dni,
password: password, user_type: user_type, status: status, date_entry: date_entry, name: name,
community_id: community_id last_name: last_name,
email: email,
phone: phone,
password: password,
user_type: user_type,
status: status,
date_entry: date_entry,
community_id: community_id,
}; };
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })), }
);
updateUser(
dni: string,
name: string,
last_name: string,
email: string,
phone: number,
password: string,
user_type: string,
status: string,
date_entry: Date,
community_id: string,
) {
const pattern = { cmd: 'updateUser' };
const payload = {
dni: dni,
name: name,
last_name: last_name,
email: email,
phone: phone,
password: password,
user_type: user_type,
status: status,
date_entry: date_entry,
community_id: community_id,
};
return this.clientUserApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
} }
//POST parameter from API //POST parameter from API
createAdminSystem(dni: string, name: string, last_name: string, email: string, phone: number createAdminSystem(dni: string, name: string, last_name: string, email: string, phone: number
, password: string, user_type: string, status: string, date_entry: Date) { , user_type: string, status: string, date_entry: Date) {
const pattern = { cmd: 'createAdminSystem' }; const pattern = { cmd: 'createAdminSystem' };
const payload = { const payload = {
dni: dni, name: name, last_name: last_name, email: email, phone: phone, dni: dni, name: name, last_name: last_name, email: email, phone: phone,
password: password, user_type: user_type, status: status, date_entry: date_entry password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry
}; };
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
createGuard(dni: string, name: string, last_name: string, email: string, phone: number createGuard(dni: string, name: string, last_name: string, email: string, phone: number
, password: string, user_type: string, status: string, date_entry: Date, community_id: string) { , user_type: string, status: string, date_entry: Date, community_id: string) {
const pattern = { cmd: 'createGuard' }; const pattern = { cmd: 'createGuard' };
const payload = { const payload = {
dni: dni, name: name, last_name: last_name, email: email, phone: phone, dni: dni, name: name, last_name: last_name, email: email, phone: phone,
password: password, user_type: user_type, status: status, date_entry: date_entry, community_id password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry, community_id
};
return this.clientUserApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
createAdminCommunity(dni: string, name: string, last_name: string, email: string, phone: number
, user_type: string, status: string, date_entry: Date, community_id: string) {
const pattern = { cmd: 'createAdminCommunity' };
const payload = {
dni: dni, name: name, last_name: last_name, email: email, phone: phone,
password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry, community_id
}; };
return this.clientUserApp return this.clientUserApp
@ -70,9 +130,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allUsersAdminSistema() { allUsersAdminSistema() {
@ -80,14 +138,20 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allUsersAdminComunidad() { allUsersAdminComunidad() {
const pattern = { cmd: 'findAdminComunidad' }; const pattern = { cmd: 'findAdminComunidad' };
const payload = {}; const payload = {};
return this.clientUserApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
allUsersTenants() {
const pattern = { cmd: 'findTenants' };
const payload = {};
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(
@ -95,15 +159,14 @@ export class AppService {
); );
} }
//GET parameter from API //GET parameter from API
findUser(paramUserDNI: string) { findUser(paramUserDNI: string) {
const pattern = { cmd: 'findUserDNI' }; const pattern = { cmd: 'findUserDNI' };
const payload = { dni: paramUserDNI }; const payload = { dni: paramUserDNI };
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
findGuardsCommunity(community_id: string) { findGuardsCommunity(community_id: string) {
@ -111,59 +174,88 @@ export class AppService {
const payload = { community_id: community_id }; const payload = { community_id: community_id };
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })), }
);
findTenantsCommunity(community_id: string) {
const pattern = { cmd: 'findTenantsCommunity' };
const payload = { community_id: community_id };
return this.clientUserApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
} }
deleteAdminSystem(id: string) { deleteAdminSystem(id: string) {
const pattern = { cmd: 'deleteAdminSystem' }; const pattern = { cmd: 'deleteAdminSystem' };
const payload = { id: id }; const payload = { id: id };
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
inicioSesion(pEmail: string, pPassword: string) { inicioSesion(pEmail: string, pPassword: string) {
const pattern = { cmd: 'loginUser' }; const pattern = { cmd: 'loginUser' };
const payload = { email: pEmail, password: pPassword}; const payload = { email: pEmail, password: pPassword };
return this.clientUserApp return this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
findCommunityAdmin(community_id: string) { findCommunityAdmin(community_id: string) {
const pattern = { cmd: 'findCommunityAdmin' }; const pattern = { cmd: 'findCommunityAdmin' };
const payload = { community_id: community_id }; const payload = { community_id: community_id };
return this.clientCommunityApp return this.clientCommunityApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== COMMUNITIES ===============================
//GET parameter from API
findUserById(id: string) {
const pattern = { cmd: 'findById' };
const payload = { id: id };
return this.clientUserApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
changeStatusUser(pId: string, pStatus: string) {
const pattern = { cmd: 'changeStatus' };
const payload = { id: pId, status: pStatus };
return this.clientUserApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
// ====================== COMMUNITIES ===============================
changeStatusCommunity(pId: string, pStatus: string) {
const pattern = { cmd: 'changeStatus' };
const payload = { id: pId, status: pStatus };
return this.clientCommunityApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
//POST parameter from API //POST parameter from API
createCommunity(name: string, province: string, canton: string, district: string createCommunity(name: string, province: string, canton: string, district: string
, num_houses: number, phone: string, status: string, date_entry: Date, houses: []) { , num_houses: number, phone: string, status: string, date_entry: Date, houses: []) {
const pattern = { cmd: 'createCommunity' }; const pattern = { cmd: 'createCommunity' };
const payload = { const payload = {
name: name, province: province, canton: canton, district: district, num_houses: num_houses, name: name,
phone: phone, status: status, date_entry: date_entry, houses: houses province: province,
canton: canton,
district: district,
num_houses: num_houses,
phone: phone,
status: status,
date_entry: date_entry,
houses: houses,
}; };
return this.clientCommunityApp return this.clientCommunityApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allCommunities() { allCommunities() {
@ -171,9 +263,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientCommunityApp return this.clientCommunityApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -182,9 +272,7 @@ export class AppService {
const payload = { id: paramCommunityId }; const payload = { id: paramCommunityId };
return this.clientCommunityApp return this.clientCommunityApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
findCommunityName(paramCommunityId: string) { findCommunityName(paramCommunityId: string) {
@ -192,27 +280,30 @@ export class AppService {
const payload = { id: paramCommunityId }; const payload = { id: paramCommunityId };
return this.clientCommunityApp return this.clientCommunityApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== COMMON AREAS ===============================
// ====================== COMMON AREAS ===============================
//POST parameter from API //POST parameter from API
createCommonArea(name: string, hourMin: string, hourMax: string, createCommonArea(
bookable: number, community_id: string) { name: string,
hourMin: string,
hourMax: string,
bookable: number,
community_id: string,
) {
const pattern = { cmd: 'createCommonArea' }; const pattern = { cmd: 'createCommonArea' };
const payload = { const payload = {
name: name, hourMin: hourMin, hourMax: hourMax, bookable: bookable, name: name,
community_id: community_id hourMin: hourMin,
hourMax: hourMax,
bookable: bookable,
community_id: community_id,
status: '1'
}; };
return this.clientCommonAreaApp return this.clientCommonAreaApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allCommonAreas() { allCommonAreas() {
@ -220,9 +311,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientCommonAreaApp return this.clientCommonAreaApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -231,28 +320,49 @@ export class AppService {
const payload = { id: paramCommonAreaId }; const payload = { id: paramCommonAreaId };
return this.clientCommonAreaApp return this.clientCommonAreaApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== GUESTS =============================== //GET parameter from API
findByCommunity(paramCommunityId: string) {
const pattern = { cmd: 'findByCommunity' };
const payload = { community_id: paramCommunityId };
return this.clientCommonAreaApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
//DELETE parameter from API
deleteCommonArea(paramCommonAreaId: string) {
const pattern = { cmd: 'removeCommonArea' };
const payload = { id: paramCommonAreaId };
return this.clientCommonAreaApp
.send<string>(pattern, payload)
.pipe(map((message: string) => ({ message })));
}
// ====================== GUESTS ===============================
//POST parameter from API //POST parameter from API
createGuest(name: string, last_name: string, dni: string, number_plate: string, phone: number createGuest(
, status: string, date_entry: Date) { name: string,
last_name: string,
dni: string,
number_plate: string,
phone: number,
status: string,
date_entry: Date,
) {
const pattern = { cmd: 'createGuest' }; const pattern = { cmd: 'createGuest' };
const payload = { const payload = {
name: name, last_name: last_name, dni: dni, number_plate: number_plate, phone: phone, name: name, last_name: last_name, dni: dni, number_plate: number_plate, phone: phone,
status: status, date_entry: date_entry status: status, date_entry: date_entry
}; };
return this.clientGuestApp return this.clientGuestApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allGuests() { allGuests() {
@ -260,9 +370,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientGuestApp return this.clientGuestApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -271,26 +379,29 @@ export class AppService {
const payload = { dni: paramGuestDNI }; const payload = { dni: paramGuestDNI };
return this.clientGuestApp return this.clientGuestApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== PAYMENTS =============================== // ====================== PAYMENTS ===============================
//POST parameter from API //POST parameter from API
createPayment(date_payment: Date, mount: number, description: string, period: string createPayment(
, status: string, user_id: string, communty_id: string) { date_payment: Date,
mount: number,
description: string,
period: string,
status: string,
user_id: string,
communty_id: string,
) {
const pattern = { cmd: 'createPayment' }; const pattern = { cmd: 'createPayment' };
const payload = { const payload = {
date_payment: date_payment, mount: mount, description: description, date_payment: date_payment, mount: mount, description: description,
period: period, status: status, user_id: user_id, communty_id: communty_id period: period, status: status, user_id: user_id, communty_id: communty_id
}; };
return this.clientPaymentApp return this.clientPaymentApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allPayments() { allPayments() {
@ -298,9 +409,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientPaymentApp return this.clientPaymentApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -309,27 +418,22 @@ export class AppService {
const payload = { id: paramPaymentId }; const payload = { id: paramPaymentId };
return this.clientPaymentApp return this.clientPaymentApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== RESERVATIONS ===============================
// ====================== RESERVATIONS ===============================
//POST parameter from API //POST parameter from API
createReservation(start_time: string, finish_time: string, status: string, createReservation(start_time: string, finish_time: string, status: string,
date_entry: Date, user_id: string, common_area_id: string) { date_entry: Date, user_id: string, common_area_id: string) {
const pattern = { cmd: 'createReservation' }; const pattern = { cmd: 'createReservation' };
const payload = { const payload = {
start_time: start_time, finish_time: finish_time, status: status, start_time: start_time, finish_time: finish_time, status: status,
date_entry: date_entry, user_id: user_id, common_area_id: common_area_id date_entry: date_entry, user_id: user_id, common_area_id: common_area_id
}; };
return this.clientReservationApp return this.clientReservationApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allReservations() { allReservations() {
@ -337,9 +441,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientReservationApp return this.clientReservationApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -348,27 +450,22 @@ export class AppService {
const payload = { id: paramReservationId }; const payload = { id: paramReservationId };
return this.clientReservationApp return this.clientReservationApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== POSTS ===============================
// ====================== POSTS ===============================
//POST parameter from API //POST parameter from API
createPost(post: string, date_entry: Date, user_id: string, createPost(post: string, date_entry: Date, user_id: string,
community_id: string) { community_id: string) {
const pattern = { cmd: 'createPost' }; const pattern = { cmd: 'createPost' };
const payload = { const payload = {
post: post, date_entry: date_entry, user_id: user_id, post: post, date_entry: date_entry, user_id: user_id,
community_id: community_id community_id: community_id
}; };
return this.clientPostApp return this.clientPostApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allPosts() { allPosts() {
@ -376,9 +473,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientPostApp return this.clientPostApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -387,26 +482,22 @@ export class AppService {
const payload = { id: paramPostId }; const payload = { id: paramPostId };
return this.clientPostApp return this.clientPostApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== COMMNENT POSTS =============================== // ====================== COMMNENT POSTS ===============================
//Comment parameter from API //Comment parameter from API
createComment(comment: string, date_entry: Date, user_id: string, createComment(comment: string, date_entry: Date, user_id: string,
post_id: string) { post_id: string) {
const pattern = { cmd: 'createComment' }; const pattern = { cmd: 'createComment' };
const payload = { const payload = {
comment: comment, date_entry: date_entry, user_id: user_id, comment: comment, date_entry: date_entry, user_id: user_id,
post_id: post_id post_id: post_id
}; };
return this.clientPostApp return this.clientPostApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allComments() { allComments() {
@ -414,9 +505,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientPostApp return this.clientPostApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -425,26 +514,22 @@ export class AppService {
const payload = { id: paramCommentId }; const payload = { id: paramCommentId };
return this.clientPostApp return this.clientPostApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
// ====================== REPORTS =============================== // ====================== REPORTS ===============================
//Report parameter from API //Report parameter from API
createReport(action: string, description: string, date_entry: Date, createReport(action: string, description: string, date_entry: Date,
user_id: string) { user_id: string) {
const pattern = { cmd: 'createReport' }; const pattern = { cmd: 'createReport' };
const payload = { const payload = {
action: action, description: description, date_entry: date_entry, action: action, description: description, date_entry: date_entry,
user_id: user_id user_id: user_id
}; };
return this.clientReportApp return this.clientReportApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
allReports() { allReports() {
@ -452,9 +537,7 @@ export class AppService {
const payload = {}; const payload = {};
return this.clientReportApp return this.clientReportApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
//GET parameter from API //GET parameter from API
@ -463,29 +546,40 @@ export class AppService {
const payload = { id: paramReportId }; const payload = { id: paramReportId };
return this.clientReportApp return this.clientReportApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
sendMail(email: string) { sendMail(email: string) {
const pattern = { cmd: 'sendMail' }; const pattern = { cmd: 'sendMail' };
const payload = { email: email}; const payload = { email: email };
return this.clientNotificationtApp return this.clientNotificationtApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
html(email: string, name: string) { html(email: string, name: string) {
const pattern = { cmd: 'html' }; const pattern = { cmd: 'html' };
const payload = { email: email, name: name}; const payload = { email: email, name: name };
return this.clientNotificationtApp return this.clientNotificationtApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((message: string) => ({ message })));
map((message: string) => ({ message })),
);
} }
}
/* Function to generate combination of password */
generatePassword() {
var pass = '';
var str = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' +
'abcdefghijklmnopqrstuvwxyz0123456789@#$';
for (let i = 1; i <= 8; i++) {
var char = Math.floor(Math.random()
* str.length + 1);
pass += str.charAt(char)
}
return pass;
}
}

4
devshell.toml Normal file
View File

@ -0,0 +1,4 @@
# https://numtide.github.io/devshell
[[commands]]
package = "devshell.cli"
help = "Per project developer environments"

92
flake.lock Normal file
View File

@ -0,0 +1,92 @@
{
"nodes": {
"devshell": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1658746384,
"narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=",
"owner": "numtide",
"repo": "devshell",
"rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1643381941,
"narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1659782844,
"narHash": "sha256-tM/qhHFE61puBxh9ebP3BIG1fkRAT4rHqD3jCM0HXGY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c85e56bb060291eac3fb3c75d4e0e64f6836fcfe",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"devshell": "devshell",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
}
}
},
"root": "root",
"version": 7
}

20
flake.nix Normal file
View File

@ -0,0 +1,20 @@
{
description = "virtual environments";
inputs.devshell.url = "github:numtide/devshell";
inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, flake-utils, devshell, nixpkgs }:
flake-utils.lib.eachDefaultSystem (system: {
devShell =
let pkgs = import nixpkgs {
inherit system;
overlays = [ devshell.overlay ];
};
in
pkgs.devshell.mkShell {
imports = [ (pkgs.devshell.importTOML ./devshell.toml) ];
};
});
}

View File

@ -1,6 +1,5 @@
node_modules/ node_modules/
.expo/ .expo/
dist/
npm-debug.* npm-debug.*
*.jks *.jks
*.p8 *.p8
@ -9,6 +8,6 @@ npm-debug.*
*.mobileprovision *.mobileprovision
*.orig.* *.orig.*
web-build/ web-build/
.vscode
# macOS
.DS_Store .DS_Store

138
mobile-ui/App.js Normal file
View File

@ -0,0 +1,138 @@
import React from "react";
import {
Text,
Link,
HStack,
Center,
Heading,
Switch,
useColorMode,
NativeBaseProvider,
extendTheme,
VStack,
Box,
FormControl,
Input,
Button,
Image
} from "native-base";
import NativeBaseIcon from "./components/NativeBaseIcon";
import { Platform } from "react-native";
// Define the config
const config = {
useSystemColorMode: false,
initialColorMode: "dark",
};
// extend the theme
export const theme = extendTheme({ config,
colors: {
brown: "#D7A86E"
} });
//const logo = require('./assets/')
export default function App() {
return (
<NativeBaseProvider>
<Center w="100%">
<Box safeArea p="2" py="8" w="90%" maxW="290">
{/* <Image source={{
uri: logo.default.src
}} width={500} height={500}
alt="Katoikia logo" size="xl" /> */}
<Heading
size="lg"
fontWeight="600"
color="coolGray.800"
_dark={{
color: "warmGray.50",
}}
>
Bienvenido a Katoikia
</Heading>
<Heading
mt="1"
_dark={{
color: "warmGray.200",
}}
color="coolGray.600"
fontWeight="medium"
size="xs"
>
Su app de comunidad de confianza
</Heading>
<VStack space={3} mt="5">
<FormControl>
<FormControl.Label> Correo Electrónico</FormControl.Label>
<Input />
</FormControl>
<FormControl>
<FormControl.Label> Contraseña </FormControl.Label>
<Input type="password" />
<Link
_text={{
fontSize: "xs",
fontWeight: "500",
color: "indigo.500",
}}
alignSelf="flex-end"
mt="1"
>
Recuperar contraseña
</Link>
</FormControl>
<Button mt="2" colorScheme="primary"
>
<Text>Continuar</Text>
</Button>
<HStack mt="6" justifyContent="center">
{/* <Text
fontSize="sm"
color="coolGray.600"
_dark={{
color: "warmGray.200",
}}
>
I'm a new user.
</Text> */}
<Link
_text={{
color: "warning.300",
fontWeight: "medium",
fontSize: "sm",
}}
href="#"
>
Regístrese aquí
</Link>
</HStack>
</VStack>
</Box>
</Center>
</NativeBaseProvider>
);
}
// Color Switch Component
function ToggleDarkMode() {
const { colorMode, toggleColorMode } = useColorMode();
return (
<HStack space={2} alignItems="center">
<Text>Dark</Text>
<Switch
isChecked={colorMode === "light"}
onToggle={toggleColorMode}
aria-label={
colorMode === "light" ? "switch to dark mode" : "switch to light mode"
}
/>
<Text>Light</Text>
</HStack>
);
}

View File

@ -1,20 +0,0 @@
import { StatusBar } from 'expo-status-bar';
import { StyleSheet, Text, View } from 'react-native';
export default function App() {
return (
<View style={styles.container}>
<Text>Open up App.tsx to start working on your app!</Text>
<StatusBar style="auto" />
</View>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
alignItems: 'center',
justifyContent: 'center',
},
});

9
mobile-ui/Readme.md Normal file
View File

@ -0,0 +1,9 @@
# NativeBase Expo Template
The official NativeBase template for [Expo](https://docs.expo.io/)
## Usage
```sh
expo init my-app --template @native-base/expo-template
```

View File

@ -1,11 +1,10 @@
{ {
"expo": { "expo": {
"name": "mobile-ui", "name": "my-app",
"slug": "mobile-ui", "slug": "my-app",
"version": "1.0.0", "version": "1.0.0",
"orientation": "portrait", "orientation": "portrait",
"icon": "./assets/icon.png", "icon": "./assets/icon.png",
"userInterfaceStyle": "light",
"splash": { "splash": {
"image": "./assets/splash.png", "image": "./assets/splash.png",
"resizeMode": "contain", "resizeMode": "contain",

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View File

@ -0,0 +1,44 @@
import React from "react";
import { Icon } from "native-base";
import { G, Path } from "react-native-svg";
const NativeBaseIcon = () => {
return (
<Icon size="220px" viewBox="0 0 602.339 681.729">
<G
id="Group_403"
data-name="Group 403"
transform="translate(14575 1918.542)"
>
<Path
id="Path_1"
data-name="Path 1"
d="M488.722,0A45.161,45.161,0,0,1,527.83,22.576L675.676,278.584a45.162,45.162,0,0,1,0,45.171L527.83,579.763a45.162,45.162,0,0,1-39.108,22.576H193.008A45.162,45.162,0,0,1,153.9,579.763L6.053,323.755a45.162,45.162,0,0,1,0-45.171L153.9,22.576A45.162,45.162,0,0,1,193.008,0Z"
transform="translate(-13972.661 -1918.542) rotate(90)"
fill="#356290"
/>
<Path
id="Path_252"
data-name="Path 252"
d="M401.1,0A60.816,60.816,0,0,1,453.77,30.405L567.2,226.844a60.816,60.816,0,0,1,0,60.82L453.77,484.1A60.816,60.816,0,0,1,401.1,514.509H174.241A60.816,60.816,0,0,1,121.575,484.1L8.149,287.665a60.816,60.816,0,0,1,0-60.82L121.575,30.405A60.816,60.816,0,0,1,174.241,0Z"
transform="translate(-14016.576 -1865.281) rotate(90)"
fill="#1784b2"
/>
<Path
id="Path_251"
data-name="Path 251"
d="M345.81,0a36.573,36.573,0,0,1,31.674,18.288L480.566,196.856a36.573,36.573,0,0,1,0,36.569L377.484,411.993a36.573,36.573,0,0,1-31.674,18.288H139.655a36.572,36.572,0,0,1-31.674-18.288L4.9,233.425a36.573,36.573,0,0,1,0-36.569L107.981,18.288A36.573,36.573,0,0,1,139.655,0Z"
transform="translate(-14058.69 -1820.41) rotate(90)"
fill="#50bfc3"
/>
<Path
id="_x3C__x2F__x3E_"
d="M187.066,335.455V297.993l-65.272-21.949,65.272-22.523V216.059L81,259.5v32.521Zm38.726,29.3L286.123,174H256.7l-60.33,190.759Zm72.052-29.3,106.066-43.783V259.267L297.844,216.059V254.44l59.3,23.328-59.3,19.421Z"
transform="translate(-14516.286 -1846.988)"
fill="#fff"
/>
</G>
</Icon>
);
};
export default NativeBaseIcon;

29615
mobile-ui/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,14 @@
{ {
"name": "mobile-ui", "name": "my-app",
"version": "1.0.0", "version": "1.0.0",
"main": "node_modules/expo/AppEntry.js", "main": "node_modules/expo/AppEntry.js",
"keywords": [
"react",
"expo",
"template",
"nativebase"
],
"license": "MIT",
"scripts": { "scripts": {
"start": "expo start", "start": "expo start",
"android": "expo start --android", "android": "expo start --android",
@ -10,20 +17,23 @@
"eject": "expo eject" "eject": "expo eject"
}, },
"dependencies": { "dependencies": {
"expo": "~45.0.0", "expo": "^44.0.0",
"expo-cli": "^5.4.12", "expo-status-bar": "~1.2.0",
"expo-status-bar": "~1.3.0", "native-base": "3.4.0",
"react": "17.0.2", "react": "17.0.1",
"react-dom": "17.0.2", "react-dom": "17.0.1",
"react-native": "0.68.2", "react-native": "0.64.3",
"react-native-web": "0.17.7", "react-native-safe-area-context": "3.3.2",
"sharp-cli": "^2.1.1" "react-native-svg": "12.1.1",
"react-native-web": "0.17.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.12.9", "@babel/core": "^7.12.9"
"@types/react": "~17.0.21",
"@types/react-native": "~0.66.13",
"typescript": "~4.3.5"
}, },
"bugs": {
"url": "https://github.com/GeekyAnts/nativebase-templates/issues"
},
"homepage": "https://github.com/GeekyAnts/nativebase-templates#readme",
"author": "Aditya Jamuar",
"private": true "private": true
} }

View File

@ -1,6 +0,0 @@
{
"extends": "expo/tsconfig.base",
"compilerOptions": {
"strict": true
}
}

17206
package-lock.json generated

File diff suppressed because it is too large Load Diff

31
package.json Normal file
View File

@ -0,0 +1,31 @@
{
"devDependencies": {
"husky": "^8.0.1",
"js-beautify": "^1.14.4",
"lint-staged": "^13.0.3",
"prettier": "^2.7.1"
},
"scripts": {
"format": "npm run format:prettier && npm run format:html",
"format:prettier": "prettier --config .prettierrc \"**/src/**/*.{ts,css,less,scss,js}\" --write",
"format:html": "js-beautify --config .jsbeautifyrc --type 'html' --file '**/src/**/*.html' --replace"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{ts,css,less,scss,js}": [
"prettier --config .prettierrc --write",
"git add"
],
"*.html": [
"js-beautify --config .jsbeautifyrc --type 'html' --replace",
"git add"
]
},
"dependencies": {
"@react-navigation/native": "^6.0.11"
}
}

View File

@ -5,9 +5,11 @@ import { MongooseModule } from '@nestjs/mongoose';
import { BooksModule } from './books/books.module'; import { BooksModule } from './books/books.module';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_books?retryWrites=true&w=majority`), MongooseModule.forRoot(
BooksModule, `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_books?retryWrites=true&w=majority`,
),
BooksModule,
], ],
controllers: [AppController], controllers: [AppController],
providers: [AppService], providers: [AppService],

View File

@ -9,7 +9,7 @@ import {
Delete, Delete,
} from '@nestjs/common'; } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger'; import { ApiTags } from '@nestjs/swagger';
import { Request } from 'express'; import { Request } from 'express';
import { BooksService } from './books.service'; import { BooksService } from './books.service';
import { CreateBookDto } from './dto/create-book.dto'; import { CreateBookDto } from './dto/create-book.dto';
import { UpdateBookDto } from './dto/update-book.dto'; import { UpdateBookDto } from './dto/update-book.dto';
@ -26,8 +26,8 @@ export class BooksController {
} }
@Get() @Get()
findAll(@Req() request: Request) { findAll(@Req() request: Request) {
return this.booksService.findAll(request); return this.booksService.findAll(request);
} }
@Get(':id') @Get(':id')
@ -44,4 +44,4 @@ export class BooksController {
remove(@Param('id') id: string) { remove(@Param('id') id: string) {
return this.booksService.remove(id); return this.booksService.remove(id);
} }
} }

View File

@ -6,9 +6,9 @@ import { Book, BookSchema } from './schemas/book.schema';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: Book.name, schema: BookSchema }]), MongooseModule.forFeature([{ name: Book.name, schema: BookSchema }]),
], ],
controllers: [BooksController], controllers: [BooksController],
providers: [BooksService] providers: [BooksService],
}) })
export class BooksModule {} export class BooksModule {}

View File

@ -4,7 +4,7 @@ import { UpdateBookDto } from './dto/update-book.dto';
import { InjectModel } from '@nestjs/mongoose'; import { InjectModel } from '@nestjs/mongoose';
import { Book, BookDocument } from './schemas/book.schema'; import { Book, BookDocument } from './schemas/book.schema';
import { Model } from 'mongoose'; import { Model } from 'mongoose';
import { Request } from 'express'; import { Request } from 'express';
@Injectable() @Injectable()
export class BooksService { export class BooksService {
@ -16,10 +16,10 @@ export class BooksService {
return this.bookModel.create(book); return this.bookModel.create(book);
} }
async findAll(request: Request): Promise<Book[]> { async findAll(request: Request): Promise<Book[]> {
return this.bookModel return this.bookModel
.find(request.query) .find(request.query)
.setOptions({ sanitizeFilter: true }) .setOptions({ sanitizeFilter: true })
.exec(); .exec();
} }
@ -36,4 +36,4 @@ export class BooksService {
async remove(id: string) { async remove(id: string) {
return this.bookModel.findByIdAndRemove({ _id: id }).exec(); return this.bookModel.findByIdAndRemove({ _id: id }).exec();
} }
} }

View File

@ -1,12 +1,10 @@
import { ApiProperty } from '@nestjs/swagger'; import { ApiProperty } from '@nestjs/swagger';
export class CreateBookDto { export class CreateBookDto {
@ApiProperty({ @ApiProperty({
example: 'Nest.js: A Progressive Node.js Framework (English Edition)', example: 'Nest.js: A Progressive Node.js Framework (English Edition)',
}) })
readonly title: string; readonly title: string;
@ApiProperty({ example: 'Web Development' }) @ApiProperty({ example: 'Web Development' })
readonly genre: string; readonly genre: string;
@ -28,6 +26,6 @@ export class CreateBookDto {
}) })
readonly image_url: string; readonly image_url: string;
@ApiProperty({ example: ['NestJS', 'REST API'] }) @ApiProperty({ example: ['NestJS', 'REST API'] })
readonly keywords: string[]; readonly keywords: string[];
} }

View File

@ -1,11 +1,11 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose'; import { Document } from 'mongoose';
export type BookDocument = Book & Document; export type BookDocument = Book & Document;
@Schema() @Schema()
export class Book { export class Book {
@Prop() @Prop()
genre: string; genre: string;
@Prop() @Prop()
@ -20,8 +20,8 @@ export class Book {
@Prop() @Prop()
image_url: string; image_url: string;
@Prop([String]) @Prop([String])
keywords: string[]; keywords: string[];
} }
export const BookSchema = SchemaFactory.createForClass(Book); export const BookSchema = SchemaFactory.createForClass(Book);

View File

@ -6,16 +6,16 @@ async function bootstrap() {
const app = await NestFactory.create(AppModule); const app = await NestFactory.create(AppModule);
// Configurar títulos de documentación // Configurar títulos de documentación
const options = new DocumentBuilder() const options = new DocumentBuilder()
.setTitle('MongoDB Book REST API') .setTitle('MongoDB Book REST API')
.setDescription('API REST para libros con MongoDB') .setDescription('API REST para libros con MongoDB')
.setVersion('1.0') .setVersion('1.0')
.build(); .build();
const document = SwaggerModule.createDocument(app, options); const document = SwaggerModule.createDocument(app, options);
// La ruta en que se sirve la documentación // La ruta en que se sirve la documentación
SwaggerModule.setup('docs', app, document); SwaggerModule.setup('docs', app, document);
await app.listen(3000); await app.listen(3000);
} }
bootstrap(); bootstrap();

View File

@ -1,23 +1,25 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { CommonAreasModule } from './common_areas/common_areas.module'; import { CommonAreasModule } from './common_areas/common_areas.module';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_AREAS_COMUNES", name: 'SERVICIO_AREAS_COMUNES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3003 port: 3003,
} },
} },
]), ]),
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_areas_comunes?retryWrites=true&w=majority`), MongooseModule.forRoot(
CommonAreasModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_areas_comunes?retryWrites=true&w=majority`,
),
CommonAreasModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })

View File

@ -7,30 +7,36 @@ import { CommonAreasService } from './common_areas.service';
export class CommonAreasController { export class CommonAreasController {
constructor(private readonly commonAreasService: CommonAreasService) {} constructor(private readonly commonAreasService: CommonAreasService) {}
@MessagePattern({cmd: 'createCommonArea'}) @MessagePattern({ cmd: 'createCommonArea' })
create(@Payload() commonArea: CommonAreaDocument) { create(@Payload() commonArea: CommonAreaDocument) {
return this.commonAreasService.create(commonArea); return this.commonAreasService.create(commonArea);
} }
@MessagePattern({cmd: 'findAllCommonAreas'}) @MessagePattern({ cmd: 'findAllCommonAreas' })
findAll() { findAll() {
return this.commonAreasService.findAll(); return this.commonAreasService.findAll();
} }
@MessagePattern({cmd: 'findOneCommonArea'}) @MessagePattern({ cmd: 'findOneCommonArea' })
findOne(@Payload() id: string) { findOne(@Payload() id: string) {
let _id = id['_id']; let _id = id['_id'];
return this.commonAreasService.findOne(_id); return this.commonAreasService.findOne(_id);
} }
@MessagePattern({cmd: 'updateCommonArea'}) @MessagePattern({ cmd: 'updateCommonArea' })
update(@Payload() commonArea: CommonAreaDocument) { update(@Payload() commonArea: CommonAreaDocument) {
return this.commonAreasService.update(commonArea.id, commonArea); return this.commonAreasService.update(commonArea.id, commonArea);
} }
@MessagePattern({cmd: 'removeCommonArea'}) @MessagePattern({ cmd: 'removeCommonArea' })
remove(@Payload() id: string) { remove(@Payload() id: string) {
let _id = id['_id']; let _id = id['id'];
return this.commonAreasService.remove(_id); return this.commonAreasService.remove(_id);
} }
@MessagePattern({ cmd: 'findByCommunity' })
findByCommunity(@Payload() id: string) {
let _community_id = id['community_id'];
return this.commonAreasService.findByCommunity(_community_id);
}
} }

View File

@ -6,9 +6,11 @@ import { MongooseModule } from '@nestjs/mongoose';
import { CommonArea, CommonAreaSchema } from '../schemas/common_area.schema'; import { CommonArea, CommonAreaSchema } from '../schemas/common_area.schema';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: CommonArea.name, schema: CommonAreaSchema }]), MongooseModule.forFeature([
{ name: CommonArea.name, schema: CommonAreaSchema },
]),
], ],
controllers: [CommonAreasController], controllers: [CommonAreasController],
providers: [CommonAreasService] providers: [CommonAreasService],
}) })
export class CommonAreasModule {} export class CommonAreasModule {}

View File

@ -1,23 +1,23 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { CommonArea, CommonAreaDocument } from 'src/schemas/common_area.schema'; import { CommonArea, CommonAreaDocument } from 'src/schemas/common_area.schema';
import { InjectModel } from '@nestjs/mongoose'; import { InjectModel } from '@nestjs/mongoose';
import { Model } from 'mongoose'; import { Model } from 'mongoose';
@Injectable() @Injectable()
export class CommonAreasService { export class CommonAreasService {
constructor( constructor(
@InjectModel(CommonArea.name) private readonly commonAreaModel: Model<CommonAreaDocument>, @InjectModel(CommonArea.name)
private readonly commonAreaModel: Model<CommonAreaDocument>,
) {} ) {}
async create(commonArea: CommonAreaDocument): Promise<CommonArea> { async create(commonArea: CommonAreaDocument): Promise<CommonArea> {
return this.commonAreaModel.create(commonArea); return this.commonAreaModel.create(commonArea);
} }
async findAll(): Promise<CommonArea[]> { async findAll(): Promise<CommonArea[]> {
return this.commonAreaModel return this.commonAreaModel
.find() .find()
.setOptions({ sanitizeFilter: true }) .setOptions({ sanitizeFilter: true })
.exec(); .exec();
} }
@ -32,6 +32,13 @@ export class CommonAreasService {
} }
async remove(id: string) { async remove(id: string) {
return this.commonAreaModel.findByIdAndRemove({ _id: id }).exec(); return this.commonAreaModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
new: true,
});
};
async findByCommunity(community_id: string): Promise<CommonArea[]> {
return this.commonAreaModel.find({ community_id: community_id }).exec();
} }
} }

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,12 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3003 port: 3003,
} },
}); });
app.listen().then(() => logger.log("Microservice Áreas Comunes is listening" )); app
.listen()
.then(() => logger.log('Microservice Áreas Comunes is listening'));
} }
bootstrap(); bootstrap();

View File

@ -1,29 +1,29 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose'; import { Document } from 'mongoose';
import { Timestamp } from 'rxjs'; import { Timestamp } from 'rxjs';
import { TimerOptions } from 'timers'; import { TimerOptions } from 'timers';
export type CommonAreaDocument = CommonArea & Document; export type CommonAreaDocument = CommonArea & Document;
@Schema({ collection: 'common_areas' }) @Schema({ collection: 'common_areas' })
export class CommonArea { export class CommonArea {
@Prop()
name: string;
@Prop() @Prop()
name: string; hourMin: string; //hora militar, separado por dos puntos
@Prop() @Prop()
hourMin: string; //hora militar, separado por dos puntos hourMax: string; //hora militar, separado por dos puntos
@Prop() @Prop()
hourMax: string; //hora militar, separado por dos puntos bookable: number; //saber si es necesario reservarlo o no
@Prop() @Prop()
bookable: number; //saber si es necesario reservarlo o no status: string;
@Prop() @Prop()
community_id: string; community_id: string;
} }
export const CommonAreaSchema = SchemaFactory.createForClass(CommonArea); export const CommonAreaSchema = SchemaFactory.createForClass(CommonArea);

View File

@ -1,24 +1,26 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { CommunitiesModule } from './communities/communities.module'; import { CommunitiesModule } from './communities/communities.module';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_COMUNIDADES", name: 'SERVICIO_COMUNIDADES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3002 port: 3002,
} },
} },
]), ]),
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_comunidades?retryWrites=true&w=majority`), MongooseModule.forRoot(
CommunitiesModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_comunidades?retryWrites=true&w=majority`,
),
CommunitiesModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })
export class AppModule { } export class AppModule {}

View File

@ -12,37 +12,45 @@ export class CommunitiesController {
return this.communitiesService.create(community); return this.communitiesService.create(community);
} }
@MessagePattern({cmd: 'findAllCommunities'}) @MessagePattern({ cmd: 'findAllCommunities' })
findAll() { findAll() {
return this.communitiesService.findAll(); return this.communitiesService.findAll();
} }
@MessagePattern({cmd: 'findOneCommunity'}) @MessagePattern({ cmd: 'findOneCommunity' })
findOne(@Payload() id: string) { findOne(@Payload() id: string) {
let _id = id['_id']; let _id = id['_id'];
return this.communitiesService.findOne(_id); return this.communitiesService.findOne(_id);
} }
@MessagePattern({cmd: 'findCommunityName'}) @MessagePattern({ cmd: 'findCommunityName' })
findOneName(@Payload() id: string) { findOneName(@Payload() id: string) {
let _id = id['_id']; let _id = id['id'];
return this.communitiesService.findOneName(_id); return this.communitiesService.findOneName(_id);
} }
/* @MessagePattern({cmd: 'findCommunityAdmin'}) /* @MessagePattern({cmd: 'findCommunityAdmin'})
findCommunityAdmin(@Payload() community: any) { findCommunityAdmin(@Payload() community: any) {
let _community = community['community_id']; let _community = community['community_id'];
return this.communitiesService.findCommunityAdmin(_community, "2"); return this.communitiesService.findCommunityAdmin(_community, "2");
}*/ }*/
@MessagePattern({cmd: 'updateCommunity'}) @MessagePattern({ cmd: 'updateCommunity' })
update(@Payload() community: CommunityDocument) { update(@Payload() community: CommunityDocument) {
return this.communitiesService.update(community.id, community); return this.communitiesService.update(community.id, community);
} }
@MessagePattern({cmd: 'removeCommunity'}) @MessagePattern({ cmd: 'removeCommunity' })
remove(@Payload() id: string) { remove(@Payload() id: string) {
let _id = id['_id']; let _id = id['_id'];
return this.communitiesService.remove(_id); return this.communitiesService.remove(_id);
} }
//cambiar de estado
@MessagePattern({ cmd: 'changeStatus' })
changeStatus(@Payload() body: string) {
let pid = body['id'];
let pstatus = body['status'];
return this.communitiesService.changeStatus(pid,pstatus);
}
} }

View File

@ -2,26 +2,27 @@ import { Module } from '@nestjs/common';
import { CommunitiesService } from './communities.service'; import { CommunitiesService } from './communities.service';
import { CommunitiesController } from './communities.controller'; import { CommunitiesController } from './communities.controller';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
import { Community, CommunitySchema } from '../schemas/community.schema'; import { Community, CommunitySchema } from '../schemas/community.schema';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_USUARIOS", name: 'SERVICIO_USUARIOS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3001 port: 3001,
} },
} },
]),
MongooseModule.forFeature([
{ name: Community.name, schema: CommunitySchema },
]), ]),
MongooseModule.forFeature([{ name: Community.name, schema: CommunitySchema }]),
], ],
controllers: [CommunitiesController], controllers: [CommunitiesController],
providers: [CommunitiesService] providers: [CommunitiesService],
}) })
export class CommunitiesModule {} export class CommunitiesModule {}

View File

@ -7,47 +7,46 @@ import { from, lastValueFrom, map, scan, mergeMap } from 'rxjs';
import { Admin } from 'src/schemas/admin.entity'; import { Admin } from 'src/schemas/admin.entity';
import { appendFileSync } from 'fs'; import { appendFileSync } from 'fs';
@Injectable() @Injectable()
export class CommunitiesService { export class CommunitiesService {
constructor( constructor(
@InjectModel(Community.name) private readonly communityModel: Model<CommunityDocument>, @InjectModel(Community.name)
private readonly communityModel: Model<CommunityDocument>,
@Inject('SERVICIO_USUARIOS') private readonly clientUserApp: ClientProxy, @Inject('SERVICIO_USUARIOS') private readonly clientUserApp: ClientProxy,
) {}
) { }
async create(community: CommunityDocument): Promise<Community> { async create(community: CommunityDocument): Promise<Community> {
return this.communityModel.create(community); return this.communityModel.create(community);
} }
async findAll(): Promise<Community[]> { async findAll(): Promise<Community[]> {
return await this.communityModel return await this.communityModel
.find() .find()
.setOptions({ sanitizeFilter: true }) .setOptions({ sanitizeFilter: true })
.exec() .exec()
.then(async community => { .then(async (community) => {
if (community) { if (community) {
await Promise.all(community.map(async c => { await Promise.all(
//buscar al usuario con el id de la comunidad anexado community.map(async (c) => {
let admin = await this.findCommunityAdmin(c["_id"], "2") //buscar al usuario con el id de la comunidad anexado
if (admin) { let admin = await this.findCommunityAdmin(c['_id'], '2');
c["id_admin"] = admin["_id"] if (admin) {
c["name_admin"] = admin["name"] c['id_admin'] = admin['_id'];
} c['name_admin'] = admin['name'];
return c }
})) return c;
}),
);
} }
return community; return community;
}) });
} }
findOne(id: string): Promise<Community> { findOne(id: string): Promise<Community> {
return this.communityModel.findOne({ _id: id }).exec(); return this.communityModel.findOne({ _id: id }).exec();
} }
findOneName(id: string): Promise<Community> { findOneName(id: string): Promise<Community> {
return this.communityModel.findOne({ _id: "62be68215692582bbfd77134" }).exec(); return this.communityModel.findOne({ _id: id }).exec();
} }
update(id: string, community: CommunityDocument) { update(id: string, community: CommunityDocument) {
@ -57,21 +56,26 @@ export class CommunitiesService {
} }
async remove(id: string) { async remove(id: string) {
return this.communityModel.findByIdAndRemove({ _id: id }).exec(); return this.communityModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
new: true,
});
}
async changeStatus(id: string, status: string) {
return this.communityModel.findOneAndUpdate({ _id: id }, {status: status}, {
new: true,
});
} }
async findCommunityAdmin(community: string, user_type: string) { async findCommunityAdmin(community: string, user_type: string) {
const pattern = { cmd: 'findOneCommunityUser' } const pattern = { cmd: 'findOneCommunityUser' };
const payload = { community_id: community, user_type: user_type } const payload = { community_id: community, user_type: user_type };
let callback = await this.clientUserApp let callback = await this.clientUserApp
.send<string>(pattern, payload) .send<string>(pattern, payload)
.pipe( .pipe(map((response: string) => ({ response })));
map((response: string) => ({ response }))
)
const finalValue = await lastValueFrom(callback); const finalValue = await lastValueFrom(callback);
return finalValue['response']; return finalValue['response'];
} }
} }

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,14 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3002 port: 3002,
} },
}); });
app.listen().then(() => logger.log("Microservice Comunidades de vivienda is listening" )); app
.listen()
.then(() =>
logger.log('Microservice Comunidades de vivienda is listening'),
);
} }
bootstrap(); bootstrap();

View File

@ -1,4 +1,4 @@
export interface Admin { export interface Admin {
id_community: string; id_community: string;
user_type: string; user_type: string;
} }

View File

@ -2,45 +2,42 @@ import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose'; import { Document } from 'mongoose';
import { House, HouseSchema } from './house.schema'; import { House, HouseSchema } from './house.schema';
export type CommunityDocument = Community & Document; export type CommunityDocument = Community & Document;
@Schema({ collection: 'communities' }) @Schema({ collection: 'communities' })
export class Community { export class Community {
@Prop() @Prop()
id_admin: string; id_admin: string;
@Prop() @Prop()
name_admin: string ; name_admin: string;
@Prop() @Prop()
name: string; name: string;
@Prop() @Prop()
province: string; province: string;
@Prop() @Prop()
canton: string; canton: string;
@Prop() @Prop()
district: string; district: string;
@Prop() @Prop()
num_houses: number; num_houses: number;
@Prop() @Prop()
phone: string; phone: string;
@Prop() @Prop()
status: string; status: string;
@Prop() @Prop()
date_entry: Date; date_entry: Date;
@Prop({ type: [HouseSchema] })
houses: Array<House>;
@Prop({ type: [HouseSchema] })
houses: Array<House>;
} }
export const CommunitySchema = SchemaFactory.createForClass(Community);
export const CommunitySchema = SchemaFactory.createForClass(Community);

View File

@ -4,17 +4,15 @@ import { Document } from 'mongoose';
import { empty } from 'rxjs'; import { empty } from 'rxjs';
import { Tenant, TenantSchema } from './tenant.schema'; import { Tenant, TenantSchema } from './tenant.schema';
@Schema() @Schema()
export class House extends Document { export class House extends Document {
@Prop({ default: " " }) @Prop({ default: ' ' })
number_house: string; number_house: string;
@Prop({ default: "desocupada" }) @Prop({ default: 'desocupada' })
state: string; state: string;
@Prop({ type: TenantSchema }) @Prop({ type: TenantSchema })
tenants: Tenant; tenants: Tenant;
} }
export const HouseSchema = SchemaFactory.createForClass(House); export const HouseSchema = SchemaFactory.createForClass(House);

View File

@ -1,11 +1,9 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
@Schema() @Schema()
export class Tenant { export class Tenant {
@Prop( {default: ''}) @Prop({ default: '' })
tenant_id: string; tenant_id: string;
} }
export const TenantSchema = SchemaFactory.createForClass(Tenant); export const TenantSchema = SchemaFactory.createForClass(Tenant);

View File

@ -1,23 +1,27 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
import { PostsModule } from './posts/posts.module'; import { PostsModule } from './posts/posts.module';
import { PostCommentsModule } from './post-comments/post-comments.module'; import { PostCommentsModule } from './post-comments/post-comments.module';
@Module({ @Module({
imports: [ ClientsModule.register([ imports: [
{ ClientsModule.register([
name: "SERVICIO_POSTS", {
transport: Transport.TCP, name: 'SERVICIO_POSTS',
options: { transport: Transport.TCP,
host: "127.0.0.1", options: {
port: 3007 host: '127.0.0.1',
} port: 3007,
} },
]), },
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_posts?retryWrites=true&w=majority`), ]),
PostsModule, MongooseModule.forRoot(
PostCommentsModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_posts?retryWrites=true&w=majority`,
),
PostsModule,
PostCommentsModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,10 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3007 port: 3007,
} },
}); });
app.listen().then(() => logger.log("Microservice Comunicados is listening" )); app.listen().then(() => logger.log('Microservice Comunicados is listening'));
} }
bootstrap(); bootstrap();

View File

@ -3,7 +3,6 @@ import { MessagePattern, Payload } from '@nestjs/microservices';
import { PostCommentsService } from './post-comments.service'; import { PostCommentsService } from './post-comments.service';
import { Comment, CommentDocument } from '../schemas/post-comment.schema'; import { Comment, CommentDocument } from '../schemas/post-comment.schema';
@Controller() @Controller()
export class PostCommentsController { export class PostCommentsController {
constructor(private readonly postCommentsService: PostCommentsService) {} constructor(private readonly postCommentsService: PostCommentsService) {}
@ -18,7 +17,7 @@ export class PostCommentsController {
return this.postCommentsService.findAll(); return this.postCommentsService.findAll();
} }
@MessagePattern({cmd: 'findOneComment'}) @MessagePattern({ cmd: 'findOneComment' })
findOne(@Payload() id: string) { findOne(@Payload() id: string) {
let _id = id['id']; let _id = id['id'];
return this.postCommentsService.findOne(_id); return this.postCommentsService.findOne(_id);

View File

@ -6,9 +6,9 @@ import { Comment, CommentSchema } from '../schemas/post-comment.schema';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: Comment.name, schema: CommentSchema }]), MongooseModule.forFeature([{ name: Comment.name, schema: CommentSchema }]),
], ],
controllers: [PostCommentsController], controllers: [PostCommentsController],
providers: [PostCommentsService] providers: [PostCommentsService],
}) })
export class PostCommentsModule {} export class PostCommentsModule {}

View File

@ -3,24 +3,21 @@ import { Comment, CommentDocument } from '../schemas/post-comment.schema';
import { Model } from 'mongoose'; import { Model } from 'mongoose';
import { InjectModel } from '@nestjs/mongoose'; import { InjectModel } from '@nestjs/mongoose';
@Injectable() @Injectable()
export class PostCommentsService { export class PostCommentsService {
constructor( constructor(
@InjectModel(Comment.name) private readonly commentModel: Model<CommentDocument>, @InjectModel(Comment.name)
private readonly commentModel: Model<CommentDocument>,
) {} ) {}
async create(comment: CommentDocument): Promise<Comment> { async create(comment: CommentDocument): Promise<Comment> {
return this.commentModel.create(comment); return this.commentModel.create(comment);
} }
async findAll(): Promise<Comment[]> { async findAll(): Promise<Comment[]> {
return this.commentModel return this.commentModel.find().setOptions({ sanitizeFilter: true }).exec();
.find()
.setOptions({ sanitizeFilter: true })
.exec();
} }
async findOne(id: string): Promise<Comment> { async findOne(id: string): Promise<Comment> {
return this.commentModel.findOne({ _id: id }).exec(); return this.commentModel.findOne({ _id: id }).exec();
} }
@ -36,6 +33,8 @@ export class PostCommentsService {
} }
async remove(id: string) { async remove(id: string) {
return this.commentModel.findByIdAndRemove({ _id: id }).exec(); return this.commentModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
new: true,
});
} }
} }

View File

@ -3,10 +3,9 @@ import { MessagePattern, Payload } from '@nestjs/microservices';
import { PostsService } from './posts.service'; import { PostsService } from './posts.service';
import { Post, PostDocument } from '../schemas/post.schema'; import { Post, PostDocument } from '../schemas/post.schema';
@Controller() @Controller()
export class PostsController { export class PostsController {
constructor(private readonly postsService: PostsService) { } constructor(private readonly postsService: PostsService) {}
@MessagePattern({ cmd: 'createPost' }) @MessagePattern({ cmd: 'createPost' })
create(@Payload() post: PostDocument) { create(@Payload() post: PostDocument) {

View File

@ -6,9 +6,9 @@ import { MongooseModule } from '@nestjs/mongoose';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: Post.name, schema: PostSchema }]), MongooseModule.forFeature([{ name: Post.name, schema: PostSchema }]),
], ],
controllers: [PostsController], controllers: [PostsController],
providers: [PostsService] providers: [PostsService],
}) })
export class PostsModule {} export class PostsModule {}

View File

@ -7,19 +7,16 @@ import { InjectModel } from '@nestjs/mongoose';
export class PostsService { export class PostsService {
constructor( constructor(
@InjectModel(Post.name) private readonly postModel: Model<PostDocument>, @InjectModel(Post.name) private readonly postModel: Model<PostDocument>,
) { } ) {}
async create(post: PostDocument): Promise<Post> { async create(post: PostDocument): Promise<Post> {
return this.postModel.create(post); return this.postModel.create(post);
} }
async findAll(): Promise<Post[]> { async findAll(): Promise<Post[]> {
return this.postModel return this.postModel.find().setOptions({ sanitizeFilter: true }).exec();
.find()
.setOptions({ sanitizeFilter: true })
.exec();
} }
async findOne(id: string): Promise<Post> { async findOne(id: string): Promise<Post> {
return this.postModel.findOne({ _id: id }).exec(); return this.postModel.findOne({ _id: id }).exec();
} }

View File

@ -1,25 +1,21 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document, ObjectId } from 'mongoose'; import { Document, ObjectId } from 'mongoose';
export type CommentDocument = Comment & Document; export type CommentDocument = Comment & Document;
@Schema({ collection: 'comments' }) @Schema({ collection: 'comments' })
export class Comment { export class Comment {
@Prop()
@Prop() comment: string;
comment: string;
@Prop() @Prop()
date_entry: Date; date_entry: Date;
@Prop() @Prop()
user_id: string user_id: string;
@Prop()
post_id: string;
@Prop()
post_id: string;
} }
export const CommentSchema = SchemaFactory.createForClass(Comment);
export const CommentSchema = SchemaFactory.createForClass(Comment);

View File

@ -1,24 +1,21 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document, ObjectId } from 'mongoose'; import { Document, ObjectId } from 'mongoose';
export type PostDocument = Post & Document; export type PostDocument = Post & Document;
@Schema({ collection: 'posts' }) @Schema({ collection: 'posts' })
export class Post { export class Post {
@Prop()
@Prop() post: string;
post: string;
@Prop() @Prop()
date_entry: Date; date_entry: Date;
@Prop() @Prop()
user_id: string user_id: string;
@Prop() @Prop()
community_id: string // id de la comunidad community_id: string; // id de la comunidad
} }
export const PostSchema = SchemaFactory.createForClass(Post);
export const PostSchema = SchemaFactory.createForClass(Post);

View File

@ -1,23 +1,25 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { GuestsModule } from './guests/guests.module'; import { GuestsModule } from './guests/guests.module';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_INVITADOS", name: 'SERVICIO_INVITADOS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3004 port: 3004,
} },
} },
]), ]),
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_invitados?retryWrites=true&w=majority`), MongooseModule.forRoot(
GuestsModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_invitados?retryWrites=true&w=majority`,
),
GuestsModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })

View File

@ -7,34 +7,34 @@ import { Guest, GuestDocument } from 'src/schemas/guest.schema';
export class GuestsController { export class GuestsController {
constructor(private readonly guestsService: GuestsService) {} constructor(private readonly guestsService: GuestsService) {}
@MessagePattern( {cmd:'createGuest'}) @MessagePattern({ cmd: 'createGuest' })
create(@Payload() guest: GuestDocument) { create(@Payload() guest: GuestDocument) {
return this.guestsService.create(guest); return this.guestsService.create(guest);
} }
@MessagePattern( {cmd:'findAllGuests'}) @MessagePattern({ cmd: 'findAllGuests' })
findAll() { findAll() {
return this.guestsService.findAll(); return this.guestsService.findAll();
} }
@MessagePattern( {cmd:'findOneGuest'}) @MessagePattern({ cmd: 'findOneGuest' })
findOneById(@Payload() id: string) { findOneById(@Payload() id: string) {
let _id = id['_id']; let _id = id['_id'];
return this.guestsService.findOneId(_id); return this.guestsService.findOneId(_id);
} }
@MessagePattern( {cmd:'findGuestDNI'}) @MessagePattern({ cmd: 'findGuestDNI' })
findOneByDNI(@Payload() id: string) { findOneByDNI(@Payload() id: string) {
let dni = id['dni']; let dni = id['dni'];
return this.guestsService.findOne(dni); return this.guestsService.findOne(dni);
} }
@MessagePattern( {cmd:'updateGuest'}) @MessagePattern({ cmd: 'updateGuest' })
update(@Payload() guest: GuestDocument) { update(@Payload() guest: GuestDocument) {
return this.guestsService.update(guest.id, guest); return this.guestsService.update(guest.id, guest);
} }
@MessagePattern( {cmd:'removeGuest'}) @MessagePattern({ cmd: 'removeGuest' })
remove(@Payload() id: string) { remove(@Payload() id: string) {
let dni = id['dni']; let dni = id['dni'];
return this.guestsService.remove(dni); return this.guestsService.remove(dni);

View File

@ -5,9 +5,9 @@ import { MongooseModule } from '@nestjs/mongoose';
import { Guest, GuestSchema } from 'src/schemas/guest.schema'; import { Guest, GuestSchema } from 'src/schemas/guest.schema';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: Guest.name, schema: GuestSchema }]), MongooseModule.forFeature([{ name: Guest.name, schema: GuestSchema }]),
], ],
controllers: [GuestsController], controllers: [GuestsController],
providers: [GuestsService] providers: [GuestsService],
}) })
export class GuestsModule {} export class GuestsModule {}

View File

@ -13,19 +13,14 @@ export class GuestsService {
return this.guestModel.create(guest); return this.guestModel.create(guest);
} }
async findAll(): Promise<Guest[]> { async findAll(): Promise<Guest[]> {
return this.guestModel return this.guestModel.find().setOptions({ sanitizeFilter: true }).exec();
.find()
.setOptions({ sanitizeFilter: true })
.exec();
} }
findOneId(id: string): Promise<Guest> { findOneId(id: string): Promise<Guest> {
return this.guestModel.findOne({ _id: id }).exec(); return this.guestModel.findOne({ _id: id }).exec();
} }
findOne(id: string): Promise<Guest> { findOne(id: string): Promise<Guest> {
return this.guestModel.findOne({ dni: id }).exec(); return this.guestModel.findOne({ dni: id }).exec();
} }
@ -37,6 +32,8 @@ export class GuestsService {
} }
async remove(id: string) { async remove(id: string) {
return this.guestModel.findByIdAndRemove({ _id: id }).exec(); return this.guestModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
new: true,
});
} }
} }

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,10 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3004 port: 3004,
} },
}); });
app.listen().then(() => logger.log("Microservice Invitados is listening" )); app.listen().then(() => logger.log('Microservice Invitados is listening'));
} }
bootstrap(); bootstrap();

View File

@ -1,40 +1,37 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose'; import { Document } from 'mongoose';
export type GuestDocument = Guest & Document; export type GuestDocument = Guest & Document;
@Schema({ collection: 'guests' }) @Schema({ collection: 'guests' })
export class Guest { export class Guest {
@Prop()
name: string;
@Prop() @Prop()
name: string; last_name: string;
@Prop() @Prop()
last_name: string; dni: string;
@Prop() @Prop()
dni: string; phone: number;
@Prop() @Prop()
phone: number; number_plate: string;
@Prop() @Prop()
number_plate: string; status: string;
@Prop() @Prop()
status: string; date_entry: Date;
@Prop() @Prop()
date_entry: Date; tenant_id: string;
@Prop() @Prop()
tenant_id: string; community_id: string; ///creo que se debe de agregar para facilitar al guarda ver
// ver los invitados de x comunidad
@Prop()
community_id: string; ///creo que se debe de agregar para facilitar al guarda ver
// ver los invitados de x comunidad
} }
export const GuestSchema = SchemaFactory.createForClass(Guest);
export const GuestSchema = SchemaFactory.createForClass(Guest);

View File

@ -6,6 +6,6 @@ export class AppController {
@Get() @Get()
getHello(): string { getHello(): string {
return "hola"; return 'hola';
} }
} }

View File

@ -1,14 +1,13 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { AppController } from './app.controller'; import { AppController } from './app.controller';
import { MailerModule } from '@nestjs-modules/mailer'; import { MailerModule } from '@nestjs-modules/mailer';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
import { AuthModule } from './auth/auth.module'; import { AuthModule } from './auth/auth.module';
import { EmailController } from './email.controller'; import { EmailController } from './email.controller';
import { join } from 'path'; import { join } from 'path';
import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter'; import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
import { ConfigModule, ConfigService } from '@nestjs/config'; import { ConfigModule, ConfigService } from '@nestjs/config';
@Module({ @Module({
imports: [ imports: [
MailerModule.forRootAsync({ MailerModule.forRootAsync({
@ -42,15 +41,16 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
}), }),
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_NOTIFICACIONES", name: 'SERVICIO_NOTIFICACIONES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3009 port: 3009,
} },
} },
]), ]),
AuthModule], AuthModule,
],
controllers: [AppController, EmailController], controllers: [AppController, EmailController],
providers: [], providers: [],
}) })

View File

@ -3,11 +3,10 @@ import { User } from './../user/user.entity';
@Injectable() @Injectable()
export class AuthService { export class AuthService {
async signUp(user: User) { async signUp(user: User) {
const token = Math.floor(1000 + Math.random() * 9000).toString(); const token = Math.floor(1000 + Math.random() * 9000).toString();
// create user in db // create user in db
// ... // ...
// send confirmation mail // send confirmation mail
} }
} }

View File

@ -6,24 +6,23 @@ import { User } from './user/user.entity';
@Controller() @Controller()
export class EmailController { export class EmailController {
constructor(private mailService: MailerService) { } constructor(private mailService: MailerService) {}
@MessagePattern({ cmd: 'sendMail' }) @MessagePattern({ cmd: 'sendMail' })
sendMail(@Payload() toEmail: string) { sendMail(@Payload() toEmail: string) {
var response = this.mailService.sendMail({
var response = this.mailService.sendMail({ to: toEmail['email'],
to: toEmail["email"], from: 'mbonilla.guti@gmail.com',
from: "mbonilla.guti@gmail.com", subject: 'Plain Text Email ✔',
subject: 'Plain Text Email ✔', text: 'Welcome NestJS Email Sending Tutorial',
text: 'Welcome NestJS Email Sending Tutorial', });
}); return response;
return response; }
}
@MessagePattern({ cmd: 'html' }) @MessagePattern({ cmd: 'html' })
async postHTMLEmail(@Payload() user: any) { async postHTMLEmail(@Payload() user: any) {
const url = "http://localhost:3000/"; const url = "http://localhost:3000/";
const image = "images/email.ong"; const image = "images/email.png";
var response = await this.mailService.sendMail({ var response = await this.mailService.sendMail({
to: user["email"], to: user["email"],
from: "mbonilla.guti@gmail.com", from: "mbonilla.guti@gmail.com",
@ -36,9 +35,44 @@ export class EmailController {
attachments: [ attachments: [
{ {
filename: 'email.png', filename: 'email.png',
path: __dirname +'/mails/images/email.png', path: __dirname + '/mails/images/email.png',
cid: 'logo' //my mistake was putting "cid:logo@cid" here! cid: 'logo' //my mistake was putting "cid:logo@cid" here!
} }
]
});
return response;
}
@MessagePattern({ cmd: 'emailCreateUserAdminCommunity' })
async emailCreateUserAdmin(@Payload() user: any) {
const url = "http://localhost:3000/";
const image = "images/email.png";
const logo = "images/Logo Katoikia.png";
var response = await this.mailService.sendMail({
to: user["email"],
from: "mbonilla.guti@gmail.com",
subject: 'Usuario registrado',
template: 'emailCreateUserAdminCommunity',
context: {
name: user["name"],
password: user["password"],
date_entry: user["date_entry"],
email: user["email"],
community_name: user['community_name'],
url
},
attachments: [
{
filename: 'email.png',
path: __dirname + '/mails/images/email.png',
cid: 'image_email' //my mistake was putting "cid:logo@cid" here!
},
{
filename: 'Logo_Katoikia.png',
path: __dirname + '/mails/images/Logo_Katoikia.png',
cid: 'logoKatoikia' //my mistake was putting "cid:logo@cid" here!
}
] ]
}); });
return response; return response;

View File

@ -0,0 +1,457 @@
<!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:o="urn:schemas-microsoft-com:office:office">
<head>
<meta charset="utf-8"> <!-- utf-8 works for most cases -->
<meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
<meta name="x-apple-disable-message-reformatting"> <!-- Disable auto-scale in iOS 10 Mail entirely -->
<title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.2/css/all.min.css"
integrity="sha512-1sCRPdkRXhBV2PBLUdRb4tMg1w2YPf37qatUFeS7zlBy7jJI8Lf4VHwWfZZfpXtYSLy85pkm9GaYVYMfw5BC1A=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<!-- CSS Reset : BEGIN -->
<style>
html,
body {
margin: 0 auto !important;
padding: 0 !important;
height: 100% !important;
width: 100% !important;
background: #f1f1f1;
}
/* What it does: Stops email clients resizing small text. */
* {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
/* What it does: Centers email on Android 4.4 */
div[style*="margin: 16px 0"] {
margin: 0 !important;
}
/* What it does: Stops Outlook from adding extra spacing to tables. */
table,
td {
mso-table-lspace: 0pt !important;
mso-table-rspace: 0pt !important;
}
/* What it does: Fixes webkit padding issue. */
table {
border-spacing: 0 !important;
border-collapse: collapse !important;
table-layout: fixed !important;
margin: 0 auto !important;
}
/* What it does: Uses a better rendering method when resizing images in IE. */
img {
-ms-interpolation-mode: bicubic;
}
/* What it does: Prevents Windows 10 Mail from underlining links despite inline CSS. Styles for underlined links should be inline. */
a {
text-decoration: none;
}
/* What it does: A work-around for email clients meddling in triggered links. */
*[x-apple-data-detectors],
/* iOS */
.unstyle-auto-detected-links *,
.aBn {
border-bottom: 0 !important;
cursor: default !important;
color: inherit !important;
text-decoration: none !important;
font-size: inherit !important;
font-family: inherit !important;
font-weight: inherit !important;
line-height: inherit !important;
}
/* What it does: Prevents Gmail from displaying a download button on large, non-linked images. */
.a6S {
display: none !important;
opacity: 0.01 !important;
}
/* What it does: Prevents Gmail from changing the text color in conversation threads. */
.im {
color: inherit !important;
}
/* If the above doesn't work, add a .g-img class to any image in question. */
img.g-img+div {
display: none !important;
}
/* What it does: Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89 */
/* Create one of these media queries for each additional viewport size you'd like to fix */
/* iPhone 4, 4S, 5, 5S, 5C, and 5SE */
@media only screen and (min-device-width: 320px) and (max-device-width: 374px) {
u~div .email-container {
min-width: 320px !important;
}
}
/* iPhone 6, 6S, 7, 8, and X */
@media only screen and (min-device-width: 375px) and (max-device-width: 413px) {
u~div .email-container {
min-width: 375px !important;
}
}
/* iPhone 6+, 7+, and 8+ */
@media only screen and (min-device-width: 414px) {
u~div .email-container {
min-width: 414px !important;
}
}
</style>
<!-- CSS Reset : END -->
<!-- Progressive Enhancements : BEGIN -->
<style>
.primary {
background: #D7A86E;
}
.bg_white {
background: #ffffff;
}
.bg_light {
background: #fafafa;
}
.bg_black {
background: #000000;
}
.bg_dark {
background: rgba(0, 0, 0, .8);
}
.email-section {
padding: 2.5em;
}
/*BUTTON*/
.btn {
padding: 10px 15px;
display: inline-block;
}
.btn.btn-primary {
border-radius: 5px;
background: #D7A86E;
color: #ffffff;
}
.btn.btn-white {
border-radius: 5px;
background: #ffffff;
color: #000000;
}
.btn.btn-white-outline {
border-radius: 5px;
background: transparent;
border: 1px solid #fff;
color: #fff;
}
.btn.btn-black-outline {
border-radius: 0px;
background: transparent;
border: 2px solid #000;
color: #000;
font-weight: 700;
}
h1,
h2,
h3,
h4,
h5,
h6 {
font-family: 'Lato', sans-serif;
color: #000000;
margin-top: 0;
font-weight: 400;
margin-bottom: 12px;
}
body {
font-family: 'Lato', sans-serif;
font-weight: 400;
font-size: 15px;
line-height: 1.8;
color: rgba(0, 0, 0, 0.808);
}
a {
color: #D7A86E;
}
table {}
/*LOGO*/
.logo h1 {
margin: 0;
}
.logo h1 a {
color: #D7A86E;
font-size: 24px;
font-weight: 700;
font-family: 'Lato', sans-serif;
}
/*HERO*/
.hero {
position: relative;
z-index: 0;
}
.hero .text {
color: rgba(0, 0, 0, 0.884);
}
.hero .text h2 {
color: #000;
font-size: 40px;
margin-bottom: 0;
font-weight: 400;
line-height: 1.4;
}
.hero .text h3 {
font-size: 24px;
font-weight: 300;
}
.hero .text h2 span {
font-weight: 600;
color: #D7A86E;
}
/*HEADING SECTION*/
.heading-section {}
.heading-section h2 {
color: #000000;
font-size: 28px;
margin-top: 0;
line-height: 1.4;
font-weight: 400;
}
.heading-section .subheading {
margin-bottom: 20px !important;
display: inline-block;
font-size: 13px;
text-transform: uppercase;
letter-spacing: 2px;
color: rgba(0, 0, 0, .4);
position: relative;
}
.heading-section .subheading::after {
position: absolute;
left: 0;
right: 0;
bottom: -10px;
content: '';
width: 100%;
height: 2px;
background: #D7A86E;
margin: 0 auto;
}
.heading-section-white {
color: rgba(255, 255, 255, .8);
}
.heading-section-white h2 {
line-height: 1;
padding-bottom: 0;
}
.heading-section-white h2 {
color: #ffffff;
}
.heading-section-white .subheading {
margin-bottom: 0;
display: inline-block;
font-size: 13px;
text-transform: uppercase;
letter-spacing: 2px;
color: rgba(255, 255, 255, .4);
}
ul.social {
padding: 0;
}
ul.social li {
display: inline-block;
margin-right: 10px;
}
/*FOOTER*/
.footer {
border-top: 1px solid rgba(0, 0, 0, .05);
color: rgba(0, 0, 0, .5);
}
.footer .heading {
color: #000;
font-size: 20px;
}
.footer ul {
margin: 0;
padding: 0;
}
.footer ul li {
list-style: none;
margin-bottom: 10px;
}
.footer ul li a {
color: rgba(0, 0, 0, 1);
}
@media screen and (max-width: 500px) {}
</style>
</head>
<body width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly; background-color: #f1f1f1;">
<center style="width: 100%; background-color: #f1f1f1;">
<div
style="display: none; font-size: 1px;max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;
</div>
<div style="max-width: 600px; margin: 0 auto;" class="email-container">
<!-- BEGIN BODY -->
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
style="margin: auto;">
<tr>
<td valign="top" class="bg_white" style="padding: 1em 2.5em 0 2.5em;">
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td class="logo" style="text-align: right;">
<img src="cid:logoLatoikia" alt="Logo Katoikia"
style="width: 60px; max-width: 60px; height: auto; margin: auto; display: block; float: right;">
</td>
<td class="logo" style="text-align: left;">
<h1><a href="#">Katoikia</a></h1>
</td>
</tr>
</table>
</td>
</tr><!-- end tr -->
<tr>
<td valign="middle" class="hero bg_white" style="padding: 3em 0 2em 0;">
<img src="cid:image_email" alt="Logo Katoikia"
style="width: 150px; max-width: 300px; height: auto; margin: auto; display: block;">
</td>
</tr><!-- end tr -->
<tr>
<td valign="middle" class="hero bg_white" style="padding: 2em 0 4em 0;">
<table>
<tr>
<td>
<div class="text" style="padding: 0 2.5em; text-align: center;">
<h2> Hola , {{ name }} <i class="fa-regular fa-face-smile-wink"
style="color:#D7A86E; font-size: 0.8em; margin-left: 20px;"></i></h2>
<h3>Ha sido registrado como un Administrador General del sitio web Katoikia</h3>
<h4><i class="fa-solid fa-calendar-day"
style="color:#D7A86E; margin-right: 10px;"></i> Fecha de registro
{{date_entry}}</h4>
</div>
<div class="text" style="padding: 0 4em; text-align: left;">
<h3>Estas son sus credenciales:</h3>
<p><i class="fa-regular fa-envelope" style="color:#D7A86E; margin-right: 10px;"></i> Correo electronico: {{email}}</p>
<p><i class="fa-solid fa-key" style="color:#D7A86E; margin-right: 10px;"></i> Password: {{password}}</p>
</div>
<div class="text" style="padding: 0 2.5em; text-align: center;">
<h3>Inicie sesión en el sitio web para poder acceder y disfrutar todos sus
beneficios</h3>
<p><a href="{{ url }}" class="btn btn-primary">Iniciar sesión</a></p>
</div>
</td>
</tr>
</table>
</td>
</tr><!-- end tr -->
<!-- 1 Column Text + Button : END -->
</table>
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
style="margin: auto;">
<td valign="middle" class="bg_light footer email-section">
<table>
<tr>
<td valign="top" width="33.333%" style="padding-top: 20px">
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td style="text-align: left; padding-right: 10px">
<h3 class="heading">Acerca de</h3>
<p>Katoikia es su compañero más cercano para poder estar en contacto con sus vecinos y conocer sobre los mejores anuncios sobre su comunidad.</p>
</td>
</tr>
</table>
</td>
<td valign="top" width="33.333%" style="padding-top: 20px">
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td style="text-align: left; padding-left: 5px; padding-right: 5px">
<h3 class="heading">Información de contacto</h3>
<ul>
<li><span href="mailto:katoikiaapp@gmail.com" class="text">katoikiaapp@gmail.com</span></li>
</ul>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- end: tr -->
<tr>
<td class="bg_light" style="text-align: center">
<p><a href="http://localhost:3000" style="color: rgba(0, 0, 0, 0.8)">katoikiaapp.org</a></p>
</td>
</table>
</div>
</center>
</body>
</html>

View File

@ -0,0 +1,464 @@
<!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:o="urn:schemas-microsoft-com:office:office">
<head>
<meta charset="utf-8"> <!-- utf-8 works for most cases -->
<meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
<meta name="x-apple-disable-message-reformatting"> <!-- Disable auto-scale in iOS 10 Mail entirely -->
<title></title> <!-- The title tag shows in email notifications, like Android 4.4. -->
<link href="https://fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.2/css/all.min.css"
integrity="sha512-1sCRPdkRXhBV2PBLUdRb4tMg1w2YPf37qatUFeS7zlBy7jJI8Lf4VHwWfZZfpXtYSLy85pkm9GaYVYMfw5BC1A=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<!-- CSS Reset : BEGIN -->
<style>
html,
body {
margin: 0 auto !important;
padding: 0 !important;
height: 100% !important;
width: 100% !important;
background: #f1f1f1;
}
/* What it does: Stops email clients resizing small text. */
* {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
/* What it does: Centers email on Android 4.4 */
div[style*="margin: 16px 0"] {
margin: 0 !important;
}
/* What it does: Stops Outlook from adding extra spacing to tables. */
table,
td {
mso-table-lspace: 0pt !important;
mso-table-rspace: 0pt !important;
}
/* What it does: Fixes webkit padding issue. */
table {
border-spacing: 0 !important;
border-collapse: collapse !important;
table-layout: fixed !important;
margin: 0 auto !important;
}
/* What it does: Uses a better rendering method when resizing images in IE. */
img {
-ms-interpolation-mode: bicubic;
}
/* What it does: Prevents Windows 10 Mail from underlining links despite inline CSS. Styles for underlined links should be inline. */
a {
text-decoration: none;
}
/* What it does: A work-around for email clients meddling in triggered links. */
*[x-apple-data-detectors],
/* iOS */
.unstyle-auto-detected-links *,
.aBn {
border-bottom: 0 !important;
cursor: default !important;
color: inherit !important;
text-decoration: none !important;
font-size: inherit !important;
font-family: inherit !important;
font-weight: inherit !important;
line-height: inherit !important;
}
/* What it does: Prevents Gmail from displaying a download button on large, non-linked images. */
.a6S {
display: none !important;
opacity: 0.01 !important;
}
/* What it does: Prevents Gmail from changing the text color in conversation threads. */
.im {
color: inherit !important;
}
/* If the above doesn't work, add a .g-img class to any image in question. */
img.g-img+div {
display: none !important;
}
/* What it does: Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89 */
/* Create one of these media queries for each additional viewport size you'd like to fix */
/* iPhone 4, 4S, 5, 5S, 5C, and 5SE */
@media only screen and (min-device-width: 320px) and (max-device-width: 374px) {
u~div .email-container {
min-width: 320px !important;
}
}
/* iPhone 6, 6S, 7, 8, and X */
@media only screen and (min-device-width: 375px) and (max-device-width: 413px) {
u~div .email-container {
min-width: 375px !important;
}
}
/* iPhone 6+, 7+, and 8+ */
@media only screen and (min-device-width: 414px) {
u~div .email-container {
min-width: 414px !important;
}
}
</style>
<!-- CSS Reset : END -->
<!-- Progressive Enhancements : BEGIN -->
<style>
.primary {
background: #D7A86E;
}
.bg_white {
background: #ffffff;
}
.bg_light {
background: #fafafa;
}
.bg_black {
background: #000000;
}
.bg_dark {
background: rgba(0, 0, 0, .8);
}
.email-section {
padding: 2.5em;
}
/*BUTTON*/
.btn {
padding: 10px 15px;
display: inline-block;
}
.btn.btn-primary {
border-radius: 5px;
background: #D7A86E;
color: #ffffff;
}
.btn.btn-white {
border-radius: 5px;
background: #ffffff;
color: #000000;
}
.btn.btn-white-outline {
border-radius: 5px;
background: transparent;
border: 1px solid #fff;
color: #fff;
}
.btn.btn-black-outline {
border-radius: 0px;
background: transparent;
border: 2px solid #000;
color: #000;
font-weight: 700;
}
h1,
h2,
h3,
h4,
h5,
h6 {
font-family: 'Lato', sans-serif;
color: #000000;
margin-top: 0;
font-weight: 400;
margin-bottom: 12px;
}
body {
font-family: 'Lato', sans-serif;
font-weight: 400;
font-size: 15px;
line-height: 1.8;
color: rgba(0, 0, 0, 0.808);
}
a {
color: #D7A86E;
}
table {}
/*LOGO*/
.logo h1 {
margin: 0;
}
.logo h1 a {
color: #D7A86E;
font-size: 24px;
font-weight: 700;
font-family: 'Lato', sans-serif;
}
/*HERO*/
.hero {
position: relative;
z-index: 0;
}
.hero .text {
color: rgba(0, 0, 0, 0.884);
}
.hero .text h2 {
color: #000;
font-size: 40px;
margin-bottom: 0;
font-weight: 400;
line-height: 1.4;
}
.hero .text h3 {
font-size: 24px;
font-weight: 300;
}
.hero .text h2 span {
font-weight: 600;
color: #D7A86E;
}
/*HEADING SECTION*/
.heading-section {}
.heading-section h2 {
color: #000000;
font-size: 28px;
margin-top: 0;
line-height: 1.4;
font-weight: 400;
}
.heading-section .subheading {
margin-bottom: 20px !important;
display: inline-block;
font-size: 13px;
text-transform: uppercase;
letter-spacing: 2px;
color: rgba(0, 0, 0, .4);
position: relative;
}
.heading-section .subheading::after {
position: absolute;
left: 0;
right: 0;
bottom: -10px;
content: '';
width: 100%;
height: 2px;
background: #D7A86E;
margin: 0 auto;
}
.heading-section-white {
color: rgba(255, 255, 255, .8);
}
.heading-section-white h2 {
line-height: 1;
padding-bottom: 0;
}
.heading-section-white h2 {
color: #ffffff;
}
.heading-section-white .subheading {
margin-bottom: 0;
display: inline-block;
font-size: 13px;
text-transform: uppercase;
letter-spacing: 2px;
color: rgba(255, 255, 255, .4);
}
ul.social {
padding: 0;
}
ul.social li {
display: inline-block;
margin-right: 10px;
}
/*FOOTER*/
.footer {
border-top: 1px solid rgba(0, 0, 0, .05);
color: rgba(0, 0, 0, .5);
}
.footer .heading {
color: #000;
font-size: 20px;
}
.footer ul {
margin: 0;
padding: 0;
}
.footer ul li {
list-style: none;
margin-bottom: 10px;
}
.footer ul li a {
color: rgba(0, 0, 0, 1);
}
@media screen and (max-width: 500px) {}
</style>
</head>
<body width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly; background-color: #f1f1f1;">
<center style="width: 100%; background-color: #f1f1f1;">
<div
style="display: none; font-size: 1px;max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden; mso-hide: all; font-family: sans-serif;">
&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;
</div>
<div style="max-width: 600px; margin: 0 auto;" class="email-container">
<!-- BEGIN BODY -->
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
style="margin: auto;">
<tr>
<td valign="top" class="bg_white" style="padding: 1em 2.5em 0 2.5em;">
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td class="logo" style="text-align: right;">
<img src="cid:logoKatoikia" alt="Logo Katoikia"
style="width: 60px; max-width: 60px; height: auto; margin: auto; display: block; float: right;">
</td>
<td class="logo" style="text-align: left;">
<h1><a href="#">Katoikia</a></h1>
</td>
</tr>
</table>
</td>
</tr><!-- end tr -->
<tr>
<td valign="middle" class="hero bg_white" style="padding: 3em 0 2em 0;">
<img src="cid:image_email" alt="Logo Katoikia"
style="width: 150px; max-width: 300px; height: auto; margin: auto; display: block;">
</td>
</tr><!-- end tr -->
<tr>
<td valign="middle" class="hero bg_white" style="padding: 2em 0 4em 0;">
<table>
<tr>
<td>
<div class="text" style="padding: 0 2.5em; text-align: center;">
<h2> Hola , {{ name }} <i class="fa-regular fa-face-smile-wink"
style="color:#D7A86E; font-size: 0.8em; margin-left: 20px;"></i></h2>
<h3>Ha sido registrado como un Administrador de la Comunidad `{{community_name}}`
</h3>
<h4><i class="fa-solid fa-calendar-day"
style="color:#D7A86E; margin-right: 10px;"></i> Fecha de registro
{{date_entry}}</h4>
</div>
<div class="text" style="padding: 0 4em; text-align: left;">
<h3>Estas son sus credenciales:</h3>
<p><i class="fa fa-regular fa-envelope"
style="color:#D7A86E; margin-right: 10px;"></i> Correo electronico:
{{email}}</p>
<p><i class="fa-solid fa-key" style="color:#D7A86E; margin-right: 10px;"></i>
Password: {{password}}</p>
</div>
<div class="text" style="padding: 0 2.5em; text-align: center;">
<h3>Inicie sesión en el sitio web para poder acceder y disfrutar todos sus
beneficios</h3>
<p><a href="{{ url }}" class="btn btn-primary">Iniciar sesión</a></p>
</div>
</td>
</tr>
</table>
</td>
</tr><!-- end tr -->
<!-- 1 Column Text + Button : END -->
</table>
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"
style="margin: auto;">
<td valign="middle" class="bg_light footer email-section">
<table>
<tr>
<td valign="top" width="33.333%" style="padding-top: 20px">
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td style="text-align: left; padding-right: 10px">
<h3 class="heading">Acerca de</h3>
<p>Katoikia es su compañero más cercano para poder estar en contacto con sus
vecinos y conocer sobre los mejores anuncios sobre su comunidad.</p>
</td>
</tr>
</table>
</td>
<td valign="top" width="33.333%" style="padding-top: 20px">
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td style="text-align: left; padding-left: 5px; padding-right: 5px">
<h3 class="heading">Información de contacto</h3>
<ul>
<li><span href="mailto:katoikiaapp@gmail.com"
class="text">katoikiaapp@gmail.com</span></li>
</ul>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- end: tr -->
<tr>
<td class="bg_light" style="text-align: center">
<p><a href="http://localhost:3000" style="color: rgba(0, 0, 0, 0.8)">katoikiaapp.org</a></p>
</td>
</table>
</div>
</center>
</body>
</html>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,12 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3009 port: 3009,
} },
}); });
app.listen().then(() => logger.log("Microservice Notificaciones is listening" )); app
.listen()
.then(() => logger.log('Microservice Notificaciones is listening'));
} }
bootstrap(); bootstrap();

View File

@ -8,27 +8,30 @@ import { UpdateNotificationDto } from './dto/update-notification.dto';
export class NotificationsController { export class NotificationsController {
constructor(private readonly notificationsService: NotificationsService) {} constructor(private readonly notificationsService: NotificationsService) {}
@MessagePattern({cmd: 'createNotification'}) @MessagePattern({ cmd: 'createNotification' })
create(@Payload() createNotificationDto: CreateNotificationDto) { create(@Payload() createNotificationDto: CreateNotificationDto) {
return this.notificationsService.create(createNotificationDto); return this.notificationsService.create(createNotificationDto);
} }
@MessagePattern({cmd: 'findAllNotifications'}) @MessagePattern({ cmd: 'findAllNotifications' })
findAll() { findAll() {
return this.notificationsService.findAll(); return this.notificationsService.findAll();
} }
@MessagePattern({cmd: 'findOneNotification'}) @MessagePattern({ cmd: 'findOneNotification' })
findOne(@Payload() id: number) { findOne(@Payload() id: number) {
return this.notificationsService.findOne(id); return this.notificationsService.findOne(id);
} }
@MessagePattern({cmd: 'updateNotification'}) @MessagePattern({ cmd: 'updateNotification' })
update(@Payload() updateNotificationDto: UpdateNotificationDto) { update(@Payload() updateNotificationDto: UpdateNotificationDto) {
return this.notificationsService.update(updateNotificationDto.id, updateNotificationDto); return this.notificationsService.update(
updateNotificationDto.id,
updateNotificationDto,
);
} }
@MessagePattern({cmd: 'removeNotification'}) @MessagePattern({ cmd: 'removeNotification' })
remove(@Payload() id: number) { remove(@Payload() id: number) {
return this.notificationsService.remove(id); return this.notificationsService.remove(id);
} }

View File

@ -4,6 +4,6 @@ import { NotificationsController } from './notifications.controller';
@Module({ @Module({
controllers: [NotificationsController], controllers: [NotificationsController],
providers: [NotificationsService] providers: [NotificationsService],
}) })
export class NotificationsModule {} export class NotificationsModule {}

View File

@ -1,4 +1,4 @@
export interface User { export interface User {
email: string; email: string;
name: string; name: string;
} }

View File

@ -1,23 +1,25 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { PaymentsModule } from './payments/payments.module'; import { PaymentsModule } from './payments/payments.module';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_PAGOS", name: 'SERVICIO_PAGOS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3005 port: 3005,
} },
} },
]), ]),
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_pagos?retryWrites=true&w=majority`), MongooseModule.forRoot(
PaymentsModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_pagos?retryWrites=true&w=majority`,
),
PaymentsModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,10 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3005 port: 3005,
} },
}); });
app.listen().then(() => logger.log("Microservice Invitados is listening" )); app.listen().then(() => logger.log('Microservice Invitados is listening'));
} }
bootstrap(); bootstrap();

View File

@ -7,40 +7,40 @@ import { Payment, PaymentDocument } from 'src/schemas/payment.schema';
export class PaymentsController { export class PaymentsController {
constructor(private readonly paymentsService: PaymentsService) {} constructor(private readonly paymentsService: PaymentsService) {}
@MessagePattern({cmd: 'createPayment'}) @MessagePattern({ cmd: 'createPayment' })
create(@Payload() payment: PaymentDocument) { create(@Payload() payment: PaymentDocument) {
return this.paymentsService.create(payment); return this.paymentsService.create(payment);
} }
@MessagePattern({cmd: 'findAllPayments'}) @MessagePattern({ cmd: 'findAllPayments' })
findAll() { findAll() {
return this.paymentsService.findAll(); return this.paymentsService.findAll();
} }
@MessagePattern({cmd: 'findOnePayment'}) @MessagePattern({ cmd: 'findOnePayment' })
findOne(@Payload() id: string) { findOne(@Payload() id: string) {
let _id = id['_id']; let _id = id['_id'];
return this.paymentsService.findOneId(_id); return this.paymentsService.findOneId(_id);
} }
@MessagePattern({cmd: 'findPaymentsByUser'}) @MessagePattern({ cmd: 'findPaymentsByUser' })
findByUser(@Payload() id: string) { findByUser(@Payload() id: string) {
let user_id = id['user_id']; let user_id = id['user_id'];
return this.paymentsService.findByUser(user_id); return this.paymentsService.findByUser(user_id);
} }
@MessagePattern({cmd: 'findPaymentsByCommunity'}) @MessagePattern({ cmd: 'findPaymentsByCommunity' })
findByCommunity(@Payload() id: string) { findByCommunity(@Payload() id: string) {
let community_id = id['community_id']; let community_id = id['community_id'];
return this.paymentsService.findByUser(community_id); return this.paymentsService.findByUser(community_id);
} }
@MessagePattern({cmd: 'updatePayment'}) @MessagePattern({ cmd: 'updatePayment' })
update(@Payload() payment: PaymentDocument) { update(@Payload() payment: PaymentDocument) {
return this.paymentsService.update(payment.id, payment); return this.paymentsService.update(payment.id, payment);
} }
@MessagePattern({cmd: 'removePayment'}) @MessagePattern({ cmd: 'removePayment' })
remove(@Payload() id: string) { remove(@Payload() id: string) {
let _id = id['_id']; let _id = id['_id'];
return this.paymentsService.remove(_id); return this.paymentsService.remove(_id);

View File

@ -4,12 +4,11 @@ import { PaymentsController } from './payments.controller';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { Payment, PaymentSchema } from 'src/schemas/payment.schema'; import { Payment, PaymentSchema } from 'src/schemas/payment.schema';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: Payment.name, schema: PaymentSchema }]), MongooseModule.forFeature([{ name: Payment.name, schema: PaymentSchema }]),
], ],
controllers: [PaymentsController], controllers: [PaymentsController],
providers: [PaymentsService] providers: [PaymentsService],
}) })
export class PaymentsModule {} export class PaymentsModule {}

View File

@ -3,30 +3,25 @@ import { Payment, PaymentDocument } from 'src/schemas/payment.schema';
import { Model } from 'mongoose'; import { Model } from 'mongoose';
import { InjectModel } from '@nestjs/mongoose'; import { InjectModel } from '@nestjs/mongoose';
@Injectable() @Injectable()
export class PaymentsService { export class PaymentsService {
constructor( constructor(
@InjectModel(Payment.name) private readonly paymentModel: Model<PaymentDocument>, @InjectModel(Payment.name)
private readonly paymentModel: Model<PaymentDocument>,
) {} ) {}
async create(payment: PaymentDocument): Promise<Payment> { async create(payment: PaymentDocument): Promise<Payment> {
return this.paymentModel.create(payment); return this.paymentModel.create(payment);
} }
async findAll(): Promise<Payment[]> { async findAll(): Promise<Payment[]> {
return this.paymentModel return this.paymentModel.find().setOptions({ sanitizeFilter: true }).exec();
.find()
.setOptions({ sanitizeFilter: true })
.exec();
} }
findOneId(id: string): Promise<Payment> { findOneId(id: string): Promise<Payment> {
return this.paymentModel.findOne({ _id: id }).exec(); return this.paymentModel.findOne({ _id: id }).exec();
} }
findByUser(id: string): Promise<Payment> { findByUser(id: string): Promise<Payment> {
return this.paymentModel.findOne({ user_id: id }).exec(); return this.paymentModel.findOne({ user_id: id }).exec();
} }

View File

@ -1,33 +1,30 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose'; import { Document } from 'mongoose';
export type PaymentDocument = Payment & Document; export type PaymentDocument = Payment & Document;
@Schema({ collection: 'payments' }) @Schema({ collection: 'payments' })
export class Payment { export class Payment {
@Prop()
date_payment: Date;
@Prop() @Prop()
date_payment: Date; mount: number;
@Prop() @Prop()
mount: number; description: string;
@Prop() @Prop()
description: string; period: string;
@Prop() @Prop()
period: string; status: string;
@Prop() @Prop()
status: string; user_id: string;
@Prop() @Prop()
user_id: string; communty_id: string;
@Prop()
communty_id: string;
} }
export const PaymentSchema = SchemaFactory.createForClass(Payment); export const PaymentSchema = SchemaFactory.createForClass(Payment);

View File

@ -1,25 +1,26 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { ReportsModule } from './reports/reports.module'; import { ReportsModule } from './reports/reports.module';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_REPORTES", name: 'SERVICIO_REPORTES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3008 port: 3008,
} },
} },
]), ]),
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reportes?retryWrites=true&w=majority`), MongooseModule.forRoot(
ReportsModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reportes?retryWrites=true&w=majority`,
),
ReportsModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })
export class AppModule { } export class AppModule {}

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,10 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3008 port: 3008,
} },
}); });
app.listen().then(() => logger.log("Microservice Reportes is listening" )); app.listen().then(() => logger.log('Microservice Reportes is listening'));
} }
bootstrap(); bootstrap();

View File

@ -7,7 +7,6 @@ import { Report, ReportDocument } from '../schemas/report.schema';
export class ReportsController { export class ReportsController {
constructor(private readonly reportsService: ReportsService) {} constructor(private readonly reportsService: ReportsService) {}
@MessagePattern({ cmd: 'createReport' }) @MessagePattern({ cmd: 'createReport' })
create(@Payload() report: ReportDocument) { create(@Payload() report: ReportDocument) {
return this.reportsService.create(report); return this.reportsService.create(report);

View File

@ -6,9 +6,9 @@ import { Report, ReportSchema } from '../schemas/report.schema';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: Report.name, schema:ReportSchema }]), MongooseModule.forFeature([{ name: Report.name, schema: ReportSchema }]),
], ],
controllers: [ReportsController], controllers: [ReportsController],
providers: [ReportsService] providers: [ReportsService],
}) })
export class ReportsModule {} export class ReportsModule {}

View File

@ -1,34 +1,29 @@
import { Injectable, Inject } from '@nestjs/common'; import { Injectable, Inject } from '@nestjs/common';
import { ClientProxy } from "@nestjs/microservices"; import { ClientProxy } from '@nestjs/microservices';
import { Model } from 'mongoose'; import { Model } from 'mongoose';
import { InjectModel } from '@nestjs/mongoose'; import { InjectModel } from '@nestjs/mongoose';
import { Report, ReportDocument } from '../schemas/report.schema'; import { Report, ReportDocument } from '../schemas/report.schema';
import { map } from "rxjs/operators"; import { map } from 'rxjs/operators';
@Injectable() @Injectable()
export class ReportsService { export class ReportsService {
constructor( constructor(
@InjectModel(Report.name) private readonly reportModel: Model<ReportDocument>, @InjectModel(Report.name)
private readonly reportModel: Model<ReportDocument>, //
// ) {}
) { }
async create(report: ReportDocument): Promise<Report> { async create(report: ReportDocument): Promise<Report> {
return this.reportModel.create(report); return this.reportModel.create(report);
} }
async findAll(): Promise<Report[]> { async findAll(): Promise<Report[]> {
return this.reportModel return this.reportModel.find().setOptions({ sanitizeFilter: true }).exec();
.find()
.setOptions({ sanitizeFilter: true })
.exec();
} }
async findOne(id: string): Promise<Report> { async findOne(id: string): Promise<Report> {
return this.reportModel.findOne({ _id: id }).exec(); return this.reportModel.findOne({ _id: id }).exec();
} }
async update(id: string, report: ReportDocument) { async update(id: string, report: ReportDocument) {
return this.reportModel.findOneAndUpdate({ _id: id }, report, { return this.reportModel.findOneAndUpdate({ _id: id }, report, {
new: true, new: true,
@ -36,6 +31,9 @@ export class ReportsService {
} }
async remove(id: string) { async remove(id: string) {
return this.reportModel.findByIdAndRemove({ _id: id }).exec(); return this.reportModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
new: true,
});
} }
} }

View File

@ -1,24 +1,21 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document, ObjectId } from 'mongoose'; import { Document, ObjectId } from 'mongoose';
export type ReportDocument = Report & Document; export type ReportDocument = Report & Document;
@Schema({ collection: 'reports' }) @Schema({ collection: 'reports' })
export class Report { export class Report {
@Prop()
@Prop() action: string;
action: string;
@Prop()
description: string;
@Prop() @Prop()
date_entry: Date; description: string;
@Prop() @Prop()
user_id: string date_entry: Date;
@Prop()
user_id: string;
} }
export const ReportSchema = SchemaFactory.createForClass(Report);
export const ReportSchema = SchemaFactory.createForClass(Report);

View File

@ -1,22 +1,25 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { ReservationsModule } from './reservations/reservations.module'; import { ReservationsModule } from './reservations/reservations.module';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_RESERVACIONES", name: 'SERVICIO_RESERVACIONES',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3006 port: 3006,
} },
} },
]), ]),
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reservaciones?retryWrites=true&w=majority`), MongooseModule.forRoot(
ReservationsModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_reservaciones?retryWrites=true&w=majority`,
),
ReservationsModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,12 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3006 port: 3006,
} },
}); });
app.listen().then(() => logger.log("Microservice Reservaciones is listening" )); app
.listen()
.then(() => logger.log('Microservice Reservaciones is listening'));
} }
bootstrap(); bootstrap();

View File

@ -1,11 +1,14 @@
import { Controller } from '@nestjs/common'; import { Controller } from '@nestjs/common';
import { MessagePattern, Payload } from '@nestjs/microservices'; import { MessagePattern, Payload } from '@nestjs/microservices';
import { ReservationsService } from './reservations.service'; import { ReservationsService } from './reservations.service';
import { Reservation, ReservationDocument } from '../schemas/reservation.schema'; import {
Reservation,
ReservationDocument,
} from '../schemas/reservation.schema';
@Controller() @Controller()
export class ReservationsController { export class ReservationsController {
constructor(private readonly reservationsService: ReservationsService) { } constructor(private readonly reservationsService: ReservationsService) {}
@MessagePattern({ cmd: 'createReservation' }) @MessagePattern({ cmd: 'createReservation' })
create(@Payload() reservation: ReservationDocument) { create(@Payload() reservation: ReservationDocument) {

View File

@ -3,13 +3,15 @@ import { ReservationsService } from './reservations.service';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ReservationsController } from './reservations.controller'; import { ReservationsController } from './reservations.controller';
import { Reservation, ReservationSchema} from '../schemas/reservation.schema'; import { Reservation, ReservationSchema } from '../schemas/reservation.schema';
@Module({ @Module({
imports: [ imports: [
MongooseModule.forFeature([{ name: Reservation.name, schema: ReservationSchema }]), MongooseModule.forFeature([
{ name: Reservation.name, schema: ReservationSchema },
]),
], ],
controllers: [ReservationsController], controllers: [ReservationsController],
providers: [ReservationsService] providers: [ReservationsService],
}) })
export class ReservationsModule {} export class ReservationsModule {}

View File

@ -1,12 +1,16 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { Reservation, ReservationDocument} from '../schemas/reservation.schema'; import {
Reservation,
ReservationDocument,
} from '../schemas/reservation.schema';
import { Model } from 'mongoose'; import { Model } from 'mongoose';
import { InjectModel } from '@nestjs/mongoose'; import { InjectModel } from '@nestjs/mongoose';
@Injectable() @Injectable()
export class ReservationsService { export class ReservationsService {
constructor( constructor(
@InjectModel(Reservation.name) private readonly reservationModel: Model<ReservationDocument>, @InjectModel(Reservation.name)
private readonly reservationModel: Model<ReservationDocument>,
) {} ) {}
create(reservation: ReservationDocument) { create(reservation: ReservationDocument) {
@ -15,10 +19,10 @@ export class ReservationsService {
return this.reservationModel.create(reservation); return this.reservationModel.create(reservation);
} }
async findAll(): Promise<Reservation[]> { async findAll(): Promise<Reservation[]> {
return this.reservationModel return this.reservationModel
.find() .find()
.setOptions({ sanitizeFilter: true }) .setOptions({ sanitizeFilter: true })
.exec(); .exec();
} }
@ -37,6 +41,8 @@ export class ReservationsService {
} }
async remove(id: string) { async remove(id: string) {
return this.reservationModel.findByIdAndRemove({ _id: id }).exec(); return this.reservationModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
new: true,
});
} }
} }

View File

@ -1,30 +1,27 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document, ObjectId } from 'mongoose'; import { Document, ObjectId } from 'mongoose';
export type ReservationDocument = Reservation & Document; export type ReservationDocument = Reservation & Document;
@Schema({ collection: 'reservations' }) @Schema({ collection: 'reservations' })
export class Reservation { export class Reservation {
@Prop()
@Prop() start_time: string;
start_time: string;
@Prop() @Prop()
finish_time: string; finish_time: string;
@Prop() @Prop()
status: string; status: string;
@Prop() @Prop()
date_entry: Date; date_entry: Date;
@Prop() @Prop()
common_area_id: string; common_area_id: string;
@Prop() @Prop()
user_id: string user_id: string;
} }
export const ReservationSchema = SchemaFactory.createForClass(Reservation);
export const ReservationSchema = SchemaFactory.createForClass(Reservation);

File diff suppressed because it is too large Load Diff

View File

@ -29,10 +29,12 @@
"@nestjs/platform-express": "^8.0.0", "@nestjs/platform-express": "^8.0.0",
"@nestjs/swagger": "^5.2.1", "@nestjs/swagger": "^5.2.1",
"buffer": "^5.7.1", "buffer": "^5.7.1",
"class-validator": "^0.13.2",
"cors": "^2.8.5", "cors": "^2.8.5",
"crypto-browserify": "^3.12.0", "crypto-browserify": "^3.12.0",
"md5-typescript": "^1.0.5", "md5-typescript": "^1.0.5",
"mongoose": "^6.4.1", "mongoose": "^6.4.1",
"mongoose-unique-validator": "^3.1.0",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"rxjs": "^7.2.0", "rxjs": "^7.2.0",

View File

@ -0,0 +1,14 @@
import { ArgumentsHost, Catch, ConflictException, ExceptionFilter } from '@nestjs/common';
import { MongoError } from 'mongodb';
@Catch(MongoError)
export class MongoExceptionFilter implements ExceptionFilter {
catch(exception: MongoError, host: ArgumentsHost) {
switch (exception.code) {
case 11000:
console.log('llave duplicada')
// duplicate exception
// do whatever you want here, for instance send error to client
}
}
}

View File

@ -1,23 +1,27 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { MongooseModule } from '@nestjs/mongoose'; import { MongooseModule } from '@nestjs/mongoose';
import { ClientsModule, Transport } from "@nestjs/microservices"; import { ClientsModule, Transport } from '@nestjs/microservices';
import { UsersModule } from './users/users.module'; import { UsersModule } from './users/users.module';
@Module({ @Module({
imports: [ imports: [
ClientsModule.register([ ClientsModule.register([
{ {
name: "SERVICIO_USUARIOS", name: 'SERVICIO_USUARIOS',
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3001 port: 3001,
} },
} },
]), ]),
MongooseModule.forRoot(`mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_usuarios?retryWrites=true&w=majority`), MongooseModule.forRoot(
UsersModule], `mongodb+srv://proyecto_4:proyecto_4@proyecto4.yv4fb.mongodb.net/servicio_usuarios?retryWrites=true&w=majority`
),
UsersModule,
],
controllers: [], controllers: [],
providers: [], providers: [],
}) })
export class AppModule {} export class AppModule { }

View File

@ -0,0 +1,30 @@
import { Injectable } from "@nestjs/common";
import { Model } from 'mongoose';
import { User, UserDocument } from '../schemas/user.schema';
import { InjectModel } from '@nestjs/mongoose';
import { ValidationArguments, ValidatorConstraint, ValidatorConstraintInterface } from "class-validator";
@ValidatorConstraint({ name: 'UserExists', async: true })
@Injectable()
export class UserExistsRule implements ValidatorConstraintInterface {
constructor(
@InjectModel(User.name) private readonly userModel: Model<UserDocument>,
) {}
async validate(value: string) {
try {
await this.userModel.find({email: value});
} catch (e) {
return false;
}
return true;
}
defaultMessage(args: ValidationArguments) {
return `User doesn't exist`;
}
}

View File

@ -1,7 +1,7 @@
import { NestFactory } from "@nestjs/core"; import { NestFactory } from '@nestjs/core';
import { Transport } from "@nestjs/microservices"; import { Transport } from '@nestjs/microservices';
import { AppModule } from "./app.module"; import { AppModule } from './app.module';
import { Logger } from "@nestjs/common"; import { Logger } from '@nestjs/common';
const logger = new Logger(); const logger = new Logger();
@ -9,10 +9,10 @@ async function bootstrap() {
const app = await NestFactory.createMicroservice(AppModule, { const app = await NestFactory.createMicroservice(AppModule, {
transport: Transport.TCP, transport: Transport.TCP,
options: { options: {
host: "127.0.0.1", host: '127.0.0.1',
port: 3001 port: 3001,
} },
}); });
app.listen().then(() => logger.log("Microservice Usuarios is listening" )); app.listen().then(() => logger.log('Microservice Usuarios is listening'));
} }
bootstrap(); bootstrap();

View File

@ -1,46 +1,45 @@
import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose'; import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose'; import { Document } from 'mongoose';
var uniqueValidator = require('mongoose-unique-validator');
import { IsEmail, IsNotEmpty, IsString, Validate } from 'class-validator';
export type UserDocument = User & Document; export type UserDocument = User & Document;
@Schema({ collection: 'users'})
@Schema({ collection: 'users' })
export class User { export class User {
@Prop({index: true})
dni!: string;
@Prop() @Prop({required: true})
dni: string; name: string;
@Prop() @Prop({required: true})
name: string; last_name: string;
@Prop() @Prop({required: true, unique: true})
last_name: string; email: string;
@Prop() @Prop({required: true, unique: true})
email: string; phone: number;
@Prop() @Prop()
phone: number; password: string;
@Prop() @Prop()
password: string; user_type: string;
@Prop() @Prop()
user_type: string; status: string;
@Prop() @Prop()
status: string; date_entry: Date;
@Prop() @Prop()
date_entry: Date; community_id?: string;
@Prop()
@Prop() number_house?: string;
community_id?: string;
} }
export const UserSchema = SchemaFactory.createForClass(User);
UserSchema.plugin(uniqueValidator);
export const UserSchema = SchemaFactory.createForClass(User);

Some files were not shown because too many files have changed in this diff Show More