mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
save send message
This commit is contained in:
+16
-3
@@ -11,6 +11,7 @@ import { MessageInputDTO } from '../../dto/message/messageInputDtO';
|
|||||||
|
|
||||||
const tableSchema = z.object({
|
const tableSchema = z.object({
|
||||||
id: z.any().optional(),
|
id: z.any().optional(),
|
||||||
|
messageId: z.string().optional(),
|
||||||
roomId: z.string().uuid(),
|
roomId: z.string().uuid(),
|
||||||
senderId: z.number(),
|
senderId: z.number(),
|
||||||
message: z.string(),
|
message: z.string(),
|
||||||
@@ -28,7 +29,7 @@ export const messageDataSource = new Dexie('chat-message') as Dexie & {
|
|||||||
};
|
};
|
||||||
|
|
||||||
messageDataSource.version(1).stores({
|
messageDataSource.version(1).stores({
|
||||||
message: '++id, roomId, senderId, message, messageType, canEdit, oneShot, requireUnlock'
|
message: '++id, roomId, senderId, message, messageType, canEdit, oneShot, requireUnlock, messageId'
|
||||||
});
|
});
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
@@ -45,6 +46,18 @@ export class MessageLocalDataSourceService {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const result = await messageDataSource.message.add(data)
|
const result = await messageDataSource.message.add(data)
|
||||||
|
return ok(result as string)
|
||||||
|
} catch (e) {
|
||||||
|
return err(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async update(data: TableMessage) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await messageDataSource.message.update(data.id, data)
|
||||||
return ok(result)
|
return ok(result)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return err(false)
|
return err(false)
|
||||||
@@ -52,8 +65,8 @@ export class MessageLocalDataSourceService {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getItemsLive(): Observable<RoomListOutPutDTO[]> {
|
getItemsLive(roomId: string): Observable<RoomListOutPutDTO> {
|
||||||
return liveQuery(() => messageDataSource.message.toArray()) as any;
|
return liveQuery(() => messageDataSource.message.where('roomId').equals(roomId).toArray() as any) as any
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
@@ -27,4 +27,6 @@ export class MessageRemoteDataSourceService {
|
|||||||
async getMessagesFromRoom(id: MessageListInputDTO): DataSourceReturn<MessageListInputDTO> {
|
async getMessagesFromRoom(id: MessageListInputDTO): DataSourceReturn<MessageListInputDTO> {
|
||||||
return await this.httpService.get(`${this.baseUrl}/Room/${id}/Messages`);
|
return await this.httpService.get(`${this.baseUrl}/Room/${id}/Messages`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,24 @@
|
|||||||
import { z } from "zod"
|
import { z } from "zod"
|
||||||
|
|
||||||
const MessageOutPutDTOSchema = z.object({
|
const DataSchema = z.object({
|
||||||
success: z.boolean(),
|
id: z.string(),
|
||||||
|
chatRoomId: z.string(),
|
||||||
|
wxUserId: z.number(),
|
||||||
|
sender: z.string().nullable(),
|
||||||
message: z.string(),
|
message: z.string(),
|
||||||
data: z.any()
|
messageType: z.number(),
|
||||||
|
sentAt: z.string().datetime(),
|
||||||
|
deliverAt: z.string().datetime().nullable(),
|
||||||
|
canEdit: z.boolean(),
|
||||||
|
oneShot: z.boolean(),
|
||||||
|
requireUnlock: z.boolean()
|
||||||
});
|
});
|
||||||
|
|
||||||
export type MessageOutPutDTO = z.infer<typeof MessageOutPutDTOSchema>
|
|
||||||
|
const ResponseSchema = z.object({
|
||||||
|
success: z.boolean(),
|
||||||
|
message: z.string(),
|
||||||
|
data: DataSchema
|
||||||
|
});
|
||||||
|
|
||||||
|
export type MessageOutPutDTO = z.infer<typeof ResponseSchema>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { MessageRemoteDataSourceService } from '../data-source/message/message-r
|
|||||||
import { MessageLiveDataSourceService } from '../data-source/message/message-live-data-source.service';
|
import { MessageLiveDataSourceService } from '../data-source/message/message-live-data-source.service';
|
||||||
import { MessageListInputDTO } from '../dto/message/messageListInputDTO';
|
import { MessageListInputDTO } from '../dto/message/messageListInputDTO';
|
||||||
import { MessageInputDTO } from '../dto/message/messageInputDtO';
|
import { MessageInputDTO } from '../dto/message/messageInputDtO';
|
||||||
import { MessageLocalDataSourceService } from '../data-source/message/message-local-data-source.service';
|
import { MessageLocalDataSourceService, TableMessage } from '../data-source/message/message-local-data-source.service';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
@@ -22,7 +22,23 @@ export class MessageRepositoryService {
|
|||||||
|
|
||||||
if(localActionResult.isOk()) {
|
if(localActionResult.isOk()) {
|
||||||
const sendMessageResult = await this.messageRemoteDataSourceService.sendMessage(data)
|
const sendMessageResult = await this.messageRemoteDataSourceService.sendMessage(data)
|
||||||
|
|
||||||
|
|
||||||
|
if(sendMessageResult.isOk()) {
|
||||||
|
|
||||||
|
let clone: TableMessage = sendMessageResult.value.data
|
||||||
|
|
||||||
|
clone.messageId = sendMessageResult.value.data.id
|
||||||
|
clone.id = localActionResult.value
|
||||||
|
|
||||||
|
return this.messageLocalDataSourceService.update(clone)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async listAllMessagesByRoomId() {
|
||||||
|
this.messageRemoteDataSourceService
|
||||||
}
|
}
|
||||||
|
|
||||||
async getMessagesFromRoom(data: MessageListInputDTO) {
|
async getMessagesFromRoom(data: MessageListInputDTO) {
|
||||||
@@ -30,4 +46,8 @@ export class MessageRepositoryService {
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getItemsLive (roomId: string) {
|
||||||
|
return this.messageLocalDataSourceService.getItemsLive(roomId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,8 @@
|
|||||||
MESSAGE
|
MESSAGE
|
||||||
|
|
||||||
<p>Room ID: {{ roomData.id }}</p>
|
<p>Room ID: {{ roomData.id }}</p>
|
||||||
|
|
||||||
|
{{ roomMessage$ | async | json }}
|
||||||
</ion-list>
|
</ion-list>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
|||||||
textField = ''
|
textField = ''
|
||||||
|
|
||||||
roomData$: Observable<RoomListItemOutPutDTO | undefined>
|
roomData$: Observable<RoomListItemOutPutDTO | undefined>
|
||||||
|
roomMessage$: Observable<RoomListOutPutDTO>
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
public popoverController: PopoverController,
|
public popoverController: PopoverController,
|
||||||
@@ -141,6 +142,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
|||||||
|
|
||||||
ngOnChanges(changes: SimpleChanges): void {
|
ngOnChanges(changes: SimpleChanges): void {
|
||||||
this.roomData$ = this.roomRepositoryService.getItemByIdLive(this.roomId)
|
this.roomData$ = this.roomRepositoryService.getItemByIdLive(this.roomId)
|
||||||
|
this.roomMessage$ = this.messageRepositoryService.getItemsLive(this.roomId)
|
||||||
}
|
}
|
||||||
|
|
||||||
sendTyping() {}
|
sendTyping() {}
|
||||||
|
|||||||
Reference in New Issue
Block a user