From ff5c6e55ffb46cdf2db3fde8e7aae9849b1f6f74 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 16 Aug 2022 16:36:06 -0600
Subject: [PATCH 01/13] agregar numero de vivienda a inquilino

---
 api-gateway/src/app.controller.ts             |  8 +++++
 api-gateway/src/app.service.ts                | 19 +++++++++++
 servicio-usuarios/src/users/users.service.ts  | 18 +++++++++-
 web-ui/web-react/src/components/Inquilinos.js | 33 ++++++++++++++++---
 4 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts
index abc90be1..39e15aad 100644
--- a/api-gateway/src/app.controller.ts
+++ b/api-gateway/src/app.controller.ts
@@ -215,6 +215,14 @@ export class AppController {
   ) {
     return this.appService.changeStatusCommunity(pId, pStatus);
   }
+
+  @Get('community/findHousesCommunity/:id')
+  findHousesCommunity(
+    @Param('id') community_id: string,
+  ) {
+    return this.appService.findHousesCommunity(community_id);
+  }
+
   // #==== API Common Areas
   @Post('commonArea/createCommonArea')
   createCommonArea(
diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts
index a5df9129..78425570 100644
--- a/api-gateway/src/app.service.ts
+++ b/api-gateway/src/app.service.ts
@@ -1,6 +1,7 @@
 import { Injectable, Inject } from '@nestjs/common';
 import { ClientProxy } from '@nestjs/microservices';
 import { map } from 'rxjs/operators';
+import { lastValueFrom } from 'rxjs';
 
 @Injectable()
 export class AppService {
@@ -283,6 +284,24 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+
+  async findHousesCommunity(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);
+    const response = finalValue['response'];
+    const houses = response['houses'];
+    
+    return houses;
+  }
+
+  
   // ====================== COMMON AREAS ===============================
   //POST parameter from API
   createCommonArea(
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 2015ef45..5f9f50b5 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -154,7 +154,6 @@ export class UsersService {
       })
   }
 
-
   async testSendMail(user: UserDocument) {
     let passwordEncriptada = Md5.init(user.password);
     user.password = passwordEncriptada;
@@ -228,5 +227,22 @@ export class UsersService {
       new: true,
     });  
   }
+
+
+  async findHousesCommunity(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);
+    const response = finalValue['response'];
+    const houses = response['houses'];
+    
+    return houses;
+  }
 }
 
diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 4325bcf5..10380a21 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -45,7 +45,8 @@ const Inquilinos = () => {
   const [submitted, setSubmitted] = useState(false)
   const toast = useRef(null)
   const dt = useRef(null)
-
+  const [housesList, setHousesList] = useState([])
+  const [houseId, setHouseId] = useState(null)
   const [cookies, setCookie] = useCookies()
   const [changeStatusTenantDialog, setChangeStatusTenantDialog] =
     useState(false)
@@ -85,10 +86,27 @@ const Inquilinos = () => {
     setCommunitiesList(await list)
   }
 
+
+  async function getHouses() {
+    let response = await fetch(
+      `http://localhost:4000/community/findHousesCommunity/${cookies.community_id}`,
+      { method: 'GET' },
+    )
+    .then(res => res.json())
+    .then(res => console.log())
+    let resList = await response.json()
+    let list = await resList.message
+    setHousesList(await list)
+  }
+
   useEffect(() => {
     tenantsList()
   }, [tenantsList])
 
+  useEffect(() => {
+    getHouses()
+  }, [])
+
   useEffect(() => {
     getCommunites()
   }, [])
@@ -98,6 +116,13 @@ const Inquilinos = () => {
     value: item._id,
   }))
 
+  const hList = housesList.map((item) => ({
+    label: item.number_house,
+    value: item._id,
+  }))
+
+
+
   function registrarInquilino() {
     let newTenant = {
       _id: null,
@@ -613,9 +638,9 @@ const Inquilinos = () => {
               <Dropdown
                 required
                 id='numero_vivienda'
-                value={communityId}
-                options={cList}
-                onChange={(e) => setCommunityId(e.value)}
+                value={houseId}
+                options={hList}
+                onChange={(e) => setHouseId(e.value)}
               />
             </div>
             <Button label='Registrar' onClick={registrarInquilino} />

From 69775a366dba0bc105d596593c0e9eb37f456c29 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 16 Aug 2022 16:46:20 -0600
Subject: [PATCH 02/13] carga correctamente los id de la vivienda

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

diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 10380a21..837e0379 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -92,11 +92,8 @@ const Inquilinos = () => {
       `http://localhost:4000/community/findHousesCommunity/${cookies.community_id}`,
       { method: 'GET' },
     )
-    .then(res => res.json())
-    .then(res => console.log())
     let resList = await response.json()
-    let list = await resList.message
-    setHousesList(await list)
+    setHousesList(await resList)
   }
 
   useEffect(() => {

From d710e7c0ed978a096a6b86be662e12bcc117f0ea Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Tue, 16 Aug 2022 22:23:03 -0600
Subject: [PATCH 03/13] edicion para agregar inquilino al numero de vivienda

---
 api-gateway/src/app.controller.ts             |  8 +++++
 api-gateway/src/app.service.ts                |  7 +++++
 .../src/communities/communities.controller.ts |  9 ++++++
 .../src/communities/communities.service.ts    | 29 +++++++++++++++----
 servicio-usuarios/src/users/users.service.ts  | 13 +++------
 web-ui/web-react/src/components/Inquilinos.js | 28 +++++++++++++++---
 6 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts
index 39e15aad..58b9c650 100644
--- a/api-gateway/src/app.controller.ts
+++ b/api-gateway/src/app.controller.ts
@@ -223,6 +223,14 @@ export class AppController {
     return this.appService.findHousesCommunity(community_id);
   }
 
+  @Post('community/saveTenant')
+  saveTenant(
+    @Body('community_id') community_id: string,
+    @Body('number_house') number_house: string,
+    @Body('tenant_id') tenant_id: string,
+  ) {
+    return this.appService.saveTenant(community_id, number_house, tenant_id);
+  }
   // #==== API Common Areas
   @Post('commonArea/createCommonArea')
   createCommonArea(
diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts
index 78425570..4c17da9b 100644
--- a/api-gateway/src/app.service.ts
+++ b/api-gateway/src/app.service.ts
@@ -301,6 +301,13 @@ export class AppService {
     return houses;
   }
 
+  saveTenant(id: string, number_house: string, tenant_id: string) {
+    const pattern = { cmd: 'saveTenant' };
+    const payload = { _id: id, number_house: number_house, tenant_id: tenant_id };
+    return this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
   
   // ====================== COMMON AREAS ===============================
   //POST parameter from API
diff --git a/servicio-comunidad-viviendas/src/communities/communities.controller.ts b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
index 83335420..6ef0c9fc 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.controller.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
@@ -53,4 +53,13 @@ export class CommunitiesController {
      let pstatus = body['status'];
      return this.communitiesService.changeStatus(pid,pstatus);
    }
+
+
+   @MessagePattern({ cmd: 'saveTenant' })
+   saveTenant(@Payload() body: string) {
+    let id = body['_id'];
+    let tenant_id = body['tenant_id'];
+    let number_house = body['number_house'];
+    return this.communitiesService.saveTenant(id, number_house, tenant_id);
+  }
 }
diff --git a/servicio-comunidad-viviendas/src/communities/communities.service.ts b/servicio-comunidad-viviendas/src/communities/communities.service.ts
index 8b5ce685..c494222b 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.service.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.service.ts
@@ -13,7 +13,7 @@ export class CommunitiesService {
     @InjectModel(Community.name)
     private readonly communityModel: Model<CommunityDocument>,
     @Inject('SERVICIO_USUARIOS') private readonly clientUserApp: ClientProxy,
-  ) {}
+  ) { }
 
   async create(community: CommunityDocument): Promise<Community> {
     return this.communityModel.create(community);
@@ -56,15 +56,15 @@ export class CommunitiesService {
   }
 
   async remove(id: string) {
-    return this.communityModel.findOneAndUpdate({ _id: id }, {status: '-1'}, {
+    return this.communityModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
       new: true,
-    });  
+    });
   }
 
   async changeStatus(id: string, status: string) {
-    return this.communityModel.findOneAndUpdate({ _id: id }, {status: status}, {
+    return this.communityModel.findOneAndUpdate({ _id: id }, { status: status }, {
       new: true,
-    });  
+    });
   }
 
   async findCommunityAdmin(community: string, user_type: string) {
@@ -78,4 +78,23 @@ export class CommunitiesService {
     const finalValue = await lastValueFrom(callback);
     return finalValue['response'];
   }
+
+
+  async saveTenant(id: string, number_house: string, tenant_id: string) {
+
+    let community = await this.findOne(id);
+
+    await community.houses.map(house => {
+      if(house.number_house == number_house){
+        house.tenants.tenant_id = tenant_id
+      }
+      return house;
+    })
+
+    console.log(community.houses)
+
+   return await this.communityModel.findOneAndUpdate({ _id: id }, community, {
+      new: true,
+    });
+  }
 }
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 5f9f50b5..22e5c487 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -229,20 +229,15 @@ export class UsersService {
   }
 
 
-  async findHousesCommunity(community_id: string) {
-    const pattern = { cmd: 'findOneCommunity' }
-    const payload = { _id: community_id }
+  async saveTenantNumHouse(community_id: string, number_house:string, tenant_id: string) {
+    const pattern = { cmd: 'saveTenant' }
+    const payload = { _id: community_id, number_house: number_house,  tenant_id: tenant_id }
 
-    let callback = await this.clientCommunityApp
+    return await this.clientCommunityApp
       .send<string>(pattern, payload)
       .pipe(
         map((response: string) => ({ response }))
       )
-    const finalValue = await lastValueFrom(callback);
-    const response = finalValue['response'];
-    const houses = response['houses'];
-    
-    return houses;
   }
 }
 
diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 837e0379..9b12eddd 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -129,16 +129,16 @@ const Inquilinos = () => {
       email: document.getElementById('correo_electronico').value,
       phone: '',
       password: '',
-      community_id: document.getElementById('numero_vivienda').value,
+      community_id: cookies.community_id,
       community_name: '',
-      number_house: 'Sin número de vivienda',
+      number_house: document.getElementById('numero_vivienda').value,
       date_entry: new Date(),
       user_type: '3',
       status: '1',
       status_text: '',
     }
 
-    fetch('http://localhost:3000/api/createUser', {
+    fetch('http://localhost:4000/user/createUser', {
       method: 'POST',
       cache: 'no-cache',
       body: JSON.stringify(newTenant),
@@ -147,11 +147,31 @@ const Inquilinos = () => {
       },
     }).then((response) => {
       if (response.ok) {
-        alert('Inquilino registrado correctamente')
+        return response.json()
       } else {
         alert('Error al registrar inquilino')
       }
     })
+     /* .then(res => {
+        console.log(data.message)
+        let data = {
+          community_id: cookies.community_id,
+          number_house: document.getElementById('numero_vivienda').value,
+          tenant_id: data.message._id
+        }
+        return fetch('http://localhost:4000/community/saveTenant',
+          {
+            method: 'POST',
+            cache: 'no-cache',
+            body: JSON.stringify(data),
+            headers: {
+              'Content-Type': 'application/json',
+            }
+          }
+        ).then(res => alert('Inquilino registrado correctamente'))
+          .catch(error => alert('Error al registrar inquilino'))
+      })
+      .catch(error => alert('Error al registrar inquilino'))*/
   }
 
   const deleteTenant = () => {

From 2cea9bc217d2fd378c65dbf55760cf69288a9fde Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 12:35:40 -0600
Subject: [PATCH 04/13] asignar numero de vivienda

---
 api-gateway/src/app.service.ts                | 31 +++++++++++++++++++
 .../src/users/users.controller.ts             |  6 ++++
 servicio-usuarios/src/users/users.service.ts  | 26 ++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts
index 99ec6d7a..be6a794c 100644
--- a/api-gateway/src/app.service.ts
+++ b/api-gateway/src/app.service.ts
@@ -56,6 +56,37 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
+  createTenant(
+    dni: string,
+    name: string,
+    last_name: string,
+    email: string,
+    phone: number,
+    user_type: string,
+    status: string,
+    date_entry: Date,
+    community_id: string,
+    number_house: string,
+  ) {
+    const pattern = { cmd: 'createTenant' };
+    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: community_id,
+      number_house: number_house,
+    };
+    return this.clientUserApp
+      .send<string>(pattern, payload)
+      .pipe(map((message: string) => ({ message })));
+  }
+
   updateUser(
     _id: string,
     dni: string,
diff --git a/servicio-usuarios/src/users/users.controller.ts b/servicio-usuarios/src/users/users.controller.ts
index 05c13169..cedf2263 100644
--- a/servicio-usuarios/src/users/users.controller.ts
+++ b/servicio-usuarios/src/users/users.controller.ts
@@ -29,6 +29,12 @@ export class UsersController {
     return this.userService.createAdminCommunity(user);
   }
 
+  @MessagePattern({ cmd: 'createTenant' })
+  createTenant(@Payload() user: UserDocument) {
+    return this.userService.createTenant(user);
+  }
+
+
   @MessagePattern({ cmd: 'findAllUsers' })
   findAll() {
     return this.userService.findAll();
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 255d2504..d9b442fc 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -24,6 +24,32 @@ export class UsersService {
   }
 
 
+  async createTenant(user: UserDocument) {
+    let password = user.password;
+    let passwordEncriptada = Md5.init(user.password);
+    user.password = passwordEncriptada;
+    this.userModel.create(user)
+
+    await this.saveTenantNumHouse(user.community_id, user.number_house, user._id);
+
+    let community = await this.findCommunity(user.community_id);
+    user.community_id = community['name'];
+
+    const pattern = { cmd: 'emailCreateUserTenant' };
+    const payload = {
+      email: user['email'], password: password, name: user['name'],
+      date_entry: user['date_entry'], community_name: community['name'],
+      number_house:['number_house']
+    };
+
+    return this.clientNotificationtApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((message: string) => ({ message })),
+      );
+  }
+
+
   async createAdminCommunity(user: UserDocument) {
     let password = user.password;
     let passwordEncriptada = Md5.init(user.password);

From c89e501005afa2c7118bd8b6b0fe4cbf22c5ee4f Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 12:57:33 -0600
Subject: [PATCH 05/13] agregar funciones de edici[on de agregar inquilino

---
 api-gateway/src/app.controller.ts             | 29 +++++++++++++++++++
 .../src/communities/communities.service.ts    | 23 +++++++++++++++
 servicio-usuarios/src/users/users.service.ts  | 12 ++++++++
 web-ui/web-react/src/components/Inquilinos.js | 10 ++++++-
 4 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts
index 67adc7db..2975a60a 100644
--- a/api-gateway/src/app.controller.ts
+++ b/api-gateway/src/app.controller.ts
@@ -82,6 +82,35 @@ export class AppController {
     );
   }
 
+  
+  @Post('user/createTenant')
+  createTenant(
+    @Body('dni') dni: string,
+    @Body('name') name: string,
+    @Body('last_name') last_name: string,
+    @Body('email') email: string,
+    @Body('phone') phone: number,
+    @Body('user_type') user_type: string,
+    @Body('status') status: string,
+    @Body('date_entry') date_entry: Date,
+    @Body('community_id') community_id: string,
+    @Body('number_house') number_house: string,
+  ) {
+    return this.appService.createTenant(
+      dni,
+      name,
+      last_name,
+      email,
+      phone,
+      user_type,
+      status,
+      date_entry,
+      community_id,
+      number_house,
+    );
+  }
+
+
   @Put('user/updateGuard/:id')
   updateGuard(
     @Param('id') id: string,
diff --git a/servicio-comunidad-viviendas/src/communities/communities.service.ts b/servicio-comunidad-viviendas/src/communities/communities.service.ts
index c494222b..90c47cee 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.service.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.service.ts
@@ -87,6 +87,29 @@ export class CommunitiesService {
     await community.houses.map(house => {
       if(house.number_house == number_house){
         house.tenants.tenant_id = tenant_id
+        house.state = "ocupada"
+      }
+      return house;
+    })
+
+    console.log(community.houses)
+
+   return await this.communityModel.findOneAndUpdate({ _id: id }, community, {
+      new: true,
+    });
+  }
+
+
+  async deleteTenant(id: string, number_house: string, tenant_id: string) {
+
+    let community = await this.findOne(id);
+
+    await community.houses.map(house => {
+      if(house.number_house == number_house && 
+        house.tenants.tenant_id == tenant_id){
+          house.tenants = null;
+          house.state = "desocupada"
+
       }
       return house;
     })
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index d9b442fc..41257a2e 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -268,5 +268,17 @@ export class UsersService {
         map((response: string) => ({ response }))
       )
   }
+
+
+  async deleteTenantNumHouse(community_id: string, number_house:string, tenant_id: string) {
+    const pattern = { cmd: 'deleteTenant' }
+    const payload = { _id: community_id, number_house: number_house,  tenant_id: tenant_id }
+
+    return await this.clientCommunityApp
+      .send<string>(pattern, payload)
+      .pipe(
+        map((response: string) => ({ response }))
+      )
+  }
 }
 
diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 8a21fc72..72c61df1 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -122,7 +122,7 @@ const Inquilinos = () => {
         _tenant.password = _tenant.email;
       console.log(`Registrando nuevo inquilino: ${_tenant}`)
 
-        fetch(`http://localhost:4000/user/createUser`, {
+        fetch(`http://localhost:4000/user/createTenant`, {
           cache: 'no-cache',
           method: 'POST',
           body: JSON.stringify(_tenant),
@@ -136,6 +136,13 @@ const Inquilinos = () => {
             else return response.json()
           })
           .then(() => {
+            if (_tenant.status === '1') {
+              _tenant.status = '0'
+              _tenant.status_text = 'Inactivo'
+            } else if (_tenant.status === '0') {
+              _tenant.status = '1'
+              _tenant.status_text = 'Activo'
+            }
             _tenants.push(_tenant)
             toast.current.show({
               severity: 'success',
@@ -143,6 +150,7 @@ const Inquilinos = () => {
               detail: 'Inquilino creado',
               life: 3000,
             })
+            
             setTenants(_tenants)
             setTenant(emptyTenant)
             setHouseNumber('')

From b7984b374885e3a2de5746f78732059a84cca0f7 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 13:10:32 -0600
Subject: [PATCH 06/13] update funciones de notificaciones

---
 servicio-notificaciones/.env                  |  4 +-
 .../src/email.controller.ts                   | 35 +++++++++++++++++
 .../dto/create-notification.dto.ts            |  1 -
 .../dto/update-notification.dto.ts            |  6 ---
 .../notifications/notifications.controller.ts | 38 -------------------
 .../src/notifications/notifications.module.ts |  9 -----
 .../notifications/notifications.service.ts    | 26 -------------
 .../schemas/notification.schemas.ts           |  1 -
 8 files changed, 37 insertions(+), 83 deletions(-)
 delete mode 100644 servicio-notificaciones/src/notifications/dto/create-notification.dto.ts
 delete mode 100644 servicio-notificaciones/src/notifications/dto/update-notification.dto.ts
 delete mode 100644 servicio-notificaciones/src/notifications/notifications.controller.ts
 delete mode 100644 servicio-notificaciones/src/notifications/notifications.module.ts
 delete mode 100644 servicio-notificaciones/src/notifications/notifications.service.ts
 delete mode 100644 servicio-notificaciones/src/notifications/schemas/notification.schemas.ts

diff --git a/servicio-notificaciones/.env b/servicio-notificaciones/.env
index 80c3aee2..7b8f623a 100644
--- a/servicio-notificaciones/.env
+++ b/servicio-notificaciones/.env
@@ -1,7 +1,7 @@
 # mail
 MAIL_HOST=smtp.gmail.com
-MAIL_USER=mbonilla.guti@gmail.com
-MAIL_PASSWORD=laofghlofgffmyry
+MAIL_USER=katoikiap4@gmail.com
+MAIL_PASSWORD=snxwbncohehilkkz
 MAIL_FROM=noreply@example.com
 
 # optional
diff --git a/servicio-notificaciones/src/email.controller.ts b/servicio-notificaciones/src/email.controller.ts
index d1363138..b342079f 100644
--- a/servicio-notificaciones/src/email.controller.ts
+++ b/servicio-notificaciones/src/email.controller.ts
@@ -77,4 +77,39 @@ export class EmailController {
         });
         return response;
     }
+
+
+    @MessagePattern({ cmd: 'emailCreateUserTenant' })
+    async emailCreateUserTenant(@Payload() user: any) {
+        const url = "http://localhost:3000/";
+        const image = "images/email.png";
+        const logo = "images/Logo Katoikia.png";
+        var response = await this.mailService.sendMail({
+            to: user["email"],
+            from: "mbonilla.guti@gmail.com",
+            subject: 'Usuario registrado',
+            template: 'emailCreateUserTenant',
+            context: {
+                name: user["name"],
+                password: user["password"],
+                date_entry: user["date_entry"],
+                email: user["email"],
+                community_name: user['community_name'],
+                url
+            },
+            attachments: [
+                {
+                    filename: 'email.png',
+                    path: __dirname + '/mails/images/email.png',
+                    cid: 'image_email' //my mistake was putting "cid:logo@cid" here! 
+                },
+                {
+                    filename: 'Logo_Katoikia.png',
+                    path: __dirname + '/mails/images/Logo_Katoikia.png',
+                    cid: 'logoKatoikia' //my mistake was putting "cid:logo@cid" here! 
+                }
+            ]
+        });
+        return response;
+    }
 }
diff --git a/servicio-notificaciones/src/notifications/dto/create-notification.dto.ts b/servicio-notificaciones/src/notifications/dto/create-notification.dto.ts
deleted file mode 100644
index 98ca4791..00000000
--- a/servicio-notificaciones/src/notifications/dto/create-notification.dto.ts
+++ /dev/null
@@ -1 +0,0 @@
-export class CreateNotificationDto {}
diff --git a/servicio-notificaciones/src/notifications/dto/update-notification.dto.ts b/servicio-notificaciones/src/notifications/dto/update-notification.dto.ts
deleted file mode 100644
index f639cde4..00000000
--- a/servicio-notificaciones/src/notifications/dto/update-notification.dto.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateNotificationDto } from './create-notification.dto';
-
-export class UpdateNotificationDto extends PartialType(CreateNotificationDto) {
-  id: number;
-}
diff --git a/servicio-notificaciones/src/notifications/notifications.controller.ts b/servicio-notificaciones/src/notifications/notifications.controller.ts
deleted file mode 100644
index 4d8484f7..00000000
--- a/servicio-notificaciones/src/notifications/notifications.controller.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Controller } from '@nestjs/common';
-import { MessagePattern, Payload } from '@nestjs/microservices';
-import { NotificationsService } from './notifications.service';
-import { CreateNotificationDto } from './dto/create-notification.dto';
-import { UpdateNotificationDto } from './dto/update-notification.dto';
-
-@Controller()
-export class NotificationsController {
-  constructor(private readonly notificationsService: NotificationsService) {}
-
-  @MessagePattern({ cmd: 'createNotification' })
-  create(@Payload() createNotificationDto: CreateNotificationDto) {
-    return this.notificationsService.create(createNotificationDto);
-  }
-
-  @MessagePattern({ cmd: 'findAllNotifications' })
-  findAll() {
-    return this.notificationsService.findAll();
-  }
-
-  @MessagePattern({ cmd: 'findOneNotification' })
-  findOne(@Payload() id: number) {
-    return this.notificationsService.findOne(id);
-  }
-
-  @MessagePattern({ cmd: 'updateNotification' })
-  update(@Payload() updateNotificationDto: UpdateNotificationDto) {
-    return this.notificationsService.update(
-      updateNotificationDto.id,
-      updateNotificationDto,
-    );
-  }
-
-  @MessagePattern({ cmd: 'removeNotification' })
-  remove(@Payload() id: number) {
-    return this.notificationsService.remove(id);
-  }
-}
diff --git a/servicio-notificaciones/src/notifications/notifications.module.ts b/servicio-notificaciones/src/notifications/notifications.module.ts
deleted file mode 100644
index a3b7b79c..00000000
--- a/servicio-notificaciones/src/notifications/notifications.module.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-import { NotificationsService } from './notifications.service';
-import { NotificationsController } from './notifications.controller';
-
-@Module({
-  controllers: [NotificationsController],
-  providers: [NotificationsService],
-})
-export class NotificationsModule {}
diff --git a/servicio-notificaciones/src/notifications/notifications.service.ts b/servicio-notificaciones/src/notifications/notifications.service.ts
deleted file mode 100644
index 41219fe1..00000000
--- a/servicio-notificaciones/src/notifications/notifications.service.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { CreateNotificationDto } from './dto/create-notification.dto';
-import { UpdateNotificationDto } from './dto/update-notification.dto';
-
-@Injectable()
-export class NotificationsService {
-  create(createNotificationDto: CreateNotificationDto) {
-    return 'This action adds a new notification';
-  }
-
-  findAll() {
-    return `This action returns all notifications`;
-  }
-
-  findOne(id: number) {
-    return `This action returns a #${id} notification`;
-  }
-
-  update(id: number, updateNotificationDto: UpdateNotificationDto) {
-    return `This action updates a #${id} notification`;
-  }
-
-  remove(id: number) {
-    return `This action removes a #${id} notification`;
-  }
-}
diff --git a/servicio-notificaciones/src/notifications/schemas/notification.schemas.ts b/servicio-notificaciones/src/notifications/schemas/notification.schemas.ts
deleted file mode 100644
index b79d7d57..00000000
--- a/servicio-notificaciones/src/notifications/schemas/notification.schemas.ts
+++ /dev/null
@@ -1 +0,0 @@
-export class Notification {}

From 85e44d8c92a1ce40fed496a5926f42bada94e9f1 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 13:18:46 -0600
Subject: [PATCH 07/13] agregar notificacion para inquilino registrado

---
 .../src/email.controller.ts                   |  10 +-
 .../src/mails/emailCreateUserAdmin.hbs        |   2 +-
 .../mails/emailCreateUserAdminCommunity.hbs   |   4 +-
 .../src/mails/emailCreateUserTenant.hbs       | 459 ++++++++++++++++++
 4 files changed, 467 insertions(+), 8 deletions(-)
 create mode 100644 servicio-notificaciones/src/mails/emailCreateUserTenant.hbs

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

From c8da611700eb9afd266eb901efac3e282976f2bf Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 14:58:43 -0600
Subject: [PATCH 08/13] corregir agregar inquilino a comunidad

---
 .../src/communities/communities.controller.ts |  1 +
 .../src/communities/communities.service.ts    | 41 +++++++++++++------
 .../src/mails/emailCreateUserTenant.hbs       |  2 +-
 .../src/users/users.controller.ts             |  2 +-
 servicio-usuarios/src/users/users.service.ts  |  9 ++--
 web-ui/web-react/src/components/Inquilinos.js |  6 +--
 6 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/servicio-comunidad-viviendas/src/communities/communities.controller.ts b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
index 6ef0c9fc..1133b4d0 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.controller.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
@@ -57,6 +57,7 @@ export class CommunitiesController {
 
    @MessagePattern({ cmd: 'saveTenant' })
    saveTenant(@Payload() body: string) {
+
     let id = body['_id'];
     let tenant_id = body['tenant_id'];
     let number_house = body['number_house'];
diff --git a/servicio-comunidad-viviendas/src/communities/communities.service.ts b/servicio-comunidad-viviendas/src/communities/communities.service.ts
index 90c47cee..48ad87b8 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.service.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.service.ts
@@ -6,6 +6,7 @@ import { RpcException, ClientProxy } from '@nestjs/microservices';
 import { from, lastValueFrom, map, scan, mergeMap } from 'rxjs';
 import { Admin } from 'src/schemas/admin.entity';
 import { appendFileSync } from 'fs';
+import { Tenant, TenantSchema } from 'src/schemas/tenant.schema';
 
 @Injectable()
 export class CommunitiesService {
@@ -80,21 +81,37 @@ export class CommunitiesService {
   }
 
 
-  async saveTenant(id: string, number_house: string, tenant_id: string) {
-
+  async saveTenant(id: string, number_house: string, ptenant_id: string) {
     let community = await this.findOne(id);
 
+    console.log(ptenant_id)
+
     await community.houses.map(house => {
-      if(house.number_house == number_house){
-        house.tenants.tenant_id = tenant_id
+      if (house.number_house == number_house) {
+        if (house.tenants) {
+          console.log(house.tenants.tenant_id + '1')
+
+          house.tenants.tenant_id = ptenant_id
+          console.log(house.tenants.tenant_id + '1')
+          console.log(house.tenants + '1')
+        } else {
+          let tenant = new Tenant()
+
+          tenant.tenant_id = ptenant_id;
+          console.log(tenant)
+
+          house.tenants = tenant;
+          console.log(house.tenants + '2')
+
+        }
+        console.log(house.tenants + '3')
+
         house.state = "ocupada"
       }
       return house;
     })
 
-    console.log(community.houses)
-
-   return await this.communityModel.findOneAndUpdate({ _id: id }, community, {
+    return await this.communityModel.findOneAndUpdate({ _id: id }, community, {
       new: true,
     });
   }
@@ -105,10 +122,10 @@ export class CommunitiesService {
     let community = await this.findOne(id);
 
     await community.houses.map(house => {
-      if(house.number_house == number_house && 
-        house.tenants.tenant_id == tenant_id){
-          house.tenants = null;
-          house.state = "desocupada"
+      if (house.number_house == number_house &&
+        house.tenants.tenant_id == tenant_id) {
+        house.tenants = null;
+        house.state = "desocupada"
 
       }
       return house;
@@ -116,7 +133,7 @@ export class CommunitiesService {
 
     console.log(community.houses)
 
-   return await this.communityModel.findOneAndUpdate({ _id: id }, community, {
+    return await this.communityModel.findOneAndUpdate({ _id: id }, community, {
       new: true,
     });
   }
diff --git a/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs b/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs
index 3915f374..4669d4a8 100644
--- a/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs
+++ b/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs
@@ -393,7 +393,7 @@
                                             {{date_entry}}</h4>
                                     </div>
                                     <div class="text" style="padding: 0 4em; text-align: left;">
-                                        <p>Fue asignado en la comunidad {{community_name}} en la vivienda #{{number_house}}</p>
+                                        <p>Fue asignado en la comunidad {{community_name}} en la vivienda # {{number_house}}</p>
 
                                     </div>
                                     <div class="text" style="padding: 0 4em; text-align: left;">
diff --git a/servicio-usuarios/src/users/users.controller.ts b/servicio-usuarios/src/users/users.controller.ts
index cedf2263..06f9cd88 100644
--- a/servicio-usuarios/src/users/users.controller.ts
+++ b/servicio-usuarios/src/users/users.controller.ts
@@ -133,7 +133,7 @@ export class UsersController {
 
   @MessagePattern({ cmd: 'deleteTenant' })
   deleteTenant(@Payload() user: any) {
-    return this.userService.deleteTenant(user['id']);
+    return this.userService.deleteTenant(user['_id']);
   }
 
   @MessagePattern({ cmd: 'changeStatus' })
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 41257a2e..8061479e 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -28,9 +28,12 @@ export class UsersService {
     let password = user.password;
     let passwordEncriptada = Md5.init(user.password);
     user.password = passwordEncriptada;
-    this.userModel.create(user)
+    let userCreated = await this.userModel.create(user);
+    console.log(await userCreated);
+    let callback = await this.saveTenantNumHouse(user.community_id, user.number_house, userCreated['_id']);
 
-    await this.saveTenantNumHouse(user.community_id, user.number_house, user._id);
+    const finalValue = await lastValueFrom(callback);
+    const response = await finalValue['response'];
 
     let community = await this.findCommunity(user.community_id);
     user.community_id = community['name'];
@@ -39,7 +42,7 @@ export class UsersService {
     const payload = {
       email: user['email'], password: password, name: user['name'],
       date_entry: user['date_entry'], community_name: community['name'],
-      number_house:['number_house']
+      number_house: user['number_house']
     };
 
     return this.clientNotificationtApp
diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 72c61df1..94e4ab4e 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -137,11 +137,9 @@ const Inquilinos = () => {
           })
           .then(() => {
             if (_tenant.status === '1') {
-              _tenant.status = '0'
-              _tenant.status_text = 'Inactivo'
-            } else if (_tenant.status === '0') {
-              _tenant.status = '1'
               _tenant.status_text = 'Activo'
+            } else if (_tenant.status === '0') {
+              _tenant.status_text = 'Inactivo'
             }
             _tenants.push(_tenant)
             toast.current.show({

From 9e7ac1d91fd584c47635326ffcc75f859ef930b0 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 15:04:47 -0600
Subject: [PATCH 09/13] arreglar correo de registro

---
 .../src/communities/communities.service.ts          | 13 -------------
 .../src/mails/emailCreateUserTenant.hbs             |  4 ++--
 servicio-usuarios/src/users/users.service.ts        |  6 +-----
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/servicio-comunidad-viviendas/src/communities/communities.service.ts b/servicio-comunidad-viviendas/src/communities/communities.service.ts
index 48ad87b8..fa7ed5b7 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.service.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.service.ts
@@ -83,29 +83,16 @@ export class CommunitiesService {
 
   async saveTenant(id: string, number_house: string, ptenant_id: string) {
     let community = await this.findOne(id);
-
-    console.log(ptenant_id)
-
     await community.houses.map(house => {
       if (house.number_house == number_house) {
         if (house.tenants) {
-          console.log(house.tenants.tenant_id + '1')
 
           house.tenants.tenant_id = ptenant_id
-          console.log(house.tenants.tenant_id + '1')
-          console.log(house.tenants + '1')
         } else {
           let tenant = new Tenant()
-
           tenant.tenant_id = ptenant_id;
-          console.log(tenant)
-
           house.tenants = tenant;
-          console.log(house.tenants + '2')
-
         }
-        console.log(house.tenants + '3')
-
         house.state = "ocupada"
       }
       return house;
diff --git a/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs b/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs
index 4669d4a8..a4a7586c 100644
--- a/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs
+++ b/servicio-notificaciones/src/mails/emailCreateUserTenant.hbs
@@ -362,7 +362,7 @@
                             <tr>
 
                                 <td class="logo" style="text-align: right;">
-                                    <img src="cid:logoLatoikia" alt="Logo Katoikia"
+                                    <img src="cid:logoKatoikia" alt="Logo Katoikia"
                                         style="width: 60px; max-width: 60px; height: auto; margin: auto; display: block; float: right;">
                                 </td>
                                 <td class="logo" style="text-align: left;">
@@ -393,7 +393,7 @@
                                             {{date_entry}}</h4>
                                     </div>
                                     <div class="text" style="padding: 0 4em; text-align: left;">
-                                        <p>Fue asignado en la comunidad {{community_name}} en la vivienda # {{number_house}}</p>
+                                        <p>Fue asignado en la comunidad "{{community_name}}" en la vivienda #{{number_house}}</p>
 
                                     </div>
                                     <div class="text" style="padding: 0 4em; text-align: left;">
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 8061479e..96c973d7 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -29,11 +29,7 @@ export class UsersService {
     let passwordEncriptada = Md5.init(user.password);
     user.password = passwordEncriptada;
     let userCreated = await this.userModel.create(user);
-    console.log(await userCreated);
-    let callback = await this.saveTenantNumHouse(user.community_id, user.number_house, userCreated['_id']);
-
-    const finalValue = await lastValueFrom(callback);
-    const response = await finalValue['response'];
+     await this.saveTenantNumHouse(user.community_id, user.number_house, userCreated['_id']);
 
     let community = await this.findCommunity(user.community_id);
     user.community_id = community['name'];

From 456d9ce4d096a910b621e22f00b965a432c37cc5 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 15:06:44 -0600
Subject: [PATCH 10/13] deleteTenant function community

---
 .../src/communities/communities.controller.ts            | 9 +++++++++
 .../src/communities/communities.service.ts               | 5 +----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/servicio-comunidad-viviendas/src/communities/communities.controller.ts b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
index 1133b4d0..d8302399 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.controller.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
@@ -63,4 +63,13 @@ export class CommunitiesController {
     let number_house = body['number_house'];
     return this.communitiesService.saveTenant(id, number_house, tenant_id);
   }
+
+  @MessagePattern({ cmd: 'deleteTenant' })
+  deleteTenant(@Payload() body: string) {
+
+   let id = body['_id'];
+   let tenant_id = body['tenant_id'];
+   let number_house = body['number_house'];
+   return this.communitiesService.deleteTenant(id, number_house, tenant_id);
+ }
 }
diff --git a/servicio-comunidad-viviendas/src/communities/communities.service.ts b/servicio-comunidad-viviendas/src/communities/communities.service.ts
index fa7ed5b7..b718a024 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.service.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.service.ts
@@ -111,15 +111,12 @@ export class CommunitiesService {
     await community.houses.map(house => {
       if (house.number_house == number_house &&
         house.tenants.tenant_id == tenant_id) {
-        house.tenants = null;
+        house.tenants.tenant_id = "";
         house.state = "desocupada"
-
       }
       return house;
     })
 
-    console.log(community.houses)
-
     return await this.communityModel.findOneAndUpdate({ _id: id }, community, {
       new: true,
     });

From a9c02244a8d16ea5120c3f40c788da760174da44 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 16:39:20 -0600
Subject: [PATCH 11/13] finalizar eliminar inquilino

---
 api-gateway/src/app.controller.ts             | 26 ++++++----
 api-gateway/src/app.service.ts                |  8 +--
 .../src/communities/communities.controller.ts |  1 -
 .../src/communities/communities.service.ts    |  4 +-
 .../src/users/users.controller.ts             |  5 +-
 servicio-usuarios/src/users/users.service.ts  | 29 +++++++----
 web-ui/web-react/src/components/Inquilinos.js | 52 +++++++++++++++----
 7 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/api-gateway/src/app.controller.ts b/api-gateway/src/app.controller.ts
index 2975a60a..510dfeb9 100644
--- a/api-gateway/src/app.controller.ts
+++ b/api-gateway/src/app.controller.ts
@@ -2,7 +2,7 @@ import { Controller, Get, Post, Put, Body, Param, Delete } from '@nestjs/common'
 import { AppService } from './app.service';
 @Controller()
 export class AppController {
-  constructor(private readonly appService: AppService) {}
+  constructor(private readonly appService: AppService) { }
   // #==== API Users
   @Post('user/createAdminSystem')
   createAdminSystem(
@@ -15,8 +15,8 @@ export class AppController {
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
   ) {
-    return this.appService.createAdminSystem(dni, name, last_name, email, phone, 
-            user_type, status, date_entry);
+    return this.appService.createAdminSystem(dni, name, last_name, email, phone,
+      user_type, status, date_entry);
   }
 
   @Post('user/createGuard')
@@ -33,7 +33,7 @@ export class AppController {
     @Body('community_id') community_id: string,
   ) {
     return this.appService.createGuard(dni, name, last_name, email, phone,
-      user_type, status, date_entry,community_id);
+      user_type, status, date_entry, community_id);
   }
 
   @Post('user/createAdminCommunity')
@@ -47,10 +47,10 @@ export class AppController {
     @Body('user_type') user_type: string,
     @Body('status') status: string,
     @Body('date_entry') date_entry: Date,
-    @Body('community_id') community_id:string
+    @Body('community_id') community_id: string
   ) {
     return this.appService.createAdminCommunity(dni, name, last_name, email, phone,
-      user_type, status, date_entry,community_id);
+      user_type, status, date_entry, community_id);
   }
 
   @Post('user/createUser')
@@ -82,7 +82,7 @@ export class AppController {
     );
   }
 
-  
+
   @Post('user/createTenant')
   createTenant(
     @Body('dni') dni: string,
@@ -203,7 +203,7 @@ export class AppController {
   allUsersTenants(@Param('community_id') paramCommunity_id: string) {
     return this.appService.findTenantsCommunity(paramCommunity_id);
   }
-  
+
   @Get('user/find/:dni')
   findUser(@Param('dni') paramUserDNI: string) {
     return this.appService.findUser(paramUserDNI);
@@ -224,9 +224,13 @@ export class AppController {
     return this.appService.deleteAdminCommunity(id);
   }
 
-  @Delete('user/deleteTenant/:id')
-  deleteTenant(@Param('id') id: string) {
-    return this.appService.deleteTenant(id);
+  @Put('user/deleteTenant/:id')
+  deleteTenant(
+    @Param('id') id: string,
+    @Body('community_id') community_id: string,
+    @Body('number_house') number_house: string
+  ) {
+    return this.appService.deleteTenant(id, community_id, number_house);
   }
 
   @Post('user/changeStatus')
diff --git a/api-gateway/src/app.service.ts b/api-gateway/src/app.service.ts
index be6a794c..42475489 100644
--- a/api-gateway/src/app.service.ts
+++ b/api-gateway/src/app.service.ts
@@ -271,9 +271,9 @@ export class AppService {
       .pipe(map((message: string) => ({ message })));
   }
 
-  deleteTenant(id: string) {
+  deleteTenant(id: string, community_id: string, number_house: string) {
     const pattern = { cmd: 'deleteTenant' };
-    const payload = { id: id };
+    const payload = { _id: id, community_id: community_id, number_house: number_house };
     return this.clientUserApp
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
@@ -382,7 +382,7 @@ export class AppService {
     const finalValue = await lastValueFrom(callback);
     const response = finalValue['response'];
     const houses = response['houses'];
-    
+
     return houses;
   }
 
@@ -393,7 +393,7 @@ export class AppService {
       .send<string>(pattern, payload)
       .pipe(map((message: string) => ({ message })));
   }
-  
+
   // ====================== COMMON AREAS ===============================
   //POST parameter from API
   createCommonArea(
diff --git a/servicio-comunidad-viviendas/src/communities/communities.controller.ts b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
index d8302399..a0fa2672 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.controller.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.controller.ts
@@ -66,7 +66,6 @@ export class CommunitiesController {
 
   @MessagePattern({ cmd: 'deleteTenant' })
   deleteTenant(@Payload() body: string) {
-
    let id = body['_id'];
    let tenant_id = body['tenant_id'];
    let number_house = body['number_house'];
diff --git a/servicio-comunidad-viviendas/src/communities/communities.service.ts b/servicio-comunidad-viviendas/src/communities/communities.service.ts
index b718a024..dc3773e7 100644
--- a/servicio-comunidad-viviendas/src/communities/communities.service.ts
+++ b/servicio-comunidad-viviendas/src/communities/communities.service.ts
@@ -105,12 +105,10 @@ export class CommunitiesService {
 
 
   async deleteTenant(id: string, number_house: string, tenant_id: string) {
-
     let community = await this.findOne(id);
 
     await community.houses.map(house => {
-      if (house.number_house == number_house &&
-        house.tenants.tenant_id == tenant_id) {
+      if (house.number_house === number_house) {
         house.tenants.tenant_id = "";
         house.state = "desocupada"
       }
diff --git a/servicio-usuarios/src/users/users.controller.ts b/servicio-usuarios/src/users/users.controller.ts
index 06f9cd88..07cee85d 100644
--- a/servicio-usuarios/src/users/users.controller.ts
+++ b/servicio-usuarios/src/users/users.controller.ts
@@ -133,7 +133,10 @@ export class UsersController {
 
   @MessagePattern({ cmd: 'deleteTenant' })
   deleteTenant(@Payload() user: any) {
-    return this.userService.deleteTenant(user['_id']);
+    let tenant_id =  user['_id'];
+    return this.userService.deleteTenant(tenant_id, 
+    user['community_id'], 
+    user['number_house']);
   }
 
   @MessagePattern({ cmd: 'changeStatus' })
diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index 96c973d7..d42cffb9 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -29,7 +29,7 @@ export class UsersService {
     let passwordEncriptada = Md5.init(user.password);
     user.password = passwordEncriptada;
     let userCreated = await this.userModel.create(user);
-     await this.saveTenantNumHouse(user.community_id, user.number_house, userCreated['_id']);
+    await this.saveTenantNumHouse(user.community_id, user.number_house, userCreated['_id']);
 
     let community = await this.findCommunity(user.community_id);
     user.community_id = community['name'];
@@ -195,7 +195,7 @@ export class UsersService {
   }
 
   async deleteAdminSystem(id: string) {
-    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
+    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1', number_house:'' }, {
       new: true,
     });
   }
@@ -206,10 +206,18 @@ export class UsersService {
     });
   }
 
-  async deleteTenant(id: string) {
-    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1' }, {
-      new: true,
-    });
+  async deleteTenant(tenant_id: string, community_id: string, number_house: string) {
+
+    try{
+      this.userModel.findOneAndUpdate({ _id: tenant_id }, { status: '-1' }, {
+        new: true,
+      });
+  
+      return await this.deleteTenantNumHouse(community_id, number_house, tenant_id);
+    } catch(error){
+      console.log(error)
+      return error;
+    }
   }
 
   async validateEmail(email: string) {
@@ -257,9 +265,9 @@ export class UsersService {
   }
 
 
-  async saveTenantNumHouse(community_id: string, number_house:string, tenant_id: string) {
+  async saveTenantNumHouse(community_id: string, number_house: string, tenant_id: string) {
     const pattern = { cmd: 'saveTenant' }
-    const payload = { _id: community_id, number_house: number_house,  tenant_id: tenant_id }
+    const payload = { _id: community_id, number_house: number_house, tenant_id: tenant_id }
 
     return await this.clientCommunityApp
       .send<string>(pattern, payload)
@@ -269,10 +277,9 @@ export class UsersService {
   }
 
 
-  async deleteTenantNumHouse(community_id: string, number_house:string, tenant_id: string) {
+  async deleteTenantNumHouse(community_id: string, number_house: string, tenant_id: string) {
     const pattern = { cmd: 'deleteTenant' }
-    const payload = { _id: community_id, number_house: number_house,  tenant_id: tenant_id }
-
+    const payload = { _id: community_id, number_house: number_house, tenant_id: tenant_id }
     return await this.clientCommunityApp
       .send<string>(pattern, payload)
       .pipe(
diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 94e4ab4e..0f8fa2a3 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -184,15 +184,49 @@ const Inquilinos = () => {
   }
 
   const deleteTenant = () => {
-    let _tenants = tenants.filter((val) => val._id !== tenant._id)
-    setTenants(_tenants)
-    setDeleteTenantDialog(false)
-    setTenant(emptyTenant)
-    toast.current.show({
-      severity: 'success',
-      summary: 'Inquilino Eliminado',
-      life: 3000,
-    })
+    
+    let _tenant = {
+      community_id: tenant.community_id,
+      number_house: tenant.number_house
+    };
+
+    fetch('http://localhost:4000/user/deleteTenant/' + tenant._id, {
+      cache: 'no-cache',
+      method: 'PUT',
+      body: JSON.stringify(_tenant),
+      headers: {
+          'Content-Type': 'application/json'
+      }
+  })
+      .then(
+          function (response) {
+              if (response.status != 201)
+                  console.log('Ocurrió un error con el servicio: ' + response.status);
+              else
+                  return response.json();
+          }
+      )
+      .then(
+          function (response) {
+
+              let _tenants = tenants.filter((val) => val._id !== tenant._id)
+              setTenants(_tenants)
+              setDeleteTenantDialog(false)
+              setTenant(emptyTenant)
+              toast.current.show({
+                severity: 'success',
+                summary: 'Inquilino Eliminado',
+                life: 3000,
+              })          }
+      )
+      .catch(
+          err => {
+              console.log('Ocurrió un error con el fetch', err)
+              toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Inquilino no se pudo eliminar', life: 3000 });
+          }
+      );
+    
+   
   }
 
   const deleteSelectedTenants = () => {

From 2dcfdf495f13278b036cd6bc83f6351413698b71 Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 16:43:52 -0600
Subject: [PATCH 12/13] arreglar ultimos detalles para el eliminar

---
 servicio-usuarios/src/users/users.service.ts  |  4 +-
 web-ui/web-react/src/components/Inquilinos.js | 57 ++++++++++---------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/servicio-usuarios/src/users/users.service.ts b/servicio-usuarios/src/users/users.service.ts
index d42cffb9..e5a17fef 100644
--- a/servicio-usuarios/src/users/users.service.ts
+++ b/servicio-usuarios/src/users/users.service.ts
@@ -195,7 +195,7 @@ export class UsersService {
   }
 
   async deleteAdminSystem(id: string) {
-    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1', number_house:'' }, {
+    return this.userModel.findOneAndUpdate({ _id: id }, { status: '-1'}, {
       new: true,
     });
   }
@@ -209,7 +209,7 @@ export class UsersService {
   async deleteTenant(tenant_id: string, community_id: string, number_house: string) {
 
     try{
-      this.userModel.findOneAndUpdate({ _id: tenant_id }, { status: '-1' }, {
+       await this.userModel.findOneAndUpdate({ _id: tenant_id }, { status: '-1', number_house:''}, {
         new: true,
       });
   
diff --git a/web-ui/web-react/src/components/Inquilinos.js b/web-ui/web-react/src/components/Inquilinos.js
index 0f8fa2a3..0e0350e9 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -60,7 +60,7 @@ const Inquilinos = () => {
       .then((response) => response.json())
       .then((data) => data.message)
       .then((data) => {
-        data = data.filter((val) => val.status !== -1)
+        data = data.filter((val) => val.status != -1)
         data.map((item) => {
           if (item.status === '1') {
             item.status_text = 'Activo'
@@ -120,7 +120,7 @@ const Inquilinos = () => {
         _tenant.community_id = cookies.community_id;
         _tenant.number_house = houseNumber;
         _tenant.password = _tenant.email;
-      console.log(`Registrando nuevo inquilino: ${_tenant}`)
+        console.log(`Registrando nuevo inquilino: ${_tenant}`)
 
         fetch(`http://localhost:4000/user/createTenant`, {
           cache: 'no-cache',
@@ -135,7 +135,7 @@ const Inquilinos = () => {
               console.log(`Hubo un error en el servicio: ${response.status}`)
             else return response.json()
           })
-          .then(() => {
+          .then((data) => {
             if (_tenant.status === '1') {
               _tenant.status_text = 'Activo'
             } else if (_tenant.status === '0') {
@@ -184,7 +184,7 @@ const Inquilinos = () => {
   }
 
   const deleteTenant = () => {
-    
+
     let _tenant = {
       community_id: tenant.community_id,
       number_house: tenant.number_house
@@ -195,38 +195,39 @@ const Inquilinos = () => {
       method: 'PUT',
       body: JSON.stringify(_tenant),
       headers: {
-          'Content-Type': 'application/json'
+        'Content-Type': 'application/json'
       }
-  })
+    })
       .then(
-          function (response) {
-              if (response.status != 201)
-                  console.log('Ocurrió un error con el servicio: ' + response.status);
-              else
-                  return response.json();
-          }
+        function (response) {
+          if (response.status != 201)
+            console.log('Ocurrió un error con el servicio: ' + response.status);
+          else
+            return response.json();
+        }
       )
       .then(
-          function (response) {
+        function (response) {
 
-              let _tenants = tenants.filter((val) => val._id !== tenant._id)
-              setTenants(_tenants)
-              setDeleteTenantDialog(false)
-              setTenant(emptyTenant)
-              toast.current.show({
-                severity: 'success',
-                summary: 'Inquilino Eliminado',
-                life: 3000,
-              })          }
+          let _tenants = tenants.filter((val) => val._id !== tenant._id)
+          setTenants(_tenants)
+          setDeleteTenantDialog(false)
+          setTenant(emptyTenant)
+          toast.current.show({
+            severity: 'success',
+            summary: 'Inquilino Eliminado',
+            life: 3000,
+          })
+        }
       )
       .catch(
-          err => {
-              console.log('Ocurrió un error con el fetch', err)
-              toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Inquilino no se pudo eliminar', life: 3000 });
-          }
+        err => {
+          console.log('Ocurrió un error con el fetch', err)
+          toast.current.show({ severity: 'danger', summary: 'Error', detail: 'Inquilino no se pudo eliminar', life: 3000 });
+        }
       );
-    
-   
+
+
   }
 
   const deleteSelectedTenants = () => {

From b9d79c8402a2028bf342f3f19b01749a64654acd Mon Sep 17 00:00:00 2001
From: Mariela <mbonilla.guti@gmail.com>
Date: Mon, 22 Aug 2022 17:54:08 -0600
Subject: [PATCH 13/13] fix filtro de inquilinos eliminados

---
 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 0e0350e9..459cee47 100644
--- a/web-ui/web-react/src/components/Inquilinos.js
+++ b/web-ui/web-react/src/components/Inquilinos.js
@@ -60,7 +60,7 @@ const Inquilinos = () => {
       .then((response) => response.json())
       .then((data) => data.message)
       .then((data) => {
-        data = data.filter((val) => val.status != -1)
+        data = data.filter((val) => val.status !== -1)
         data.map((item) => {
           if (item.status === '1') {
             item.status_text = 'Activo'