126: upgrade libs for graphql major versions (#127)
* upgraded minor and patch libraries * upgrade lock file for tests * 126: upgraded all major versions in package.json * removed unused import
This commit is contained in:
Generated
+1279
-2433
File diff suppressed because it is too large
Load Diff
+8
-8
@@ -21,14 +21,14 @@
|
|||||||
"@aws-sdk/client-sqs": "^3.194.0",
|
"@aws-sdk/client-sqs": "^3.194.0",
|
||||||
"@aws-sdk/client-translate": "^3.195.0",
|
"@aws-sdk/client-translate": "^3.195.0",
|
||||||
"@aws-sdk/s3-request-presigner": "^3.194.0",
|
"@aws-sdk/s3-request-presigner": "^3.194.0",
|
||||||
"@newrelic/apollo-server-plugin": "^1.3.0",
|
"@newrelic/apollo-server-plugin": "^2.0.1",
|
||||||
"apollo-datasource": "^3.3.2",
|
"apollo-datasource": "^3.3.2",
|
||||||
"apollo-datasource-rest": "^3.7.0",
|
"apollo-datasource-rest": "^3.7.0",
|
||||||
"apollo-server": "^3.10.3",
|
"apollo-server": "^3.10.3",
|
||||||
"apollo-server-caching": "^3.3.0",
|
"apollo-server-caching": "^3.3.0",
|
||||||
"async-redis": "^2.0.0",
|
"async-redis": "^2.0.0",
|
||||||
"axios": "^0.27.2",
|
"axios": "^1.1.3",
|
||||||
"datasource-sql": "^1.6.0",
|
"datasource-sql": "^2.0.1",
|
||||||
"dotenv": "^16.0.3",
|
"dotenv": "^16.0.3",
|
||||||
"graphql": "^16.6.0",
|
"graphql": "^16.6.0",
|
||||||
"graphql-scalars": "^1.20.0",
|
"graphql-scalars": "^1.20.0",
|
||||||
@@ -36,12 +36,12 @@
|
|||||||
"jwk-to-pem": "^2.0.5",
|
"jwk-to-pem": "^2.0.5",
|
||||||
"knex": "^2.3.0",
|
"knex": "^2.3.0",
|
||||||
"knex-stringcase": "^1.4.6",
|
"knex-stringcase": "^1.4.6",
|
||||||
"newrelic": "^8.17.1",
|
"newrelic": "^9.4.0",
|
||||||
"nodemon": "^2.0.20",
|
"nodemon": "^2.0.20",
|
||||||
"pg": "^8.8.0",
|
"pg": "^8.8.0",
|
||||||
"pg-hstore": "^2.3.4",
|
"pg-hstore": "^2.3.4",
|
||||||
"prettier": "^2.7.1",
|
"prettier": "^2.7.1",
|
||||||
"slug": "^5.3.0",
|
"slug": "^8.2.2",
|
||||||
"stringcase": "^4.3.1",
|
"stringcase": "^4.3.1",
|
||||||
"ts-node": "^10.9.1",
|
"ts-node": "^10.9.1",
|
||||||
"typescript": "^4.8.4",
|
"typescript": "^4.8.4",
|
||||||
@@ -49,15 +49,15 @@
|
|||||||
"validator": "^13.7.0"
|
"validator": "^13.7.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jest": "^27.5.2",
|
"@types/jest": "^29.2.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.41.0",
|
"@typescript-eslint/eslint-plugin": "^5.41.0",
|
||||||
"@typescript-eslint/parser": "^5.41.0",
|
"@typescript-eslint/parser": "^5.41.0",
|
||||||
"eslint": "^8.26.0",
|
"eslint": "^8.26.0",
|
||||||
"eslint-config-prettier": "^8.5.0",
|
"eslint-config-prettier": "^8.5.0",
|
||||||
"eslint-plugin-prettier": "^4.2.1",
|
"eslint-plugin-prettier": "^4.2.1",
|
||||||
"isomorphic-fetch": "^3.0.0",
|
"isomorphic-fetch": "^3.0.0",
|
||||||
"jest": "^28.1.3",
|
"jest": "^29.2.2",
|
||||||
"testcontainers": "^8.16.0",
|
"testcontainers": "^8.16.0",
|
||||||
"ts-jest": "^28.0.8"
|
"ts-jest": "^29.0.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ WHERE product_category.product_id = ?
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getCategories(): Promise<Array<Category>> {
|
async getCategories(): Promise<Array<Category>> {
|
||||||
|
// @ts-ignore
|
||||||
return this.knex.select('*').from('v_categorytree').cache(MINUTE);
|
return this.knex.select('*').from('v_categorytree').cache(MINUTE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,12 +41,15 @@ WHERE product_category.product_id = ?
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getCategoryById(id: number): Promise<Category> {
|
async getCategoryById(id: number): Promise<Category> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('v_categorytree')
|
.from('v_categorytree')
|
||||||
.where('id', id)
|
.where('id', id)
|
||||||
.first()
|
.first()
|
||||||
.cache(MINUTE);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getLocaleNameForId(id: number): Promise<JSON> {
|
async getLocaleNameForId(id: number): Promise<JSON> {
|
||||||
|
|||||||
@@ -9,11 +9,13 @@ export class DesignerAPI extends BaseSQLDataSource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getDesignerById(id: number): Promise<Designer> {
|
async getDesignerById(id: number): Promise<Designer> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('designers')
|
.from('designers')
|
||||||
.where('designerid', id)
|
.where('designerid', id)
|
||||||
.first()
|
.first()
|
||||||
|
// @ts-ignore
|
||||||
.cache(MINUTE)
|
.cache(MINUTE)
|
||||||
.then((row) => {
|
.then((row) => {
|
||||||
return {
|
return {
|
||||||
@@ -21,7 +23,8 @@ export class DesignerAPI extends BaseSQLDataSource {
|
|||||||
id: row.designerid,
|
id: row.designerid,
|
||||||
excludeFromSearch: !row.visibleSearch || !row.visibleDesignerpage,
|
excludeFromSearch: !row.visibleSearch || !row.visibleDesignerpage,
|
||||||
};
|
};
|
||||||
});
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async searchDesigners(name: string): Promise<Array<Designer>> {
|
async searchDesigners(name: string): Promise<Array<Designer>> {
|
||||||
@@ -42,11 +45,13 @@ export class DesignerAPI extends BaseSQLDataSource {
|
|||||||
|
|
||||||
async getDesigners(limit: Maybe<number>): Promise<Array<Designer>> {
|
async getDesigners(limit: Maybe<number>): Promise<Array<Designer>> {
|
||||||
limit = limit ?? 5000;
|
limit = limit ?? 5000;
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('designers')
|
.from('designers')
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
.orderBy('name')
|
.orderBy('name')
|
||||||
|
// @ts-ignore
|
||||||
.cache(MINUTE)
|
.cache(MINUTE)
|
||||||
.then((rows) => {
|
.then((rows) => {
|
||||||
return rows.map((row) => {
|
return rows.map((row) => {
|
||||||
@@ -56,6 +61,7 @@ export class DesignerAPI extends BaseSQLDataSource {
|
|||||||
excludeFromSearch: !row.visibleSearch || !row.visibleDesignerpage,
|
excludeFromSearch: !row.visibleSearch || !row.visibleDesignerpage,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
});
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,14 +48,17 @@ ORDER BY keywords.value
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getKeywordById(id: number): Promise<Keyword> {
|
async getKeywordById(id: number): Promise<Keyword> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('keywords')
|
.from('keywords')
|
||||||
.leftJoin('keyword_type', 'keyword_type.keyword_id', 'keywords.id')
|
.leftJoin('keyword_type', 'keyword_type.keyword_id', 'keywords.id')
|
||||||
.where('id', id)
|
.where('id', id)
|
||||||
.first()
|
.first()
|
||||||
|
// @ts-ignore
|
||||||
.cache(MINUTE)
|
.cache(MINUTE)
|
||||||
.then((row) => this.getType(row));
|
.then((row) => this.getType(row))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async searchKeywords(name: string): Promise<Array<Keyword>> {
|
async searchKeywords(name: string): Promise<Array<Keyword>> {
|
||||||
|
|||||||
@@ -10,52 +10,70 @@ export class MarketLocaleAPI extends SQLDataSource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getMarketById(id: number): Promise<Market> {
|
async getMarketById(id: number): Promise<Market> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('markets')
|
.from('markets')
|
||||||
.where('id', id)
|
.where('id', id)
|
||||||
.first()
|
.first()
|
||||||
.cache(MINUTE * 5);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE * 5)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getMarketByName(name: string): Promise<Market> {
|
async getMarketByName(name: string): Promise<Market> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('markets')
|
.from('markets')
|
||||||
.where('name', name)
|
.where('name', name)
|
||||||
.first()
|
.first()
|
||||||
.cache(MINUTE * 5);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE * 5)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getMarkets(): Promise<Array<Market>> {
|
async getMarkets(): Promise<Array<Market>> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('markets')
|
.from('markets')
|
||||||
.cache(MINUTE * 5);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE * 5)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getLocaleById(id: number): Promise<Locale> {
|
async getLocaleById(id: number): Promise<Locale> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('locales')
|
.from('locales')
|
||||||
.where('id', id)
|
.where('id', id)
|
||||||
.first()
|
.first()
|
||||||
.cache(MINUTE * 5);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE * 5)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getLocaleByValue(value: string): Promise<Locale> {
|
async getLocaleByValue(value: string): Promise<Locale> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('locales')
|
.from('locales')
|
||||||
.where('value', value)
|
.where('value', value)
|
||||||
.first()
|
.first()
|
||||||
.cache(MINUTE * 5);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE * 5)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getLocales(): Promise<Array<Locale>> {
|
async getLocales(): Promise<Array<Locale>> {
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('locales')
|
.from('locales')
|
||||||
.cache(MINUTE * 5);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE * 5)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ export class OrderAPI extends BaseSQLDataSource {
|
|||||||
.from('addresses')
|
.from('addresses')
|
||||||
.where('id', addressId)
|
.where('id', addressId)
|
||||||
.first()
|
.first()
|
||||||
|
// @ts-ignore
|
||||||
.cache(MINUTE);
|
.cache(MINUTE);
|
||||||
|
|
||||||
return row
|
return row
|
||||||
@@ -34,6 +35,7 @@ export class OrderAPI extends BaseSQLDataSource {
|
|||||||
.clone()
|
.clone()
|
||||||
.count()
|
.count()
|
||||||
.first()
|
.first()
|
||||||
|
// @ts-ignore
|
||||||
.cache(MINUTE * 5);
|
.cache(MINUTE * 5);
|
||||||
return res['count'] as number; // Optimize later to return Promise
|
return res['count'] as number; // Optimize later to return Promise
|
||||||
}
|
}
|
||||||
@@ -44,6 +46,7 @@ export class OrderAPI extends BaseSQLDataSource {
|
|||||||
let query = this.getOrdersQuery(input).limit(limit).offset(offset);
|
let query = this.getOrdersQuery(input).limit(limit).offset(offset);
|
||||||
|
|
||||||
query = query.orderBy('inserted', 'ASC');
|
query = query.orderBy('inserted', 'ASC');
|
||||||
|
// @ts-ignore
|
||||||
return query.cache(MINUTE);
|
return query.cache(MINUTE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,13 +76,16 @@ export class OrderAPI extends BaseSQLDataSource {
|
|||||||
: 'klarna_order_id';
|
: 'klarna_order_id';
|
||||||
const value = paypalTransactionId ?? klarnaOrderId;
|
const value = paypalTransactionId ?? klarnaOrderId;
|
||||||
|
|
||||||
return this.knex
|
return (
|
||||||
|
this.knex
|
||||||
.select('*')
|
.select('*')
|
||||||
.from('orders')
|
.from('orders')
|
||||||
.where(column, value)
|
.where(column, value)
|
||||||
.orderBy('id')
|
.orderBy('id')
|
||||||
.first()
|
.first()
|
||||||
.cache(MINUTE);
|
// @ts-ignore
|
||||||
|
.cache(MINUTE)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getOrderRowsByOrderId(orderId: number): Promise<Array<OrderRow>> {
|
async getOrderRowsByOrderId(orderId: number): Promise<Array<OrderRow>> {
|
||||||
|
|||||||
Reference in New Issue
Block a user