Skip to content
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.

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

dev #81

Merged
merged 20 commits into from
Jan 29, 2024
Merged

dev #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ef2f3d4
fix: modules that don't belong to a finish also show up
AssisrMatheus Mar 24, 2022
0ba1954
Merge pull request #74 from perimetre/feature/Rules-Drawer-filler_CU-…
AssisrMatheus Mar 24, 2022
c6d1750
fix: fixes query that shows modules of other collections
AssisrMatheus Mar 24, 2022
18a0a49
Merge pull request #75 from perimetre/feature/Rules-Drawer-filler_CU-…
AssisrMatheus Mar 24, 2022
f9bf2e0
feat: favors external id when syncing modules
AssisrMatheus Mar 31, 2022
0f7c49a
feat: now all features are considered as rules
AssisrMatheus Apr 21, 2022
eb811bb
fix: updates sync product so it updates all parent modules if neede
AssisrMatheus Apr 22, 2022
d5192f3
feat: finished all schemas
AssisrMatheus Apr 26, 2022
0358583
feat: adds owner external id and virtual product
AssisrMatheus Apr 26, 2022
e5c1712
fix: fixes inconsistencies with sync
AssisrMatheus Apr 27, 2022
8554b56
fix: makes sure sync doesn't overwrite
AssisrMatheus Apr 27, 2022
1bbf576
Merge pull request #76 from perimetre/feature/Update-sync-for-imprint…
AssisrMatheus Apr 27, 2022
e3ee8e1
fix: fixes should hide when syncing
AssisrMatheus Apr 28, 2022
48f8b37
Merge pull request #77 from perimetre/feature/Update-sync-for-imprint…
AssisrMatheus Apr 28, 2022
4089554
fix: comments logging files
AssisrMatheus Apr 28, 2022
f473518
Merge pull request #78 from perimetre/feature/Update-sync-for-imprint…
AssisrMatheus Apr 28, 2022
48340ca
fix: fixes bundle path for module
AssisrMatheus May 2, 2022
c135686
Merge pull request #79 from perimetre/feature/Update-sync-for-imprint…
AssisrMatheus May 2, 2022
2010d85
feat: fix sync
AssisrMatheus Jan 29, 2024
b36a0c1
Merge pull request #80 from perimetre/feature/Update-sync-for-imprint…
AssisrMatheus Jan 29, 2024
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
808 changes: 798 additions & 10 deletions graphql.schema.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"graphql-middleware": "^6.0.10",
"graphql-shield": "^7.5.0",
"lodash": "^4.17.21",
"mime-types": "^2.1.35",
"multer": "^1.4.3",
"multer-s3": "^2.10.0",
"nanoid": "^3.2.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE `Module` ADD COLUMN `originalMarathonProductJson` JSON;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE `Module` ADD COLUMN `isVirtualProduct` BOOLEAN NOT NULL DEFAULT false;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE `Module` ADD COLUMN `ownerExternalId` VARCHAR(191);
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AddForeignKey
ALTER TABLE `Module` ADD FOREIGN KEY (`ownerExternalId`) REFERENCES `Module`(`externalId`) ON DELETE SET NULL ON UPDATE CASCADE;
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- AlterTable
ALTER TABLE `List` ADD COLUMN `createdAt` DATETIME(0) DEFAULT CURRENT_TIMESTAMP(0),
ADD COLUMN `updatedAt` DATETIME(0) DEFAULT CURRENT_TIMESTAMP(0);
13 changes: 10 additions & 3 deletions prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ model FinishTranslations {
}

model List {
id Int @id @default(autoincrement())
externalId String? @unique
id Int @id @default(autoincrement())
externalId String? @unique
name String?
createdAt DateTime? @default(now()) @db.DateTime(0)
updatedAt DateTime? @default(now()) @updatedAt @db.DateTime(0)
projectId Int?
project Project? @relation(fields: [projectId], references: [id])
project Project? @relation(fields: [projectId], references: [id])
}

model ModuleAttachments {
Expand All @@ -105,6 +107,8 @@ model Module {
id Int @id @default(autoincrement())
partNumber String @unique
externalId String? @unique
ownerExternalId String?
owner Module? @relation("ownerRelation", fields: [ownerExternalId], references: [externalId])
description String?
thumbnailUrl String? @db.VarChar(255)
bundleUrl String? @db.VarChar(255)
Expand All @@ -113,6 +117,7 @@ model Module {
isMat Boolean @default(false)
isExtension Boolean @default(false)
shouldHideBasedOnWidth Boolean @default(false)
isVirtualProduct Boolean @default(false)
createdAt DateTime @default(now()) @db.DateTime(0)
updatedAt DateTime @default(now()) @db.DateTime(0)
alwaysDisplay Boolean @default(false)
Expand All @@ -128,6 +133,7 @@ model Module {
collectionId Int
collection Collection @relation(fields: [collectionId], references: [id])
rules Json?
originalMarathonProductJson Json?
projectModules ProjectModule[]
moduleCategories ModuleCategory[]
defaultLeftExtensionParents Module[] @relation("defaultLeftExtensionRelation")
Expand All @@ -136,6 +142,7 @@ model Module {
moduleAttachments ModuleAttachments[] @relation("module_moduleAttachments")
moduleAttachedTo ModuleAttachments[] @relation("attachment_moduleAttachments")
moduleType ModuleType[]
modulesIOwn Module[] @relation("ownerRelation")
}

model Project {
Expand Down
Loading
Loading