From 176a6931cedeb3e76030eafc10cbcf0d824ffd77 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Thu, 18 Aug 2022 20:31:54 -0600
Subject: [PATCH 01/17] add node to devshell

---
 devshell.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/devshell.toml b/devshell.toml
index 4b8c8bff..d7746d94 100644
--- a/devshell.toml
+++ b/devshell.toml
@@ -2,3 +2,8 @@
 [[commands]]
 package = "devshell.cli"
 help = "Per project developer environments"
+
+[[commands]]
+package = "nodejs"
+help = "Node.js"
+

From 2a69b1ff16d59397a1641a4339a029f7688cabb3 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Thu, 18 Aug 2022 21:03:34 -0600
Subject: [PATCH 02/17] corregir puerto de api para crear inquilino

---
 web-ui/web-react/src/components/Inquilinos.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 4325bcf5..5d6630d2 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -116,7 +116,7 @@ const Inquilinos = () => {
       status_text: '',
     }
 
-    fetch('http://localhost:3000/api/createUser', {
+    fetch('http://localhost:4000/api/createUser', {
       method: 'POST',
       cache: 'no-cache',
       body: JSON.stringify(newTenant),

From f6ce86909fddceaf5c93ec4736e40ce71f30cc10 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 02:41:46 -0600
Subject: [PATCH 03/17] add name to servicio comunidad viviendas

---
 servicio-comunidad-viviendas/package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/servicio-comunidad-viviendas/package-lock.json b/servicio-comunidad-viviendas/package-lock.json
index 46dd3dd0..22c95f9b 100644
--- a/servicio-comunidad-viviendas/package-lock.json
+++ b/servicio-comunidad-viviendas/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "servicio-comunidad-viviendas",
       "version": "0.0.1",
       "license": "UNLICENSED",
       "dependencies": {

From dc65cdda4fa73af5eef20745cf7825a6bfc12dd2 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 02:42:33 -0600
Subject: [PATCH 04/17] clean up saveTenant function

---
 web-ui/web-react/src/components/Inquilinos.js | 72 ++++++++++---------
 1 file changed, 40 insertions(+), 32 deletions(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 5d6630d2..e16249f2 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -98,38 +98,39 @@ const Inquilinos = () => {
     value: item._id,
   }))
 
-  function registrarInquilino() {
-    let newTenant = {
-      _id: null,
-      dni: '',
-      name: '',
-      last_name: '',
-      email: document.getElementById('correo_electronico').value,
-      phone: '',
-      password: '',
-      community_id: document.getElementById('numero_vivienda').value,
-      community_name: '',
-      number_house: 'Sin número de vivienda',
-      date_entry: new Date(),
-      user_type: '3',
-      status: '1',
-      status_text: '',
-    }
+  const saveTenant = () => {
+    if (tenant.email && tenant.number_house) {
+      let _tenants = [...tenants]
+      let _tenant = { ...tenant }
+      _tenant.community_id = communityId
+      console.log(_tenant)
 
-    fetch('http://localhost:4000/api/createUser', {
-      method: 'POST',
-      cache: 'no-cache',
-      body: JSON.stringify(newTenant),
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    }).then((response) => {
-      if (response.ok) {
-        alert('Inquilino registrado correctamente')
-      } else {
-        alert('Error al registrar inquilino')
-      }
-    })
+      fetch(`http://localhost:4000/user/createUser`, {
+        cache: 'no-cache',
+        method: 'POST',
+        body: JSON.stringify(tenant),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      })
+        .then((response) => {
+          if (response.status !== 201)
+            console.log(`Hubo un error en el servicio: ${response.status}`)
+          else return response.json()
+        })
+        .then(() => {
+          _tenants.push(_tenant)
+          toast.current.show({
+            severity: 'success',
+            summary: 'Éxito',
+            detail: 'Inquilino creado',
+            life: 3000,
+          })
+          setTenants(_tenants)
+          setTenant(emptyTenant)
+        })
+        .catch((error) => console.log(`Ocurrió un error: ${error}`))
+    } else setSubmitted(true)
   }
 
   const deleteTenant = () => {
@@ -418,6 +419,13 @@ const Inquilinos = () => {
     )
   }
 
+  const onInputChange = (e) => {
+    const value = (e.target && e.target.value) || ''
+    let _tenant = { ...tenant }
+    _tenant[`${name}`] = value
+    setTenant(_tenant)
+  }
+
   return (
     <div className='grid'>
       <div className='col-12'>
@@ -618,7 +626,7 @@ const Inquilinos = () => {
                 onChange={(e) => setCommunityId(e.value)}
               />
             </div>
-            <Button label='Registrar' onClick={registrarInquilino} />
+            <Button label='Registrar' onClick={saveTenant} />
           </div>
         </div>
       </div>

From 435af70439534c03d8036e598824d95493728cf3 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 03:44:14 -0600
Subject: [PATCH 05/17] set emptyTenant to constant

---
 web-ui/web-react/src/components/Inquilinos.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index e16249f2..dd76474b 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -17,7 +17,7 @@ import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons'
 import { useCookies } from 'react-cookie'
 
 const Inquilinos = () => {
-  let emptyTenant = {
+  const emptyTenant = {
     _id: null,
     dni: '',
     name: '',

From 2a325d4e2e0d4ae55083906e6122c6f1dec6c68c Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 04:40:07 -0600
Subject: [PATCH 06/17] add onInputChange to inputs

---
 web-ui/web-react/src/components/Inquilinos.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index dd76474b..30dbbea1 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -614,6 +614,7 @@ const Inquilinos = () => {
                 type='email'
                 className='form-control'
                 id='correo_electronico'
+                onChange={(e) => onInputChange(e, 'email')}
               />
             </div>
             <div className='field col-12 md:col-6'>
@@ -623,7 +624,7 @@ const Inquilinos = () => {
                 id='numero_vivienda'
                 value={communityId}
                 options={cList}
-                onChange={(e) => setCommunityId(e.value)}
+                onChange={(e) => onInputChange(e, 'community_id')}
               />
             </div>
             <Button label='Registrar' onClick={saveTenant} />

From 3cb8e4762814572666ca975d2e05ba75d0874c95 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 19:04:02 -0600
Subject: [PATCH 07/17] add name as parameter for onInputChange

---
 web-ui/web-react/src/components/Inquilinos.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 30dbbea1..da8aa512 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -419,7 +419,7 @@ const Inquilinos = () => {
     )
   }
 
-  const onInputChange = (e) => {
+  const onInputChange = (e, name) => {
     const value = (e.target && e.target.value) || ''
     let _tenant = { ...tenant }
     _tenant[`${name}`] = value

From 8dd3132ec4ba99d561db64f054125620ffbc3ee2 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 19:38:40 -0600
Subject: [PATCH 08/17] =?UTF-8?q?garantizar=20que=20se=20analiza=20la=20co?=
 =?UTF-8?q?ntrase=C3=B1a=20solo=20si=20el=20usuario=20existe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

estaba dando un error causado por la ausencia de un usuario, pero el
sistema de todos modos intentaba accesar su contraseña, por lo que
resultaba 'undefined'
---
 servicio-usuarios/src/users/users.service.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 0cd70023..b2c42794 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -99,10 +99,13 @@ export class UsersService {
           reject(err);
         } else {
           let passwordEncriptada = Md5.init(password);
+          if (res.length > 0) {
           if (res[0].password == passwordEncriptada) {
             resolve(res[0]);
           } else {
             resolve(null);
+            }}else{
+            resolve(null);
           }
         }
       });

From c1106e7d63f3f827882cfba7e2cdb7380882c020 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 19:50:41 -0600
Subject: [PATCH 09/17] format

---
 servicio-usuarios/src/users/users.service.ts | 39 ++++++++++----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index b2c42794..dc2549d2 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -14,8 +14,8 @@ export class UsersService {
     @InjectModel(User.name) private readonly userModel: Model<UserDocument>,
     @Inject('SERVICIO_NOTIFICACIONES') 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);
@@ -78,14 +78,14 @@ export class UsersService {
     });
   }
 
- /* async remove(id: string) {
-    return this.userModel.findByIdAndRemove({ _id: id }).exec();
-  }*/
+  /* async remove(id: string) {
+     return this.userModel.findByIdAndRemove({ _id: id }).exec();
+   }*/
 
   async remove(id: string) {
-    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
       new: true,
-    });  
+    });
   }
 
   //inicio de sesion
@@ -100,12 +100,13 @@ export class UsersService {
         } else {
           let passwordEncriptada = Md5.init(password);
           if (res.length > 0) {
-          if (res[0].password == passwordEncriptada) {
-            resolve(res[0]);
+            if (res[0].password == passwordEncriptada) {
+              resolve(res[0]);
+            } else {
+              resolve(null);
+            }
           } else {
             resolve(null);
-            }}else{
-            resolve(null);
           }
         }
       });
@@ -183,16 +184,16 @@ export class UsersService {
   }
 
   async deleteAdminSystem(id: string) {
-    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
       new: true,
-    });  
+    });
   }
 
 
   deleteAdminCommunity(id: string) {
-    return this.userModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
       new: true,
-    });  
+    });
   }
 
   async validateEmail(email: string) {
@@ -226,17 +227,17 @@ export class UsersService {
     const houses = response['houses'];
     let num_house = "";
     await houses.forEach(async house => {
-        if (tenant_id == house.tenants.tenant_id) {
-          num_house = house.number_house;
-        }
+      if (tenant_id == house.tenants.tenant_id) {
+        num_house = house.number_house;
+      }
     })
     return num_house;
   }
 
   async changeStatus(id: string, status: string) {
-    return this.userModel.findOneAndUpdate({ _id: id }, {status: status}, {
+    return this.userModel.findOneAndUpdate({ _id: id }, { status: status }, {
       new: true,
-    });  
+    });
   }
 }
 

From 70174ad5df71ee2de362b9ce9724fd3b395792c4 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 20:25:55 -0600
Subject: [PATCH 10/17] request complete info on tenant for registration

it's too complex to handle it as a two-step process, plus it makes sense
to get all this information when registering a new tenant into an
apartment anyway
---
 web-ui/web-react/src/components/Inquilinos.js | 101 ++++++++++++++----
 1 file changed, 78 insertions(+), 23 deletions(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index da8aa512..2dae6d77 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -15,6 +15,7 @@ import { faIdCardAlt } from '@fortawesome/free-solid-svg-icons'
 import { faHashtag } from '@fortawesome/free-solid-svg-icons'
 import { faCircleQuestion } from '@fortawesome/free-solid-svg-icons'
 import { useCookies } from 'react-cookie'
+import classNames from 'classnames';
 
 const Inquilinos = () => {
   const emptyTenant = {
@@ -603,31 +604,85 @@ const Inquilinos = () => {
           </Dialog>
         </div>
       </div>
-      <div className='col-12'>
-        <div className='card'>
-          <h5 className='card-header'>Registrar Inquilino</h5>
-          <div className='p-fluid formgrid grid'>
-            <div className='field col-12 md:col-6'>
-              <label htmlFor='correo_electronico'>Correo electrónico</label>
-              <InputText
-                required
-                type='email'
-                className='form-control'
-                id='correo_electronico'
-                onChange={(e) => onInputChange(e, 'email')}
-              />
+      <div className="col-12">
+        <div className="card">
+          <h5>Registro de un administrador de una comunidad de viviendas</h5>
+          <div className="p-fluid formgrid grid">
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Nombre</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText id="name" value={tenant.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.name === '' })} />
+                </div>
+                {submitted && tenant.name === '' && <small className="p-invalid">Nombre es requerido.</small>}
+              </div>
             </div>
-            <div className='field col-12 md:col-6'>
-              <label htmlFor='numero_vivienda'>Número de Vivienda</label>
-              <Dropdown
-                required
-                id='numero_vivienda'
-                value={communityId}
-                options={cList}
-                onChange={(e) => onInputChange(e, 'community_id')}
-              />
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Apellido(s)</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText id="last_name" value={tenant.last_name} onChange={(e) => onInputChange(e, 'last_name')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.last_name === '' })} />
+                </div>
+                {submitted && tenant.last_name === '' && <small className="p-invalid">Apellidos es requerido.</small>}
+              </div>
             </div>
-            <Button label='Registrar' onClick={saveTenant} />
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Correo Electrónico</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText id="email" value={tenant.email} onChange={(e) => onInputChange(e, 'email')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.email === '' })} />
+                </div>
+                {submitted && tenant.email === '' && <small className="p-invalid">Correo electrónico
+                                    es requerido.</small>}
+              </div>
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Identificación</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <InputText id="dni" value={tenant.dni} onChange={(e) => onInputChange(e, 'dni')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.dni === '' })} />
+                </div>
+                {submitted && tenant.email === '' && <small className="p-invalid">Identificación es requerida.</small>}
+              </div>
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="name">Número de teléfono</label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-phone"></i>
+                  </span>
+                  <InputText id="phone" value={tenant.phone} onChange={(e) => onInputChange(e, 'phone')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.phone === '' })} />
+                </div>
+                {submitted && tenant.phone === '' && <small className="p-invalid">Número de teléfono es requerido.</small>}
+              </div>
+            </div>
+            <div className="field col-12 md:col-6">
+              <label htmlFor="administrator">Comunidad a asignar: </label>
+              <div className="p-0 col-12 md:col-12">
+                <div className="p-inputgroup">
+                  <span className="p-inputgroup-addon p-button p-icon-input-khaki">
+                    <i className="pi pi-home"></i>
+                  </span>
+                  <Dropdown placeholder="--Seleccione la Casa a Asignar--" id="administrator" value={communityId} options={cList}
+                    onChange={handleCommunities} required autoFocus className={classNames({ 'p-invalid': submitted && !communityId })} />
+                </div>
+                {submitted && !communityId && <small className="p-invalid">Comunidad es requerida.</small>}
+              </div>
+            </div>
+            <Button label="Registrar" onClick={saveTenant} />
           </div>
         </div>
       </div>

From 5689f3053e751535c0c3feeabd48b34f7d0d7b70 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 20:31:28 -0600
Subject: [PATCH 11/17] arreglar tipos de inputs

---
 web-ui/web-react/src/components/Inquilinos.js | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 2dae6d77..bf2c5b79 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -615,7 +615,7 @@ const Inquilinos = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-home"></i>
                   </span>
-                  <InputText id="name" value={tenant.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.name === '' })} />
+                  <InputText type="text" id="name" value={tenant.name} onChange={(e) => onInputChange(e, 'name')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.name === '' })} />
                 </div>
                 {submitted && tenant.name === '' && <small className="p-invalid">Nombre es requerido.</small>}
               </div>
@@ -627,9 +627,9 @@ const Inquilinos = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-home"></i>
                   </span>
-                  <InputText id="last_name" value={tenant.last_name} onChange={(e) => onInputChange(e, 'last_name')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.last_name === '' })} />
+                  <InputText type="text" id="last_name" value={tenant.last_name} onChange={(e) => onInputChange(e, 'last_name')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.last_name === '' })} />
                 </div>
-                {submitted && tenant.last_name === '' && <small className="p-invalid">Apellidos es requerido.</small>}
+                {submitted && tenant.last_name === '' && <small className="p-invalid">Apellidos son requeridos.</small>}
               </div>
             </div>
             <div className="field col-12 md:col-6">
@@ -639,14 +639,13 @@ const Inquilinos = () => {
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-home"></i>
                   </span>
-                  <InputText id="email" value={tenant.email} onChange={(e) => onInputChange(e, 'email')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.email === '' })} />
+                  <InputText type='email' id="email" value={tenant.email} onChange={(e) => onInputChange(e, 'email')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.email === '' })} />
                 </div>
-                {submitted && tenant.email === '' && <small className="p-invalid">Correo electrónico
-                                    es requerido.</small>}
+                {submitted && tenant.email === '' && <small className="p-invalid">Correo electrónico es requerido.</small>}
               </div>
             </div>
             <div className="field col-12 md:col-6">
-              <label htmlFor="name">Identificación</label>
+              <label htmlFor="dni">Identificación</label>
               <div className="p-0 col-12 md:col-12">
                 <div className="p-inputgroup">
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
@@ -658,26 +657,26 @@ const Inquilinos = () => {
               </div>
             </div>
             <div className="field col-12 md:col-6">
-              <label htmlFor="name">Número de teléfono</label>
+              <label htmlFor="phone">Número de teléfono</label>
               <div className="p-0 col-12 md:col-12">
                 <div className="p-inputgroup">
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-phone"></i>
                   </span>
-                  <InputText id="phone" value={tenant.phone} onChange={(e) => onInputChange(e, 'phone')} required autoFocus className={classNames({ 'p-invalid': submitted && tenant.phone === '' })} />
+                  <InputText id="phone" value={tenant.phone} onChange={(e) => onInputChange(e, 'phone')} type='tel' required autoFocus className={classNames({ 'p-invalid': submitted && tenant.phone === '' })} />
                 </div>
                 {submitted && tenant.phone === '' && <small className="p-invalid">Número de teléfono es requerido.</small>}
               </div>
             </div>
             <div className="field col-12 md:col-6">
-              <label htmlFor="administrator">Comunidad a asignar: </label>
+              <label htmlFor="community_id">Comunidad a asignar: </label>
               <div className="p-0 col-12 md:col-12">
                 <div className="p-inputgroup">
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-home"></i>
                   </span>
-                  <Dropdown placeholder="--Seleccione la Casa a Asignar--" id="administrator" value={communityId} options={cList}
-                    onChange={handleCommunities} required autoFocus className={classNames({ 'p-invalid': submitted && !communityId })} />
+                  <Dropdown placeholder="--Seleccione la Casa a Asignar--" id="community_id" value={communityId} options={cList}
+                    onChange={(e) => onInputChange(e, 'community_id')} required autoFocus className={classNames({ 'p-invalid': submitted && !communityId })} />
                 </div>
                 {submitted && !communityId && <small className="p-invalid">Comunidad es requerida.</small>}
               </div>

From 99e9ef98f6401f879eb163aeda27f69903ddc8dc Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 20:33:16 -0600
Subject: [PATCH 12/17] eliminar componente para completar info de inquilinos

---
 web-ui/web-react/src/App.js                   |   1 -
 .../src/components/InquilinosCompletar.js     | 125 ------------------
 2 files changed, 126 deletions(-)
 delete mode 100644 web-ui/web-react/src/components/InquilinosCompletar.js

diff --git a/web-ui/web-react/src/App.js b/web-ui/web-react/src/App.js
index 2b95c37c..1551381d 100644
--- a/web-ui/web-react/src/App.js
+++ b/web-ui/web-react/src/App.js
@@ -33,7 +33,6 @@ import AdministradoresComunidad from './components/AdministradoresComunidad';
 import GuardasSeguridad from './components/GuardasSeguridad';
 import Communities from './components/ComunidadViviendas';
 import Inquilinos from './components/Inquilinos';
-import InquilinosCompletar from "./components/InquilinosCompletar.js";
 import RegistroComunicado from './components/RegistroComunicado';
 import "../node_modules/bootstrap/dist/css/bootstrap.min.css";
 
diff --git a/web-ui/web-react/src/components/InquilinosCompletar.js b/web-ui/web-react/src/components/InquilinosCompletar.js
deleted file mode 100644
index 06a18ca1..00000000
--- a/web-ui/web-react/src/components/InquilinosCompletar.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import { Button } from 'primereact/button'
-import { InputText } from 'primereact/inputtext'
-import React, { useState } from 'react'
-
-import { useCookies } from 'react-cookie'
-
-const InquilinosCompletar = () => {
-  let emptyTenant = {
-    _id: null,
-    dni: '',
-    name: '',
-    last_name: '',
-    email: '',
-    phone: '',
-    password: '',
-    community_id: '',
-    community_name: '',
-    number_house: 'Sin número de vivienda',
-    user_type: '4',
-    date_entry: new Date(),
-    status: '1',
-    status_text: '',
-  }
-
-  const [tenant, setTenant] = useState(emptyTenant)
-  const [selectedTentants, setSelectedTenants] = useState(null)
-  const [globalFilter, setGlobalFilter] = useState(null)
-  const [deleteTenantDialog, setDeleteTenantDialog] = useState(false)
-  const [deleteTenantsDialog, setDeleteTenantsDialog] = useState(false)
-  const [communitiesList, setCommunitiesList] = useState([])
-  const [communityId, setCommunityId] = useState(null)
-  const [submitted, setSubmitted] = useState(false)
-  const [cookies, setCookie] = useCookies()
-  const [changeStatusTenantDialog, setChangeStatusTenantDialog] =
-    useState(false)
-
-  function finalizarRegistro() {
-    let data = {
-      dni: document.getElementById('identificacion').value,
-      name: document.getElementById('nombre').value,
-      last_name: document.getElementById('apellidos').value,
-      phone: document.getElementById('telefono').value,
-      email: document.getElementById('correo_electronico').value,
-      community_id: document.getElementById('numero_vivienda').value,
-      password: document.getElementById('password').value,
-      user_type: '3',
-      status: '1',
-    }
-
-    fetch('http://localhost:3000/api/createUser', {
-      method: 'PUT',
-      cache: 'no-cache',
-      body: JSON.stringify(data),
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    }).then((response) => {
-      if (response.ok) {
-        alert('Inquilino registrado correctamente')
-      } else {
-        alert('Error al registrar inquilino')
-      }
-    })
-  }
-
-  return (
-    <div className='grid'>
-      <div className='col-12'>
-        <div className='card'>
-          <h5 className='card-header'>Finalizar Registro</h5>
-          <div className='p-fluid formgrid grid'>
-            <div className='field col-12 md:col-6'>
-              <label htmlFor='nombre'>Nombre</label>
-              <InputText
-                required
-                type='text'
-                className='form-control'
-                id='nombre'
-              />
-            </div>
-            <div className='field col-12 md:col-6'>
-              <label htmlFor='apellidos'>Apellido(s)</label>
-              <InputText
-                required
-                type='text'
-                className='form-control'
-                id='apellidos'
-              />
-            </div>
-            <div className='field col-12 md:col-6'>
-              <label htmlFor='identificacion'>Identificación</label>
-              <InputText
-                required
-                type='text'
-                className='form-control'
-                id='identificacion'
-              />
-            </div>
-            <div className='field col-12 md:col-6'>
-              <label htmlFor='correo_electronico'>Correo electrónico</label>
-              <InputText
-                required
-                type='email'
-                className='form-control'
-                id='correo_electronico'
-              />
-            </div>
-            <div className='field col-12 md:col-6'>
-              <label htmlFor='password'>Password</label>
-              <InputText
-                required
-                type='password'
-                className='form-control'
-                id='password'
-              />
-            </div>
-            <Button label='Registrar' onClick={finalizarRegistro} />
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default React.memo(InquilinosCompletar)

From 259444b3711b9d67900ca372f79186ca1866b130 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sat, 20 Aug 2022 21:20:50 -0600
Subject: [PATCH 13/17] add missing checks and default password

---
 web-ui/web-react/src/components/Inquilinos.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index bf2c5b79..c8794b57 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -100,16 +100,18 @@ const Inquilinos = () => {
   }))
 
   const saveTenant = () => {
-    if (tenant.email && tenant.number_house) {
+    if (tenant.email && tenant.community_id && tenant.dni
+    && tenant.name && tenant.last_name && tenant.phone) {
       let _tenants = [...tenants]
       let _tenant = { ...tenant }
-      _tenant.community_id = communityId
+      _tenant.community_id = communityId;
+      _tenant.password = _tenant.email;
       console.log(_tenant)
 
       fetch(`http://localhost:4000/user/createUser`, {
         cache: 'no-cache',
         method: 'POST',
-        body: JSON.stringify(tenant),
+        body: JSON.stringify(_tenant),
         headers: {
           'Content-Type': 'application/json',
         },

From 20f6aeb376279b4aaf2f47afb62daf2a0294b9ad Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sun, 21 Aug 2022 03:50:27 -0600
Subject: [PATCH 14/17] =?UTF-8?q?cambiar=20selecci=C3=B3n=20de=20comunidad?=
 =?UTF-8?q?=20por=20selecci=C3=B3n=20de=20casas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no tiene sentido que se pueda seleccionar una comunidad y luego
seleccionar una casa, dado que el administrador administra una única
comunidad, y esta se puede inferir del administrador mismo. Además, el
inquilino se asigna a una casa, no necesariamente a la comunidad.
---
 web-ui/web-react/src/components/Inquilinos.js | 70 ++++++++++++-------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index c8794b57..7d94ac6d 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -41,15 +41,14 @@ const Inquilinos = () => {
   const [globalFilter, setGlobalFilter] = useState(null)
   const [deleteTenantDialog, setDeleteTenantDialog] = useState(false)
   const [deleteTenantsDialog, setDeleteTenantsDialog] = useState(false)
-  const [communitiesList, setCommunitiesList] = useState([])
-  const [communityId, setCommunityId] = useState(null)
+  const [community, setCommunity] = useState([])
+  const [houseNumber, setHouseNumber] = useState([])
+  const [housesList, setHousesList] = useState([])
   const [submitted, setSubmitted] = useState(false)
   const toast = useRef(null)
   const dt = useRef(null)
-
-  const [cookies, setCookie] = useCookies()
-  const [changeStatusTenantDialog, setChangeStatusTenantDialog] =
-    useState(false)
+  const [cookies] = useCookies()
+  const [changeStatusTenantDialog, setChangeStatusTenantDialog] = useState(false)
 
   async function tenantsList() {
     await fetch(
@@ -75,15 +74,21 @@ const Inquilinos = () => {
       })
   }
 
-  async function getCommunites() {
+  async function getCommunity() {
     let response = await fetch(
-      'http://localhost:4000/community/allCommunities',
+      `http://localhost:4000/community/findCommunityName/${cookies.community_id}`,
       { method: 'GET' },
     )
-    let resList = await response.json()
-    let list = await resList.message
-    list = await list.filter((val) => val.status !== -1)
-    setCommunitiesList(await list)
+    const responseJson = await response.json()
+    const result = await responseJson.message
+    setCommunity(await result)
+    const houses = await result.houses.filter((house) =>
+      house.state === "desocupada"
+    )
+    setHousesList(houses.map((house) => ({
+      label: house.number_house, value: house.number_house
+    }))
+    )
   }
 
   useEffect(() => {
@@ -91,20 +96,15 @@ const Inquilinos = () => {
   }, [tenantsList])
 
   useEffect(() => {
-    getCommunites()
+    getCommunity()
   }, [])
 
-  const cList = communitiesList.map((item) => ({
-    label: item.name,
-    value: item._id,
-  }))
-
   const saveTenant = () => {
-    if (tenant.email && tenant.community_id && tenant.dni
-    && tenant.name && tenant.last_name && tenant.phone) {
+    if (tenant.email && tenant.number_house && tenant.dni
+      && tenant.name && tenant.last_name && tenant.phone) {
       let _tenants = [...tenants]
       let _tenant = { ...tenant }
-      _tenant.community_id = communityId;
+      _tenant.community_id = cookies.community_id;
       _tenant.password = _tenant.email;
       console.log(_tenant)
 
@@ -429,6 +429,12 @@ const Inquilinos = () => {
     setTenant(_tenant)
   }
 
+  const handleHouses = (e) => {
+    const getHouseNumber = e.target.value;
+    setHouseNumber(getHouseNumber);
+    console.log(getHouseNumber);
+  }
+
   return (
     <div className='grid'>
       <div className='col-12'>
@@ -667,20 +673,32 @@ const Inquilinos = () => {
                   </span>
                   <InputText id="phone" value={tenant.phone} onChange={(e) => onInputChange(e, 'phone')} type='tel' required autoFocus className={classNames({ 'p-invalid': submitted && tenant.phone === '' })} />
                 </div>
-                {submitted && tenant.phone === '' && <small className="p-invalid">Número de teléfono es requerido.</small>}
+                {submitted
+                  && tenant.phone === ''
+                  && <small className="p-invalid">Número de teléfono es requerido.</small>}
               </div>
             </div>
             <div className="field col-12 md:col-6">
-              <label htmlFor="community_id">Comunidad a asignar: </label>
+              <label htmlFor="number_house">Casa a asignar: </label>
               <div className="p-0 col-12 md:col-12">
                 <div className="p-inputgroup">
                   <span className="p-inputgroup-addon p-button p-icon-input-khaki">
                     <i className="pi pi-home"></i>
                   </span>
-                  <Dropdown placeholder="--Seleccione la Casa a Asignar--" id="community_id" value={communityId} options={cList}
-                    onChange={(e) => onInputChange(e, 'community_id')} required autoFocus className={classNames({ 'p-invalid': submitted && !communityId })} />
+                  <Dropdown
+                    placeholder="--Seleccione la Casa a Asignar--"
+                    id="number_house"
+                    value={houseNumber}
+                    options={housesList}
+                    onChange={handleHouses}
+                    required autoFocus
+                    className={
+                      classNames({ 'p-invalid': submitted && !houseNumber })}
+                  />
                 </div>
-                {submitted && !communityId && <small className="p-invalid">Comunidad es requerida.</small>}
+                {submitted
+                  && !houseNumber
+                  && <small className="p-invalid">Casa es requerida.</small>}
               </div>
             </div>
             <Button label="Registrar" onClick={saveTenant} />

From 809620088625bc24620b094146d960ef7eff6b3f Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sun, 21 Aug 2022 04:31:27 -0600
Subject: [PATCH 15/17] add number_house to new tenant

---
 web-ui/web-react/src/components/Inquilinos.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 7d94ac6d..0b248337 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -105,6 +105,7 @@ const Inquilinos = () => {
       let _tenants = [...tenants]
       let _tenant = { ...tenant }
       _tenant.community_id = cookies.community_id;
+      _tenant.number_house = houseNumber;
       _tenant.password = _tenant.email;
       console.log(_tenant)
 

From 25344faca01dc325466fbd52a17ed155153887e3 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sun, 21 Aug 2022 04:31:46 -0600
Subject: [PATCH 16/17] add deleteTenant method to user service

---
 servicio-usuarios/src/users/users.service.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index dc2549d2..26ae3c95 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -196,6 +196,12 @@ export class UsersService {
     });
   }
 
+  async deleteTenant(id: string) {
+    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
+    new: true,
+    });
+  }
+
   async validateEmail(email: string) {
     let repo1 = this.userModel;
     return new Promise<User>((resolve, reject) => {

From 11aff885e7a70bbca81bb1de800388f89f1d2dee Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Sun, 21 Aug 2022 04:35:59 -0600
Subject: [PATCH 17/17] add plumbing to delete tenant

---
 api-gateway/src/app.controller.ts               |  4 ++++
 api-gateway/src/app.service.ts                  | 12 ++++++++++--
 servicio-usuarios/src/users/users.controller.ts |  6 ++++--
 servicio-usuarios/src/users/users.service.ts    |  1 -
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts
index 94b6fc14..7e6fe785 100644
--- a/api-gateway/src/app.controller.ts
+++ b/api-gateway/src/app.controller.ts
@@ -160,6 +160,10 @@ export class AppController {
     return this.appService.deleteAdminCommunity(id);
   }
 
+  @Delete('user/deleteTenant/:id')
+  deleteTenant(@Param('id') id: string) {
+    return this.appService.deleteTenant(id);
+  }
 
   @Post('user/changeStatus')
   changeStatusUser(
diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts
index 42e9bf22..c3396486 100644
--- a/api-gateway/src/app.service.ts
+++ b/api-gateway/src/app.service.ts
@@ -54,8 +54,8 @@ export class AppService {
   }
 
   updateUser(
-    dni: string, 
-    name: string, 
+    dni: string,
+    name: string,
     last_name: string,
     email: string,
     phone: number,
@@ -201,6 +201,14 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  deleteTenant(id: string) {
+    const pattern = { cmd: 'deleteTenant' };
+    const payload = { id: id };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
   inicioSesion(pEmail: string, pPassword: string) {
     const pattern = { cmd: 'loginUser' };
     const payload = { email: pEmail, password: pPassword };
diff --git a/servicio-usuarios/src/users/users.controller.ts b/servicio-usuarios/src/users/users.controller.ts
index e8f261a4..a13bae7c 100644
--- a/servicio-usuarios/src/users/users.controller.ts
+++ b/servicio-usuarios/src/users/users.controller.ts
@@ -115,13 +115,15 @@ export class UsersController {
     return this.userService.deleteAdminSystem(user['id']);
   }
 
-  
   @MessagePattern({ cmd: 'deleteAdminCommunity' })
   deleteAdminCommunity(@Payload() user: any) {
     return this.userService.deleteAdminCommunity(user['id']);
   }
 
-
+  @MessagePattern({ cmd: 'deleteTenant' })
+  deleteTenant(@Payload() user: any) {
+    return this.userService.deleteTenant(user['id']);
+  }
 
   @MessagePattern({ cmd: 'changeStatus' })
   changeStatus(@Payload() body: string) {
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 26ae3c95..cbe1689a 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -189,7 +189,6 @@ export class UsersService {
     });
   }
 
-
   deleteAdminCommunity(id: string) {
     return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
       new: true,