code refactoring

src/app/ui/chat/modal/chat-popover/chat-popover.page.ts

@@ -2,12 +2,13 @@ import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'
-import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
+import { SetRoomOwnerPage } from 'src/app/ui/chat/modal/set-room-owner/set-room-owner.page';
 import { SessionStore } from 'src/app/store/session.service';
 import { ZodError } from 'zod';
 import { isHttpResponse } from 'src/app/services/http.service';
 import { MessageRepositoryService } from 'src/app/module/chat/data/repository/message-respository.service'
-import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
+
+import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
 
 @Component({
   selector: 'app-chat-popover',
@@ -27,7 +28,7 @@ export class ChatPopoverPage implements OnInit {
     private navParams: NavParams,
     private toastService: ToastService,
     public ThemeService: ThemeService,
-    private RoomRepositoryService: RoomRepositoryService
+    private ChatServiceService: ChatServiceService
   ) {
     this.roomId = this.navParams.get('roomId');
     this.isAdmin = this.navParams.get('isAdmin');
@@ -84,7 +85,7 @@ export class ChatPopoverPage implements OnInit {
 
     //this.setRoomOwner();
     this.showLoader = true
-    const result = await this.RoomRepositoryService.leaveRoom({
+    const result = await this.ChatServiceService.leaveRoom({
       id: this.roomId,
       members: [SessionStore.user.UserId]
     })
@@ -112,7 +113,8 @@ export class ChatPopoverPage implements OnInit {
   //Delete
   async deleteGroup() {
     this.showLoader = true
-    const result = await this.RoomRepositoryService.deleteRoomById(this.roomId)
+    
+    const result = await this.ChatServiceService.deleteRoomById(this.roomId)
 
 
     if(result.isOk()) {

src/app/ui/chat/modal/messages/contacts/contacts.page.ts

@@ -3,7 +3,6 @@ import { ModalController } from '@ionic/angular';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service';
-import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
 import { UserContacts } from 'src/app/services/Repositorys/contacts/data-source/contacts-data-source.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { ToastService } from 'src/app/services/toast.service';
@@ -37,7 +36,6 @@ export class ContactsPage implements OnInit {
     private modalController: ModalController,
     public ThemeService: ThemeService,
     private contactsRepositoryService: ContactRepositoryService,
-    private RoomRepositoryService: RoomRepositoryService,
     private httpErrorHandle: HttpErrorHandle,
     private toastService: ToastService,
   )

src/app/ui/chat/modal/messages/messages.page.ts

@@ -22,7 +22,6 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { Observable as  DexieObservable } from 'Dexie';
 import { Subscription } from 'rxjs';
 import { MessageRepositoryService } from 'src/app/module/chat/data/repository/message-respository.service'
-import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
 import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
 import { RoomListItemOutPutDTO } from 'src/app/module/chat/data/dto/room/roomListOutputDTO';
 import { UserTypingServiceRepository } from 'src/app/module/chat/data/repository/user-typing-repository.service';
@@ -43,6 +42,8 @@ import { FilePickerMobileService } from 'src/app/infra/file-picker/mobile/file-p
 import { FilePickerWebService } from 'src/app/infra/file-picker/web/file-picker-web.service'
 import { allowedDocExtension } from 'src/app/utils/allowedDocExtension';
 import { JSFileToDataUrl } from 'src/app/utils/ToBase64';
+import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room-local-repository.service'
+import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member-list-local-repository.service'
 const IMAGE_DIR = 'stored-images';
 
 @Component({
@@ -137,21 +138,22 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private platform: Platform,
     private storage: Storage,
     private sanitiser: DomSanitizer,
-    private roomRepositoryService: RoomRepositoryService,
     private messageRepositoryService: MessageRepositoryService,
     private userTypingServiceRepository: UserTypingServiceRepository,
     private chatServiceService: ChatServiceService,
     private FilePickerService: FilePickerService,
     private CameraService: CameraService,
     private FilePickerMobileService: FilePickerMobileService,
-    private FilePickerWebService: FilePickerWebService
+    private FilePickerWebService: FilePickerWebService,
+    private RoomLocalRepository: RoomLocalRepository,
+    private MemberListLocalRepository: MemberListLocalRepository,
   ) {
 
 
     this.roomId = this.navParams.get('roomId');
 
 
-    this.roomData$ = this.roomRepositoryService.getItemByIdLive(this.roomId)
+    this.roomData$ = this.RoomLocalRepository.getRoomByIdLive(this.roomId)
 
     this.getMessages();
     this.listenToIncomingMessage();
@@ -161,8 +163,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
 
     // this.roomMessage$ = this.messageRepositoryService.getItemsLive(this.roomId)
-    this.roomMembers$ = this.roomRepositoryService.getRoomMemberByIdLive(this.roomId) as any
-    this.roomStatus$ = this.roomRepositoryService.getRoomStatus(this.roomId)
+    this.roomMembers$ = this.MemberListLocalRepository.getRoomMemberByIdLive(this.roomId) as any
+    this.roomStatus$ = this.MemberListLocalRepository.allMemberOnline(this.roomId)
     // this.roomRepositoryService.getRoomById(this.roomId)
 
     this.userTypingServiceRepository.getUserTypingLive().subscribe((e) => {

src/app/ui/chat/modal/set-room-owner/set-room-owner-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { SetRoomOwnerPage } from './set-room-owner.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SetRoomOwnerPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class SetRoomOwnerPageRoutingModule {}

src/app/ui/chat/modal/set-room-owner/set-room-owner.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { SetRoomOwnerPageRoutingModule } from './set-room-owner-routing.module';
+
+import { SetRoomOwnerPage } from './set-room-owner.page';
+import { PipesModule } from 'src/app/pipes/pipes.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    PipesModule,
+    SetRoomOwnerPageRoutingModule
+  ],
+  declarations: [SetRoomOwnerPage]
+})
+export class SetRoomOwnerPageModule {}

src/app/ui/chat/modal/set-room-owner/set-room-owner.page.html

@@ -0,0 +1,45 @@
+<ion-header  class="ion-no-border">
+  <ion-toolbar class="header-toolbar">
+    <div class="main-header">
+      <div class="title-content width-100">
+        <div class="back-icon">
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/Theme/doneIt/icons-arrow-arrow-left.svg'></ion-icon>
+          <button class="btn-no-color cursor-pointer" (click)="close()">
+            <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-arrow-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+          </button>
+        </div>
+        <div class="div-title">
+          <ion-label class="title">Nomear novo administrador</ion-label>
+        </div>
+      </div>
+    </div>
+  </ion-toolbar>
+  <ion-toolbar class="toolbar-search">
+    <div class="search">
+      <ion-searchbar search-icon="undefined" debounce="500" (ionChange)="onChange($event)" placeholder="Pesquisar por contacto" ></ion-searchbar>
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <div class="main-content" *ngIf="roomMembers$ | async as memberList">
+    <ion-virtual-scroll [items]="memberList | filter:textSearch: 'wxFullName'" approxItemHeight="70px" [headerFn]="separateLetter">
+
+      <div class="item-divider" *virtualHeader="let header">
+        <ion-label>{{header}}</ion-label>
+      </div>
+
+      <div *virtualItem="let user" class="item-checkbox">
+        <div class="cursor-pointer d-flex width-100" (click)="setRoomOwner(user)" (ionChange)="setRoomOwner(user)">
+          <p class="flex-1">{{user.wxFullName}}</p>
+          <ion-icon slot="end" class="{{user.status}}" name="ellipse"></ion-icon>
+        </div>
+      </div>
+
+    </ion-virtual-scroll>
+
+  </div>
+</ion-content>
+

src/app/ui/chat/modal/set-room-owner/set-room-owner.page.scss

@@ -0,0 +1,166 @@
+@import '~src/function.scss';
+
+.header-toolbar{
+    --background:transparent;
+    --opacity: 1;
+
+   .main-header{
+     width: 100%; /* 400px */
+     height: 100%;
+     font-family: Roboto;
+     border-top-left-radius: 25px;
+     border-top-right-radius: 25px;
+     background-color: #fff;
+     overflow:hidden;
+     padding: 30px 20px 0px 20px;
+     color:#000;
+     transform: translate3d(0, 1px, 0);
+
+     .div-icon{
+       width: rem(40);
+       float: right;
+       font-size: rem(35);
+       overflow: auto;
+       padding: 1px;
+     }
+     .div-icon ion-icon{
+       float: right;
+       padding-left: 20px;
+     }
+       .title-content{
+         margin: 0px auto;
+         overflow: auto;
+         padding: 0 !important;
+       }
+
+     .back-icon{
+       width: 37px;
+       float: left;
+       font-size: rem(35);
+       overflow: auto;
+
+       }
+     .div-title{
+         width: calc(100% - 45px);
+         padding: 0!important;
+         float: left;
+         margin: 2.5px 0 0 5px;
+     }
+     .title{
+         font-size: rem(25);
+     }
+   }
+ }
+ .toolbar-search{
+   --padding-top:0 !important;
+   --padding-bottom:0 !important;
+   --padding-start:0 !important;
+   --padding-end:0 !important;
+
+   .search{
+     border: 1px solid #ebebeb;
+     margin: 5px 20px 5px 20px;
+     border-radius: 5px;
+   }
+   .search ion-searchbar{
+     /* border: 1px solid green; */
+     width: 100%;
+     margin: 0 !important;
+     padding: 0 !important;
+     --border-radius: 5px;
+     --box-shadow: none;
+     overflow: auto;
+     --icon-color: var(--font-awesome);
+   }
+
+ }
+ ion-content{
+   --background:transparent;
+ }
+ .main-content{
+   width: 100%;
+   height: 100%;
+   font-family: Roboto;
+   margin: 0 auto;
+   background-color: #fff;
+   overflow:auto;
+   padding: 0 0 0 0;
+
+    .members-label{
+      margin: 10px 20px 10px 20px !important;
+      /* font-size: rem(15); */
+      font-weight: bold;
+    }
+
+    .members-checkbox{
+      display: flex;
+      margin: 0px 20px 0px 20px !important;
+      overflow: auto;
+      align-items: center;
+      border-bottom: 1px solid #ebebeb;
+    }
+
+    .members-options{
+      margin: 0px 20px 0px 19px !important;
+      overflow: auto;
+    }
+
+    .item-divider{
+      background: #ebebeb;
+      font-size: rem(15);
+      margin: 10px 0 10px 0;
+      padding:5px 0 5px 20px;
+
+    }
+
+     .item-checkbox{
+       display: flex;
+       margin: 10px 20px 10px 20px !important;
+       overflow: auto;
+       align-items: center;
+       overflow: auto;
+     }
+
+     .members-checkbox ion-checkbox{
+      --border-color: var(--title-text-color);
+      --background-checked:var(--title-text-color);
+      float: left;
+  }
+
+     .item-checkbox ion-checkbox{
+         --border-color: var(--title-text-color);
+         --background-checked:var(--title-text-color);
+         float: left;
+     }
+
+     .item-checkbox p, .members-checkbox p{
+         display: block;
+         margin: 0 !important;
+         padding-left: 10px;
+         font-size: rem(15);
+         color: var(--title-text-color);
+         float: left;
+     }
+     .item-checkbox ion-icon, .members-checkbox ion-icon{
+       font-size: rem(10);
+       float: left;
+       color:#99e47b;
+       margin-left: 10px;
+     }
+     .online{
+      color:#99e47b !important;
+      }
+    .offline{
+      color:#cbced1 !important;
+      }
+    .away{
+      color:#ffd21f !important;
+      }
+      .invisible{
+        color:#cbced1 !important;
+      }
+      .busy{
+        color:#f5455c !important;
+      }
+   }
+

src/app/ui/chat/modal/set-room-owner/set-room-owner.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { SetRoomOwnerPage } from './set-room-owner.page';
+
+describe('SetRoomOwnerPage', () => {
+  let component: SetRoomOwnerPage;
+  let fixture: ComponentFixture<SetRoomOwnerPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SetRoomOwnerPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SetRoomOwnerPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/ui/chat/modal/set-room-owner/set-room-owner.page.ts

@@ -0,0 +1,79 @@
+
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
+;
+import { ThemeService } from 'src/app/services/theme.service'
+import { ToastService } from 'src/app/services/toast.service';
+import { Observable as  DexieObservable } from 'Dexie';
+import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
+import { MemberTable } from 'src/app/module/chat/infra/database/dexie/schema/members';
+import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member-list-local-repository.service'
+
+@Component({
+  selector: 'app-set-room-owner',
+  templateUrl: './set-room-owner.page.html',
+  styleUrls: ['./set-room-owner.page.scss'],
+})
+export class SetRoomOwnerPage implements OnInit {
+
+  textSearch:string = "";
+  roomId:any;
+  members:any;
+  roomMembers$:  DexieObservable<MemberTable[] | undefined>
+
+  constructor(
+    private modalController: ModalController,
+    private navParams: NavParams,
+    public ThemeService: ThemeService,
+    private toastService: ToastService,
+    private chatServiceService: ChatServiceService,
+    private MemberListLocalRepository: MemberListLocalRepository
+  ) {
+    this.roomId = this.navParams.get('roomId');
+    this.members = this.navParams.get('members');
+  }
+
+  ngOnInit() {
+    // this.chatService.refreshtoken();
+    this.roomMembers$ = this.MemberListLocalRepository.getRoomMemberNoneAdminByIdLive(this.roomId) as any
+  }
+
+  async close() {
+    this.modalController.dismiss();
+  }
+
+  onChange(event) {
+    this.textSearch = event.detail.value;
+  }
+
+  separateLetter(record:MemberTable, recordIndex, records:MemberTable[]) {
+    if(recordIndex == 0){
+      return record.wxFullName[0];
+    }
+
+    let first_prev = records[recordIndex - 1].wxFullName[0];
+    let first_current = record.wxFullName[0];
+
+    if(first_prev != first_current){
+      return first_current;
+    }
+    return null;
+  }
+
+  async setRoomOwner(user:MemberTable) {
+
+    const result = await this.chatServiceService.setAdmin({
+      roomId: user.roomId,
+      memberId: user.wxUserId.toString()
+    });
+
+    if(result.isOk()) {
+      this.chatServiceService.getRoomById(this.roomId);
+      // this.modalController.dismiss('success');
+    } else {
+      this.toastService._badRequest('Não foi possível completar a ação, por favor tente novamente.');
+    }
+
+  }
+
+}