@machynx/data-db 1.0.0 → 1.0.4

package/client/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "prisma-client-42e00b689da0346759e9a69fa4866b644caacc486b410217ff27f3ba834cdb4a",
+  "name": "prisma-client-dc8ca5ca13bedb37e8d4d0350444242b69929018853f9ee7e4753b5342df10b3",
   "main": "index.js",
   "types": "index.d.ts",
   "browser": "default.js",
@@ -109,10 +109,10 @@
     },
     "./*": "./*"
   },
-  "version": "7.0.0",
+  "version": "7.2.0",
   "sideEffects": false,
   "dependencies": {
-    "@prisma/client-runtime-utils": "7.0.0"
+    "@prisma/client-runtime-utils": "7.2.0"
   },
   "imports": {
     "#wasm-compiler-loader": {

package/client/schema.prisma

@@ -26,6 +26,8 @@ model MachineHourlyAnalytics {
 
   @@unique([organizationId, machineId, startDateTime], map: "unique_machineHourlyCompound")
   @@index([machineId, startDateTime])
+  @@index([organizationId, startDateTime]) // For org-wide queries
+  @@index([machineId, startDateTime, endDateTime]) // For range scans
   @@schema("analytics")
 }
 
@@ -240,24 +242,24 @@ model DevicePowerSensorHourlyAnalytics {
 // ----------------------------------------------------------------------
 
 model AuditLog {
-  id         BigInt   @id @default(autoincrement()) @db.BigInt
-  entityName String
-  entityId   Int?
-  action     String
-  userId     Int? // ID for CoreUser
-  orgId      Int? // ID for CoreOrganization
-  timestamp  DateTime @default(now())
-  httpMethod String
-  route      String
-  statusCode Int
-  ipAddress  String?
-  userAgent  String?
-  oldValues  Json?
-  newValues  Json?
+  id             BigInt   @id @default(autoincrement()) @db.BigInt
+  entityName     String
+  entityId       Int?
+  action         String
+  userId         Int? // ID for CoreUser
+  organizationId Int? // ID for CoreOrganization
+  timestamp      DateTime @default(now())
+  httpMethod     String
+  route          String
+  statusCode     Int
+  ipAddress      String?
+  userAgent      String?
+  oldValues      Json?
+  newValues      Json?
 
   @@index([entityName, entityId])
   @@index([userId])
-  @@index([orgId])
+  @@index([organizationId])
   @@schema("audit")
 }
 
@@ -371,11 +373,11 @@ model Device {
   // PRODUCTION CRITICAL: The Link to your Global Inventory
   globalDeviceUid String @unique // Immutable ID printed on the sticker (Core DB)
 
-  deviceUid  String  @unique @default(cuid()) // Local Internal ID
-  deviceName String?
-  isActive   Boolean @default(true)
-  orgId      Int
-  gatewayId  Int?
+  deviceUid      String  @unique @default(cuid()) // Local Internal ID
+  deviceName     String?
+  isActive       Boolean @default(true)
+  organizationId Int
+  gatewayId      Int?
 
   // Hardware
   sensors Sensor[] @relation("DeviceSensors")
@@ -400,8 +402,11 @@ model Device {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  @@index([orgId])
+  @@index([organizationId])
   @@index([globalDeviceUid])
+  @@index([gatewayId])
+  @@index([machineId])
+  @@index([factoryId])
   @@schema("device")
 }
 
@@ -487,6 +492,9 @@ model MachineDeviceAssignment {
   machine      Machine   @relation("MachineToDeviceAssignments", fields: [machineId], references: [id])
 
   @@index([deviceId])
+  @@index([machineId])
+  @@index([assignedAt])
+  @@index([unassignedAt])
   @@schema("device")
 }
 
@@ -507,6 +515,9 @@ model SensorLog {
   updatedAt DateTime @default(now())
 
   @@unique([sensorId, senseTime])
+  @@index([isProcessed])
+  @@index([sensorId, isProcessed])
+  @@index([senseTime])
   @@schema("device")
 }
 
@@ -523,6 +534,9 @@ model RFIDSensorLog {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
+  @@index([operatorId])
+  @@index([rfid])
+  @@index([sensorLogId])
   @@schema("device")
 }
 
@@ -621,6 +635,8 @@ model Factory {
   requestCategories MaintenanceRequestCategory[] @relation("FactoryMaintenanceRequestCategories")
   hourlyAnalytics   FactoryHourlyAnalytics[]     @relation("FactoryToHourlyAnalytics")
 
+  userAccess OrganizationUserFactoryEntityAccess[] @relation("UserToFactory")
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
@@ -645,7 +661,6 @@ model Floor {
   devicesDirect   Device[]               @relation("FloorToDevicesDirect")
   hourlyAnalytics FloorHourlyAnalytics[] @relation("FloorToHourlyAnalytics")
 
-  // Access Control (FIXED: Added this relation)
   userAccess OrganizationUserFactoryEntityAccess[] @relation("UserToFloors")
 
   floorTypeId Int?
@@ -692,11 +707,12 @@ model FloorSetting {
 }
 
 model AssemblyLine {
-  id          Int     @id @default(autoincrement())
-  code        String?
-  name        String
-  description String?
-  floorId     Int
+  id             Int     @id @default(autoincrement())
+  organizationId Int
+  code           String?
+  name           String
+  description    String?
+  floorId        Int
 
   machines        Machine[]             @relation("LineToMachines")
   sensors         Sensor[]              @relation("AssemblyLineToSensors")
@@ -979,14 +995,14 @@ enum MaintenanceLogStatus {
 }
 
 model MaintenanceLog {
-  id           Int                  @id @default(autoincrement())
-  machineId    Int
-  orgId        Int
-  reportedById Int?
-  description  String?
-  status       MaintenanceLogStatus @default(OPEN)
-  startTime    DateTime?
-  endTime      DateTime?
+  id             Int                  @id @default(autoincrement())
+  machineId      Int
+  organizationId Int
+  reportedById   Int?
+  description    String?
+  status         MaintenanceLogStatus @default(OPEN)
+  startTime      DateTime?
+  endTime        DateTime?
 
   machine Machine @relation("MachineMaintenance", fields: [machineId], references: [id])
 
@@ -1171,6 +1187,10 @@ model OperatorTimeLog {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
+  @@index([operatorId, checkInAt])
+  @@index([deviceId, checkInAt])
+  @@index([machineId, checkInAt])
+  @@index([checkInAt, checkOutAt])
   @@schema("operator")
 }
 
@@ -1243,6 +1263,7 @@ model Order {
   @@index([organizationId])
   @@index([customerId])
   @@index([factoryId])
+  @@index([erpSource, externalId])
   @@schema("order")
 }
 
@@ -1365,17 +1386,62 @@ model ProductionUnitQC {
 }
 
 model OrganizationUserFactoryEntityAccess {
-  id        Int      @id @default(autoincrement())
-  userId    Int      @unique // Links to CoreUser in Core DB
+  id             Int @id @default(autoincrement())
+  userId         Int
+  organizationId Int
+
+  factoryId      Int?
+  floorId        Int?
+  assemblyLineId Int?
+  machineId      Int?
+
+  factory      Factory?      @relation("UserToFactory", fields: [factoryId], references: [id], onDelete: Cascade)
+  floor        Floor?        @relation("UserToFloors", fields: [floorId], references: [id], onDelete: Cascade)
+  assemblyLine AssemblyLine? @relation("UserToAssemblyLines", fields: [assemblyLineId], references: [id], onDelete: Cascade)
+  machine      Machine?      @relation("UserToMachines", fields: [machineId], references: [id], onDelete: Cascade)
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  // Local Access Grants
-  floors        Floor[]        @relation("UserToFloors")
-  assemblyLines AssemblyLine[] @relation("UserToAssemblyLines")
-  machines      Machine[]      @relation("UserToMachines")
+  @@unique([userId, factoryId, floorId, assemblyLineId, machineId], name: "unique_user_entity")
+  @@index([userId, organizationId])
+  @@index([factoryId])
+  @@index([floorId])
+  @@index([assemblyLineId])
+  @@index([machineId])
+  @@schema("organization")
+}
 
-  @@index([userId])
+model MaintenanceSpecialization {
+  id             Int    @id @default(autoincrement())
+  organizationId Int
+  name           String
+
+  @@unique([organizationId, name])
+  @@schema("organization")
+}
+
+model OrganizationCustomer {
+  id             Int      @id @default(autoincrement())
+  organizationId Int
+  name           String
+  description    String?
+  createdAt      DateTime @default(now())
+  updatedAt      DateTime @updatedAt
+
+  @@index([organizationId])
+  @@schema("organization")
+}
+
+model AssemblyLineType {
+  id             Int      @id @default(autoincrement())
+  name           String
+  organizationId Int
+  createdAt      DateTime @default(now())
+  updatedAt      DateTime @updatedAt
+
+  @@unique([organizationId, name])
+  @@index([organizationId])
   @@schema("organization")
 }
 

package/index.d.ts

@@ -1,4 +1,4 @@
-// @machynx/core-db/index.d.ts
+// @machynx/data-db/index.d.ts
 
 /**
  * THIS FILE IS ZERO-MAINTENANCE.
@@ -16,3 +16,12 @@ export { PrismaClient } from "./client";
 
 // Re-export the global Prisma namespace (for inputs like TaskCreateInput).
 export type { Prisma } from "./client";
+
+// Re-export Prisma runtime error classes for convenient import
+export {
+  PrismaClientKnownRequestError,
+  PrismaClientValidationError,
+  PrismaClientInitializationError,
+  PrismaClientRustPanicError,
+  PrismaClientUnknownRequestError,
+} from "./client/runtime/client";

package/index.js

@@ -1,5 +1,12 @@
-// @machynx/core-db/index.js
+// @machynx/data-db/index.js
 
-// This file serves as the main entry point for Node.js modules.
-// It exports the generated PrismaClient instance from the './client' directory.
-module.exports = require("./client");
+const client = require("./client");
+
+module.exports = {
+  ...client,
+  PrismaClientKnownRequestError: client.PrismaClientKnownRequestError,
+  PrismaClientValidationError: client.PrismaClientValidationError,
+  PrismaClientInitializationError: client.PrismaClientInitializationError,
+  PrismaClientRustPanicError: client.PrismaClientRustPanicError,
+  PrismaClientUnknownRequestError: client.PrismaClientUnknownRequestError,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machynx/data-db",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "description": "Machynx Data Plane Database - Shared Prisma schema & client",
   "main": "index.js",
   "types": "index.d.ts",
@@ -8,6 +8,10 @@
     ".": {
       "import": "./index.js",
       "require": "./index.js"
+    },
+    "./client/runtime/client": {
+      "import": "./client/runtime/client.js",
+      "require": "./client/runtime/client.js"
     }
   },
   "scripts": {
@@ -17,9 +21,9 @@
     "db:push": "prisma db push --skip-generate",
     "db:seed": "ts-node prisma/seed.ts",
     "prisma:studio": "prisma studio",
-    "release:patch": "npm version patch -m \"chore: release v%s\" && yarn release:git",
-    "release:minor": "npm version minor -m \"chore: release v%s\" && yarn release:git",
-    "release:major": "npm version major -m \"chore: release v%s\" && yarn release:git",
+    "release:patch": "npm version patch -m \"chore: release v%s\" && npm run release:git",
+    "release:minor": "npm version minor -m \"chore: release v%s\" && npm run release:git",
+    "release:major": "npm version major -m \"chore: release v%s\" && npm run release:git",
     "release:git": "git push && git push --tags",
     "release:publish": "npm publish --access public"
   },
@@ -54,8 +58,8 @@
     "prisma": "^7.0.0"
   },
   "devDependencies": {
-    "@types/node": "^24.10.1",
-    "prisma": "^7.0.0",
+    "@types/node": "^25.0.7",
+    "prisma": "^7.2.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   }