Merge pull request #135 from DeimosPr4/UH-registroAdminComunidad

registro Comunidad y errores de compilacion

api-gateway/src/app.controller.ts

@@ -11,22 +11,12 @@ export class AppController {
     @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,
   ) {
-    return this.appService.createAdminSystem(
+    return this.appService.createAdminSystem(dni, name, last_name, email, phone, 
-      dni,
+            user_type, status, date_entry);
-      name,
-      last_name,
-      email,
-      phone,
-      password,
-      user_type,
-      status,
-      date_entry,
-    );
   }
 
   @Post('user/createGuard')
@@ -37,24 +27,30 @@ export class AppController {
     @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.createGuard(
+    return this.appService.createGuard(dni, name, last_name, email, phone,
-      dni,
+      user_type, status, date_entry,community_id);
-      name,
+  }
-      last_name,
+
-      email,
+  @Post('user/createAdminCommunity')
-      phone,
+  createAdminCommunity(
-      password,
+    //Nombre, Apellidos, Correo electrónico, Cédula, Teléfono, Contraseña
-      user_type,
+    @Body('dni') dni: string,
-      status,
+    @Body('name') name: string,
-      date_entry,
+    @Body('last_name') last_name: string,
-      community_id,
+    @Body('email') email: string,
-    );
+    @Body('phone') phone: number,
+    @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.createAdminCommunity(dni, name, last_name, email, phone,
+      user_type, status, date_entry,community_id);
   }
 
   @Post('user/createUser')
@@ -371,4 +367,8 @@ export class AppController {
   html(@Body('email') email: string, @Body('name') name: string) {
     return this.appService.html(email, name);
   }
+
+
+
+  
 }

api-gateway/src/app.service.ts

@@ -54,64 +54,47 @@ export class AppService {
   }
 
   //POST parameter from API
-  createAdminSystem(
+  createAdminSystem(dni: string, name: string, last_name: string, email: string, phone: number
-    dni: string,
+    , user_type: string, status: string, date_entry: Date) {
-    name: string,
-    last_name: string,
-    email: string,
-    phone: number,
-    password: string,
-    user_type: string,
-    status: string,
-    date_entry: Date,
-  ) {
     const pattern = { cmd: 'createAdminSystem' };
     const payload = {
-      dni: dni,
+      dni: dni, name: name, last_name: last_name, email: email, phone: phone,
-      name: name,
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry
-      last_name: last_name,
-      email: email,
-      phone: phone,
-      password: password,
-      user_type: user_type,
-      status: status,
-      date_entry: date_entry,
     };
     return this.clientUserApp
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
   }
 
-  createGuard(
+  createGuard(dni: string, name: string, last_name: string, email: string, phone: number
-    dni: string,
+    , user_type: string, status: string, date_entry: Date, community_id: 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: 'createGuard' };
     const payload = {
-      dni: dni,
+      dni: dni, name: name, last_name: last_name, email: email, phone: phone,
-      name: name,
+      password: this.generatePassword(), user_type: user_type, status: status, date_entry: date_entry, community_id
-      last_name: last_name,
+
-      email: email,
-      phone: phone,
-      password: password,
-      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
+      .send<string>(pattern, payload)
+      .pipe(
+        map((message: string) => ({ message })),
+      );
+  }
+
   allUsers() {
     const pattern = { cmd: 'findAllUsers' };
     const payload = {};
@@ -153,6 +136,7 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+
   deleteAdminSystem(id: string) {
     const pattern = { cmd: 'deleteAdminSystem' };
     const payload = { id: id };
@@ -181,17 +165,8 @@ export class AppService {
   // ====================== COMMUNITIES ===============================
 
   //POST parameter from API
-  createCommunity(
+  createCommunity(name: string, province: string, canton: string, district: string
-    name: string,
+    , num_houses: number, phone: string, status: string, date_entry: Date, houses: []) {
-    province: string,
-    canton: string,
-    district: string,
-    num_houses: number,
-    phone: string,
-    status: string,
-    date_entry: Date,
-    houses: [],
-  ) {
     const pattern = { cmd: 'createCommunity' };
     const payload = {
       name: name,
@@ -287,13 +262,8 @@ export class AppService {
   ) {
     const pattern = { cmd: 'createGuest' };
     const payload = {
-      name: name,
+      name: name, last_name: last_name, dni: dni, number_plate: number_plate, phone: phone,
-      last_name: last_name,
+      status: status, date_entry: date_entry
-      dni: dni,
-      number_plate: number_plate,
-      phone: phone,
-      status: status,
-      date_entry: date_entry,
     };
     return this.clientGuestApp
       .send<string>(pattern, payload)
@@ -317,7 +287,7 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
-  // ====================== PAYMENTS ===============================
+  // ====================== PAYMENTS =============================== 
 
   //POST parameter from API
   createPayment(
@@ -331,13 +301,8 @@ export class AppService {
   ) {
     const pattern = { cmd: 'createPayment' };
     const payload = {
-      date_payment: date_payment,
+      date_payment: date_payment, mount: mount, description: description,
-      mount: mount,
+      period: period, status: status, user_id: user_id, communty_id: communty_id
-      description: description,
-      period: period,
-      status: status,
-      user_id: user_id,
-      communty_id: communty_id,
     };
     return this.clientPaymentApp
       .send<string>(pattern, payload)
@@ -364,22 +329,12 @@ export class AppService {
   // ====================== RESERVATIONS ===============================
 
   //POST parameter from API
-  createReservation(
+  createReservation(start_time: string, finish_time: string, status: string,
-    start_time: string,
+    date_entry: Date, user_id: string, common_area_id: string) {
-    finish_time: string,
-    status: string,
-    date_entry: Date,
-    user_id: string,
-    common_area_id: string,
-  ) {
     const pattern = { cmd: 'createReservation' };
     const payload = {
-      start_time: start_time,
+      start_time: start_time, finish_time: finish_time, status: status,
-      finish_time: finish_time,
+      date_entry: date_entry, user_id: user_id, common_area_id: common_area_id
-      status: status,
-      date_entry: date_entry,
-      user_id: user_id,
-      common_area_id: common_area_id,
     };
     return this.clientReservationApp
       .send<string>(pattern, payload)
@@ -406,18 +361,12 @@ export class AppService {
   // ====================== POSTS ===============================
 
   //POST parameter from API
-  createPost(
+  createPost(post: string, date_entry: Date, user_id: string,
-    post: string,
+    community_id: string) {
-    date_entry: Date,
-    user_id: string,
-    community_id: string,
-  ) {
     const pattern = { cmd: 'createPost' };
     const payload = {
-      post: post,
+      post: post, date_entry: date_entry, user_id: user_id,
-      date_entry: date_entry,
+      community_id: community_id
-      user_id: user_id,
-      community_id: community_id,
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
@@ -444,18 +393,12 @@ export class AppService {
   // ====================== COMMNENT POSTS ===============================
 
   //Comment parameter from API
-  createComment(
+  createComment(comment: string, date_entry: Date, user_id: string,
-    comment: string,
+    post_id: string) {
-    date_entry: Date,
-    user_id: string,
-    post_id: string,
-  ) {
     const pattern = { cmd: 'createComment' };
     const payload = {
-      comment: comment,
+      comment: comment, date_entry: date_entry, user_id: user_id,
-      date_entry: date_entry,
+      post_id: post_id
-      user_id: user_id,
-      post_id: post_id,
     };
     return this.clientPostApp
       .send<string>(pattern, payload)
@@ -482,18 +425,12 @@ export class AppService {
   // ====================== REPORTS ===============================
 
   //Report parameter from API
-  createReport(
+  createReport(action: string, description: string, date_entry: Date,
-    action: string,
+    user_id: string) {
-    description: string,
-    date_entry: Date,
-    user_id: string,
-  ) {
     const pattern = { cmd: 'createReport' };
     const payload = {
-      action: action,
+      action: action, description: description, date_entry: date_entry,
-      description: description,
+      user_id: user_id
-      date_entry: date_entry,
-      user_id: user_id,
     };
     return this.clientReportApp
       .send<string>(pattern, payload)
@@ -532,4 +469,22 @@ export class AppService {
       .send<string>(pattern, payload)
       .pipe(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;
+  }
 }

servicio-notificaciones/src/email.controller.ts

@@ -19,27 +19,62 @@ export class EmailController {
     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.ong";
-    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",
-      subject: 'HTML Dynamic Template',
+            subject: 'HTML Dynamic Template',
-      template: 'templateEmail',
+            template: 'templateEmail',
-      context: {
+            context: {
-        name: user['name'],
+                name: user["name"],
-        url,
+                url
-      },
+            },
-      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;
+        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.svg";
+        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.svg',
+                    path: __dirname + '/mails/images/Logo Katoikia.svg',
+                    cid: 'logoKatoikia' //my mistake was putting "cid:logo@cid" here! 
+                }
+            ]
+        });
+        return response;
+    }
 }

servicio-notificaciones/src/mails/emailCreateUserAdmin.hbs

@@ -0,0 +1,442 @@
+<!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">
+
+    <!-- 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: #30e3ca;
+        }
+
+        .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: #30e3ca;
+            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;
+        }
+
+        body {
+            font-family: 'Lato', sans-serif;
+            font-weight: 400;
+            font-size: 15px;
+            line-height: 1.8;
+            color: rgba(0, 0, 0, .4);
+        }
+
+        a {
+            color: #30e3ca;
+        }
+
+        table {}
+
+        /*LOGO*/
+
+        .logo h1 {
+            margin: 0;
+        }
+
+        .logo h1 a {
+            color: #30e3ca;
+            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, .3);
+        }
+
+        .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: #30e3ca;
+        }
+
+
+        /*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: #30e3ca;
+            margin: 0 auto;
+        }
+
+        .heading-section-white {
+            color: rgba(255, 255, 255, .8);
+        }
+
+        .heading-section-white h2 {
+            font-family:
+                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: center;">
+                                    <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:logoLatoikia" alt=""
+                            style="width: 300px; max-width: 600px; 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 }}</h2>
+                                        <h2>Ha sido registrado como un Administrador General del sitio web Katoikia</h2>
+                                        <h3>Fecha de registro {{date_entry}}</h3>
+                                        
+                                        <h3>Estas son sus credenciales:</h3>
+                                        <ul>
+                                            <li>Correo electronico:  {{email}}</li>
+                                            <li>Password:  {{password}}</li>
+                                        </ul>
+                                        <h3>Inicie sesión en el sitio web para poder acceder y disfrutar todos sus benefucuin</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;">
+                <tr>
+                    <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">About</h3>
+                                                <p>A small river named Duden flows by their place and supplies it with
+                                                    the necessary regelialia.</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">Informacion de contacto</h3>
+                                                <ul>
+                                                    <li><span class="text">203 Fake St. Mountain View, San Francisco,
+                                                            California, USA</span></li>
+                                                    <li><span class="text">+2 392 3929 210</span></a></li>
+                                                </ul>
+                                                -->
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                
+                            </tr>
+                        </table>
+                    </td>
+                </tr><!-- end: tr -->
+                
+            </table>
+
+        </div>
+    </center>
+</body>
+
+</html>

servicio-notificaciones/src/mails/emailCreateUserAdminCommunity.hbs

@@ -0,0 +1,442 @@
+<!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">
+
+    <!-- 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: #30e3ca;
+        }
+
+        .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: #30e3ca;
+            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;
+        }
+
+        body {
+            font-family: 'Lato', sans-serif;
+            font-weight: 400;
+            font-size: 15px;
+            line-height: 1.8;
+            color: rgba(0, 0, 0, .4);
+        }
+
+        a {
+            color: #30e3ca;
+        }
+
+        table {}
+
+        /*LOGO*/
+
+        .logo h1 {
+            margin: 0;
+        }
+
+        .logo h1 a {
+            color: #30e3ca;
+            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, .3);
+        }
+
+        .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: #30e3ca;
+        }
+
+
+        /*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: #30e3ca;
+            margin: 0 auto;
+        }
+
+        .heading-section-white {
+            color: rgba(255, 255, 255, .8);
+        }
+
+        .heading-section-white h2 {
+            font-family:
+                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: center;">
+                                    <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:logoKatoikia" alt=""
+                            style="width: 300px; max-width: 600px; 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 }}</h2>
+                                        <p>Ha sido registrado como un Administrador de la Comunidad `{{community_name}}`</p>
+                                        <p>Fecha de registro: {{date_entry}}</p>
+                                        
+                                        <h3>Estas son sus credenciales:</h3>
+                                        <ul>
+                                            <li></p>Correo electronico:  {{email}}</p></li>
+                                            <li><p>>Password:  {{password}}</p></li>
+                                        </ul>
+                                        <p>Inicie sesión en el sitio web para poder acceder y disfrutar todos sus benefucuin</p>
+                                        <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;">
+                <tr>
+                    <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">About</h3>
+                                                <p>A small river named Duden flows by their place and supplies it with
+                                                    the necessary regelialia.</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">Informacion de contacto</h3>
+                                                <ul>
+                                                    <li><span class="text">203 Fake St. Mountain View, San Francisco,
+                                                            California, USA</span></li>
+                                                    <li><span class="text">+2 392 3929 210</span></a></li>
+                                                </ul>
+                                                -->
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                                
+                            </tr>
+                        </table>
+                    </td>
+                </tr><!-- end: tr -->
+                
+            </table>
+
+        </div>
+    </center>
+</body>
+
+</html>

servicio-usuarios/src/users/users.controller.ts

@@ -22,6 +22,11 @@ export class UsersController {
     return this.userService.create(user);
   }
 
+  @MessagePattern({ cmd: 'createAdminCommunity' })
+  createAdminCommunity(@Payload() user: UserDocument) {
+    return this.userService.createAdminCommunity(user);
+  }
+
   @MessagePattern({ cmd: 'findAllUsers' })
   findAll() {
     return this.userService.findAll();
@@ -91,4 +96,7 @@ export class UsersController {
 
     return this.userService.deleteAdminSystem(user['id']);
   }
+
+  
+
 }

servicio-usuarios/src/users/users.module.ts

@@ -18,7 +18,17 @@ import { ClientsModule, Transport } from '@nestjs/microservices';
         },
       },
     ]),
-    MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
+    ClientsModule.register([
+      {
+        name: "SERVICIO_COMUNIDADES",
+        transport: Transport.TCP,
+        options: {
+          host: "127.0.0.1",
+          port: 3002
+        }
+      }
+    ]),
+    MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]), 
   ],
   controllers: [UsersController],
   providers: [UsersService],

servicio-usuarios/src/users/users.service.ts

@@ -4,6 +4,7 @@ import { User, UserDocument } from '../schemas/user.schema';
 import { InjectModel } from '@nestjs/mongoose';
 import { Md5 } from 'md5-typescript';
 import { map } from 'rxjs/operators';
+import { lastValueFrom } from 'rxjs';
 
 import { RpcException, ClientProxy } from '@nestjs/microservices';
 
@@ -11,9 +12,10 @@ import { RpcException, ClientProxy } from '@nestjs/microservices';
 export class UsersService {
   constructor(
     @InjectModel(User.name) private readonly userModel: Model<UserDocument>,
-    @Inject('SERVICIO_NOTIFICACIONES')
+    @Inject('SERVICIO_NOTIFICACIONES') private readonly clientNotificationtApp: ClientProxy,
-    private readonly clientNotificationtApp: ClientProxy,
+    @Inject('SERVICIO_COMUNIDADES') private readonly clientCommunityApp: ClientProxy,
-  ) {}
+
+  ) { }
   private publicKey: string;
   async create(user: UserDocument): Promise<User> {
     let passwordEncriptada = Md5.init(user.password);
@@ -21,6 +23,38 @@ export class UsersService {
     return this.userModel.create(user);
   }
 
+
+  async createAdminCommunity(user: UserDocument) {
+    let password = user.password;
+    let passwordEncriptada = Md5.init(user.password);
+    user.password = passwordEncriptada;
+    this.userModel.create(user);
+    let community = await this.findCommunity(user.community_id);
+    user.community_id = community['name'];
+
+    const pattern = { cmd: 'emailCreateUserAdminCommunity' };
+    const payload = { email: user['email'], password: password, name: user['name'], date_entry: user['date_entry'] };
+    return this.clientNotificationtApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((message: string) => ({ message })),
+      );
+  }
+
+  async findCommunity(community_id: string) {
+    const pattern = { cmd: 'findOneCommunity' }
+    const payload = { _id: community_id }
+
+    let callback = await this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((response: string) => ({ response }))
+      )
+    const finalValue = await lastValueFrom(callback);
+    return finalValue['response'];
+
+  }
+
   async findAll(): Promise<User[]> {
     return this.userModel.find().setOptions({ sanitizeFilter: true }).exec();
   }
@@ -106,4 +140,9 @@ export class UsersService {
   async deleteAdminSystem(id: string) {
     return this.userModel.deleteOne({ _id: id }).exec();
   }
+
+
+
+
 }
+

web-ui/web-react/src/components/AdministradoresSistema.js

@@ -36,9 +36,10 @@ const AdministradoresSistema = () => {
     phone: '',
     password: '',
     user_type: '1',
-    status: '',
+    status: '1',
   };
 
+
   async function fetchP() {
     let nombres = await fetch(urlFetch, { method: 'GET' });
     let adminRes = await nombres.json();
@@ -47,7 +48,8 @@ const AdministradoresSistema = () => {
   }
   useEffect(() => {
     fetchP();
-  }, []);
+  }, [])
+
 
   function registrarAdmin() {
     var data = {
@@ -57,9 +59,10 @@ const AdministradoresSistema = () => {
       email: document.getElementById('correo_electronico').value,
       phone: document.getElementById('telefono').value,
       password: document.getElementById('correo_electronico').value,
-      user_type: '1', //1 es admin
+      user_type: "1", //1 es admin
-      status: '1',
+      status: "1"
     };
+    setSysAdmin(data)
     // console.log(data);
 
     fetch('http://localhost:4000/user/createAdminSystem/', {
@@ -67,31 +70,30 @@ const AdministradoresSistema = () => {
       method: 'POST',
       body: JSON.stringify(data),
       headers: {
-        'Content-Type': 'application/json',
+        'Content-Type': 'application/json'
-      },
+      }
     })
-      .then(function (response) {
+      .then(
-        if (response.status != 201)
+        function (response) {
-          console.log('Ocurrió un error con el servicio: ' + response.status);
+          if (response.status != 201)
-        else return response.json();
+            console.log('Ocurrió un error con el servicio: ' + response.status);
-      })
+          else
-      .then(function (response) {
+            return response.json();
-        let _administrators = [...administrators];
+        }
-        let _admin = { ...response.message };
+      )
-        _administrators.push(_admin);
+      .then(
-        setAdministrators(_administrators);
+        function (response) {
-      })
+          let _administrators = [...administrators];
-      .catch((err) => console.log('Ocurrió un error con el fetch', err));
+          let _admin = { ...sysadmin };
+          _administrators.push(_admin);
+          setAdministrators(_administrators)
+        }
+      )
+      .catch(
+        err => console.log('Ocurrió un error con el fetch', err)
+      );
   }
 
-  const hideDeleteAdminSystemDialog = () => {
-    setDeleteAdminSystemDialog(false);
-  };
-
-  const hideDeleteAdminsSystemsDialog = () => {
-    setDeleteAdminsSystemDialog(false);
-  };
-
   const confirmDeleteAdminSystem = (sysAdmin) => {
     setSysAdmin(sysAdmin);
     setDeleteAdminSystemDialog(true);
@@ -101,6 +103,15 @@ const AdministradoresSistema = () => {
     setDeleteAdminsSystemDialog(true);
   };
 
+  const hideDeleteAdminSystemDialog = () => {
+    setDeleteAdminSystemDialog(false);
+  };
+
+  const hideDeleteAdminsSystemDialog = () => {
+    setDeleteAdminsSystemDialog(false);
+  };
+
+
   const deleteSysAdmin = () => {
     fetch('http://localhost:4000/user/deleteAdminSystem/' + sysadmin._id, {
       cache: 'no-cache',
@@ -206,7 +217,7 @@ const AdministradoresSistema = () => {
   const header = (
     <div className="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
       <h5 className="m-0">
-        Administradores del sistema <i class="fal fa-user"></i>
+        Administradores del sistema <i className="fal fa-user"></i>
       </h5>
       <span className="block mt-2 md:mt-0 p-input-icon-left">
         <i className="pi pi-search" />
@@ -242,7 +253,7 @@ const AdministradoresSistema = () => {
         label="No"
         icon="pi pi-times"
         className="p-button-text"
-        onClick={hideDeleteAdminsSystemsDialog}
+        onClick={hideDeleteAdminsSystemDialog}
       />
       <Button
         label="Yes"
@@ -432,7 +443,7 @@ const AdministradoresSistema = () => {
             header="Confirmar"
             modal
             footer={deleteAdminsSystemDialogFooter}
-            onHide={hideDeleteAdminsSystemsDialog}
+            onHide={hideDeleteAdminsSystemDialog}
           >
             <div className="flex align-items-center justify-content-center">
               <i

web-ui/web-react/src/components/ComunidadViviendas.js

@@ -23,7 +23,7 @@ const Communities = () => {
     district: districtId,
     phone: '',
     num_houses: 0,
-    status: 'activo',
+    status: '1',
     date_entry: new Date(),
     houses: [],
   };
@@ -64,17 +64,6 @@ const Communities = () => {
     parent: item.parentCode,
   }));
 
-  useEffect(() => {
-    fillProvinces();
-  }, []);
-
-  useEffect(() => {
-    fillCantons();
-  }, [provinciaId]);
-
-  useEffect(() => {
-    fillDistricts();
-  }, [cantonId]);
 
   async function getProvinces() {
     const response = await fetch('assets/demo/data/provincias.json', {
@@ -118,6 +107,20 @@ const Communities = () => {
     setDistrictsList(await districts);
   }
 
+
+  useEffect(() => {
+    fillProvinces();
+  }, []);
+
+  useEffect(() => {
+    fillCantons();
+  }, [provinciaId]);
+
+  useEffect(() => {
+    fillDistricts();
+  }, [cantonId]);
+
+  
   const handleProvinces = (event) => {
     const getprovinciaId = event.target.value;
     setProvinciaId(getprovinciaId);