diff --git a/src/app/app.module.ts b/src/app/app.module.ts index afcf9e498..229150c63 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -97,15 +97,12 @@ import { ImageCropperModule } from 'ngx-image-cropper'; import { createAction, createReducer, on, StoreModule } from '@ngrx/store'; import { ChatModule } from './module/chat/chat.module'; import { openTelemetryLogging, OpenTelemetryLogging } from './services/monitoring/opentelemetry/logging'; -// import { ServiceWorkerModule } from '@angular/service-worker'; -// import { AngularFireModule } from '@angular/fire'; -// import { AngularFireMessagingModule } from '@angular/fire/messaging'; -// import { environment } from 'src/environments/environment'; -/* import { FCM } from '@ionic-native/fcm/ngx'; -import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */ -//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; +import { registerLocaleData } from '@angular/common'; +import localePt from '@angular/common/locales/pt'; +// Register the locale data +registerLocaleData(localePt, 'pt'); Sentry.init( { diff --git a/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts b/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts index bd4b53fed..b3e8045da 100644 --- a/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts +++ b/src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts @@ -40,73 +40,77 @@ export class SendLocalMessagesUseCaseService { for(const message of messages) { const room = allRooms.value.find(e => e.id == message.roomId) - const attachments = await this.AttachmentRepositoryService.find({$messageId: message.$id}) + if(room) { - if(attachments.isOk()) { + const attachments = await this.AttachmentRepositoryService.find({$messageId: message.$id}) - message.attachments = attachments.value.map(e => ({ - fileType: e.fileType, - source: e.source, - fileName: e.fileName, - applicationId: e.applicationId, - docId: e.docId, - id: e.id, - mimeType: e.mimeType, - description: e.description, - file: e.base64.split(',')[1] - })) - console.log('to upload', messages) - const requestId = InstanceId +'@'+ uuidv4(); + if(attachments.isOk()) { - await this.messageLocalDataSourceService.update(message.$id, { sending: true }) + message.attachments = attachments.value.map(e => ({ + fileType: e.fileType, + source: e.source, + fileName: e.fileName, + applicationId: e.applicationId, + docId: e.docId, + id: e.id, + mimeType: e.mimeType, + description: e.description, + file: e.base64.split(',')[1] + })) + console.log('to upload', messages) + const requestId = InstanceId +'@'+ uuidv4(); - let sendMessageResult: Result - if(room.roomType == RoomType.Group) { - const DTO = MessageMapper.fromDomain(message, message.requestId) - sendMessageResult = await this.MessageSocketRepositoryService.sendGroupMessage(DTO) - } else { + await this.messageLocalDataSourceService.update(message.$id, { sending: true }) - if(message.receiverId) { - const DTO = MessageMapper.fromDomain(message, message.requestId) - sendMessageResult = await this.messageSocketRepositoryService.sendDirectMessage(DTO) - } else { - const getRoomMembers = await this.MemberListLocalRepository.directMember({ - roomId:message.roomId, - currentUserId: SessionStore.user.UserId - }) - if(getRoomMembers.isOk()) { - message.receiverId = getRoomMembers.value.wxUserId + let sendMessageResult: Result + if(room.roomType == RoomType.Group) { const DTO = MessageMapper.fromDomain(message, message.requestId) - sendMessageResult = await this.messageSocketRepositoryService.sendGroupMessage(DTO) + sendMessageResult = await this.MessageSocketRepositoryService.sendGroupMessage(DTO) } else { - console.log('not found direct users', getRoomMembers.error) + + if(message.receiverId) { + const DTO = MessageMapper.fromDomain(message, message.requestId) + sendMessageResult = await this.messageSocketRepositoryService.sendDirectMessage(DTO) + } else { + const getRoomMembers = await this.MemberListLocalRepository.directMember({ + roomId:message.roomId, + currentUserId: SessionStore.user.UserId + }) + if(getRoomMembers.isOk()) { + message.receiverId = getRoomMembers.value.wxUserId + const DTO = MessageMapper.fromDomain(message, message.requestId) + sendMessageResult = await this.messageSocketRepositoryService.sendGroupMessage(DTO) + } else { + console.log('not found direct users', getRoomMembers.error) + } + } + + } + + if(sendMessageResult.isOk()) { + + if(sendMessageResult.value.sender == undefined || sendMessageResult.value.sender == null) { + + delete sendMessageResult.value.sender + } + + let clone: MessageTable = { + ...sendMessageResult.value, + id: sendMessageResult.value.id, + $id : message.$id + } + + clone.sending = false + console.log({clone}) + console.log('send message local '+ messages.length) + + this.messageLocalDataSourceService.update(message.$id, {id: sendMessageResult.value.id, sending: false}) + } else { + this.messageLocalDataSourceService.update(message.$id, {sending: false}) } } - } - if(sendMessageResult.isOk()) { - - if(sendMessageResult.value.sender == undefined || sendMessageResult.value.sender == null) { - - delete sendMessageResult.value.sender - } - - let clone: MessageTable = { - ...sendMessageResult.value, - id: sendMessageResult.value.id, - $id : message.$id - } - - clone.sending = false - console.log({clone}) - console.log('send message local '+ messages.length) - - this.messageLocalDataSourceService.update(message.$id, {id: sendMessageResult.value.id, sending: false}) - } else { - this.messageLocalDataSourceService.update(message.$id, {sending: false}) - } - } } }