Skip to content

Commit fabe3a5

Browse files
committed
#1523 - simplify schema
1 parent 3c79d1a commit fabe3a5

4 files changed

Lines changed: 7 additions & 17 deletions

File tree

src/backend/src/prisma/migrations/20231119081007_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231119081759_add_bom/migration.sql

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CREATE TABLE "Manufacturer" (
6363
"dateCreated" TIMESTAMP(3) NOT NULL,
6464
"creatorId" INTEGER NOT NULL,
6565
"dateDeleted" TIMESTAMP(3),
66-
"deletedByUserId" INTEGER,
6766

6867
CONSTRAINT "Manufacturer_pkey" PRIMARY KEY ("name")
6968
);
@@ -100,6 +99,3 @@ ALTER TABLE "Material" ADD CONSTRAINT "Material_manufacturerName_fkey" FOREIGN K
10099

101100
-- AddForeignKey
102101
ALTER TABLE "Material" ADD CONSTRAINT "Material_unitName_fkey" FOREIGN KEY ("unitName") REFERENCES "Unit"("name") ON DELETE SET NULL ON UPDATE CASCADE;
103-
104-
-- AddForeignKey
105-
ALTER TABLE "Manufacturer" ADD CONSTRAINT "Manufacturer_deletedByUserId_fkey" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("userId") ON DELETE SET NULL ON UPDATE CASCADE;

src/backend/src/prisma/schema.prisma

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ model User {
114114
createdAssemblies Assembly[] @relation(name: "assemblyCreator")
115115
deletedMaterials Material[] @relation(name: "materialDeleter")
116116
createdMaterials Material[] @relation(name: "materialCreator")
117-
deletedManufacturers Manufacturer[] @relation(name: "deletedManufacturer")
118117
}
119118

120119
model Team {
@@ -526,11 +525,9 @@ model Material_Type {
526525
}
527526

528527
model Manufacturer {
529-
name String @id
530-
dateCreated DateTime
531-
creatorId Int
532-
dateDeleted DateTime?
533-
deletedByUserId Int?
534-
deletedBy User? @relation(name: "deletedManufacturer", fields: [deletedByUserId], references: [userId])
535-
materials Material[]
528+
name String @id
529+
dateCreated DateTime
530+
creatorId Int
531+
dateDeleted DateTime?
532+
materials Material[]
536533
}

src/backend/src/services/projects.services.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -823,14 +823,12 @@ export default class ProjectsService {
823823
if (manufacturer.dateDeleted) throw new DeletedException('Manufacturer', manufacturer.name);
824824

825825
const dateDeleted: Date = new Date();
826-
const deletedByUserId = user.userId;
827826
const deletedManufacturer = await prisma.manufacturer.update({
828827
where: {
829828
name: manufacturer.name
830829
},
831830
data: {
832-
dateDeleted,
833-
deletedByUserId
831+
dateDeleted
834832
}
835833
});
836834

src/backend/src/transformers/manufacturer.transformer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export const manufacturerTransformer = (
1313
name: manufacturer.name,
1414
dateCreated: manufacturer.dateCreated,
1515
creatorId: manufacturer.creatorId,
16-
dateDeleted: manufacturer.dateDeleted,
17-
deletedByUserId: manufacturer.deletedByUserId
16+
dateDeleted: manufacturer.dateDeleted
1817
};
1918
};

0 commit comments

Comments
 (0)