Merge branch 'route/test' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/services/auth.service.ts

@@ -228,7 +228,7 @@ export class AuthService {
       }, 1) */
     }
 
-    autologout(expirationDate:number){
+    autologout(expirationDate:number) {
       setTimeout(()=>{
         this.logout();
       }, expirationDate)
@@ -248,13 +248,13 @@ export class AuthService {
     }
 
     //Get user data from RocketChat | global object
-    getUserData(){
+    getUserData() {
       this.storageService.get(AuthConnstants.AUTH).then(res=>{
         this.userData$.next(res);
       });
     }
 
-    logoutChat(){
+    logoutChat() {
       //this.storageService.clear();
       /* this.storageService.removeStorageItem(AuthConnstants.AUTH).then(res =>{
         this.userData$.next('');

src/app/services/chat/message.service.ts

@@ -18,7 +18,13 @@ export class MessageService {
   msg = ''
   rid = ''
   ts = {}
-  u = {}
+  
+  u = { 
+    name: '', 
+    username: '', 
+    _id: ""
+  }
+
   t = ''
   _id  =''
   _updatedAt
@@ -35,6 +41,8 @@ export class MessageService {
   loadHistory = false
   duration = ''
   localReference = null
+  viewed = []
+  received = []
 
   constructor(private storage: Storage,
     private NfService: NfService,
@@ -78,6 +86,7 @@ export class MessageService {
       }
     }
 
+
     this.calDateDuration()
   }
 
@@ -140,9 +149,9 @@ export class MessageService {
 
           console.log('message', message)
           let ChatMessage = message.result
-
+          
           if (environment.chatOffline) {  
-            // this.redefinedMessage(ChatMessage)
+            this.redefinedMessage(ChatMessage)
             this.offline = false
           }
 
@@ -189,5 +198,47 @@ export class MessageService {
     this.duration = showDateDuration(date || this._updatedAt);
   }
 
+  private messageReceptor() {
+    return this.u.username != SessionStore.user.RochetChatUser
+  }
+
+  receptorReceive() {
+
+    if(this.messageReceptor()) {
+      let newMessage = {
+        rid: this._id,
+        msg: this.msg,
+        attachments: this.attachments,
+        file: this.file,
+        localReference: this.localReference,
+        viewed: this.viewed.push('123'),
+        received: this.viewed.push('123'),
+      }
+  
+      this.WsChatService.updateMessage(newMessage).then(()=>{
+        console.log('newMessage', newMessage)
+      })
+    }
+
+  }
+
+  receptorView() {
+    if(this.messageReceptor()) {
+      let newMessage = {
+        rid: this._id,
+        msg: this.msg,
+        attachments: this.attachments,
+        file: this.file,
+        localReference: this.localReference,
+        viewed: this.viewed.push('123'),
+        received: this.viewed.push('123'),
+      }
+  
+      this.WsChatService.updateMessage(newMessage).then(()=>{
+        console.log('newMessage', newMessage)
+      })
+    }
+
+  }
 
 }

src/app/services/chat/room.service.ts

@@ -201,6 +201,40 @@ export class RoomService {
       })
     }
 
+  }
+
+  async updateViewedMessage(id, userId) {
+    if (environment.chatOffline) { 
+      this.storage.get('chatmsg' + this.id).then((messages: any = []) => {
+        if(!Array.isArray(messages)) {
+          messages = []
+        }
+
+        let index;
+        const find = messages.find((message, _index)=> {
+        
+          if(message._id == id) {
+            index = _index
+            return true
+          }
+          
+          return false
+        })
+
+        if(find) {
+
+          if(!messages[index].hasOwnProperty('viewed') || !Array.isArray(messages[index].viewed)) {
+            messages.viewed = []
+          }
+
+          messages.viewed.push(userId)
+          this.storage.set('chatmsg' + this.id, messages)
+
+        }
+        
+      })
+    }
+
   }
 
     /**
@@ -279,11 +313,16 @@ export class RoomService {
       attachments,
       file,
       temporaryData,
-      localReference
+      localReference,
+      viewed: [],
+      received: []
     }
 
     const message: MessageService = this.prepareMessage(offlineChatMessage, environment.chatOffline)
 
+    /**
+     * @description redefine message offline data "offlineChatMessage" with live ChatMessage
+     */
     message.send().then((ChatMessage) => {
       this.updateMessageDB(ChatMessage, localReference)
     })
@@ -305,6 +344,13 @@ export class RoomService {
     this.message= ''
   }
 
+
+  /**
+   * 
+   * @param message 
+   * @param ChatMessage 
+   * @description when creating message we use offline data, then we need redefined with live data
+   */
   redefinedMessage  (message: MessageService, ChatMessage) {
 
     ChatMessage = this.fix_updatedAt(ChatMessage)
@@ -448,7 +494,12 @@ export class RoomService {
   }
 
 
-
+  /**
+   * @description find or create message
+   * @param message 
+   * @param save 
+   * @returns 
+   */
   prepareMessage(message, save = true): MessageService {
     message = this.fix_updatedAt(message)
     const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService)

src/app/services/chat/ws-chat-methods.service.ts

@@ -22,8 +22,8 @@ export class WsChatMethodsService {
   dm: {[key: string]:  RoomService} = {}
   group: {[key: string]:  RoomService} = {}
 
-  _dm = []
-  _group = []
+  _dm: RoomService[] = []
+  _group: RoomService[] = []
 
   loadingWholeList = false
 
@@ -71,7 +71,9 @@ export class WsChatMethodsService {
       }
     })
 
-    this.changeProfileService.registerCallback(()=>{
+
+    // on change profile remove a rooms
+    this.changeProfileService.registerCallback(() => {
       this.clearChat()
       this.ReLoadChat()
       this.storage.remove('Rooms');
@@ -142,13 +144,6 @@ export class WsChatMethodsService {
     this.users = []
   }
 
-  getRoomFromDb() {
-    this.storage.get('Rooms').then((rooms) => {
-      rooms.result.update.forEach((roomData: room) => {
-        this.prepareRoom(roomData);
-      });
-    })
-  }
 
   openRoom(roomId) {
 
@@ -186,7 +181,6 @@ export class WsChatMethodsService {
 
   async getAllRooms () {
     this.loadingWholeList = true
-    //this.getRoomFromDb();
     const rooms = await this.WsChatService.getRooms();
     await this.storage.remove('Rooms');
     await this.storage.set('Rooms', rooms);
@@ -266,6 +260,9 @@ export class WsChatMethodsService {
   prepareRoom(roomData) {
 
 
+    /**
+     * @description data used to define or create room
+     */
     const setData = {
       customFields: roomData.customFields,
       id: this.getRoomId(roomData),
@@ -277,13 +274,16 @@ export class WsChatMethodsService {
 
     let roomId = this.getRoomId(roomData)
 
-    if(!this.dm[roomId] && !this.group[roomId]) {
+    // create room
+    if(!this.roomExist(roomId)) {
       let room:RoomService = new RoomService(this.WsChatService, new MessageService(this.storage, this.NfService, this.WsChatService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService)
       room.setData(setData)
       room.receiveMessage()
       room.getAllUsers = this.getUsers
       room.receiveMessageDelete();
       room.sortRoomList = this.sortRoomList
+      
+      // create individual room
 
       if(this.isIndividual(roomData)) {
 
@@ -292,12 +292,16 @@ export class WsChatMethodsService {
         this.dmCount++
 
       } else {
+        // create group room
+
         this.group[roomId] = room
         this._group.push(room)
         this.groupCount++
 
       }
     } else {
+      // in this case room is already present, therefor it will only be necessary,
+      // to redefine
 
       if(this.dm[roomId]) {
         this.dm[roomId].setData(setData)
@@ -306,11 +310,11 @@ export class WsChatMethodsService {
       }
 
     }
-
-
   }
 
-
+  roomExist(roomId) {
+    return this.dm[roomId] && this.group[roomId]
+  }
 
   getReceptorName(roomData) {
     try {
@@ -326,20 +330,20 @@ export class WsChatMethodsService {
    */
   private getUserStatus(id?:string) {
 
-    // this.WsChatService.getUserStatus((d) => {
+    this.WsChatService.getUserStatus((d) => {
 
-    //   const username = d.fields.args[0][1]
-    //   const statusNum = d.fields.args[0][2]
+      const username = d.fields.args[0][1]
+      const statusNum = d.fields.args[0][2]
 
-    //   const statusText = this.statusNumberToText(statusNum)
+      const statusText = this.statusNumberToText(statusNum)
 
-    //   const user = this.getUserByName(username)
+      const user = this.getUserByName(username)
 
-    //   if(user) {
-    //     user.status = statusText
-    //   }
+      if(user) {
+        user.status = statusText
+      }
 
-    // })
+    })
 
   }
 
@@ -393,8 +397,11 @@ export class WsChatMethodsService {
   }
 
   hidingRoom(id?) {
-    //this.hideRoom(id);
-    return this.WsChatService.hidingRoom(id);
+    
+    return this.WsChatService.hidingRoom(id).then(()=>{
+      // this.hideRoom(id)      
+    })
+
   }
 
   addRoomOwner(roomid, userId){
@@ -420,7 +427,7 @@ export class WsChatMethodsService {
   getRoomName(roomData: room) {
     if(this.isIndividual(roomData)) {
       const names: String[] = roomData.usernames
-      const roomName = names.filter((name)=>{
+      const roomName = names.filter((name, index)=>{
         return name != SessionStore.user.RochetChatUser
       })[0]
 

src/app/services/chat/ws-chat.service.ts

@@ -186,6 +186,29 @@ export class WsChatService {
     });
   }
 
+  updateMessage(messageObject) {
+
+    const requestId = uuidv4()
+    var message = {
+      msg: "method",
+      method: "updateMessage",
+      id: requestId,
+      params: [messageObject]
+    }
+
+    this.ws.send({message, requestId});
+
+    return new Promise((resolve, reject) => {
+      this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
+        if(message.id == requestId ) { // same request send
+          resolve({message, requestId})
+          return true
+        }
+      }})
+    })
+
+  }
+
   leaveRoom(roomId) {
 
     const requestId =  uuidv4()

src/app/services/route.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
-import { NavigationEnd, Router, NavigationStart } from '@angular/router';
-
+import { NavigationEnd, Router, NavigationStart, NavigationExtras } from '@angular/router';
+import { LocalstoreService } from '../store/localstore.service';
+import { Location } from '@angular/common'
 
 @Injectable({
   providedIn: 'root'
@@ -8,11 +9,15 @@ import { NavigationEnd, Router, NavigationStart } from '@angular/router';
 export class RouteService {
 
   history: any = [];
-  isGoBack = false;
 
   constructor(
     private router: Router,
+    private LocalstoreService: LocalstoreService,
+    private Location: Location
   ) {
+
+    this.history = this.LocalstoreService.get('history', [])
+
     this.router.events.forEach((event) => {
       if (event instanceof NavigationEnd) {
 
@@ -20,6 +25,7 @@ export class RouteService {
 
         if(event.url != lastRoute) {
           this.history.push(event.url)
+          this.reduceHistory()
         }
 
       }
@@ -30,27 +36,56 @@ export class RouteService {
   }
 
   /**
-   * @param url [string] incase no history to go back
-   * @param option [Object] some options to the url
-   */
-  goBack(url = null, option: object = {}) {
-    console.log(url);
-
+   * @param url [string] incase no history to go back   */
+  goBack(url = null)  {
     if(this.history.length >= 2) {
       console.log(this.history);
 
       this.history.pop();
-      const goTo = this.history.pop();
-      this.isGoBack = true;
-      this.router.navigate([goTo]);
+      const url = this.history.pop();
+
+      this.goTo(url)
+
     } else if(url) {
-      this.goTo({url})
+      this.goTo(url)
     }
 
+    this.reduceHistory()
   }
 
-  goTo({url}) {
-    this.router.navigate([url]);
+  goTo(url) {
+    let navigationExtras: NavigationExtras = {
+      queryParams: this.queryParams(url)
+    }
+
+    const urlObject = new URL('http://localhost:8100'+url);
+    this.router.navigate([urlObject.pathname], navigationExtras);
+  }
+
+
+  reduceHistory() {
+    if(this.history.length >= 15) {
+      this.history = this.history.slice(5, this.history.length)
+    }
+    this.LocalstoreService.set('history', this.history)
+  }
+
+
+  queryParams(url) {
+
+    const urlObject = new URL('http://localhost:8100'+url);
+
+    const paramsString = urlObject.search;
+    let searchParams: any = new URLSearchParams(paramsString);
+    let params = {}
+
+    for (let [key, value] of searchParams) {
+      params[key] = value
+    }
+
+    console.log('params', params)
+    return params
+
   }
 
 }