clear console.log with errors

This commit is contained in:
Peter Maquiran
2024-10-23 09:58:49 +01:00
parent bc6833b6c4
commit 4396b17909
6 changed files with 31 additions and 18 deletions
@@ -42,10 +42,10 @@ export class SyncAllRoomMessagesService {
const removeLocalRooms = allRooms.value.filter((e)=> e.local != IDBoolean.true)
const roomPromises = removeLocalRooms.map(async (room) => {
const lastMessage = room.messages.find(e => e.sentAt && e.id)
const lastMessage = room?.messages?.find(e => e.sentAt && e.id)
const [result, localResult] = await Promise.all([
this.messageRemoteDataSourceService.getMessagesFromRoom({roomId:room.id, lastMessageDate: lastMessage?.sentAt}),
this.messageRemoteDataSourceService.getMessagesFromRoom({roomId:room.id, lastMessageDate: lastMessage?.sentAt || null}),
this.messageLocalDataSourceService.getItems(room.id)
]);
@@ -5,6 +5,9 @@ import { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service';
import { HttpAdapter } from 'src/app/infra/http/adapter';
import { IMessageGetAllByRoomIdOutPut } from 'src/app/core/chat/usecase/message/message-get-all-by-room-Id';
import { IGetMessagesFromRoomParams, IMessageRemoteRepository } from 'src/app/core/chat/repository/message/message-remote-repository';
import { HttpErrorResponse } from '@angular/common/http';
import { Result } from 'neverthrow';
import { HttpResult } from 'src/app/infra/http/type';
@Injectable({
providedIn: 'root'
@@ -23,7 +26,13 @@ export class MessageRemoteDataSourceService implements IMessageRemoteRepository
// @APIReturn(MessageOutPutDTOSchema, 'get/Messages')
async getMessagesFromRoom(input: IGetMessagesFromRoomParams): DataSourceReturn<IMessageGetAllByRoomIdOutPut> {
var a = await this.http.get<IMessageGetAllByRoomIdOutPut>(`${this.baseUrl}/Room/${input.roomId}/Messages?startDate=${encodeURIComponent(input.lastMessageDate)}`)
let a: Result<HttpResult<IMessageGetAllByRoomIdOutPut>, HttpErrorResponse>
if(input.lastMessageDate) {
a = await this.http.get<IMessageGetAllByRoomIdOutPut>(`${this.baseUrl}/Room/${input.roomId}/Messages?startDate=${encodeURIComponent(input.lastMessageDate)}`)
} else {
a = await this.http.get<IMessageGetAllByRoomIdOutPut>(`${this.baseUrl}/Room/${input.roomId}/Messages`)
}
return a.map((e) => {
return e.data
+1 -1
View File
@@ -89,7 +89,7 @@
<span *ngIf="room.lastMessageAudio" class="item-files-title font-13-em"> audio </span>
<fa-icon *ngIf="room?.messages?.[0]?.attachments[0]?.mimeType == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.$id == selectedRoomId"></fa-icon>
<fa-icon *ngIf="room.lastMessageImage" icon="image"></fa-icon>
<span class="pl-2 font-13-em add-ellipsis">{{ room.messages[0].attachments[0].description }}</span>
<span class="pl-2 font-13-em add-ellipsis" *ngIf="!room.lastMessageAudio">{{ room.messages[0].attachments[0].description }}</span>
</div>
<!-- <div class="item-files" *ngIf="room.attachments">
+7 -5
View File
@@ -208,7 +208,10 @@ export class ChatPage implements OnInit {
const urlParams = new URLSearchParams(window.location.search);
const roomId = urlParams.get('roomId');
if (roomId) {
const roomExist = this.rooms.find(e => e.id == roomId)
if (roomId && roomExist) {
if (this.firstEnter) {
this.firstEnter = false
@@ -221,17 +224,16 @@ export class ChatPage implements OnInit {
if (!delay) {
console.log("delay")
setTimeout(() => {
this.openChat(roomId)
this.openChat(roomExist.$id)
}, 2000)
} else {
console.log("no dalay")
this.openChat(roomId)
this.openChat(roomExist.$id)
}
} else {
this.openChat(roomId)
this.openChat(roomExist.$id)
}
}
}
@@ -60,9 +60,11 @@ export class GroupContactsPage implements OnInit {
if(addMembers.isOk()) {
// this.addContacts(this.roomId);
this.openGroupMessage.emit(this.roomId);
this.chatServiceService.getRoomById(this.roomId);
setTimeout(() => {
this.openGroupMessage.emit(this.roomId);
}, 100)
// await this.chatServiceService.getRoomById(this.roomId);
} else if(addMembers.error instanceof HttpRequest) {
this.httpErrorHandle.httpStatusHandle(addMembers.error)
}
+6 -6
View File
@@ -1,11 +1,11 @@
export let versionData = {
"shortSHA": "0bbde0d98",
"SHA": "0bbde0d98b1fe8f79acb81baae723765d548670c",
"shortSHA": "bc6833b6c",
"SHA": "bc6833b6c43b65e3cf70f7cdc691503bf8d0c265",
"branch": "feature/chat-new-api-peter",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Oct 22 14:39:20 2024 +0100'",
"lastCommitMessage": "merge",
"lastCommitNumber": "6112",
"changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/ui/agenda/component/edit-event/edit-event.page.html\n\tmodified: src/app/ui/agenda/component/edit-event/edit-event.page.ts\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.html\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/modal/edit-event/edit-event.page.html\n\tmodified: src/app/ui/agenda/modal/edit-event/edit-event.page.ts\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.html\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.ts",
"lastCommitTime": "'Tue Oct 22 16:24:34 2024 +0100'",
"lastCommitMessage": "visual alignment",
"lastCommitNumber": "6113",
"changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/core/chat/usecase/message/sync-all-room-messages.service.ts\n\tmodified: src/app/module/chat/data/repository/message/message-remote-data-source.service.ts\n\tmodified: src/app/ui/chat/chat.page.html\n\tmodified: src/app/ui/chat/chat.page.ts\n\tmodified: src/app/ui/chat/component/group-contacts/group-contacts.page.ts",
"changeAuthor": "peter.maquiran"
}