Merge dev to main #1

Open
kibin wants to merge 33 commits from dev into main
Showing only changes of commit d792a9a9ed - Show all commits

View File

@@ -117,7 +117,7 @@ export class TicketService {
});
}
async resolve(tenantId: string, id: string, resolvedById: string) {
async resolve(tenantId: string, id: string, resolvedById: string, body?: { latitude?: number; longitude?: number }) {
const db = this.prisma.forTenant(tenantId);
const ticket = await db.ticket.findFirst({ where: { id } });
@@ -139,6 +139,8 @@ export class TicketService {
status: 'resolved',
resolvedAt: new Date(),
assigneeId: resolvedById,
...(body?.latitude !== undefined && { latitude: body.latitude }),
...(body?.longitude !== undefined && { longitude: body.longitude }),
},
});