Merge pull request #110 from Cloudshelf/CS-2081

feat: support machine sizes for certain retailers

package.json

@@ -14,7 +14,7 @@
     "--- database options ---": "",
     "db:generate:migration": "ENV_FILE_PATH=environment-variables/.local MIKRO_ORM_CLI_CONFIG=src/modules/database/mikro-orm.config.ts npx mikro-orm migration:create",
     "db:migrate:down": "ENV_FILE_PATH=environment-variables/.local MIKRO_ORM_CLI_CONFIG=src/modules/database/mikro-orm.config.ts npx mikro-orm migration:down",
-    "db:migrate:up": "ENV_FILE_PATH=environment-variables/.local MIKRO_ORM_CLI_CONFIG=src/modules/database/mikro-orm.config.ts npx mikro-orm migration:up",
+    "db:migrate:up": "ENV_FILE_PATH=environment-variables/.dev MIKRO_ORM_CLI_CONFIG=src/modules/database/mikro-orm.config.ts npx mikro-orm migration:up",
     "--- codegen options ---": "",
     "codegen:cloudshelf": "graphql-codegen --config src/graphql/cloudshelf/codegen.ts",
     "codegen:shopifyAdmin": "graphql-codegen --config src/graphql/shopifyAdmin/codegen.ts",
@@ -53,15 +53,20 @@
     "@nestjs/platform-express": "^10.4.3",
     "@nestjs/schedule": "^4.0.2",
     "@nestjs/terminus": "^10.2.3",
+    "@opentelemetry/instrumentation-fs": "^0.14.0",
+    "@opentelemetry/instrumentation-http": "^0.52.1",
+    "@opentelemetry/instrumentation-pg": "^0.43.0",
+    "@opentelemetry/instrumentation-undici": "^0.4.0",
     "@sentry/cli": "^2.25.3",
     "@sentry/node": "^7.114.0",
     "@sentry/profiling-node": "^1.3.5",
     "@sentry/tracing": "^7.114.0",
     "@shopify/shopify-api": "^9.0.2",
     "@slack/web-api": "^7.0.1",
-    "@trigger.dev/sdk": "^3.3.7",
+    "@trigger.dev/sdk": "^3.3.11",
     "apollo-server-core": "^3.13.0",
     "async": "^3.2.5",
+    "class-transformer": "^0.3.1",
     "date-fns": "^3.3.1",
     "dotenv-flow": "^4.1.0",
     "graphql": "^16.8.1",
@@ -72,15 +77,12 @@
     "nestjs-cls": "^4.3.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.2.0",
-    "ulid": "^2.3.0",
-    "@opentelemetry/instrumentation-fs": "^0.14.0",
-    "@opentelemetry/instrumentation-http": "^0.52.1",
-    "@opentelemetry/instrumentation-pg": "^0.43.0",
-    "@opentelemetry/instrumentation-undici": "^0.4.0",
-    "class-transformer": "^0.3.1",
-    "ts-morph": "21.0.0"
+    "ts-morph": "*",
+    "ulid": "^2.3.0"
   },
   "devDependencies": {
+    "@azure/app-configuration": "1.7.0",
+    "@azure/keyvault-secrets": "4.8.0",
     "@graphql-codegen/cli": "5.0.0",
     "@graphql-codegen/introspection": "^4.0.0",
     "@graphql-codegen/typescript": "4.0.1",
@@ -92,6 +94,7 @@
     "@nestjs/schematics": "^10.1.1",
     "@nestjs/testing": "^10.3.7",
     "@shopify/cli": "^3.53.1",
+    "@trigger.dev/build": "^3.3.11",
     "@types/async": "^3.2.24",
     "@types/express": "^4.17.13",
     "@types/jest": "29.5.0",
@@ -104,6 +107,10 @@
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-prettier": "4.0.0",
     "jest": "29.5.0",
+    "oci-common": "2.93.0",
+    "oci-identity": "2.93.0",
+    "oci-objectstorage": "2.93.0",
+    "oci-secrets": "2.93.0",
     "patch-package": "^8.0.0",
     "prettier": "^2.3.2",
     "source-map-support": "^0.5.20",
@@ -112,17 +119,11 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "4.2.0",
-    "typescript": "^4.7.4",
-    "@azure/app-configuration": "1.7.0",
-    "@azure/keyvault-secrets": "4.8.0",
-    "oci-common": "2.93.0",
-    "oci-identity": "2.93.0",
-    "oci-secrets": "2.93.0",
-    "oci-objectstorage": "2.93.0",
-    "@trigger.dev/build": "^3.3.7"
+    "typescript": "^4.7.4"
   },
   "peerDependencies": {
     "@apollo/subgraph": "*",
+    "@azure/app-configuration": "*",
     "@nestjs/microservices": "*",
     "@nestjs/platform-socket.io": "*",
     "@nestjs/websockets": "*",
@@ -142,8 +143,7 @@
     "pg-query-stream": "*",
     "sqlite3": "*",
     "tedious": "*",
-    "ts-morph": "*",
-    "@azure/app-configuration": "*"
+    "ts-morph": "*"
   },
   "peerDependenciesMeta": {
     "@apollo/subgraph": {
@@ -236,4 +236,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}

src/modules/data-ingestion/collection.job.utils.ts

@@ -71,6 +71,7 @@ export class CollectionJobUtils {
                 tags,
                 concurrencyKey: retailer.id,
                 idempotencyKey: await idempotencyKeys.create(bulkOp.shopifyBulkOpId),
+                machine: retailer.triggerMachineSizeProductGroups ?? undefined,
             },
         );
     }

src/modules/data-ingestion/product.job.utils.ts

@@ -127,6 +127,7 @@ export class ProductJobUtils {
                     tags,
                     concurrencyKey: retailer.id,
                     idempotencyKey: idempotencyKey,
+                    machine: retailer.triggerMachineSizeProducts ?? undefined,
                 },
             );
 

src/modules/database/migrations/.snapshot-shopify-connector.json

@@ -421,6 +421,24 @@
           "primary": false,
           "nullable": true,
           "mappedType": "text"
+        },
+        "trigger_machine_size_products": {
+          "name": "trigger_machine_size_products",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
+        },
+        "trigger_machine_size_product_groups": {
+          "name": "trigger_machine_size_product_groups",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "text"
         }
       },
       "name": "retailer_entity",

src/modules/database/migrations/Migration20250123151703.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20250123151703 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "retailer_entity" add column "trigger_machine_size_products" text null, add column "trigger_machine_size_product_groups" text null;`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "retailer_entity" drop column "trigger_machine_size_products", drop column "trigger_machine_size_product_groups";`);
+  }
+
+}

src/modules/retailer/retailer.entity.ts

@@ -1,4 +1,5 @@
 import { Entity, Index, Property, types } from '@mikro-orm/core';
+import { MachineSize } from '../../trigger/reuseables/machines_size';
 import { BaseEntity } from '../database/abstract-entities/entity.base';
 
 @Entity({ tableName: 'retailer_entity' })
@@ -55,6 +56,12 @@ export class RetailerEntity extends BaseEntity {
     @Property({ type: 'text', nullable: true })
     syncErrorCode: string | null;
 
+    @Property({ type: 'text', nullable: true })
+    triggerMachineSizeProducts: MachineSize | null;
+
+    @Property({ type: 'text', nullable: true })
+    triggerMachineSizeProductGroups: MachineSize | null;
+
     async supportsWithPublicationStatus(): Promise<boolean> {
         return this.scopes.includes('read_product_listings');
     }

src/trigger/reuseables/machines_size.ts

@@ -0,0 +1 @@
+export type MachineSize = 'micro' | 'small-1x' | 'small-2x' | 'medium-1x' | 'medium-2x' | 'large-1x' | 'large-2x';

trigger.config.ts

@@ -9,6 +9,7 @@ import { defineConfig, logger, usage } from '@trigger.dev/sdk/v3';
 
 export default defineConfig({
     project: 'proj_pnqbfgxmeuaytlevhxap',
+    maxDuration: 7200, // 2 hours
     build: {
         external: [
             '@as-integrations/fastify',