Merge pull request #165 from Photowall/4194-drop-product-types-table

Remove product-type

.gitignore

@@ -93,3 +93,4 @@ jspm_packages
 .vscode/
 .env
 src/__test__/export
+docker-compose.yml

docker-compose.yml.example

@@ -2,6 +2,7 @@ version: '3.8'
 
 services:
   api:
+    restart: always
     build:
       context: ./
       dockerfile: ./Dockerfile-dev

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':

src/datasources/product-api.ts

@@ -16,7 +16,6 @@ import {
   ProductInfoInput,
   ProductBlacklistMarketInput,
   ProductMaterials,
-  ProductSizeTypes,
   ProductProportionsInput,
   Batch,
   Copyright,
@@ -806,17 +805,10 @@ 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 (?, ?)`;
-      const insertQuery = `INSERT INTO "product-printproducts" (productid, groupid, typeid) VALUES (?, ?, ?)`;
       shouldAdd.forEach((groupId) => {
         insertionProducts.push(
-          this.knex.raw(insertQuery, [
+          this.knex.raw(insertQuery, [productId, groupId]),
-            productId,
-            groupId,
-            groupId === ProductGroup.WALLPAPER
-              ? ProductSizeTypes.TILING
-              : ProductSizeTypes.SCALING,
-          ]),
         );
       });
 

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,