Replaces the device-events demo with the actual product:
- Prisma + PostGIS data layer (postgis/postgis:17-3.5). Lat/lng decimals
are the source of truth; a generated geometry(Point,4326) column with
a GIST index backs bbox queries. Migrations apply on container boot.
- JWT auth (bcryptjs + httpOnly cookie) with public registration that
creates an org; per-org roles (ORG_ADMIN/MEMBER/VIEWER) enforced by
guards on all /orgs/:orgId routes.
- Scoped API keys (X-API-Key, sha256-hashed, shown once) for
programmatic access, manageable by org admins.
- REST API: jobs/tickets CRUD with filters, points query (time range,
recordedAt cursor, bbox), members, devices, api-keys.
- MQTT ingest: devices publish to devices/{username}/points and /jobs;
unknown tickets auto-create stub jobs (source=DEVICE); every message
is raw-logged to device_events; acks on devices/{username}/jobs/ack.
Broker gets a dedicated backend user; testuser is now a plain device.
- Realtime: plain-WS gateway at /api/ws (socket.io removed) with
cookie auth and per-job channels feeding the map live.
- Next.js frontend: login/register, jobs list with filters, job detail
with live Google map (APWA utility colors, polylines per run) behind
a provider-neutral JobMap abstraction for a future Esri swap, and
settings pages for members/devices/api-keys.
- Seed: Umagul org, admin user, testuser device, demo job with RTK
points. Sample publisher updated to the new topic contract.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
61 lines
2.1 KiB
TypeScript
61 lines
2.1 KiB
TypeScript
import { Injectable, Logger } from '@nestjs/common';
|
|
import { Device } from '@prisma/client';
|
|
import { plainToInstance } from 'class-transformer';
|
|
import { validate } from 'class-validator';
|
|
import { PrismaService } from '../prisma/prisma.service';
|
|
import { MqttJobMessageDto } from './dto/mqtt-messages.dto';
|
|
import { MqttClientService } from './mqtt-client.service';
|
|
|
|
@Injectable()
|
|
export class JobsIngestService {
|
|
private readonly logger = new Logger(JobsIngestService.name);
|
|
|
|
constructor(
|
|
private readonly prisma: PrismaService,
|
|
private readonly mqttClient: MqttClientService,
|
|
) {}
|
|
|
|
async handle(device: Device, rawPayload: string) {
|
|
let msg: MqttJobMessageDto;
|
|
try {
|
|
msg = plainToInstance(MqttJobMessageDto, JSON.parse(rawPayload) as object);
|
|
} catch {
|
|
this.ack(device, { ticket: null, status: 'error', reason: 'invalid JSON' });
|
|
return;
|
|
}
|
|
|
|
const errors = await validate(msg, { whitelist: true });
|
|
if (errors.length > 0) {
|
|
this.ack(device, { ticket: msg.ticket ?? null, status: 'error', reason: 'validation failed' });
|
|
this.logger.warn(`Invalid job message from ${device.mqttUsername}: ${errors}`);
|
|
return;
|
|
}
|
|
|
|
const existing = await this.prisma.job.findUnique({
|
|
where: { orgId_ticketNumber: { orgId: device.orgId, ticketNumber: msg.ticket } },
|
|
});
|
|
if (existing) {
|
|
this.ack(device, { ticket: msg.ticket, jobId: existing.id, status: 'exists' });
|
|
return;
|
|
}
|
|
|
|
const job = await this.prisma.job.create({
|
|
data: {
|
|
orgId: device.orgId,
|
|
ticketNumber: msg.ticket,
|
|
title: msg.title || `Ticket ${msg.ticket}`,
|
|
description: msg.description,
|
|
address: msg.address,
|
|
source: 'DEVICE',
|
|
createdByDeviceId: device.id,
|
|
},
|
|
});
|
|
this.ack(device, { ticket: msg.ticket, jobId: job.id, status: 'created' });
|
|
this.logger.log(`Device ${device.mqttUsername} created job ${job.ticketNumber}`);
|
|
}
|
|
|
|
private ack(device: Device, payload: object) {
|
|
this.mqttClient.publish(`devices/${device.mqttUsername}/jobs/ack`, payload);
|
|
}
|
|
}
|