Skip to content

Commit

Permalink
Merge pull request #96 from Cloudshelf/node-version-is-build
Browse files Browse the repository at this point in the history
Node version is build
  • Loading branch information
ashleyww93 authored Dec 31, 2024
2 parents 84110be + a2c3455 commit f41ab0c
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/deployment_development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

# Enforce node version
- uses: actions/setup-node@v4
with:
node-version: 20.17.0

# Create the first message on slack
- name: Update status on slack
id: slack
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/deployment_production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

# Enforce node version
- uses: actions/setup-node@v4
with:
node-version: 20.17.0

# Create the first message on slack
- name: Update status on slack
id: slack
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"@apollo/client": "^3.8.1",
"@apollo/server": "^4.10.0",
"@aws-sdk/client-s3": "^3.637.0",
"@mikro-orm/cli": "^6.3.6",
"@mikro-orm/core": "^6.3.6",
"@mikro-orm/migrations": "^6.3.6",
"@mikro-orm/cli": "^6.3.13",
"@mikro-orm/core": "^6.3.13",
"@mikro-orm/migrations": "^6.3.13",
"@mikro-orm/nestjs": "^6.0.2",
"@mikro-orm/postgresql": "^6.3.6",
"@mikro-orm/postgresql": "^6.3.13",
"@mikro-orm/sql-highlighter": "^1.0.1",
"@nestjs-shopify/auth": "^4.2.0",
"@nestjs-shopify/core": "^3.3.0",
Expand Down
1 change: 1 addition & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ async function bootstrap() {
maxValueLength: 1250,
async beforeSend(event: SentryEvent, hint?: EventHint): Promise<SentryEvent | null> {
//Do some filtering here
console.log('Sentry before send', event);
return event;
},
});
Expand Down
1 change: 1 addition & 0 deletions src/modules/data-ingestion/product.job.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export class ProductJobUtils {
} catch (err: any) {
logs?.error(`Error in product consumer scheduler.`);
logs?.error(`err`, err);
throw err;
}
}
}
5 changes: 4 additions & 1 deletion src/modules/shopify/auth/no.oauth.cookie.exception.filter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ArgumentsHost, Catch, ExceptionFilter, HttpException, HttpStatus } from '@nestjs/common';
import { ArgumentsHost, Catch, ExceptionFilter } from '@nestjs/common';
import { ExtendedLogger } from '../../../utils/ExtendedLogger';
import { HtmlUtils } from '../../../utils/HtmlUtils';
import { Request, Response } from 'express';
Expand All @@ -9,6 +9,8 @@ export class NoOAuthCookieExceptionFilter implements ExceptionFilter {
catch(exception: unknown, host: ArgumentsHost) {
this.logger.debug(`In NoOAuthCookieExceptionFilter`);
const ctx = host.switchToHttp();
this.logger.debug('ctx type', (ctx as any).contextType ?? 'unknown');
this.logger.debug('exception being filtered', exception);
if ((ctx as any).contextType && (ctx as any).contextType === 'graphql') {
//do nothing as we want to see the GQL errors in the manager, so we rethrow
this.logger.debug(`graphql context, skipping`);
Expand All @@ -28,6 +30,7 @@ export class NoOAuthCookieExceptionFilter implements ExceptionFilter {
return;
}

this.logger.debug(`rethorwing`);
throw exception;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,16 @@ export class BulkOperationFinishedWebhookHandler extends ShopifyWebhookHandler<u
if (!bulkOp) {
this.logger.log('bulkOpComplete webhook referenced unknown bulkOp');
return;
} else {
this.logger.debug(`Loaded bulkop from database`, bulkOp);
}

const retailer = await this.retailerService.getByDomain(domain);
if (!retailer) {
this.logger.debug('Cannot get retailer for domain ' + domain);
return;
} else {
this.logger.debug(`Loaded retailer from database`, retailer);
}

bulkOp = await this.bulkOperationService.updateFromShopify(retailer, bulkOp);
Expand Down

0 comments on commit f41ab0c

Please sign in to comment.