Skip to content

[VW-355] Notification DeviceGroupMatching linking #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
perrydev17 merged 16 commits into from
Jul 6, 2026
Merged

[VW-355] Notification DeviceGroupMatching linking #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
77e6df3
update Notification schema, link to DeviceGroupMapping instead of Dev…
perrydev17 Jun 29, 2026
060409c
update usage from deviceGroup linking with deviceGroupMatching linking
perrydev17 Jun 30, 2026
59dfab4
add match with vulnerability handling
perrydev17 Jun 30, 2026
9a1cbd9
add searchRemediation, searchAsset, addressed initial comments
perrydev17 Jul 2, 2026
053567f
apply FE changes for deviceGroupMatching updates, update seed-notific…
perrydev17 Jul 2, 2026
a6cca02
merge upstream
perrydev17 Jul 2, 2026
c69537e
redo migration, minor typo fixes
perrydev17 Jul 2, 2026
6a715b2
add missing file
perrydev17 Jul 2, 2026
d70f02e
fix linting
perrydev17 Jul 2, 2026
f7af4b5
add missing migration file
perrydev17 Jul 2, 2026
a36c3fa
fix linting
perrydev17 Jul 2, 2026
344b932
fix typo - linting
perrydev17 Jul 2, 2026
37bd5ee
add cvssScore, cvssVector, macAddress, serial number, addressed comments
perrydev17 Jul 3, 2026
5c6c79a
fix typo
perrydev17 Jul 3, 2026
f5d7233
remove extra line
perrydev17 Jul 3, 2026
c7b0c20
npm run format
perrydev17 Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"@trpc/client": "^11.6.0",
"@trpc/server": "^11.6.0",
"@trpc/tanstack-react-query": "^11.6.0",
"@types/semver": "^7.7.1",
"@xyflow/react": "^12.8.6",
"ai": "5.0.100",
"better-auth": "1.4.9",
Expand Down Expand Up @@ -122,6 +121,7 @@
"@types/nodemailer": "^6.4.21",
"@types/react": "^19",
"@types/react-dom": "^19",
"@types/semver": "^7.7.1",
"@types/supertest": "^6.0.3",
"@types/toposort": "^2.0.7",
"@types/turndown": "^5.0.6",
Expand Down
23 changes: 23 additions & 0 deletions prisma/migrations/20260629161924_notification_device_group_matching/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Warnings:

- You are about to drop the column `deviceGroupId` on the `notification_device_group_mapping` table. All the data in the column will be lost.
- A unique constraint covering the columns `[notificationId,deviceGroupMatchingId]` on the table `notification_device_group_mapping` will be added. If there are existing duplicate values, this will fail.
- Added the required column `deviceGroupMatchingId` to the `notification_device_group_mapping` table without a default value. This is not possible if the table is not empty.

*/
-- DropForeignKey
ALTER TABLE "notification_device_group_mapping" DROP CONSTRAINT "notification_device_group_mapping_deviceGroupId_fkey";

-- DropIndex
DROP INDEX "notification_device_group_mapping_notificationId_deviceGrou_key";

-- AlterTable
ALTER TABLE "notification_device_group_mapping" DROP COLUMN "deviceGroupId",
ADD COLUMN "deviceGroupMatchingId" TEXT NOT NULL;

-- CreateIndex
CREATE UNIQUE INDEX "notification_device_group_mapping_notificationId_deviceGrou_key" ON "notification_device_group_mapping"("notificationId", "deviceGroupMatchingId");

-- AddForeignKey
ALTER TABLE "notification_device_group_mapping" ADD CONSTRAINT "notification_device_group_mapping_deviceGroupMatchingId_fkey" FOREIGN KEY ("deviceGroupMatchingId") REFERENCES "device_group_matching"("id") ON DELETE CASCADE ON UPDATE CASCADE;
8 changes: 8 additions & 0 deletions prisma/migrations/20260702173451_work_order_id_device_group_matching_id/migration.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
Warnings:

- A unique constraint covering the columns `[workOrderTicketId,deviceGroupMatchingId]` on the table `notification_device_group_mapping` will be added. If there are existing duplicate values, this will fail.

*/
-- CreateIndex
CREATE UNIQUE INDEX "ndg_mapping_workorder_devicegroupmatching_key" ON "notification_device_group_mapping"("workOrderTicketId", "deviceGroupMatchingId");
23 changes: 9 additions & 14 deletions prisma/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,7 @@ model DeviceGroup {
updatedAt DateTime @updatedAt
deviceGroupHistories DeviceGroupHistory[]
assets Asset[]
// Vulnerabilities / remediations / advisories / device artifacts connect via
// DeviceGroupMatching now, not a direct relation. notificationMappings is from
// main's notifications feature and stays.
notificationMappings NotificationDeviceGroupMapping[]

// NOTE: Postgres treats NULLs as distinct, so this composite unique will NOT
// prevent duplicate rows when versionId is null. Identity resolution is done
// in the app via resolveDeviceGroup() (findFirst + create in a transaction).

@@unique([vendorId, productId, versionId, versionStatus], name: "device_group_identity")
@@index([vendorId, productId])
@@map("device_group")
Expand All @@ -310,6 +303,7 @@ model DeviceGroupMatching {
remediations Remediation[] @relation("RemediationMatchings")
advisories Advisory[] @relation("AdvisoryMatchings")
deviceArtifacts DeviceArtifact[] @relation("DeviceArtifactMatchings")
notificationMappings NotificationDeviceGroupMapping[]

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
Expand Down Expand Up @@ -1163,8 +1157,8 @@ model Notification {

sources NotificationSource[]
reads NotificationRead[]
assets NotificationAssetMapping[]
deviceGroups NotificationDeviceGroupMapping[]
assets NotificationAssetMapping[]
deviceGroupsMatchings NotificationDeviceGroupMapping[]

@0xcad 0xcad Jul 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider renaming to deviceGroupMatchings, here (not deviceGroup_s_Matchings)

And see the relevant coderabbit error here: https://github.com/PATCH-UPGRADE/viper/pull/147/changes#r3514907510

@perrydev17 perrydev17 Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

vulnerabilities NotificationVulnerabilityMapping[]
remediations NotificationRemediationMapping[]

Expand Down Expand Up @@ -1251,14 +1245,15 @@ model NotificationDeviceGroupMapping {
notification Notification? @relation(fields: [notificationId], references: [id], onDelete: Cascade)
workOrderTicketId String?
workOrderTicket WorkOrderTicket? @relation(fields: [workOrderTicketId], references: [id], onDelete: Cascade)
deviceGroupId String
deviceGroup DeviceGroup @relation(fields: [deviceGroupId], references: [id], onDelete: Cascade)
deviceGroupMatchingId String
deviceGroupMatching DeviceGroupMatching @relation(fields:[deviceGroupMatchingId], references: [id], onDelete: Cascade)
confidence ConfidenceLevel?
reasonWhy String?

@@unique([notificationId, deviceGroupId])
@@unique([workOrderTicketId, deviceGroupId], map: "ndg_mapping_workorder_devicegroup_key")
@@unique([notificationId, deviceGroupMatchingId])
@@unique([workOrderTicketId, deviceGroupMatchingId], map: "ndg_mapping_workorder_devicegroupmatching_key")
@@index([workOrderTicketId])

@@map("notification_device_group_mapping")
}

Expand Down
17 changes: 13 additions & 4 deletions scripts/seed-notifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ async function seedDeviceGroups(userId: string) {
const existing = await prisma.deviceGroup.findFirst({ where: identity });
const deviceGroup =
existing ?? (await prisma.deviceGroup.create({ data: identity }));

const existingMatching = await prisma.deviceGroupMatching.findFirst({
where: { vendorId: vendor.id, productId: product.id, versionId: null },
});
const deviceGroupMatching =
existingMatching ??
(await prisma.deviceGroupMatching.create({ data: identity }));
const existingAssets = await prisma.asset.count({
where: { deviceGroupId: deviceGroup.id },
});
Expand All @@ -104,7 +109,11 @@ async function seedDeviceGroups(userId: string) {
console.log(
` ✅ ${dg.vendor} ${dg.product} (${deviceGroup.id}) — ${dg.assetCount} assets`,
);
results.push({ ...dg, deviceGroupId: deviceGroup.id });
results.push({
...dg,
deviceGroupId: deviceGroup.id,
deviceGroupMatchingId: deviceGroupMatching.id,
});
}

return results;
Expand Down Expand Up @@ -355,7 +364,7 @@ async function getSeedUser() {

async function seedNotifications(
_userId: string,
deviceGroups: Array<{ deviceGroupId: string }>,
deviceGroups: Array<{ deviceGroupMatchingId: string }>,
) {
console.log("\n🌱 Seeding notifications...");

Expand Down Expand Up @@ -407,7 +416,7 @@ async function seedNotifications(
await prisma.notificationDeviceGroupMapping.create({
data: {
notificationId: notification.id,
deviceGroupId: dg.deviceGroupId,
deviceGroupMatchingId: dg.deviceGroupMatchingId,
confidence:
Math.random() > 0.3
? ConfidenceLevel.Confirmed
Expand Down
Loading
Loading