efiber-prisma-schema 1.12.16 → 1.13.0

package/.github/workflows/main.yml

@@ -0,0 +1,84 @@
+name: Run Prisma Migrations
+
+on:
+  push:
+    branches:
+      - development
+      - staging
+      - main
+
+jobs:
+  migrate-development:
+    if: github.ref == 'refs/heads/development'
+    runs-on: ubuntu-latest
+    environment: development
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup SSH Key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo -e "Host *\n  StrictHostKeyChecking no\n" > ~/.ssh/config
+
+      - name: Run Migrations on Development
+        run: |
+          ssh ${{ secrets.DEVELOPMENT_SSH_USER }}@${{ secrets.DEVELOPMENT_SSH_HOST }} "
+            cd efiber-prisma-schema &&
+            git reset --hard && git clean -fd && git pull origin development &&
+            export PATH=\$PATH:/home/jacob/.nvm/versions/node/v24.7.0/bin &&
+            npm ci && npx prisma migrate deploy --schema=./prisma/schema.prisma
+          "
+
+  migrate-staging:
+    if: github.ref == 'refs/heads/staging'
+    runs-on: ubuntu-latest
+    environment: staging
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup SSH Key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo -e "Host *\n  StrictHostKeyChecking no\n" > ~/.ssh/config
+
+      - name: Run Migrations on Staging (via Bastion → Prod → Staging)
+        run: |
+          ssh -J ${{ secrets.BASTION_USER }}@${{ secrets.BASTION_HOST }},${{ secrets.PRODUCTION_SSH_USER }}@${{ secrets.PRODUCTION_SSH_HOST }} \
+              ${{ secrets.STAGING_SSH_USER }}@${{ secrets.STAGING_SSH_HOST }} "
+            cd efiber-prisma-schema &&
+            git reset --hard && git clean -fd && git pull origin staging &&
+            export PATH=\$PATH:/home/ubuni/.nvm/versions/node/v24.7.0/bin && npm ci &&
+            npx prisma migrate deploy --schema=./prisma/schema.prisma
+          "
+
+  migrate-production:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup SSH Key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo -e "Host *\n  StrictHostKeyChecking no\n" > ~/.ssh/config
+
+      - name: Run Migrations on Production (via Bastion)
+        run: |
+          ssh -J ${{ secrets.BASTION_USER }}@${{ secrets.BASTION_HOST }} \
+              ${{ secrets.PRODUCTION_SSH_USER }}@${{ secrets.PRODUCTION_SSH_HOST }} "
+            cd efiber-prisma-schema &&
+            git reset --hard && git clean -fd && git pull origin main &&
+            export PATH=\$PATH:/home/ubuni/.nvm/versions/node/v24.7.0/bin && npm ci &&
+            npx prisma migrate deploy --schema=./prisma/schema.prisma
+          "
+          

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "efiber-prisma-schema",
-  "version": "1.12.16",
+  "version": "1.13.0",
   "description": "Database schema for eFiber",
   "main": "index.js",
   "scripts": {

package/prisma/migrations/20250925093531_cluster_notes/migration.sql

@@ -0,0 +1,27 @@
+-- AlterTable
+ALTER TABLE "AttributeDefinition" ADD COLUMN     "visibleOnDispatchMobile" BOOLEAN NOT NULL DEFAULT true;
+
+-- CreateTable
+CREATE TABLE "ClusterNotes" (
+    "id" TEXT NOT NULL,
+    "no" SERIAL NOT NULL,
+    "comment" TEXT NOT NULL,
+    "hasPicture" BOOLEAN NOT NULL DEFAULT false,
+    "coordinates" JSONB,
+    "picture" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "createdById" TEXT NOT NULL,
+    "clusterId" TEXT NOT NULL,
+
+    CONSTRAINT "ClusterNotes_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ClusterNotes_id_key" ON "ClusterNotes"("id");
+
+-- AddForeignKey
+ALTER TABLE "ClusterNotes" ADD CONSTRAINT "ClusterNotes_createdById_fkey" FOREIGN KEY ("createdById") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ClusterNotes" ADD CONSTRAINT "ClusterNotes_clusterId_fkey" FOREIGN KEY ("clusterId") REFERENCES "Cluster"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

package/prisma/schema.prisma

@@ -518,6 +518,9 @@ model User {
   ClusterComments              ClusterComments[]
   CreatedRevisions             Revision[]                     @relation("revisionCreatedBy")
   ResolvedRevisions            Revision[]                     @relation("revisionResolvedBy")
+  ClusterNotes                 ClusterNotes[]
+  Conduit                      Conduit[]
+  ConduitTemplate              ConduitTemplate[]
 }
 
 model MainProject {
@@ -568,7 +571,7 @@ model Project {
 
   pboFatTemplates         PboFatTemplate[]
   pboFat                  PboFat[]
-  cableAttributes         CableAtttributes[]
+  cableAttributes         CableAttributes[]
   spliceClosureAttributes SpliceClosureAttributes[]
   Cable                   Cable[]
   CableTemplate           CableTemplate[]
@@ -594,6 +597,8 @@ model Project {
   usersOnline             integrationProjectUserStatus[]
   MapElementTemplate      MapElementTemplate[]
   MapElement              MapElement[]
+  ConduitTemplate         ConduitTemplate?               @relation(fields: [conduitTemplateId], references: [id])
+  conduitTemplateId       String?
 }
 
 model integrationProjectUserStatus {
@@ -1038,7 +1043,7 @@ model Material {
   billOfMaterial MaterialBillOfMaterial[]
 
   pboFatAttributes        PboFatAttributes[]
-  cableAttributes         CableAtttributes[]
+  cableAttributes         CableAttributes[]
   spliceClosureAttributes SpliceClosureAttributes[]
 }
 
@@ -1372,6 +1377,8 @@ model NetworkElement {
   MapElementTemplate    MapElementTemplate[]
   MapElement            MapElement[]
   ElementNode           ElementNode[]
+  Conduit               Conduit[]
+  ConduitTemplate       ConduitTemplate[]
 }
 
 model ElementNode {
@@ -1403,6 +1410,7 @@ model ElementNode {
   SFU             SFU[]
   Building        Building[]
   MapElement      MapElement[]
+  Conduit         Conduit[]
 }
 
 model ElementRelation {
@@ -1429,10 +1437,11 @@ model AttributeDefinition {
   label String
   type  AttributeType
 
-  required        Boolean          @default(false)
-  visibleOnWeb    Boolean          @default(true)
-  visibleOnMobile Boolean          @default(true)
-  AttributeValue  AttributeValue[]
+  required                Boolean          @default(false)
+  visibleOnWeb            Boolean          @default(true)
+  visibleOnMobile         Boolean          @default(true)
+  visibleOnDispatchMobile Boolean          @default(true)
+  AttributeValue          AttributeValue[]
 }
 
 model OptionSource {
@@ -1509,12 +1518,14 @@ model Cable {
   installation   NetworkElementInstallation? @relation(fields: [installationId], references: [id])
   installationId String?
 
-  cableAttributes  CableAtttributes[]
+  cableAttributes  CableAttributes[]
   PboFatAttributes PboFatAttributes[]
   qrCodeTag        qrCodeTag[]
   cluster          Cluster?           @relation(fields: [clusterId], references: [id])
   clusterId        String?
   Revision         Revision[]
+  Duct             Duct?              @relation(fields: [ductId], references: [id])
+  ductId           String?
 }
 
 model CableTemplate {
@@ -1546,14 +1557,134 @@ model CableTemplate {
 
   projects Project[]
 
-  cableAttributes CableAtttributes[]
+  cableAttributes CableAttributes[]
   qrCodeTemplate  qrCodeTemplate[]
   Cable           Cable[]
   cluster         Cluster?           @relation(fields: [clusterId], references: [id])
   clusterId       String?
 }
 
-model CableAtttributes {
+model Conduit {
+  id String @id @unique @default(uuid())
+  no Int    @default(autoincrement())
+
+  status         String  @default("active")
+  name           String
+  terminalAccess Boolean @default(false)
+  photos         Json? //Upload files for photos
+  texts          Json? //Add text attributes to the conduit
+  files          Json? //Upload files for the conduit
+  zone           Json? //Color code for zone
+  geometry       Json? //Icon for the conduit
+  attributes     Json? //Attributes for the conduit
+
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  deletedAt DateTime?
+
+  asBuiltCoordinates Json? //As built coordinates
+  isInstalled        Boolean   @default(false)
+  installationDate   DateTime?
+
+  isInRevision       Boolean @default(false)
+  installationStatus String? @default("pending") //pending, approved, in-revision
+
+  comments String?
+
+  updatedBy   User?   @relation(fields: [updatedById], references: [id])
+  updatedById String?
+
+  networkElement   NetworkElement @relation(fields: [networkElementId], references: [id])
+  networkElementId String
+
+  node   ElementNode? @relation(fields: [nodeId], references: [id])
+  nodeId String?
+
+  installation   NetworkElementInstallation? @relation(fields: [installationId], references: [id])
+  installationId String?
+
+  template   ConduitTemplate? @relation(fields: [templateId], references: [id])
+  templateId String?
+
+  cluster   Cluster?    @relation(fields: [clusterId], references: [id])
+  clusterId String?
+  qrCodeTag qrCodeTag[]
+  ducts     Duct[]
+}
+
+model Duct {
+  id String @id @unique @default(uuid())
+  no Int    @default(autoincrement())
+
+  type            String
+  material        String
+  dimension       Float
+  typeOptions     String[]
+  materialOptions String[]
+
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  deletedAt DateTime?
+
+  conduit   Conduit @relation(fields: [conduitId], references: [id])
+  conduitId String
+
+  cables Cable[]
+}
+
+model ductTemplate {
+  id String @id @unique @default(uuid())
+  no Int    @default(autoincrement())
+
+  type      String
+  material  String
+  dimension Float
+
+  typeOptions     String[]
+  materialOptions String[]
+
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  deletedAt DateTime?
+
+  conduit           ConduitTemplate @relation(fields: [conduitTemplateId], references: [id])
+  conduitTemplateId String
+}
+
+model ConduitTemplate {
+  id String @id @unique @default(uuid())
+  no Int    @default(autoincrement())
+
+  status         String  @default("active")
+  name           String
+  terminalAccess Boolean @default(false)
+  photos         Json? //Upload files for photos
+  texts          Json? //Add text attributes to the conduit
+  files          Json? //Upload files for the conduit
+  zone           Json? //Color code for zone
+  geometry       Json? //Icon for the conduit
+  attributes     Json? //Attributes for the conduit
+
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  deletedAt DateTime?
+
+  updatedBy   User?   @relation(fields: [updatedById], references: [id])
+  updatedById String?
+
+  networkElement   NetworkElement @relation(fields: [networkElementId], references: [id])
+  networkElementId String
+
+  projects Project[]
+  Conduit  Conduit[]
+
+  cluster        Cluster?         @relation(fields: [clusterId], references: [id])
+  clusterId      String?
+  qrCodeTemplate qrCodeTemplate[]
+  ductTemplates   ductTemplate[]
+}
+
+model CableAttributes {
   id              String  @id @unique @default(uuid())
   no              Int     @default(autoincrement())
   name            String
@@ -2626,6 +2757,7 @@ model NetworkElementInstallation {
   FDTSRO           FDTSRO[]
   SFU              SFU[]
   Building         Building[]
+  Conduit          Conduit[]
 }
 
 model CentralOffice {
@@ -2697,6 +2829,9 @@ model Cluster {
   ClusterComments         ClusterComments[]
   Revision                Revision[]
   ElementRelation         ElementRelation[]
+  ClusterNotes            ClusterNotes[]
+  Conduit                 Conduit[]
+  ConduitTemplate         ConduitTemplate[]
 }
 
 model ClusterComments {
@@ -2716,6 +2851,25 @@ model ClusterComments {
   clusterId String
 }
 
+model ClusterNotes {
+  id String @id @unique @default(uuid())
+  no Int    @default(autoincrement())
+
+  comment     String
+  hasPicture  Boolean @default(false)
+  coordinates Json?
+  picture     String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  createdBy   User   @relation(fields: [createdById], references: [id])
+  createdById String
+
+  cluster   Cluster @relation(fields: [clusterId], references: [id])
+  clusterId String
+}
+
 model CentralOfficeTeam {
   id   String @id @unique @default(uuid())
   no   Int    @default(autoincrement())
@@ -2809,6 +2963,9 @@ model qrCodeTemplate {
   qrCodeTag            qrCodeTag[]
   MapElementTemplate   MapElementTemplate? @relation(fields: [mapElementTemplateId], references: [id])
   mapElementTemplateId String?
+
+  conduitTemplate   ConduitTemplate? @relation(fields: [conduitTemplateId], references: [id])
+  conduitTemplateId String?
 }
 
 model qrCodeTag {
@@ -2860,6 +3017,9 @@ model qrCodeTag {
   buildingId   String?
   MapElement   MapElement? @relation(fields: [mapElementId], references: [id])
   mapElementId String?
+
+  conduit   Conduit? @relation(fields: [conduitId], references: [id])
+  conduitId String?
 }
 
 model installationSequence {