@dynamatix/gb-schemas 2.0.67 → 2.0.68

package/dist/entities/product-catalogues/index.d.ts

@@ -1,8 +1,7 @@
-import type { ProductCatalogue, ProductDefinition, ProductVariant, Product, Rule } from '@prisma/client';
-export type { ProductCatalogue, ProductDefinition, ProductVariant, Product, Rule };
+import type { ProductCatalogue, ProductDefinition, ProductVariant, Product } from '@prisma/client';
+export type { ProductCatalogue, ProductDefinition, ProductVariant, Product };
 export * from './product-catalogue.entity';
 export * from './product-definition.entity';
 export * from './product-variant.entity';
 export * from './product.entity';
-export * from './rule.entity';
 //# sourceMappingURL=index.d.ts.map

package/dist/entities/product-catalogues/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../entities/product-catalogues/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,IAAI,EACP,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,IAAI,EACP,CAAC;AAGF,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../entities/product-catalogues/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,OAAO,EACV,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACR,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,OAAO,EACV,CAAC;AAGF,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC"}

package/dist/entities/product-catalogues/index.js

@@ -3,4 +3,3 @@ export * from './product-catalogue.entity';
 export * from './product-definition.entity';
 export * from './product-variant.entity';
 export * from './product.entity';
-export * from './rule.entity';

package/dist/entities/product-catalogues/product-definition.entity.d.ts

@@ -1,5 +1,17 @@
 import { ProductCatalogueEntity } from './product-catalogue.entity';
-import { RuleEntity } from './rule.entity';
+export interface Rule {
+    ruleId: string;
+    rule: string;
+    name: string;
+    description?: string;
+    scope?: string;
+    mandatory: boolean;
+    overrideRuleType?: string;
+    overrideRuleMessage?: string;
+    inheritedFrom?: string;
+    anyPass: boolean;
+    preCashflow: boolean;
+}
 export declare class ProductDefinitionEntity {
     id: string;
     productDefinitionId: string;
@@ -7,10 +19,10 @@ export declare class ProductDefinitionEntity {
     name: string;
     atLeastOnePass: boolean;
     elements: any[];
+    rules: Rule[];
     createdAt: Date;
     updatedAt: Date;
     productCatalogue?: ProductCatalogueEntity;
-    rules?: RuleEntity[];
     constructor(partial: Partial<ProductDefinitionEntity>);
 }
 //# sourceMappingURL=product-definition.entity.d.ts.map

package/dist/entities/product-catalogues/product-definition.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"product-definition.entity.d.ts","sourceRoot":"","sources":["../../../entities/product-catalogues/product-definition.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBAAa,uBAAuB;IAChC,EAAE,EAAG,MAAM,CAAC;IACZ,mBAAmB,EAAG,MAAM,CAAC;IAC7B,kBAAkB,EAAG,MAAM,CAAC;IAC5B,IAAI,EAAG,MAAM,CAAC;IACd,cAAc,EAAG,OAAO,CAAC;IACzB,QAAQ,EAAG,GAAG,EAAE,CAAC;IACjB,SAAS,EAAG,IAAI,CAAC;IACjB,SAAS,EAAG,IAAI,CAAC;IAGjB,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;gBAET,OAAO,EAAE,OAAO,CAAC,uBAAuB,CAAC;CAGxD"}
+{"version":3,"file":"product-definition.entity.d.ts","sourceRoot":"","sources":["../../../entities/product-catalogues/product-definition.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAGpE,MAAM,WAAW,IAAI;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACxB;AAED,qBAAa,uBAAuB;IAChC,EAAE,EAAG,MAAM,CAAC;IACZ,mBAAmB,EAAG,MAAM,CAAC;IAC7B,kBAAkB,EAAG,MAAM,CAAC;IAC5B,IAAI,EAAG,MAAM,CAAC;IACd,cAAc,EAAG,OAAO,CAAC;IACzB,QAAQ,EAAG,GAAG,EAAE,CAAC;IACjB,KAAK,EAAG,IAAI,EAAE,CAAC;IACf,SAAS,EAAG,IAAI,CAAC;IACjB,SAAS,EAAG,IAAI,CAAC;IAGjB,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;gBAC9B,OAAO,EAAE,OAAO,CAAC,uBAAuB,CAAC;CAGxD"}

package/entities/product-catalogues/index.ts

@@ -2,8 +2,7 @@ import type {
     ProductCatalogue,
     ProductDefinition,
     ProductVariant,
-    Product,
-    Rule
+    Product
 } from '@prisma/client';
 
 // Export Prisma types
@@ -11,13 +10,11 @@ export type {
     ProductCatalogue,
     ProductDefinition,
     ProductVariant,
-    Product,
-    Rule
+    Product
 };
 
 // Export entity classes
 export * from './product-catalogue.entity';
 export * from './product-definition.entity';
 export * from './product-variant.entity';
-export * from './product.entity';
-export * from './rule.entity'; 
+export * from './product.entity';

package/entities/product-catalogues/product-definition.entity.ts

@@ -1,5 +1,19 @@
 import { ProductCatalogueEntity } from './product-catalogue.entity';
-import { RuleEntity } from './rule.entity';
+
+// Define Rule interface within the same file
+export interface Rule {
+    ruleId: string;
+    rule: string;
+    name: string;
+    description?: string;
+    scope?: string;
+    mandatory: boolean;
+    overrideRuleType?: string;
+    overrideRuleMessage?: string;
+    inheritedFrom?: string;
+    anyPass: boolean;
+    preCashflow: boolean;
+}
 
 export class ProductDefinitionEntity {
     id!: string;
@@ -8,14 +22,13 @@ export class ProductDefinitionEntity {
     name!: string;
     atLeastOnePass!: boolean;
     elements!: any[];
+    rules!: Rule[];
     createdAt!: Date;
     updatedAt!: Date;
 
     // Relations
     productCatalogue?: ProductCatalogueEntity;
-    rules?: RuleEntity[];
-
     constructor(partial: Partial<ProductDefinitionEntity>) {
         Object.assign(this, partial);
     }
-} 
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/gb-schemas",
-  "version": "2.0.67",
+  "version": "2.0.68",
   "description": "All the schemas for gatehouse bank back-end",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/prisma/migrations/20250521194549_update_product_definition_schema/migration.sql

@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - You are about to drop the `rules` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "rules" DROP CONSTRAINT "rules_product_definition_id_fkey";
+
+-- AlterTable
+ALTER TABLE "product_definitions" ADD COLUMN     "rules" JSONB NOT NULL DEFAULT '[]';
+
+-- DropTable
+DROP TABLE "rules";

package/prisma/product-catalogues/product-definition.prisma

@@ -5,12 +5,12 @@ model ProductDefinition {
   name                String   @map("name")
   atLeastOnePass      Boolean  @map("at_least_one_pass")
   elements            Json     @default("[]") @map("elements")
+  rules               Json     @default("[]") @map("rules")
   createdAt           DateTime @default(now()) @map("created_at")
   updatedAt           DateTime @updatedAt @map("updated_at")
 
   // Relations
-  productCatalogue ProductCatalogue @relation(fields: [productCatalogueId], references: [id])
-  rules            Rule[]
+  productCatalogue    ProductCatalogue @relation(fields: [productCatalogueId], references: [id])
 
   @@map("product_definitions")
-}
+}

package/prisma/schema.prisma

@@ -418,12 +418,12 @@ model ProductDefinition {
   name                String   @map("name")
   atLeastOnePass      Boolean  @map("at_least_one_pass")
   elements            Json     @default("[]") @map("elements")
+  rules               Json     @default("[]") @map("rules")
   createdAt           DateTime @default(now()) @map("created_at")
   updatedAt           DateTime @updatedAt @map("updated_at")
 
   // Relations
-  productCatalogue ProductCatalogue @relation(fields: [productCatalogueId], references: [id])
-  rules            Rule[]
+  productCatalogue    ProductCatalogue @relation(fields: [productCatalogueId], references: [id])
 
   @@map("product_definitions")
 }
@@ -457,30 +457,6 @@ model Product {
   @@map("products")
 }
 
-// From prisma/product-catalogues/rule.prisma
-model Rule {
-    id                  String   @id @default(uuid())
-    ruleId              String   @unique @map("rule_id")
-    rule                String   @map("rule")
-    name                String   @map("name")
-    description         String?  @map("description")
-    scope               String?  @map("scope")
-    mandatory           Boolean  @map("mandatory")
-    overrideRuleType    String?  @map("override_rule_type")
-    overrideRuleMessage String?  @map("override_rule_message")
-    inheritedFrom       String?  @map("inherited_from")
-    anyPass             Boolean  @map("any_pass")
-    preCashflow         Boolean  @map("pre_cashflow")
-    productDefinitionId String   @map("product_definition_id")
-    createdAt           DateTime @default(now()) @map("created_at")
-    updatedAt           DateTime @updatedAt @map("updated_at")
-
-    // Relations
-    productDefinition ProductDefinition @relation(fields: [productDefinitionId], references: [id])
-
-    @@map("rules")
-}
-
 // From prisma/applicants/applicant-credit-data.prisma
 model ApplicantCreditData {
   id                String    @id @default(uuid())

package/dist/entities/product-catalogues/rule.entity.d.ts

@@ -1,21 +0,0 @@
-import { ProductDefinitionEntity } from './product-definition.entity';
-export declare class RuleEntity {
-    id: string;
-    ruleId: string;
-    rule: string;
-    name: string;
-    description?: string;
-    scope?: string;
-    mandatory: boolean;
-    overrideRuleType?: string;
-    overrideRuleMessage?: string;
-    inheritedFrom?: string;
-    anyPass: boolean;
-    preCashflow: boolean;
-    productDefinitionId: string;
-    createdAt: Date;
-    updatedAt: Date;
-    productDefinition?: ProductDefinitionEntity;
-    constructor(partial: Partial<RuleEntity>);
-}
-//# sourceMappingURL=rule.entity.d.ts.map

package/dist/entities/product-catalogues/rule.entity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rule.entity.d.ts","sourceRoot":"","sources":["../../../entities/product-catalogues/rule.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,qBAAa,UAAU;IACnB,EAAE,EAAG,MAAM,CAAC;IACZ,MAAM,EAAG,MAAM,CAAC;IAChB,IAAI,EAAG,MAAM,CAAC;IACd,IAAI,EAAG,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAG,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAG,OAAO,CAAC;IAClB,WAAW,EAAG,OAAO,CAAC;IACtB,mBAAmB,EAAG,MAAM,CAAC;IAC7B,SAAS,EAAG,IAAI,CAAC;IACjB,SAAS,EAAG,IAAI,CAAC;IAGjB,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;gBAEhC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC;CAG3C"}

package/dist/entities/product-catalogues/rule.entity.js

@@ -1,5 +0,0 @@
-export class RuleEntity {
-    constructor(partial) {
-        Object.assign(this, partial);
-    }
-}

package/entities/product-catalogues/rule.entity.ts

@@ -1,26 +0,0 @@
-import { ProductDefinitionEntity } from './product-definition.entity';
-
-export class RuleEntity {
-    id!: string;
-    ruleId!: string;
-    rule!: string;
-    name!: string;
-    description?: string;
-    scope?: string;
-    mandatory!: boolean;
-    overrideRuleType?: string;
-    overrideRuleMessage?: string;
-    inheritedFrom?: string;
-    anyPass!: boolean;
-    preCashflow!: boolean;
-    productDefinitionId!: string;
-    createdAt!: Date;
-    updatedAt!: Date;
-
-    // Relations
-    productDefinition?: ProductDefinitionEntity;
-
-    constructor(partial: Partial<RuleEntity>) {
-        Object.assign(this, partial);
-    }
-} 

package/prisma/product-catalogues/rule.prisma

@@ -1,22 +0,0 @@
-model Rule {
-    id                  String   @id @default(uuid())
-    ruleId              String   @unique @map("rule_id")
-    rule                String   @map("rule")
-    name                String   @map("name")
-    description         String?  @map("description")
-    scope               String?  @map("scope")
-    mandatory           Boolean  @map("mandatory")
-    overrideRuleType    String?  @map("override_rule_type")
-    overrideRuleMessage String?  @map("override_rule_message")
-    inheritedFrom       String?  @map("inherited_from")
-    anyPass             Boolean  @map("any_pass")
-    preCashflow         Boolean  @map("pre_cashflow")
-    productDefinitionId String   @map("product_definition_id")
-    createdAt           DateTime @default(now()) @map("created_at")
-    updatedAt           DateTime @updatedAt @map("updated_at")
-
-    // Relations
-    productDefinition ProductDefinition @relation(fields: [productDefinitionId], references: [id])
-
-    @@map("rules")
-}