From 350bad44049ba9a4f34ece9a2d1f4e155f9490a4 Mon Sep 17 00:00:00 2001 From: Rikard Bartholf Date: Thu, 4 Apr 2024 16:43:13 +0200 Subject: [PATCH 1/4] Remove product-type --- src/datasources/product-api.ts | 11 ++--------- src/types/product-types.ts | 6 ------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/datasources/product-api.ts b/src/datasources/product-api.ts index 17cbe59..fa5faa4 100644 --- a/src/datasources/product-api.ts +++ b/src/datasources/product-api.ts @@ -16,7 +16,6 @@ import { ProductInfoInput, ProductBlacklistMarketInput, ProductMaterials, - ProductSizeTypes, ProductProportionsInput, Batch, Copyright, @@ -807,16 +806,10 @@ export class ProductAPI extends BaseSQLDataSource { const insertionProducts = []; // Insert in product-printproducts // TODO: Depracate typeid, its not used to check repeating - const insertQuery = `INSERT INTO "product-printproducts" (productid, groupid, typeid) VALUES (?, ?, ?)`; + const insertQuery = `INSERT INTO "product-printproducts" (productid, groupid) VALUES (?, ?)`; shouldAdd.forEach((groupId) => { insertionProducts.push( - this.knex.raw(insertQuery, [ - productId, - groupId, - groupId === ProductGroup.WALLPAPER - ? ProductSizeTypes.TILING - : ProductSizeTypes.SCALING, - ]), + this.knex.raw(insertQuery, [productId, groupId]), ); }); diff --git a/src/types/product-types.ts b/src/types/product-types.ts index 4a9bd3f..cee4a0d 100644 --- a/src/types/product-types.ts +++ b/src/types/product-types.ts @@ -84,12 +84,6 @@ export enum ProductMaterials { PREMIUM_FRAMED_PRINT = 6, } -export enum ProductSizeTypes { - SCALING = 1, - FIXED = 2, - TILING = 3, -} - export enum ProductType { UNKNOWN = 0, PHOTO = 1, From 6c753a79544e66ff3a41c98b0762c890c1030e65 Mon Sep 17 00:00:00 2001 From: Rikard Bartholf Date: Thu, 4 Apr 2024 16:45:35 +0200 Subject: [PATCH 2/4] Remove redundant TODO: --- src/datasources/product-api.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/datasources/product-api.ts b/src/datasources/product-api.ts index fa5faa4..b1b37d3 100644 --- a/src/datasources/product-api.ts +++ b/src/datasources/product-api.ts @@ -805,7 +805,6 @@ export class ProductAPI extends BaseSQLDataSource { if (shouldAdd.length > 0) { const insertionProducts = []; // Insert in product-printproducts - // TODO: Depracate typeid, its not used to check repeating const insertQuery = `INSERT INTO "product-printproducts" (productid, groupid) VALUES (?, ?)`; shouldAdd.forEach((groupId) => { insertionProducts.push( From 1ea4534cce36ed9cafd3bb8c2695b15014ca82e8 Mon Sep 17 00:00:00 2001 From: Rikard Bartholf Date: Tue, 28 May 2024 13:23:38 +0200 Subject: [PATCH 3/4] Remove references in config.txt --- docker-compose.yml | 1 + src/config.ts | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 570bb32..3da3082 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,7 @@ version: '3.8' services: api: + restart: always build: context: ./ dockerfile: ./Dockerfile-dev diff --git a/src/config.ts b/src/config.ts index bb7b3df..b1b2129 100644 --- a/src/config.ts +++ b/src/config.ts @@ -65,8 +65,6 @@ export const dbConfig = { return 'product-stockprices'; case 'product_stockproducts': return 'product-stockproducts'; - case 'product_types': - return 'product-types'; case 'stock_items': return 'stock-items'; case 'stock_items_data': From 84e368acba49d7c4d7c2eb72d455ffeb09746107 Mon Sep 17 00:00:00 2001 From: Rikard Bartholf Date: Tue, 28 May 2024 13:37:53 +0200 Subject: [PATCH 4/4] Add docker-compose.yml to .gitignore --- .gitignore | 1 + docker-compose.yml => docker-compose.yml.example | 0 2 files changed, 1 insertion(+) rename docker-compose.yml => docker-compose.yml.example (100%) diff --git a/.gitignore b/.gitignore index a5b6960..c3f4921 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ jspm_packages .vscode/ .env src/__test__/export +docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml.example similarity index 100% rename from docker-compose.yml rename to docker-compose.yml.example